From dc2d88bd716aeedfe8655428455f37c57ec3e25a Mon Sep 17 00:00:00 2001 From: Loc Nguyen Date: Tue, 17 Sep 2024 16:17:49 +0700 Subject: [PATCH 01/16] feature/IVYPORTAL-17431-Remove-Express-from-Portal - Remove ChatRenderBean --- .../portal/processes/Start Processes/PortalStart.p.json | 6 +----- .../ch/ivy/addon/portal/generic/bean/ChatRendererBean.java | 5 ----- .../layouts/restricted/AbstractTaskTemplate.xhtml | 2 +- 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/AxonIvyPortal/portal/processes/Start Processes/PortalStart.p.json b/AxonIvyPortal/portal/processes/Start Processes/PortalStart.p.json index cb92d8cb9bf..fba685d3460 100644 --- a/AxonIvyPortal/portal/processes/Start Processes/PortalStart.p.json +++ b/AxonIvyPortal/portal/processes/Start Processes/PortalStart.p.json @@ -2674,11 +2674,7 @@ "at" : { "x" : 224, "y" : 96 } }, "connect" : [ - { "id" : "S10-f8", "to" : "S10-f7", "label" : { - "name" : "Express end page", - "segment" : 0.47, - "offset" : { "y" : -11 } - } }, + { "id" : "S10-f8", "to" : "S10-f7" }, { "id" : "S10-f2", "to" : "S10-f68", "via" : [ { "x" : 288, "y" : 192 } ] }, { "id" : "S10-f3", "to" : "S10-f17", "via" : [ { "x" : 288, "y" : 288 } ] }, { "id" : "S10-f4", "to" : "S10-f19", "via" : [ { "x" : 256, "y" : 384 } ] }, diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portal/generic/bean/ChatRendererBean.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portal/generic/bean/ChatRendererBean.java index 34313ca3178..dcfff0cca55 100644 --- a/AxonIvyPortal/portal/src/ch/ivy/addon/portal/generic/bean/ChatRendererBean.java +++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portal/generic/bean/ChatRendererBean.java @@ -20,7 +20,6 @@ public class ChatRendererBean implements Serializable { private static final long serialVersionUID = 4691697531600235758L; - private static final String EXPRESS_CREATION_TASK = "isExpressCreationTask"; private Boolean isGroupChatRendered; private Boolean isPrivateChatRendered; @@ -56,8 +55,4 @@ public void getGroupChatName() { String groupChatName = Ivy.cms().co("/ch.ivy.addon.portalkit.ui.jsf/common/case") + "-{caseId}" + " {caseName}"; PrimeFaces.current().executeScript("var groupChatFormat = '" + groupChatName + "'"); } - - public boolean isExpressCreationTask() { - return Ivy.wfTask().customFields().stringField(EXPRESS_CREATION_TASK).get().isPresent(); - } } diff --git a/AxonIvyPortal/portal/webContent/layouts/restricted/AbstractTaskTemplate.xhtml b/AxonIvyPortal/portal/webContent/layouts/restricted/AbstractTaskTemplate.xhtml index 82b2d9e8f72..71a6a408896 100644 --- a/AxonIvyPortal/portal/webContent/layouts/restricted/AbstractTaskTemplate.xhtml +++ b/AxonIvyPortal/portal/webContent/layouts/restricted/AbstractTaskTemplate.xhtml @@ -141,7 +141,7 @@ icon="si si-move-to-bottom" onclick="PF('adhoc-task-reset-confirmation-dialog').show()" /> Date: Wed, 18 Sep 2024 11:43:16 +0700 Subject: [PATCH 02/16] feature/IVYPORTAL-17431-Remove-Express-from-Portal - Remove from AbstractTaskTemplate --- AxonIvyPortal/portal/cms/cms.yaml | 6 -- AxonIvyPortal/portal/cms/cms_de.yaml | 6 -- AxonIvyPortal/portal/cms/cms_en.yaml | 6 -- AxonIvyPortal/portal/cms/cms_es.yaml | 6 -- AxonIvyPortal/portal/cms/cms_fr.yaml | 6 -- .../bean/AbstractTaskTemplateBean.java | 56 ---------- .../ivy/addon/portalkit/bo/AdhocHistory.java | 61 ----------- .../dashboard/process/DashboardProcess.java | 25 ----- .../portalkit/enums/AdditionalProperty.java | 2 - .../service/AdhocHistoryService.java | 33 ------ .../webContent/layouts/TaskTemplate-8.xhtml | 1 - .../restricted/AbstractTaskTemplate.xhtml | 101 +----------------- .../webContent/resources/css/module.css | 22 ---- 13 files changed, 2 insertions(+), 329 deletions(-) delete mode 100644 AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bo/AdhocHistory.java delete mode 100644 AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/service/AdhocHistoryService.java diff --git a/AxonIvyPortal/portal/cms/cms.yaml b/AxonIvyPortal/portal/cms/cms.yaml index f036beb4fa2..ae600261641 100644 --- a/AxonIvyPortal/portal/cms/cms.yaml +++ b/AxonIvyPortal/portal/cms/cms.yaml @@ -11,16 +11,11 @@ ch.ivy.addon.portal.generic: requestTabTitle: Request statusTabTitle: Case Information OpenTaskTemplate: - adhocHistory: Adhoc history - adhocHistoryTooltip: Show adhoc history browserTabClosingWarning: You may lose your work in progress. Do you want to continue? goToAdhocWarning: You may lose your work in progress and start the Ad-hoc process. Do you want to continue? goToSidestepWarning: Your current modifications will not be saved, when a sidestep process is started directly from a task. Do you want to continue? - noteOfResultFromAdhocProcess: 'Note: You will find all these entries also in the process history' reCreateAdhocWarning: There is already an adhoc process for this task, do you want to create another one? resultFromAdhocProcess: Results from the Ad-Hoc Process - startAdHoc: Start Adhoc - startAdHocTooltip: Reroute this process using ad-hoc steps ch.ivy.addon.portalkit.ui.jsf: AbsenceAndDeputy: Messages: @@ -102,7 +97,6 @@ ch.ivy.addon.portalkit.ui.jsf: GRID: Grid IMAGE: Image ProcessType: - EXPRESS_PROCESS: Express Workflow EXTERNAL_LINK: External Link IVY_PROCESS: Business Process ProcessWidgetMode: diff --git a/AxonIvyPortal/portal/cms/cms_de.yaml b/AxonIvyPortal/portal/cms/cms_de.yaml index 40bbc209c05..6c659b01cdf 100644 --- a/AxonIvyPortal/portal/cms/cms_de.yaml +++ b/AxonIvyPortal/portal/cms/cms_de.yaml @@ -11,16 +11,11 @@ ch.ivy.addon.portal.generic: requestTabTitle: Anfrage statusTabTitle: Vorgangsinformationen OpenTaskTemplate: - adhocHistory: AdHoc Prozesshistorie - adhocHistoryTooltip: AdHoc Prozesshistorie anzeigen browserTabClosingWarning: Durch diese Aktion gehen ungespeicherte Änderungen verloren. Möchten Sie wirklich fortfahren? goToAdhocWarning: Beim starten von Ad-hoc Prozess gehen Ihre nicht gespeicherte Eingaben verloren. Möchten Sie weiter? goToSidestepWarning: Bei starten eines Sidestep Prozesses werden die aktuelle Eingaben nicht gespeichert. Möchten Sie sich trotzdem fortsetzen? - noteOfResultFromAdhocProcess: 'Achtung: alle Einträge sind auch in der Vorgangshistorie' reCreateAdhocWarning: Es gibt bereits einen AdHoc Prozess zu dieser Aufgabe. Möchten Sie einen neuen erstellen? resultFromAdhocProcess: Ergebnisse aus dem Ad-Hoc Prozess - startAdHoc: Start Adhoc - startAdHocTooltip: Neue Aufgabe hinzufügen, und den aktuellen Prozess umleiten. PortalName: PortalName: Portal ch.ivy.addon.portalkit.ui.jsf: @@ -111,7 +106,6 @@ ch.ivy.addon.portalkit.ui.jsf: BY_CUSTOM_ORDER: Benutzerdefinierte Reihenfolge BY_INDEX: Sortierindex ProcessType: - EXPRESS_PROCESS: Express Workflow EXTERNAL_LINK: External Link IVY_PROCESS: Geschäftsprozess ProcessWidgetMode: diff --git a/AxonIvyPortal/portal/cms/cms_en.yaml b/AxonIvyPortal/portal/cms/cms_en.yaml index 1bef35227c3..cb94c7de8d5 100644 --- a/AxonIvyPortal/portal/cms/cms_en.yaml +++ b/AxonIvyPortal/portal/cms/cms_en.yaml @@ -11,16 +11,11 @@ ch.ivy.addon.portal.generic: requestTabTitle: Request statusTabTitle: Case Information OpenTaskTemplate: - adhocHistory: Adhoc history - adhocHistoryTooltip: Show adhoc history browserTabClosingWarning: You may lose your work in progress. Do you want to continue? goToAdhocWarning: You may lose your work in progress and start the Ad-hoc process. Do you want to continue? goToSidestepWarning: Your current modifications will not be saved, when a sidestep process is started directly from a task. Do you want to continue? - noteOfResultFromAdhocProcess: 'Note: You will find all these entries also in the process history' reCreateAdhocWarning: There is already an adhoc process for this task, do you want to create another one? resultFromAdhocProcess: Results from the Ad-Hoc Process - startAdHoc: Start Adhoc - startAdHocTooltip: Reroute this process using ad-hoc steps PortalName: PortalName: Portal ch.ivy.addon.portalkit.ui.jsf: @@ -111,7 +106,6 @@ ch.ivy.addon.portalkit.ui.jsf: BY_CUSTOM_ORDER: Custom order BY_INDEX: Sorting index ProcessType: - EXPRESS_PROCESS: Express Workflow EXTERNAL_LINK: External Link IVY_PROCESS: Business Process ProcessWidgetMode: diff --git a/AxonIvyPortal/portal/cms/cms_es.yaml b/AxonIvyPortal/portal/cms/cms_es.yaml index 8c8237e6fc9..ba59acf895b 100644 --- a/AxonIvyPortal/portal/cms/cms_es.yaml +++ b/AxonIvyPortal/portal/cms/cms_es.yaml @@ -11,16 +11,11 @@ ch.ivy.addon.portal.generic: requestTabTitle: Solicitud statusTabTitle: Información del caso OpenTaskTemplate: - adhocHistory: Historial del proceso AdHoc - adhocHistoryTooltip: Mostrar historial del proceso AdHoc browserTabClosingWarning: Puede perder su trabajo en progreso. ¿Quiere continuar? goToAdhocWarning: Puede perder su trabajo en progreso e iniciar el proceso Ad-hoc. ¿Quiere continuar? goToSidestepWarning: Sus modificaciones actuales no se guardarán cuando se inicie un proceso de paso lateral directamente desde una tarea. ¿Quiere continuar? - noteOfResultFromAdhocProcess: 'Nota: podrá encontrar este historial también en el historial del caso.' reCreateAdhocWarning: Ya existe un proceso AdHoc para esta tarea. ¿Desea crear un proceso nuevo? resultFromAdhocProcess: Resultados del proceso AdHoc - startAdHoc: Comenzar Adhoc - startAdHocTooltip: Redirija este proceso usando pasos ad-hoc PortalName: PortalName: Portal ch.ivy.addon.portalkit.ui.jsf: @@ -111,7 +106,6 @@ ch.ivy.addon.portalkit.ui.jsf: BY_CUSTOM_ORDER: Pedido personalizado BY_INDEX: Índice de clasificación ProcessType: - EXPRESS_PROCESS: Flujo de trabajo exprés EXTERNAL_LINK: Link externo IVY_PROCESS: Proceso de negocio ProcessWidgetMode: diff --git a/AxonIvyPortal/portal/cms/cms_fr.yaml b/AxonIvyPortal/portal/cms/cms_fr.yaml index 186b08da480..9c3ef995f8e 100644 --- a/AxonIvyPortal/portal/cms/cms_fr.yaml +++ b/AxonIvyPortal/portal/cms/cms_fr.yaml @@ -11,16 +11,11 @@ ch.ivy.addon.portal.generic: requestTabTitle: Demande statusTabTitle: Informations sur le dossier OpenTaskTemplate: - adhocHistory: l'historique adhoc - adhocHistoryTooltip: Afficher l'historique adhoc browserTabClosingWarning: Votre travail risque d'être perdu. Souhaitez-vous continuer ? goToAdhocWarning: En démarrant un processus ad hoc, vos données non sauvegardées seront perdues. Voulez-vous continuer? goToSidestepWarning: En démarrant un processus sidestep, vos données non sauvegardées seront perdues. Voulez-vous continuer? - noteOfResultFromAdhocProcess: 'Remarque : Vous trouverez également toutes ces entrées dans l''historique du processus.' reCreateAdhocWarning: Il existe déjà un processus ad hoc pour cette tâche, voulez-vous en créer un autre ? resultFromAdhocProcess: Résultats du processus ad hoc - startAdHoc: Démarrer ad-hoc - startAdHocTooltip: Rediriger ce processus en ajoutant une étape ad hoc. PortalName: PortalName: Portal ch.ivy.addon.portalkit.ui.jsf: @@ -111,7 +106,6 @@ ch.ivy.addon.portalkit.ui.jsf: BY_CUSTOM_ORDER: Commande personnalisée BY_INDEX: Index de tri ProcessType: - EXPRESS_PROCESS: Flux de travail express EXTERNAL_LINK: Lien externe IVY_PROCESS: Processus d'entreprise ProcessWidgetMode: diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portal/generic/bean/AbstractTaskTemplateBean.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portal/generic/bean/AbstractTaskTemplateBean.java index 12d52a2910f..5fbf065d0b5 100644 --- a/AxonIvyPortal/portal/src/ch/ivy/addon/portal/generic/bean/AbstractTaskTemplateBean.java +++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portal/generic/bean/AbstractTaskTemplateBean.java @@ -7,15 +7,9 @@ import javax.faces.context.FacesContext; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.StringUtils; -import org.primefaces.PrimeFaces; import ch.ivy.addon.portal.generic.navigation.PortalNavigator; -import ch.ivy.addon.portalkit.bo.AdhocHistory; -import ch.ivy.addon.portalkit.enums.AdditionalProperty; -import ch.ivy.addon.portalkit.service.AdhocHistoryService; -import ch.ivy.addon.portalkit.service.ExpressProcessService; import ch.ivy.addon.portalkit.util.TaskUtils; import ch.ivy.addon.portalkit.util.UrlUtils; import ch.ivy.addon.portalkit.util.UserUtils; @@ -36,7 +30,6 @@ public abstract class AbstractTaskTemplateBean implements Serializable { protected List sideStepList; protected IStartableSideStep selectedSideStep; - protected List adhocHistories; protected String caseDetailsLink; protected ITask task; protected ITask currentTask; @@ -49,23 +42,12 @@ public void setSelectedSideStep(IStartableSideStep selectedSideStep) { this.selectedSideStep = selectedSideStep; } - public void startAdhoc(Long taskId) { - String url = ExpressProcessService.getInstance().findExpressAdhocWFLink(); - url = url + "?originalTaskId=" + taskId; - PortalNavigator.redirect(url); - } - public void startSideStep(ITask task) { TaskUtils.resetTask(task); String link = UrlUtils.formatLinkWithEmbedInFrameParam(selectedSideStep.getStartLink().getRelativeEncoded()); PortalNavigator.redirect(link); } - public boolean hasExpressAdhocWF() { - String adhocUrl = ExpressProcessService.getInstance().findExpressAdhocWFLink(); - return !adhocUrl.isEmpty(); - } - public List generateSideStepList(ICase iCase) { if (iCase == null) { return Collections.emptyList(); @@ -87,37 +69,6 @@ private boolean isSkippingTaskList() { return task != null && currentTask != null && currentTask.getId() != task.getId(); } - public boolean hasAdhocTasks(ITask task) { - if (task == null) { - return false; - } - boolean isFirstTimeOpenOriginalAdhocTask = AdditionalProperty.FIRST_TIME_OPEN_ORIGINAL_ADHOC_TASK.toString() - .equals(task.customFields().stringField(AdditionalProperty.FIRST_TIME_OPEN_ORIGINAL_ADHOC_TASK.toString()).getOrNull()); - if (isFirstTimeOpenOriginalAdhocTask) { - PrimeFaces.current().executeScript("PF('adhoc-task-history-dialog').show()"); - } - return AdditionalProperty.ORIGINAL_ADHOC_EXPRESS_TASK.toString().equals(task.customFields().stringField(AdditionalProperty.ORIGINAL_ADHOC_EXPRESS_TASK.toString()).getOrNull()); - } - - public void onCloseAdhocTaskHistoryDialog(ITask task) { - task.customFields().stringField(AdditionalProperty.FIRST_TIME_OPEN_ORIGINAL_ADHOC_TASK.toString()).delete(); - } - - public String getAdhocCreationMessage(Long taskId) { - AdhocHistoryService adhocHistoryService = new AdhocHistoryService(); - boolean hasAdhocHistory = adhocHistoryService.hasAdhocHistory(taskId); - return hasAdhocHistory ? Ivy.cms().co("/ch.ivy.addon.portal.generic/OpenTaskTemplate/reCreateAdhocWarning") : Ivy.cms().co("/ch.ivy.addon.portal.generic/OpenTaskTemplate/goToAdhocWarning"); - } - - public List getAllAdhocHistories(ITask task) { - if (adhocHistories == null && task != null) { - AdhocHistoryService adhocHistoryService = new AdhocHistoryService(); - adhocHistories = adhocHistoryService.getHistoriesByTaskID(task.getId()); - adhocHistories.sort((first, second) -> second.getTimestamp().compareTo(first.getTimestamp())); - } - return adhocHistories; - } - public static String getUserByUsernameAndExternalName(String username, String externalId) { if (StringUtils.isBlank(username)) { return ""; @@ -234,13 +185,6 @@ public void setTask(ITask task) { this.task = task; } - public boolean canStartAdhoc(String isShowStartAdhocButton, - Boolean isCurrentTaskPersistent) { - return StringUtils.isBlank(isShowStartAdhocButton) - ? (hasExpressAdhocWF() && isCurrentTaskPersistent) - : BooleanUtils.toBoolean(isShowStartAdhocButton); - } - public void doNothing() { } } diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bo/AdhocHistory.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bo/AdhocHistory.java deleted file mode 100644 index 19d588a71bd..00000000000 --- a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bo/AdhocHistory.java +++ /dev/null @@ -1,61 +0,0 @@ -package ch.ivy.addon.portalkit.bo; - -import java.util.Date; - -public class AdhocHistory { - - private long originalTaskId; - private String content; - private Date timestamp; - private String taskName; - private String authorUsername; - private String externalSecurityId; - - public long getOriginalTaskId() { - return originalTaskId; - } - - public void setOriginalTaskId(long originalTaskId) { - this.originalTaskId = originalTaskId; - } - - public String getContent() { - return content; - } - - public void setContent(String content) { - this.content = content; - } - - public Date getTimestamp() { - return timestamp; - } - - public void setTimestamp(Date timestamp) { - this.timestamp = timestamp; - } - - public String getTaskName() { - return taskName; - } - - public void setTaskName(String taskName) { - this.taskName = taskName; - } - - public String getAuthorUsername() { - return authorUsername; - } - - public void setAuthorUsername(String authorUsername) { - this.authorUsername = authorUsername; - } - - public String getExternalSecurityId() { - return externalSecurityId; - } - - public void setExternalSecurityId(String externalSecurityId) { - this.externalSecurityId = externalSecurityId; - } -} diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/dto/dashboard/process/DashboardProcess.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/dto/dashboard/process/DashboardProcess.java index 5c554e68c61..1f3fd787c90 100644 --- a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/dto/dashboard/process/DashboardProcess.java +++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/dto/dashboard/process/DashboardProcess.java @@ -8,23 +8,17 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import ch.ivy.addon.portalkit.bo.ExpressProcess; import ch.ivy.addon.portalkit.bo.ExternalLinkProcessItem; -import ch.ivy.addon.portalkit.bo.PortalExpressProcess; import ch.ivy.addon.portalkit.bo.Process; import ch.ivy.addon.portalkit.dto.DisplayName; import ch.ivy.addon.portalkit.enums.DefaultImage; import ch.ivy.addon.portalkit.enums.ProcessType; -import ch.ivy.addon.portalkit.service.ExpressProcessService; -import ch.ivy.addon.portalkit.util.CategoryUtils; -import ch.ivyteam.ivy.application.IApplication; import ch.ivyteam.ivy.environment.Ivy; import ch.ivyteam.ivy.workflow.category.Category; import ch.ivyteam.ivy.workflow.start.IWebStartable; @JsonInclude(JsonInclude.Include.NON_NULL) public class DashboardProcess implements Process { - private static final String EXPRESS_WORKFLOW_ID_PARAM = "?workflowID="; private String id; @Deprecated(forRemoval = true, since = "11.2.0") private Long processStartId; @@ -71,16 +65,6 @@ public DashboardProcess(IWebStartable process) { this.portalProcessInformation = getPortalProcessInformation(process); } - public DashboardProcess(ExpressProcess process) { - this.id = process.getId(); - this.type = ProcessType.EXPRESS_PROCESS; - this.name = process.getProcessName(); - this.description = process.getProcessDescription(); - this.icon = process.getIcon(); - this.category = CategoryUtils.buildExpressCategory(process.getProcessName()); - this.application = IApplication.current().getName(); - } - @Override public String getId() { return id; @@ -130,9 +114,6 @@ public void setNames(List names) { @Override public String getStartLink() { - if (this.type == ProcessType.EXPRESS_PROCESS) { - return generateWorkflowStartLink(); - } return startLink; } @@ -145,8 +126,6 @@ public String getIcon() { if (StringUtils.isBlank(icon)) { if (this.type == ProcessType.IVY_PROCESS) { return Process.DEFAULT_PROCESS_ICON; - } else if (this.type == ProcessType.EXPRESS_PROCESS) { - return PortalExpressProcess.DEFAULT_ICON; } else if (this.type == ProcessType.EXTERNAL_LINK) { return ExternalLinkProcessItem.DEFAULT_ICON; } @@ -164,10 +143,6 @@ private String getActiveDisplayName() { .map(DisplayName::getValue).findFirst().orElse(this.name); } - private String generateWorkflowStartLink() { - return ExpressProcessService.getInstance().findExpressWorkflowStartLink() + EXPRESS_WORKFLOW_ID_PARAM + this.id; - } - /** * @deprecated use {@link #setProcessElementId(String)} * @return process start id diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/enums/AdditionalProperty.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/enums/AdditionalProperty.java index d432fefa9b3..97988070ce4 100644 --- a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/enums/AdditionalProperty.java +++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/enums/AdditionalProperty.java @@ -5,8 +5,6 @@ public enum AdditionalProperty { CUSTOMIZATION_ADDITIONAL_CASE_DETAILS_PAGE, CASE_BUSINESS_ENTITY_PROPERTY, HIDE, - ORIGINAL_ADHOC_EXPRESS_TASK, ADHOC_EXPRESS_TASK, - FIRST_TIME_OPEN_ORIGINAL_ADHOC_TASK, PORTAL_GROUP_CHAT_INFO; } diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/service/AdhocHistoryService.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/service/AdhocHistoryService.java deleted file mode 100644 index bf51f1ec443..00000000000 --- a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/service/AdhocHistoryService.java +++ /dev/null @@ -1,33 +0,0 @@ -package ch.ivy.addon.portalkit.service; - -import java.util.List; - -import ch.ivy.addon.portalkit.bo.AdhocHistory; -import ch.ivyteam.ivy.business.data.store.search.Filter; -import ch.ivyteam.ivy.business.data.store.search.Result; - -public class AdhocHistoryService extends BusinessDataService { - - private static final String ORIGINAL_TASK_ID = "originalTaskId"; - - @Override - public Class getType() { - return AdhocHistory.class; - } - - public List getHistoriesByTaskID(long taskID) { - Filter query = repo().search(getType()).numberField(ORIGINAL_TASK_ID).isEqualTo(taskID); - Result queryResult = query.execute(); - long totalCount = queryResult.totalCount(); - if(totalCount > LIMIT_10) { - queryResult = query.limit(Math.toIntExact(totalCount)).execute(); - } - return queryResult.getAll(); - } - - public boolean hasAdhocHistory(long taskID) { - Filter query = repo().search(getType()).numberField(ORIGINAL_TASK_ID).isEqualTo(taskID); - return query.limit(1).execute().count() > 0; - } - -} diff --git a/AxonIvyPortal/portal/webContent/layouts/TaskTemplate-8.xhtml b/AxonIvyPortal/portal/webContent/layouts/TaskTemplate-8.xhtml index 80fc802ccfe..1d88d40411f 100644 --- a/AxonIvyPortal/portal/webContent/layouts/TaskTemplate-8.xhtml +++ b/AxonIvyPortal/portal/webContent/layouts/TaskTemplate-8.xhtml @@ -36,7 +36,6 @@ - diff --git a/AxonIvyPortal/portal/webContent/layouts/restricted/AbstractTaskTemplate.xhtml b/AxonIvyPortal/portal/webContent/layouts/restricted/AbstractTaskTemplate.xhtml index 71a6a408896..21f9cc4a85a 100644 --- a/AxonIvyPortal/portal/webContent/layouts/restricted/AbstractTaskTemplate.xhtml +++ b/AxonIvyPortal/portal/webContent/layouts/restricted/AbstractTaskTemplate.xhtml @@ -72,27 +72,11 @@ - - - - - - - - + - - - + rendered="#{chatRendererBean.isGroupChatRendered and !(currentTask.state eq 'CREATED')}" /> - - - - - - - - - - - -
- #{abstractTaskTemplateBean.getAdhocCreationMessage(currentTask.id)} -
- - - - - - - - - - - - - @@ -287,46 +230,6 @@ - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/AxonIvyPortal/portal/webContent/resources/css/module.css b/AxonIvyPortal/portal/webContent/resources/css/module.css index 69bd1aa9323..5139ba57375 100644 --- a/AxonIvyPortal/portal/webContent/resources/css/module.css +++ b/AxonIvyPortal/portal/webContent/resources/css/module.css @@ -4466,17 +4466,6 @@ _:-ms-fullscreen, :root .content-link-history { } /* =================== END ENHANCEMENT ====================== */ -/* =================== ADHOC ============================= */ -.adhoc-task-history-dialog .ui-dialog-content.ui-widget-content { - max-height: 50vh; - width: 35vw; -} - -.adhoc-task-history-author { - display: inline; -} -/* ===================== END ADHOC ======================= */ - /* =================== ADD CHAT ============================= */ .chat-assignee-dialog { width: 600px !important; @@ -4741,10 +4730,6 @@ _:-ms-fullscreen, :root .content-link-history { max-width: 96vw; } - .adhoc-task-history-dialog .ui-dialog-content.ui-widget-content { - margin: 0 !important; - width: calc(100vw - 40px) !important; - } .case-details-data-1st-column { padding-right: 10px; text-align: left; @@ -4762,13 +4747,6 @@ _:-ms-fullscreen, :root .content-link-history { } } -@media screen and (min-width: 40.063em) and (max-width: 64.062em) { - .adhoc-task-history-dialog .ui-dialog-content.ui-widget-content { - margin: 0 !important; - width: calc(80vw - 40px) !important; - } -} - .note-show-more-link-icon, .note-show-more-link { margin-left: 5px; } From 500761e7b66e0768ae797ca8ced8d1fdaee2894d Mon Sep 17 00:00:00 2001 From: Loc Nguyen Date: Wed, 18 Sep 2024 15:31:26 +0700 Subject: [PATCH 03/16] feature/IVYPORTAL-17431-Remove-Express-from-Portal - Remove all AdHoc related --- AxonIvyPortal/portal/cms/cms.yaml | 25 ------------------- AxonIvyPortal/portal/cms/cms_de.yaml | 19 -------------- AxonIvyPortal/portal/cms/cms_en.yaml | 25 ------------------- AxonIvyPortal/portal/cms/cms_es.yaml | 25 ------------------- AxonIvyPortal/portal/cms/cms_fr.yaml | 19 -------------- .../addon/portalkit/bean/SideStepBean.java | 22 ++++++---------- .../addon/portalkit/bean/TaskActionBean.java | 3 +-- .../portalkit/enums/AdditionalProperty.java | 1 - .../portalkit/ivydata/bo/IvySideStep.java | 9 ------- .../SideStepSearchCriteria.java | 9 ------- .../ivydata/service/impl/SideStepService.java | 21 ---------------- .../service/ExpressProcessService.java | 6 ----- .../portalkit/service/HistoryService.java | 17 +++---------- .../component/CaseWidget/ActionsCell.xhtml | 2 +- .../component/TaskWidget/ActionsCell.xhtml | 2 +- .../component/ActionStep/ActionStep.xhtml | 8 ++---- .../component/CaseItem/CaseItem.xhtml | 2 +- .../CaseItemDetails/CaseItemDetails.xhtml | 1 - .../CaseItemRelatedCases/CaseAction.xhtml | 2 +- .../CaseItemRelatedCases.xhtml | 2 +- .../CaseItemRelatedTasks/TaskAction.xhtml | 2 +- .../component/SideStep/SideStep.xhtml | 12 +++------ .../component/TaskItem/TaskAction.xhtml | 2 +- .../TaskItemDetails/TaskItemDetails.xhtml | 2 +- 24 files changed, 26 insertions(+), 212 deletions(-) diff --git a/AxonIvyPortal/portal/cms/cms.yaml b/AxonIvyPortal/portal/cms/cms.yaml index ae600261641..68ce2e6402f 100644 --- a/AxonIvyPortal/portal/cms/cms.yaml +++ b/AxonIvyPortal/portal/cms/cms.yaml @@ -1,6 +1,4 @@ Categories: - AdhocExpressTasks: - name: Adhoc Express Tasks CreateExpressWorkflow: name: Create Express Workflow ExpressWorkflow: @@ -12,10 +10,7 @@ ch.ivy.addon.portal.generic: statusTabTitle: Case Information OpenTaskTemplate: browserTabClosingWarning: You may lose your work in progress. Do you want to continue? - goToAdhocWarning: You may lose your work in progress and start the Ad-hoc process. Do you want to continue? goToSidestepWarning: Your current modifications will not be saved, when a sidestep process is started directly from a task. Do you want to continue? - reCreateAdhocWarning: There is already an adhoc process for this task, do you want to create another one? - resultFromAdhocProcess: Results from the Ad-Hoc Process ch.ivy.addon.portalkit.ui.jsf: AbsenceAndDeputy: Messages: @@ -361,7 +356,6 @@ ch.ivy.addon.portalkit.ui.jsf: add: Add addDocument: Add document addNote: Add note - adhoc: Adhoc allCategories: All Categories allowPng: Only png types allowed apply: Apply @@ -905,8 +899,6 @@ ch.ivy.addon.portalkit.ui.jsf: process: Process searchResults: Search Results searchResultsFor: '{0} search results for "{1}"' - sidestep: - addAdhocTask: Add Ad-hoc Task statistic: chart: ExpandOrCollapseColumn: Expand/Collapse Columns @@ -1092,7 +1084,6 @@ ch.ivy.addon.portalkit.ui.jsf: expiry: Expiry failedDelayValidation: Task delay timestamp cannot be an empty value or invalid date format failedExpiryValidation: Task expiry timestamp cannot be in the past. - noAdhoc: No Adhoc available noDescription: No description noNotes: No notes processingTime: Processing Time @@ -1253,8 +1244,6 @@ Dialogs: FormDefinition: TaskDescription: Please define the form! TaskName: Form creation! - ProcessLoaded: - TaskName: AdHoc Configuration Task SaveWorkflow: TaskName: Express workflow creation in progress TaskDetail: @@ -1293,7 +1282,6 @@ Dialogs: agileBPM: TooltipForOriginalTask: Your current task will return once previous steps of the ad hoc workflow are finished. define_WF: - AdhocWorkflowTasks: Workflow Tasks ErrorSelectInvalidAssignee: Assignee is already selected or invalid ListOfSelectedUser: List of selected users ResponsibleDialogHeader: Responsible Users @@ -1385,7 +1373,6 @@ Dialogs: MaxLabelLenght: '35' maxOptionsLength: '20' workflowCreation: - AdhocProcessName: AdHoc Process for Task {0} - {1} FormDefinition: AddCheckboxField: Add new field AddOptionboxField: Append new option @@ -1467,7 +1454,6 @@ Dialogs: Processflow: Process flow Processstep: Process step Processtype: Type of process - ProcesstypeAdHoc: One time ProcesstypeRepeating: Repeatable TaskType: Task Type UntilDaysTooltip: After expiry, the task will be assigned to Everybody and its priority becomes High. @@ -1481,7 +1467,6 @@ Dialogs: ReqMsgGeneric: ' is a required field!' processStep: Process Step Labels: - AdhocWorkflow: Describe your Workflow AppendTask-Explain: The task is added to the sequence after my task. AppendTheTask: Append the task CreateNewDashboard: Create new dashboard @@ -1496,7 +1481,6 @@ Labels: TaskItemDetail: Task Details TaskUser-Explain: Comma separated list of users ViewAllResults: View all results - adhocTaskRequired: You must add at least one new task. disabledUserPrefix: (disabled) title: Self Service Ad-hoc Workflow patterns: @@ -1529,17 +1513,8 @@ Processes: portalHome: Portal Home portalSettingSaved: Portal settings are saved ProcessPages: - selfServiceAdhocProcess: Axon Ivy Self Service selfServiceDescription: 'Self Service Prozess: Launch an ad-hoc Workflow based on a predefined flow pattern.' Texts: - Adhoc-Explain: |+ -

- - Enter your comment and press Send to proceed the workflow. - -

- - AdhocWF-Explain: "

\n\nDefine and launch a Workflow at your fingertip: Select a flow pattern, add some tasks and start the Workflow. \n\n

\n\n

\n\n\n\n

\n\n" Approval-Explain: |+

diff --git a/AxonIvyPortal/portal/cms/cms_de.yaml b/AxonIvyPortal/portal/cms/cms_de.yaml index 6c659b01cdf..1d610ea6f29 100644 --- a/AxonIvyPortal/portal/cms/cms_de.yaml +++ b/AxonIvyPortal/portal/cms/cms_de.yaml @@ -1,6 +1,4 @@ Categories: - AdhocExpressTasks: - name: Adhoc Express Aufgaben CreateExpressWorkflow: name: Express Workflow erstellen ExpressWorkflow: @@ -12,10 +10,7 @@ ch.ivy.addon.portal.generic: statusTabTitle: Vorgangsinformationen OpenTaskTemplate: browserTabClosingWarning: Durch diese Aktion gehen ungespeicherte Änderungen verloren. Möchten Sie wirklich fortfahren? - goToAdhocWarning: Beim starten von Ad-hoc Prozess gehen Ihre nicht gespeicherte Eingaben verloren. Möchten Sie weiter? goToSidestepWarning: Bei starten eines Sidestep Prozesses werden die aktuelle Eingaben nicht gespeichert. Möchten Sie sich trotzdem fortsetzen? - reCreateAdhocWarning: Es gibt bereits einen AdHoc Prozess zu dieser Aufgabe. Möchten Sie einen neuen erstellen? - resultFromAdhocProcess: Ergebnisse aus dem Ad-Hoc Prozess PortalName: PortalName: Portal ch.ivy.addon.portalkit.ui.jsf: @@ -424,7 +419,6 @@ ch.ivy.addon.portalkit.ui.jsf: add: Hinzufügen addDocument: Dokument hinzufügen addNote: Notiz hinzufügen - adhoc: Adhoc allCategories: Alle Kategorien allowPng: Nur das png Format wird unterstützt apply: Anwenden @@ -1125,8 +1119,6 @@ ch.ivy.addon.portalkit.ui.jsf: process: Prozess searchResults: Suchresultate searchResultsFor: '{0} Suchresultate für "{1}"' - sidestep: - addAdhocTask: Ad-hoc Aufgabe hinzufügen statistic: chart: ExpandOrCollapseColumn: Spalten auf-/zuklappen @@ -1319,7 +1311,6 @@ ch.ivy.addon.portalkit.ui.jsf: expiry: Ablauffrist failedDelayValidation: Der Zeitstempel der Aufgabenverzögerung darf kein leerer Wert oder ungültiges Datumsformat sein failedExpiryValidation: Der Ablauf der Aufgabe darf nicht in der Vergangenheit liegen. - noAdhoc: AdHoc nicht verfügbar noDescription: Keine Beschreibung vorhanden noNotes: Keine Notizen processingTime: Bearbeitungszeit @@ -1484,8 +1475,6 @@ Dialogs: FormDefinition: TaskDescription: Bitte definieren Sie das Formular! TaskName: Formulardefinition! - ProcessLoaded: - TaskName: Aufgabe für die Adhoc Konfiguration SaveWorkflow: TaskName: Ein Express Workflowprozess ist gerade am Entstehen TaskDetail: @@ -1524,7 +1513,6 @@ Dialogs: agileBPM: TooltipForOriginalTask: Ihre aktuelle Aufgabe wird wieder auftauchen sobald der Ad hoc Workflow fertiggestellt ist. define_WF: - AdhocWorkflowTasks: Workflow Aufgaben ErrorSelectInvalidAssignee: Der Beauftragte ist bereits ausgewählt oder ungültig ListOfSelectedUser: Liste ausgewählter Benutzer ResponsibleDialogHeader: Verantwortliche Benutzer @@ -1659,7 +1647,6 @@ Dialogs: invalidSizeMessage: Datei zu groß! maximumFileUploadElement: Es gibt bereits ein Datei-Upload-Element workflowCreation: - AdhocProcessName: AdHoc Prozess für Aufgabe {0} - {1} FormDefinition: AddCheckboxField: Neues Feld hinzufügen AddOptionboxField: Neue Option hinzufügen @@ -1741,7 +1728,6 @@ Dialogs: Processflow: Prozessfluss Processstep: Prozessschritt Processtype: Prozessart - ProcesstypeAdHoc: Einmalig ProcesstypeRepeating: Wiederkehrend TaskType: Aufgabentyp UntilDaysTooltip: Nach Ablauf wird die Aufgabe an die Rolle Everybody zugeteilt, und ihre Priorität auf Hoch gesetzt. @@ -1755,7 +1741,6 @@ Dialogs: ReqMsgGeneric: ' ist ein erforderliches Feld!' processStep: Prozessschritt Labels: - AdhocWorkflow: Beschreiben Sie Ihren Workflow AppendTask-Explain: Die Aufgabe wird in der Sequenz nach meiner Aufgabe hinzugefügt. AppendTheTask: Aufgabe anhängen CreateNewDashboard: Neues Dashboard erstellen @@ -1853,7 +1838,6 @@ Labels: TaskUser-Explain: Kommaseparierte Liste von Benutzern ToggleMenu: Menü umschalten ViewAllResults: Alle Ergebnisse anzeigen - adhocTaskRequired: Zumindest eine Aufgabe ist erforderlich. disabledUserPrefix: (inaktiv) title: Self Service Ad-hoc Workflow patterns: @@ -1886,11 +1870,8 @@ Processes: portalHome: Portal Home portalSettingSaved: Portaleinstellungen sind gespeichert ProcessPages: - selfServiceAdhocProcess: Axon Ivy Self Service selfServiceDescription: 'Self Service Prozess: ein ad-hoc Workflow starten' Texts: - Adhoc-Explain: '

Geben Sie Ihren Kommentar ein und drücken Sie Senden um weiterzufahren.

' - AdhocWF-Explain: "

\n\nDefinieren und starten Sie einen Workflow auf Knopfdruck. \n\n

\n\n" Approval-Explain: "

\n\nTreffen Sie Ihre Entscheidung und klicken Sie auf Senden um weiterzufahren. \n\n

\n\n" QA-Explain: |+

diff --git a/AxonIvyPortal/portal/cms/cms_en.yaml b/AxonIvyPortal/portal/cms/cms_en.yaml index cb94c7de8d5..3bff66d18c4 100644 --- a/AxonIvyPortal/portal/cms/cms_en.yaml +++ b/AxonIvyPortal/portal/cms/cms_en.yaml @@ -1,6 +1,4 @@ Categories: - AdhocExpressTasks: - name: Adhoc Express Tasks CreateExpressWorkflow: name: Create Express Workflow ExpressWorkflow: @@ -12,10 +10,7 @@ ch.ivy.addon.portal.generic: statusTabTitle: Case Information OpenTaskTemplate: browserTabClosingWarning: You may lose your work in progress. Do you want to continue? - goToAdhocWarning: You may lose your work in progress and start the Ad-hoc process. Do you want to continue? goToSidestepWarning: Your current modifications will not be saved, when a sidestep process is started directly from a task. Do you want to continue? - reCreateAdhocWarning: There is already an adhoc process for this task, do you want to create another one? - resultFromAdhocProcess: Results from the Ad-Hoc Process PortalName: PortalName: Portal ch.ivy.addon.portalkit.ui.jsf: @@ -423,7 +418,6 @@ ch.ivy.addon.portalkit.ui.jsf: add: Add addDocument: Add document addNote: Add note - adhoc: Adhoc allCategories: All Categories allowPng: Only png types allowed apply: Apply @@ -1127,8 +1121,6 @@ ch.ivy.addon.portalkit.ui.jsf: process: Process searchResults: Search Results searchResultsFor: '{0} search results for "{1}"' - sidestep: - addAdhocTask: Add Ad-hoc Task statistic: chart: ExpandOrCollapseColumn: Expand/Collapse Columns @@ -1321,7 +1313,6 @@ ch.ivy.addon.portalkit.ui.jsf: expiry: Expiry failedDelayValidation: Task delay timestamp cannot be an empty value or invalid date format failedExpiryValidation: Task expiry timestamp cannot be in the past. - noAdhoc: No Adhoc available noDescription: No description noNotes: No notes processingTime: Processing Time @@ -1485,8 +1476,6 @@ Dialogs: FormDefinition: TaskDescription: Please define the form! TaskName: Form creation! - ProcessLoaded: - TaskName: AdHoc Configuration Task SaveWorkflow: TaskName: Express workflow creation in progress TaskDetail: @@ -1525,7 +1514,6 @@ Dialogs: agileBPM: TooltipForOriginalTask: Your current task will return once previous steps of the ad hoc workflow are finished. define_WF: - AdhocWorkflowTasks: Workflow Tasks ErrorSelectInvalidAssignee: Assignee is already selected or invalid ListOfSelectedUser: List of selected users ResponsibleDialogHeader: Responsible Users @@ -1663,7 +1651,6 @@ Dialogs: MaxLabelLenght: '35' maxOptionsLength: '20' workflowCreation: - AdhocProcessName: AdHoc Process for Task {0} - {1} FormDefinition: AddCheckboxField: Add new field AddOptionboxField: Append new option @@ -1745,7 +1732,6 @@ Dialogs: Processflow: Process flow Processstep: Process step Processtype: Type of process - ProcesstypeAdHoc: One time ProcesstypeRepeating: Repeatable TaskType: Task Type UntilDaysTooltip: After expiry, the task will be assigned to Everybody and its priority becomes High. @@ -1759,7 +1745,6 @@ Dialogs: ReqMsgGeneric: ' is a required field!' processStep: Process Step Labels: - AdhocWorkflow: Describe your Workflow AppendTask-Explain: The task is added to the sequence after my task. AppendTheTask: Append the task CreateNewDashboard: Create new dashboard @@ -1857,7 +1842,6 @@ Labels: TaskUser-Explain: Comma separated list of users ToggleMenu: Toggle menu ViewAllResults: View all results - adhocTaskRequired: You must add at least one new task. disabledUserPrefix: (disabled) title: Self Service Ad-hoc Workflow patterns: @@ -1890,17 +1874,8 @@ Processes: portalHome: Portal Home portalSettingSaved: Portal settings are saved ProcessPages: - selfServiceAdhocProcess: Axon Ivy Self Service selfServiceDescription: 'Self Service Prozess: Launch an ad-hoc Workflow based on a predefined flow pattern.' Texts: - Adhoc-Explain: |+ -

- - Enter your comment and press Send to proceed the workflow. - -

- - AdhocWF-Explain: "

\n\nDefine and launch a Workflow at your fingertip: Select a flow pattern, add some tasks and start the Workflow. \n\n

\n\n

\n\n\n\n

\n\n" Approval-Explain: |+

diff --git a/AxonIvyPortal/portal/cms/cms_es.yaml b/AxonIvyPortal/portal/cms/cms_es.yaml index ba59acf895b..53de8c86961 100644 --- a/AxonIvyPortal/portal/cms/cms_es.yaml +++ b/AxonIvyPortal/portal/cms/cms_es.yaml @@ -1,6 +1,4 @@ Categories: - AdhocExpressTasks: - name: Tareas Adhoc de Express CreateExpressWorkflow: name: Crear Express Workflow ExpressWorkflow: @@ -12,10 +10,7 @@ ch.ivy.addon.portal.generic: statusTabTitle: Información del caso OpenTaskTemplate: browserTabClosingWarning: Puede perder su trabajo en progreso. ¿Quiere continuar? - goToAdhocWarning: Puede perder su trabajo en progreso e iniciar el proceso Ad-hoc. ¿Quiere continuar? goToSidestepWarning: Sus modificaciones actuales no se guardarán cuando se inicie un proceso de paso lateral directamente desde una tarea. ¿Quiere continuar? - reCreateAdhocWarning: Ya existe un proceso AdHoc para esta tarea. ¿Desea crear un proceso nuevo? - resultFromAdhocProcess: Resultados del proceso AdHoc PortalName: PortalName: Portal ch.ivy.addon.portalkit.ui.jsf: @@ -425,7 +420,6 @@ ch.ivy.addon.portalkit.ui.jsf: add: Añadir addDocument: Agregar documento addNote: Agregar nota - adhoc: Adhoc allCategories: Todas las categorias allowPng: Solo se permiten los tipos png apply: Aplicar @@ -1124,8 +1118,6 @@ ch.ivy.addon.portalkit.ui.jsf: process: Proceso searchResults: Resultados de la búsqueda searchResultsFor: '{0} resultados de búsqueda para "{1}"' - sidestep: - addAdhocTask: Añadir tarea Ad-hoc statistic: chart: ExpandOrCollapseColumn: Abrir/Cerrar columnas @@ -1321,7 +1313,6 @@ ch.ivy.addon.portalkit.ui.jsf: expiry: Expiración failedDelayValidation: La marca de tiempo del retraso de la tarea no puede ser un valor vacío o un formato de fecha inválido failedExpiryValidation: La fecha de vencimiento de la tarea no puede estar en el pasado. - noAdhoc: Proceso AdHoc no disponible noDescription: Sin descripción noNotes: Sin notas processingTime: Tiempo de procesado @@ -1486,8 +1477,6 @@ Dialogs: FormDefinition: TaskDescription: ¡Por favor define el formulario! TaskName: ¡Creación de formulario! - ProcessLoaded: - TaskName: Tarea para configurar el proceso Adhoc SaveWorkflow: TaskName: El flujo de trabajo express en tramitación TaskDetail: @@ -1526,7 +1515,6 @@ Dialogs: agileBPM: TooltipForOriginalTask: Su tarea actual volverá a evaluarse cuando estén completados los flujos de trabajo ad hoc previos. define_WF: - AdhocWorkflowTasks: Tareas del flujo de trabajo ErrorSelectInvalidAssignee: El destinatario ya está seleccionado o es inválido ListOfSelectedUser: Lista de usuarios seleccionados ResponsibleDialogHeader: Usuarios responsables @@ -1661,7 +1649,6 @@ Dialogs: invalidSizeMessage: ¡El archivo es muy grande! maximumFileUploadElement: Ya existe un elemento de subir documentos workflowCreation: - AdhocProcessName: Proceso adHoc para la tarea {0} - {1} FormDefinition: AddCheckboxField: Agregar nuevo campo AddOptionboxField: Anexar nueva opción @@ -1743,7 +1730,6 @@ Dialogs: Processflow: Flujo de proceso Processstep: Paso del proceso Processtype: Tipo de proceso - ProcesstypeAdHoc: Una vez ProcesstypeRepeating: Recurrente TaskType: Tipo de tarea UntilDaysTooltip: Después de la fecha de caducidad, esta tarea será asignada al grupo "todos" y su prioridad será alta @@ -1757,7 +1743,6 @@ Dialogs: ReqMsgGeneric: ¡Es un campo requerido! processStep: Paso del proceso Labels: - AdhocWorkflow: Describe tu Flujo de Trabajo AppendTask-Explain: La tarea es añadida a la secuencia después de mi tarea. AppendTheTask: Anexar la tarea CreateNewDashboard: Crear un nuevo cuadro de mandos @@ -1855,7 +1840,6 @@ Labels: TaskUser-Explain: Lista de usuario separados por coma ToggleMenu: Menú alternativo ViewAllResults: Ver todos los resultados - adhocTaskRequired: Deberá agregar al menos una tarea. disabledUserPrefix: (inactivo) title: Flujo de trabajo Ad-hoc de auto servicio patterns: @@ -1888,17 +1872,8 @@ Processes: portalHome: Portal Principal portalSettingSaved: Ajustes del portal guardados ProcessPages: - selfServiceAdhocProcess: Auto servicio Axon Ivy selfServiceDescription: 'Proceso de auto servicio: Lanzar un flujo de trabajo ad-hoc basado en un patrón de flujo predefinido' Texts: - Adhoc-Explain: |+ -

- - Introduzca sus comentarios y presione Enviar para proceder al flujo de trabajo. - -

- - AdhocWF-Explain: "

\n\nDefinir y lanzar un flujo de trabajo es muy sencillo: seleccione un patrón de flujo, agregue algunas tareas y empieze el flujo de trabajo. \n\n

\n\n

\n\n\n\n

\n\n" Approval-Explain: |+

diff --git a/AxonIvyPortal/portal/cms/cms_fr.yaml b/AxonIvyPortal/portal/cms/cms_fr.yaml index 9c3ef995f8e..0f0a51ca764 100644 --- a/AxonIvyPortal/portal/cms/cms_fr.yaml +++ b/AxonIvyPortal/portal/cms/cms_fr.yaml @@ -1,6 +1,4 @@ Categories: - AdhocExpressTasks: - name: Tâches Adhoc Express CreateExpressWorkflow: name: Créer un workflow express ExpressWorkflow: @@ -12,10 +10,7 @@ ch.ivy.addon.portal.generic: statusTabTitle: Informations sur le dossier OpenTaskTemplate: browserTabClosingWarning: Votre travail risque d'être perdu. Souhaitez-vous continuer ? - goToAdhocWarning: En démarrant un processus ad hoc, vos données non sauvegardées seront perdues. Voulez-vous continuer? goToSidestepWarning: En démarrant un processus sidestep, vos données non sauvegardées seront perdues. Voulez-vous continuer? - reCreateAdhocWarning: Il existe déjà un processus ad hoc pour cette tâche, voulez-vous en créer un autre ? - resultFromAdhocProcess: Résultats du processus ad hoc PortalName: PortalName: Portal ch.ivy.addon.portalkit.ui.jsf: @@ -422,7 +417,6 @@ ch.ivy.addon.portalkit.ui.jsf: add: Ajouter addDocument: Ajouter un document addNote: Ajouter une note - adhoc: Adhoc allCategories: Toutes les catégories allowPng: Seulement les types .png autorisés apply: Utiliser @@ -1121,8 +1115,6 @@ ch.ivy.addon.portalkit.ui.jsf: process: Processus searchResults: Résultats de la recherche searchResultsFor: '{0} résultats pour "{1}"' - sidestep: - addAdhocTask: Ajouter une Ad-hoc tâche statistic: chart: ExpandOrCollapseColumn: Agrandir/réduire les colonnes @@ -1315,7 +1307,6 @@ ch.ivy.addon.portalkit.ui.jsf: expiry: Expiration failedDelayValidation: L'horodatage du délai des tâches ne peut pas être une valeur vide ou un format de date non valide failedExpiryValidation: L'horodatage de l'expiration des tâches ne peut pas être dans le passé. - noAdhoc: Pas d'Adhoc disponible noDescription: Aucune description noNotes: Aucune note processingTime: Durée de traitement @@ -1480,8 +1471,6 @@ Dialogs: FormDefinition: TaskDescription: Veuillez définir le formulaire ! TaskName: Création du formulaire! - ProcessLoaded: - TaskName: Tâche pour la configuration Adhoc SaveWorkflow: TaskName: Création de workflow express en cours TaskDetail: @@ -1520,7 +1509,6 @@ Dialogs: agileBPM: TooltipForOriginalTask: 'Votre tâche actuelle réapparaîtra dès que le workflow ad hoc sera terminé. ' define_WF: - AdhocWorkflowTasks: Tâches du workflow ErrorSelectInvalidAssignee: Le destinataire est déjà sélectionné ou invalide ListOfSelectedUser: Liste des utilisateurs sélectionnés ResponsibleDialogHeader: Utilisateurs responsables @@ -1655,7 +1643,6 @@ Dialogs: invalidSizeMessage: Le fichier est trop volumineux ! maximumFileUploadElement: Il existe déjà un élément de téléchargement de fichiers workflowCreation: - AdhocProcessName: AdHoc processues pour tâche {0} - {1} FormDefinition: AddCheckboxField: Ajouter un nouveau champs AddOptionboxField: Ajouter une nouvelle option @@ -1737,7 +1724,6 @@ Dialogs: Processflow: Flux du processus Processstep: Étape de processus Processtype: Type de processus - ProcesstypeAdHoc: Une fois ProcesstypeRepeating: Rrépétitif TaskType: Type de tâche UntilDaysTooltip: Après expiration, la tâche sera assignée au role “Everybody” et sa priorité sera passée en “haute”. @@ -1751,7 +1737,6 @@ Dialogs: ReqMsgGeneric: est un champ obligatoire ! processStep: Étape du processus Labels: - AdhocWorkflow: Décrivez votre workflow AppendTask-Explain: La tâche est ajoutée à la séquence après ma tâche. AppendTheTask: Ajouter la tâche CreateNewDashboard: Créer un nouveau tableau de bord @@ -1841,7 +1826,6 @@ Labels: TaskUser-Explain: Liste d’utilisateurs séparés par des virgules ToggleMenu: Menu à bascule ViewAllResults: Voir tous les résultats - adhocTaskRequired: Vous devez ajouter au moins une tâche. disabledUserPrefix: (désactivé) title: Workflow ad hoc Self Service patterns: @@ -1874,11 +1858,8 @@ Processes: portalHome: Page d'accueil portalSettingSaved: Les paramètres du portail sont enregistrés ProcessPages: - selfServiceAdhocProcess: Axon Ivy Self Service selfServiceDescription: 'Processus en libre service: lance un workflow ad hoc basé sur un modèle prédéfini. ' Texts: - Adhoc-Explain: '

Rentrez votre commentaire et cliquez sur Envoyer afin de poursuivre.

' - AdhocWF-Explain: "

\n\nDéfinir et démarrer un workflow en un clic. \n\n

" Approval-Explain: "

\n\nVeuillez choisir et cliquez sur Envoyer pour poursuivre. \n\n

" QA-Explain: |-

diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bean/SideStepBean.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bean/SideStepBean.java index 9eb5f74191e..25c1eda46ad 100644 --- a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bean/SideStepBean.java +++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bean/SideStepBean.java @@ -28,39 +28,38 @@ public class SideStepBean implements Serializable { private List currentSideSteps = new ArrayList<>(); - public void getSideSteps(Long taskId, Long caseId, boolean isAdhocExcluded) { + public void getSideSteps(Long taskId, Long caseId) { currentSideSteps.clear(); if(isNullOrZero(taskId)) { - currentSideSteps.addAll(getSideStepsOfCases(caseId, isAdhocExcluded)); + currentSideSteps.addAll(getSideStepsOfCases(caseId)); } else { - currentSideSteps.addAll(getSideStepsOfTasks(caseId, isAdhocExcluded)); + currentSideSteps.addAll(getSideStepsOfTasks(caseId)); } } - private List getSideStepsOfCases(Long caseId, boolean isAdhocExcluded) { + private List getSideStepsOfCases(Long caseId) { if (sideStepOfCases.containsKey(caseId)) { return sideStepOfCases.get(caseId); } - List sideSteps = getSideStepsByCriteria(caseId, isAdhocExcluded); + List sideSteps = getSideStepsByCriteria(caseId); sideStepOfCases.put(caseId, sideSteps); return sideSteps; } - private List getSideStepsOfTasks(Long caseId, boolean isAdhocExcluded) { + private List getSideStepsOfTasks(Long caseId) { if (sideStepOfTasks.containsKey(caseId)) { return sideStepOfTasks.get(caseId); } - List sideSteps = getSideStepsByCriteria(caseId, isAdhocExcluded); + List sideSteps = getSideStepsByCriteria(caseId); sideStepOfTasks.put(caseId, sideSteps); return sideSteps; } - private List getSideStepsByCriteria(Long caseId, boolean isAdhocExcluded) { + private List getSideStepsByCriteria(Long caseId) { SideStepSearchCriteria criteria = new SideStepSearchCriteria(); criteria.setCaseId(caseId); - criteria.setAdhocExcluded(isAdhocExcluded); Map params = new HashMap<>(); params.put("sideStepSearchCriteria", criteria); @@ -78,11 +77,6 @@ public void startSideStep(IvySideStep sideStep) throws IOException { String url = UrlUtils.formatLinkWithEmbedInFrameParam(sideStep.getStartLink()); FacesContext.getCurrentInstance().getExternalContext().redirect(url); } - - public void startAdhoc(IvySideStep sideStep, long taskId) throws IOException { - String url = sideStep.getStartLink() + "?originalTaskId=" + taskId; - FacesContext.getCurrentInstance().getExternalContext().redirect(url); - } public List getCurrentSideSteps() { return currentSideSteps; diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bean/TaskActionBean.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bean/TaskActionBean.java index b48abab025e..728b2329944 100644 --- a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bean/TaskActionBean.java +++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bean/TaskActionBean.java @@ -28,7 +28,6 @@ import ch.ivyteam.ivy.security.restricted.permission.IPermissionRepository; import ch.ivyteam.ivy.workflow.ITask; import ch.ivyteam.ivy.workflow.TaskState; -import ch.ivyteam.ivy.workflow.task.TaskBusinessState; @ManagedBean @ViewScoped @@ -38,7 +37,7 @@ public class TaskActionBean implements Serializable { private boolean isShowResetTask; private boolean isShowReserveTask; private boolean isShowDelegateTask; - //This variable control display of side step and create adhoc + //This variable control display of side step private boolean isShowAdditionalOptions; private boolean isShowDestroyTask; private boolean isShowReadWorkflowEvent; diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/enums/AdditionalProperty.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/enums/AdditionalProperty.java index 97988070ce4..62a72f3a1ad 100644 --- a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/enums/AdditionalProperty.java +++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/enums/AdditionalProperty.java @@ -5,6 +5,5 @@ public enum AdditionalProperty { CUSTOMIZATION_ADDITIONAL_CASE_DETAILS_PAGE, CASE_BUSINESS_ENTITY_PROPERTY, HIDE, - ADHOC_EXPRESS_TASK, PORTAL_GROUP_CHAT_INFO; } diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/ivydata/bo/IvySideStep.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/ivydata/bo/IvySideStep.java index 405f7118b8a..56c17a0b8eb 100644 --- a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/ivydata/bo/IvySideStep.java +++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/ivydata/bo/IvySideStep.java @@ -4,7 +4,6 @@ public class IvySideStep { private String name; private String startLink; - private boolean isAdhoc; public String getName() { return name; @@ -22,12 +21,4 @@ public void setStartLink(String startLink) { this.startLink = startLink; } - public boolean isAdhoc() { - return isAdhoc; - } - - public void setAdhoc(boolean isAdhoc) { - this.isAdhoc = isAdhoc; - } - } diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/ivydata/searchcriteria/SideStepSearchCriteria.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/ivydata/searchcriteria/SideStepSearchCriteria.java index f1e2aaf0613..568dec76890 100644 --- a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/ivydata/searchcriteria/SideStepSearchCriteria.java +++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/ivydata/searchcriteria/SideStepSearchCriteria.java @@ -3,7 +3,6 @@ public class SideStepSearchCriteria { private Long caseId; - private boolean isAdhocExcluded; public Long getCaseId() { return caseId; @@ -16,12 +15,4 @@ public void setCaseId(Long caseId) { public boolean hasCaseId() { return caseId != null && caseId != 0; } - - public boolean isAdhocExcluded() { - return isAdhocExcluded; - } - - public void setAdhocExcluded(boolean isAdhocExcluded) { - this.isAdhocExcluded = isAdhocExcluded; - } } diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/ivydata/service/impl/SideStepService.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/ivydata/service/impl/SideStepService.java index 5803e414906..5104de40b6c 100644 --- a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/ivydata/service/impl/SideStepService.java +++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/ivydata/service/impl/SideStepService.java @@ -7,7 +7,6 @@ import ch.ivy.addon.portalkit.ivydata.bo.IvySideStep; import ch.ivy.addon.portalkit.ivydata.searchcriteria.SideStepSearchCriteria; -import ch.ivy.addon.portalkit.service.ExpressProcessService; import ch.ivyteam.ivy.casemap.runtime.ICaseMapService; import ch.ivyteam.ivy.casemap.runtime.model.IStartableSideStep; import ch.ivyteam.ivy.environment.Ivy; @@ -34,31 +33,11 @@ public List findSideStepsByCriteria(SideStepSearchCriteria criteria List startableSideSteps = getSideSteps(iCase); List ivySideSteps = startableSideSteps.stream().map(this::toIvySideStep).collect(Collectors.toList()); - if (!criteria.isAdhocExcluded()) { - IvySideStep adhocSideStep = createAdhocSideStep(); - if (adhocSideStep != null) { - ivySideSteps.add(adhocSideStep); - } - } - ivySideSteps.sort((s1, s2) -> StringUtils.compareIgnoreCase(s1.getName(), s2.getName())); return ivySideSteps; }); } - private IvySideStep createAdhocSideStep() { - String expressAdhocWFLink = ExpressProcessService.getInstance().findExpressAdhocWFLink(); - if (StringUtils.isBlank(expressAdhocWFLink)) { - return null; - } - - IvySideStep adhoc = new IvySideStep(); - adhoc.setName(Ivy.cms().co("/ch.ivy.addon.portalkit.ui.jsf/sidestep/addAdhocTask")); - adhoc.setStartLink(expressAdhocWFLink); - adhoc.setAdhoc(true); - return adhoc; - } - private IvySideStep toIvySideStep(IStartableSideStep startableSideStep) { IvySideStep ivySideStep = new IvySideStep(); ivySideStep.setName(startableSideStep.getName()); diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/service/ExpressProcessService.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/service/ExpressProcessService.java index b89a9b7d204..9aa96d6c59e 100644 --- a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/service/ExpressProcessService.java +++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/service/ExpressProcessService.java @@ -22,8 +22,6 @@ public class ExpressProcessService extends JsonConfigurationService createHistoriesFromITasks(List tasks, boolean excludeSystemTasks, long selectedCaseId) { - List refineTasks = new ArrayList<>(); - refineTasks = tasks.stream().filter(isNotExpressTask()).collect(Collectors.toList()); if (excludeSystemTasks) { - refineTasks = refineTasks.stream().filter(isNotSystemTaskNote()).collect(Collectors.toList()); + tasks = tasks.stream().filter(isNotSystemTaskNote()).collect(Collectors.toList()); } var histories = new ArrayList(); - CollectionUtils.emptyIfNull(refineTasks).forEach(task -> { + CollectionUtils.emptyIfNull(tasks).forEach(task -> { var history = createHistoryFrom(task); buildDisplayCaseNameForNote(selectedCaseId, task.getCase(), history); histories.add(history); @@ -94,11 +91,9 @@ private List sortHistoriesByTimeStampDescending(List> lis private List createHistoriesFromITasks(List tasks, boolean excludeSystemTasks) { if (excludeSystemTasks) { - return tasks.stream().filter(isNotSystemTaskNote()).filter(isNotExpressTask()) - .map(this::createHistoryFrom).collect(Collectors.toList()); + return tasks.stream().filter(isNotSystemTaskNote()).map(this::createHistoryFrom).collect(Collectors.toList()); } - return tasks.stream().filter(isNotExpressTask()) - .map(this::createHistoryFrom).collect(Collectors.toList()); + return tasks.stream().map(this::createHistoryFrom).collect(Collectors.toList()); } public List createHistoriesFromINotes(List notes, boolean excludeSystemNotes) { @@ -113,10 +108,6 @@ private Predicate isNotSystemTaskNote() { return task -> !StringUtils.equals(task.getWorkerUserName(), ISecurityConstants.SYSTEM_USER_NAME); } - private Predicate isNotExpressTask() { - return task -> task.customFields().stringField(AdditionalProperty.ADHOC_EXPRESS_TASK.toString()).getOrNull() == null; - } - private boolean isNotSystemNote(INote note) { return !StringUtils.equals(note.getWritterName(), ISecurityConstants.SYSTEM_USER_NAME); } diff --git a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/dashboard/component/CaseWidget/ActionsCell.xhtml b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/dashboard/component/CaseWidget/ActionsCell.xhtml index f332a864b9d..50a4b5de11b 100644 --- a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/dashboard/component/CaseWidget/ActionsCell.xhtml +++ b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/dashboard/component/CaseWidget/ActionsCell.xhtml @@ -6,7 +6,7 @@ diff --git a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/dashboard/component/TaskWidget/ActionsCell.xhtml b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/dashboard/component/TaskWidget/ActionsCell.xhtml index 483ca59ab07..60ded5ca3ec 100644 --- a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/dashboard/component/TaskWidget/ActionsCell.xhtml +++ b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/dashboard/component/TaskWidget/ActionsCell.xhtml @@ -4,7 +4,7 @@ xmlns:pe="http://primefaces.org/ui/extensions" xmlns:jsf="http://xmlns.jcp.org/jsf">

- @@ -77,13 +76,10 @@ - + - - - diff --git a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/CaseItem/CaseItem.xhtml b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/CaseItem/CaseItem.xhtml index 59b816ee496..8e39f8c86cb 100644 --- a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/CaseItem/CaseItem.xhtml +++ b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/CaseItem/CaseItem.xhtml @@ -32,7 +32,7 @@ diff --git a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/CaseItemDetails/CaseItemDetails.xhtml b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/CaseItemDetails/CaseItemDetails.xhtml index 30fdc8ae336..a035bbc8d98 100644 --- a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/CaseItemDetails/CaseItemDetails.xhtml +++ b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/CaseItemDetails/CaseItemDetails.xhtml @@ -94,7 +94,6 @@ panelWidgetVar="case-details-action-panel" case="#{case}" inFrame="#{inFrame}" readOnly="#{readOnly}" renderShowDetailAction="false" - isAdhocExcluded="true" onDestroyComplete="PF('destroy-case-dialog').show()" />
diff --git a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/CaseItemRelatedCases/CaseAction.xhtml b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/CaseItemRelatedCases/CaseAction.xhtml index 23f3646cd27..07c26760781 100644 --- a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/CaseItemRelatedCases/CaseAction.xhtml +++ b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/CaseItemRelatedCases/CaseAction.xhtml @@ -26,7 +26,7 @@ diff --git a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/CaseItemRelatedCases/CaseItemRelatedCases.xhtml b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/CaseItemRelatedCases/CaseItemRelatedCases.xhtml index 12875a4a2b3..a495338f5fc 100644 --- a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/CaseItemRelatedCases/CaseItemRelatedCases.xhtml +++ b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/CaseItemRelatedCases/CaseItemRelatedCases.xhtml @@ -100,7 +100,7 @@
+ actionLinkStyleClass="ui-button-text-only" case="#{case}" inFrame="#{cc.attrs.inFrame}" onDestroyComplete="PF('destroy-related-case-dialog').show()"/>
diff --git a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/CaseItemRelatedTasks/TaskAction.xhtml b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/CaseItemRelatedTasks/TaskAction.xhtml index ab80a1fce1e..04fd68b648c 100644 --- a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/CaseItemRelatedTasks/TaskAction.xhtml +++ b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/CaseItemRelatedTasks/TaskAction.xhtml @@ -27,7 +27,7 @@ - - + @@ -115,18 +114,13 @@ - + - - - - - diff --git a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/TaskItem/TaskAction.xhtml b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/TaskItem/TaskAction.xhtml index 8aabbd28859..03940abdb6d 100644 --- a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/TaskItem/TaskAction.xhtml +++ b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/TaskItem/TaskAction.xhtml @@ -33,7 +33,7 @@ Date: Wed, 18 Sep 2024 18:13:42 +0700 Subject: [PATCH 04/16] feature/IVYPORTAL-17431-Remove-Express-from-Portal - remove process express widget related --- AxonIvyPortal/portal/cms/cms.yaml | 5 ---- AxonIvyPortal/portal/cms/cms_de.yaml | 5 ---- AxonIvyPortal/portal/cms/cms_en.yaml | 5 ---- AxonIvyPortal/portal/cms/cms_es.yaml | 5 ---- AxonIvyPortal/portal/cms/cms_fr.yaml | 5 ---- .../portalkit/bean/AbstractProcessBean.java | 4 ---- .../bean/CombinedDashboardProcessBean.java | 4 +--- .../bean/CompactDashboardProcessBean.java | 16 ------------- .../bean/CompactProcessWidgetBean.java | 16 ------------- .../portalkit/bean/DashboardProcessBean.java | 4 ---- .../ProcessWidget/CombinedModeProcess.xhtml | 3 +-- .../ProcessWidget/ImageModeProcess.xhtml | 7 +++--- .../ProcessWidget/ProcessImageMode.xhtml | 7 +++--- .../ProcessWidget/ProcessListMode.xhtml | 24 ++----------------- .../ProcessWidget/ProcessWidget.xhtml | 10 -------- .../ProcessWidget/ProcessWidgetDialogs.xhtml | 21 +--------------- .../ProcessGridItem/ProcessGridItem.xhtml | 7 +++--- .../webContent/resources/css/module.css | 24 ------------------- 18 files changed, 14 insertions(+), 158 deletions(-) diff --git a/AxonIvyPortal/portal/cms/cms.yaml b/AxonIvyPortal/portal/cms/cms.yaml index 68ce2e6402f..c5cc687a8c1 100644 --- a/AxonIvyPortal/portal/cms/cms.yaml +++ b/AxonIvyPortal/portal/cms/cms.yaml @@ -853,7 +853,6 @@ ch.ivy.addon.portalkit.ui.jsf: addNewProcess: Add new process addNewProcessDialogHeader: Add new user process backToOverview: Back to overview - deleteExpressWorkflowTooltip: Delete Express Workflow deleteExternalLinkTooltip: Delete external link deleteProcess: Delete Process deleteProcessItemConfirmation: Are you sure you want to delete the following process? @@ -864,9 +863,7 @@ ch.ivy.addon.portalkit.ui.jsf: dialogEditInfoTitle: '{0} Information' dialogHeaderDescription: In this area you can edit some information related to the selected process. dialogHeaderTitle: Edit information for {0} - editExpressWorkflowTooltip: Edit Express Workflow editProcesses: Edit processes - expressWorkflow: Express workflow externalLink: External link externalLinkVisibility: Visibility goTo: 'Go to: ' @@ -1435,7 +1432,6 @@ Dialogs: UserTask: User task UserTaskWithEmail: User task with E-mail WorkflowDefinition: - AbleToStart: Able to Start AddProcessStep: Add process step ChooseAssignee: AddUserOrRole: 'Select a group or a user, please:' @@ -1448,7 +1444,6 @@ Dialogs: EndStep: End FormDefinitionStep: Form definition ProcessNameExists: This process name was used before - ProcessOwner: Process Owner Processdescription: Process description Processdetails: Process properties Processflow: Process flow diff --git a/AxonIvyPortal/portal/cms/cms_de.yaml b/AxonIvyPortal/portal/cms/cms_de.yaml index 1d610ea6f29..b57714553a3 100644 --- a/AxonIvyPortal/portal/cms/cms_de.yaml +++ b/AxonIvyPortal/portal/cms/cms_de.yaml @@ -1069,7 +1069,6 @@ ch.ivy.addon.portalkit.ui.jsf: addNewProcess: Prozess hinzufügen addNewProcessDialogHeader: Neuen Prozess hinzufügen backToOverview: Zurück zur Übersicht - deleteExpressWorkflowTooltip: Express Workflow entfernen deleteExternalLinkTooltip: Externen Link löschen deleteProcess: Prozess löschen deleteProcessItemConfirmation: Sind sie sicher das Sie folgenden Prozess löschen wollen? @@ -1080,9 +1079,7 @@ ch.ivy.addon.portalkit.ui.jsf: dialogEditInfoTitle: '{0} Informationen' dialogHeaderDescription: In diesem Bereich können Sie einige Informationen bearbeiten, die sich auf den ausgewählten Prozess beziehen. dialogHeaderTitle: Informationen bearbeiten für {0} - editExpressWorkflowTooltip: Express Workflow bearbeiten editProcesses: Prozesse bearbeiten - expressWorkflow: Express Workflow externalLink: Externer Link externalLinkVisibility: Sichtbarkeit goTo: 'Gehe zu: ' @@ -1709,7 +1706,6 @@ Dialogs: UserTask: Aufgabe UserTaskWithEmail: Aufgabe mit E-Mail Schritt WorkflowDefinition: - AbleToStart: Startberechtigung AddProcessStep: Prozessschritt hinzufügen ChooseAssignee: AddUserOrRole: 'Wählen Sie eine Gruppe oder Benutzer aus, bitte:' @@ -1722,7 +1718,6 @@ Dialogs: EndStep: Ende FormDefinitionStep: Formular-definition ProcessNameExists: Dieser Prozessname wurde bereits benutzt - ProcessOwner: Prozessverantwortliche Processdescription: Prozessbeschreibung Processdetails: Prozesseigenschaften Processflow: Prozessfluss diff --git a/AxonIvyPortal/portal/cms/cms_en.yaml b/AxonIvyPortal/portal/cms/cms_en.yaml index 3bff66d18c4..b615d91251f 100644 --- a/AxonIvyPortal/portal/cms/cms_en.yaml +++ b/AxonIvyPortal/portal/cms/cms_en.yaml @@ -1071,7 +1071,6 @@ ch.ivy.addon.portalkit.ui.jsf: addNewProcess: Add new process addNewProcessDialogHeader: Add new user process backToOverview: Back to overview - deleteExpressWorkflowTooltip: Delete Express Workflow deleteExternalLinkTooltip: Delete external link deleteProcess: Delete Process deleteProcessItemConfirmation: Are you sure you want to delete the following process? @@ -1082,9 +1081,7 @@ ch.ivy.addon.portalkit.ui.jsf: dialogEditInfoTitle: '{0} Information' dialogHeaderDescription: In this area you can edit some information related to the selected process. dialogHeaderTitle: Edit information for {0} - editExpressWorkflowTooltip: Edit Express Workflow editProcesses: Edit processes - expressWorkflow: Express workflow externalLink: External link externalLinkVisibility: Visibility goTo: 'Go to: ' @@ -1713,7 +1710,6 @@ Dialogs: UserTask: User task UserTaskWithEmail: User task with E-mail WorkflowDefinition: - AbleToStart: Able to Start AddProcessStep: Add process step ChooseAssignee: AddUserOrRole: 'Select a group or a user, please:' @@ -1726,7 +1722,6 @@ Dialogs: EndStep: End FormDefinitionStep: Form definition ProcessNameExists: This process name was used before - ProcessOwner: Process Owner Processdescription: Process description Processdetails: Process properties Processflow: Process flow diff --git a/AxonIvyPortal/portal/cms/cms_es.yaml b/AxonIvyPortal/portal/cms/cms_es.yaml index 53de8c86961..fd03c59af5d 100644 --- a/AxonIvyPortal/portal/cms/cms_es.yaml +++ b/AxonIvyPortal/portal/cms/cms_es.yaml @@ -1068,7 +1068,6 @@ ch.ivy.addon.portalkit.ui.jsf: addNewProcess: Agregar nuevo proceso addNewProcessDialogHeader: Agregar nuevo proceso de usuario backToOverview: De regreso a la visión general - deleteExpressWorkflowTooltip: Eliminar Express Workflow deleteExternalLinkTooltip: Borrar enlace externo deleteProcess: Eliminar proceso deleteProcessItemConfirmation: ¿Seguro que quiere eliminar el siguiente proceso? @@ -1079,9 +1078,7 @@ ch.ivy.addon.portalkit.ui.jsf: dialogEditInfoTitle: '{0} Información' dialogHeaderDescription: Aqui puede configurar parámetros relacionados con el proceso seleccionado. dialogHeaderTitle: Editar información para {0} - editExpressWorkflowTooltip: Editar Express Workflow editProcesses: Editar procesos - expressWorkflow: Workflow Express externalLink: Enlace externo externalLinkVisibility: Visibilidad goTo: 'Ir a:' @@ -1711,7 +1708,6 @@ Dialogs: UserTask: Tarea UserTaskWithEmail: 'Tarea con E-Mail ' WorkflowDefinition: - AbleToStart: Permiso de ejecución AddProcessStep: Agregar paso de proceso ChooseAssignee: AddUserOrRole: 'Selecione un grupo o usuario porfavor:' @@ -1724,7 +1720,6 @@ Dialogs: EndStep: Terminar FormDefinitionStep: Definición de formulario ProcessNameExists: Este nombre para el flujo de trabajo ya ha sido seleccionado - ProcessOwner: Responsable del proceso Processdescription: Descripción de proceso Processdetails: Propiedades del proceso Processflow: Flujo de proceso diff --git a/AxonIvyPortal/portal/cms/cms_fr.yaml b/AxonIvyPortal/portal/cms/cms_fr.yaml index 0f0a51ca764..f439c1a6d1c 100644 --- a/AxonIvyPortal/portal/cms/cms_fr.yaml +++ b/AxonIvyPortal/portal/cms/cms_fr.yaml @@ -1065,7 +1065,6 @@ ch.ivy.addon.portalkit.ui.jsf: addNewProcess: Ajouter un processus addNewProcessDialogHeader: Ajouter un nouveau processus utilisateur backToOverview: Retour à l'aperçu - deleteExpressWorkflowTooltip: Supprimer le Workflow Express deleteExternalLinkTooltip: Supprimer le lien externe deleteProcess: Supprimer processus deleteProcessItemConfirmation: Êtes-vous sûr de vouloir détruire le processus suivant ? @@ -1076,9 +1075,7 @@ ch.ivy.addon.portalkit.ui.jsf: dialogEditInfoTitle: '{0} Informations' dialogHeaderDescription: Dans cette zone, vous pouvez modifier certaines informations relatives au processus sélectionné. dialogHeaderTitle: Modifier les informations pour {0} - editExpressWorkflowTooltip: Modifier le Workflow Express editProcesses: Modifier des processus - expressWorkflow: Workflow Express externalLink: lien externe externalLinkVisibility: Visibilité goTo: 'Aller à:' @@ -1705,7 +1702,6 @@ Dialogs: UserTask: Tâche UserTaskWithEmail: Tâche avec email WorkflowDefinition: - AbleToStart: Capable de commencer AddProcessStep: Ajouter une étape de processus ChooseAssignee: AddUserOrRole: 'Veuillez sélectionner un groupe ou un utilisateur :' @@ -1718,7 +1714,6 @@ Dialogs: EndStep: Fin FormDefinitionStep: Définition du formulaire ProcessNameExists: Ce nom de processus a été utilisé avant - ProcessOwner: Propriétaire du processus Processdescription: Description du processus Processdetails: Propriétés du processus Processflow: Flux du processus diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bean/AbstractProcessBean.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bean/AbstractProcessBean.java index 9e617eed6b3..0654185ea5c 100644 --- a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bean/AbstractProcessBean.java +++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bean/AbstractProcessBean.java @@ -113,10 +113,6 @@ public boolean isIvyProcess(Process process) { return !Objects.isNull(process) && process.getType() == ProcessType.IVY_PROCESS; } - public boolean isExpressProcess(Process process) { - return !Objects.isNull(process) && process.getType() == ProcessType.EXPRESS_PROCESS; - } - public boolean isExternalLink(Process process) { return !Objects.isNull(process) && process.getType() == ProcessType.EXTERNAL_LINK; } diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bean/CombinedDashboardProcessBean.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bean/CombinedDashboardProcessBean.java index 9e8e721ae9e..d7750c87756 100644 --- a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bean/CombinedDashboardProcessBean.java +++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bean/CombinedDashboardProcessBean.java @@ -77,9 +77,7 @@ public void updateProcessStartId() { if (CollectionUtils.isEmpty(startableProcessStarts)) { initStartableProcessStarts(); } - - if (getWidget() != null && getWidget().getProcess() != null - && getWidget().getProcess().getType() != ProcessType.EXPRESS_PROCESS) { + if (getWidget() != null && getWidget().getProcess() != null) { String startLink = getWidget().getProcess().getStartLink(); IProcessStart processStart = startableProcessStarts.stream() .filter(process -> process.getLink().getRelative().equals(startLink)).findFirst().get(); diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bean/CompactDashboardProcessBean.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bean/CompactDashboardProcessBean.java index e906ebc84e7..752d065ccc8 100644 --- a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bean/CompactDashboardProcessBean.java +++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bean/CompactDashboardProcessBean.java @@ -15,7 +15,6 @@ import javax.faces.bean.ViewScoped; import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.StringUtils; import ch.ivy.addon.portalkit.dto.dashboard.ColumnModel; import ch.ivy.addon.portalkit.dto.dashboard.CompactProcessDashboardWidget; @@ -24,7 +23,6 @@ import ch.ivy.addon.portalkit.enums.DashboardStandardProcessColumn; import ch.ivy.addon.portalkit.enums.ProcessSorting; import ch.ivy.addon.portalkit.jsf.ManagedBeans; -import ch.ivy.addon.portalkit.service.ExpressProcessService; import ch.ivy.addon.portalkit.util.DashboardWidgetUtils; @ManagedBean @@ -35,7 +33,6 @@ public class CompactDashboardProcessBean private static final long serialVersionUID = 1L; private List portalCompactProcesses; private DashboardProcessBean dashboardProcessBean; - private static String expressStartLink; public CompactProcessDashboardWidget getWidget() { return (CompactProcessDashboardWidget) dashboardProcessBean.getWidget(); @@ -161,12 +158,6 @@ public void startProcessWithCompactMode(DashboardProcess process) throws IOExcep return; } - if (dashboardProcessBean.isExpressProcess(process) && StringUtils.isNotBlank(process.getId()) - && StringUtils.isNotBlank(getExpressStartLink())) { - dashboardProcessBean.redirectToLink(getExpressStartLink() + "?workflowID=" + process.getId(), false); - return; - } - dashboardProcessBean.redirectToLink(link, true); } @@ -204,13 +195,6 @@ public void onChangeApplications(List applications) { dashboardProcessBean.setApplications(applications); } - private static String getExpressStartLink() { - if (StringUtils.isEmpty(expressStartLink)) { - expressStartLink = ExpressProcessService.getInstance().findExpressWorkflowStartLink(); - } - return expressStartLink; - } - public ProcessSorting[] getProcessSorting() { return ProcessSorting.values(); } diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bean/CompactProcessWidgetBean.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bean/CompactProcessWidgetBean.java index de3bd3d43cf..f69ff1aba7a 100644 --- a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bean/CompactProcessWidgetBean.java +++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bean/CompactProcessWidgetBean.java @@ -9,13 +9,10 @@ import javax.faces.bean.ViewScoped; import javax.faces.context.FacesContext; -import org.apache.commons.lang3.StringUtils; - import com.axonivy.portal.service.GlobalSearchService; import ch.ivy.addon.portalkit.configuration.UserProcess; import ch.ivy.addon.portalkit.enums.ProcessType; -import ch.ivy.addon.portalkit.service.ExpressProcessService; import ch.ivy.addon.portalkit.util.PermissionUtils; @ManagedBean @@ -42,15 +39,6 @@ public void startProcess(UserProcess userProcess) throws IOException { return; } - if (isExpressProcess(userProcess) && StringUtils.isNotBlank(userProcess.getProcessId())) { - String expressStartLink = ExpressProcessService.getInstance().findExpressWorkflowStartLink(); - if (StringUtils.isNotBlank(expressStartLink)) { - FacesContext.getCurrentInstance().getExternalContext() - .redirect(expressStartLink + "?workflowID=" + userProcess.getProcessId()); - return; - } - } - link += link.contains("?") ? "&" : "?"; // Put the "embedInIFrame" param to the process link to open it in the DefaultFramePage process // Then this process will open task in IFrame or not based on its "embedInIFrame" String custom field @@ -77,10 +65,6 @@ private boolean isExternalLink(UserProcess process) { return process != null && process.getProcessType() == ProcessType.EXTERNAL_LINK; } - private boolean isExpressProcess(UserProcess process) { - return process != null && process.getProcessType() == ProcessType.EXPRESS_PROCESS; - } - private boolean isEnableGlobalSearchScopeProcesses() { return GlobalSearchService.getInstance().isShowGlobalSearchByProcesses(); } diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bean/DashboardProcessBean.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bean/DashboardProcessBean.java index 594ce5f439b..053a54ba9f8 100644 --- a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bean/DashboardProcessBean.java +++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bean/DashboardProcessBean.java @@ -110,10 +110,6 @@ public void setDisplayModes(List displayModes) { this.displayModes = displayModes; } - public boolean isExpressProcess(DashboardProcess process) { - return process != null && process.getType() == ProcessType.EXPRESS_PROCESS; - } - public boolean isExternalLink(DashboardProcess process) { return process != null && process.getType() == ProcessType.EXTERNAL_LINK; } diff --git a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/dashboard/component/ProcessWidget/CombinedModeProcess.xhtml b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/dashboard/component/ProcessWidget/CombinedModeProcess.xhtml index 403b10fda54..2d4645d8aad 100644 --- a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/dashboard/component/ProcessWidget/CombinedModeProcess.xhtml +++ b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/dashboard/component/ProcessWidget/CombinedModeProcess.xhtml @@ -36,10 +36,9 @@ - -
+
diff --git a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/dashboard/component/ProcessWidget/ImageModeProcess.xhtml b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/dashboard/component/ProcessWidget/ImageModeProcess.xhtml index 06b9f64d730..a60af044912 100644 --- a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/dashboard/component/ProcessWidget/ImageModeProcess.xhtml +++ b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/dashboard/component/ProcessWidget/ImageModeProcess.xhtml @@ -2,13 +2,12 @@ xmlns:ic="http://ivyteam.ch/jsf/component" xmlns:p="http://primefaces.org/ui" xmlns:pe="http://primefaces.org/ui/extensions" xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"> - -
+
- +
@@ -67,7 +66,7 @@ styleClass="process-more-info-link" href="#{dashboardProcessBean.getProcessInformationPageUrl(process)}" disabled="#{!isReadOnlyMode or isInConfiguration}" - rendered="#{dashboardProcessBean.isShowInformationLink(process) and !isExternalLink and !isExpress and !isCaseMap}" + rendered="#{dashboardProcessBean.isShowInformationLink(process) and !isExternalLink and !isCaseMap}" />
diff --git a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/ProcessWidget/ProcessImageMode.xhtml b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/ProcessWidget/ProcessImageMode.xhtml index ec5b98115d1..819d16302a8 100644 --- a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/ProcessWidget/ProcessImageMode.xhtml +++ b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/ProcessWidget/ProcessImageMode.xhtml @@ -2,13 +2,12 @@ xmlns:ic="http://ivyteam.ch/jsf/component" xmlns:p="http://primefaces.org/ui" xmlns:pe="http://primefaces.org/ui/extensions" xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"> - -
+
#{process.getName()} - +
+ rendered="#{processWidgetBean.isShowInformationLink(process) and !isExternalLink and !isCaseMap}" />
diff --git a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/ProcessWidget/ProcessListMode.xhtml b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/ProcessWidget/ProcessListMode.xhtml index 10a513f1f4c..ad602bffd96 100644 --- a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/ProcessWidget/ProcessListMode.xhtml +++ b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/ProcessWidget/ProcessListMode.xhtml @@ -3,43 +3,23 @@ xmlns:pe="http://primefaces.org/ui/extensions" xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"> -
+ styleClass="process-start-list-item #{isExternalLink ? 'js-external-link-process-item' : ''}"> #{processWidgetBean.getDisplayProcessCategory(process)} -
+
- - - @@ -29,15 +28,6 @@ styleClass="js-filter-process-widget-list-item" />
- - - - #{processWidgetBean.createExpressWorkflowProcessStart.name} - -

#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/processwidget/editDialog/dialogEditInfoTitle', [process.getType().getLabel()])} -

- - - - - - - - - - - + - @@ -34,9 +33,9 @@ -
+
+ styleClass="grid-view-form u-text-align-center #{isExternalLink ? 'is-external-link' : ''}">
diff --git a/AxonIvyPortal/portal/webContent/resources/css/module.css b/AxonIvyPortal/portal/webContent/resources/css/module.css index 5139ba57375..503b1a7d088 100644 --- a/AxonIvyPortal/portal/webContent/resources/css/module.css +++ b/AxonIvyPortal/portal/webContent/resources/css/module.css @@ -1185,15 +1185,6 @@ span.case-details-document-add-link, span.task-details-document-add-link { padding-right: 50px; } -.process-start-list .process-start-list-item-name.is-express, -.process-in-search .process-start-list-item-name.is-express { - padding-right: 120px; -} - -.process-start-list-item-name.is-express { - width: calc(100% - 130px); -} - .process-start-list-item-name.is-external-link { width: calc(100% - 105px); } @@ -1242,21 +1233,6 @@ span.case-details-document-add-link, span.task-details-document-add-link { font-weight: bold !important; } -.process-start-list-item-action.is-express { - right: 50px; - flex: 1 0 auto; -} - -.process-start-list-item-action .express-workflow { - cursor: pointer; -} - -@media (max-width: 991px) { - .process-start-list-item-action .express-workflow.process-item { - display: none !important; - } -} - .process-item-action-container { display: flex; align-items: center; From 163bd26e652314bf19c6cadcd692a46b4fe5890a Mon Sep 17 00:00:00 2001 From: Loc Nguyen Date: Thu, 19 Sep 2024 10:38:43 +0700 Subject: [PATCH 05/16] feature/IVYPORTAL-17431-Remove-Express-from-Portal - Remove express from portal component --- AxonIvyPortal/portal-components/cms/cms.yaml | 1 - AxonIvyPortal/portal-components/cms/cms_de.yaml | 1 - AxonIvyPortal/portal-components/cms/cms_en.yaml | 1 - AxonIvyPortal/portal-components/cms/cms_es.yaml | 1 - AxonIvyPortal/portal-components/cms/cms_fr.yaml | 1 - .../portal/components/constant/CustomFields.java | 1 - .../portal/components/enums/PortalVariable.java | 1 - .../portal/components/enums/ProcessType.java | 1 - .../components/service/CaseDocumentService.java | 13 ++----------- .../portal/components/util/ProcessViewerUtils.java | 9 +-------- 10 files changed, 3 insertions(+), 27 deletions(-) diff --git a/AxonIvyPortal/portal-components/cms/cms.yaml b/AxonIvyPortal/portal-components/cms/cms.yaml index 7937cedf8fd..4b6dfbc4b17 100644 --- a/AxonIvyPortal/portal-components/cms/cms.yaml +++ b/AxonIvyPortal/portal-components/cms/cms.yaml @@ -22,7 +22,6 @@ Dialogs: ProcessIsHidden: The current process is hidden! ProcessType: CASE_MAP: Case Map - EXPRESS_PROCESS: Express Workflow EXTERNAL_LINK: External Link IVY_PROCESS: Business Process Labels: diff --git a/AxonIvyPortal/portal-components/cms/cms_de.yaml b/AxonIvyPortal/portal-components/cms/cms_de.yaml index 2e25b8cd3ca..d0d5b7d2792 100644 --- a/AxonIvyPortal/portal-components/cms/cms_de.yaml +++ b/AxonIvyPortal/portal-components/cms/cms_de.yaml @@ -82,7 +82,6 @@ Dialogs: ProcessNotFound: Der definierte Process kann nicht gefunden werden. ProcessType: CASE_MAP: Fall Karte - EXPRESS_PROCESS: Express Workflow EXTERNAL_LINK: External Link IVY_PROCESS: Geschäftsprozess ProcessViewerIFrameTitle: Prozessbetrachterrahmen diff --git a/AxonIvyPortal/portal-components/cms/cms_en.yaml b/AxonIvyPortal/portal-components/cms/cms_en.yaml index 806525ae6a0..67acf16aed0 100644 --- a/AxonIvyPortal/portal-components/cms/cms_en.yaml +++ b/AxonIvyPortal/portal-components/cms/cms_en.yaml @@ -83,7 +83,6 @@ Dialogs: ProcessNotFound: The defined process cannot be found. ProcessType: CASE_MAP: Case Map - EXPRESS_PROCESS: Express Workflow EXTERNAL_LINK: External Link IVY_PROCESS: Business Process ProcessViewerIFrameTitle: Process viewer frame diff --git a/AxonIvyPortal/portal-components/cms/cms_es.yaml b/AxonIvyPortal/portal-components/cms/cms_es.yaml index 15b03f3efda..5e726ec7ebb 100644 --- a/AxonIvyPortal/portal-components/cms/cms_es.yaml +++ b/AxonIvyPortal/portal-components/cms/cms_es.yaml @@ -83,7 +83,6 @@ Dialogs: ProcessNotFound: No se encuentra el proceso definido. ProcessType: CASE_MAP: Mapa del caso - EXPRESS_PROCESS: Flujo de trabajo exprés EXTERNAL_LINK: Link externo IVY_PROCESS: Proceso de negocio ProcessViewerIFrameTitle: Marco del visor de procesos diff --git a/AxonIvyPortal/portal-components/cms/cms_fr.yaml b/AxonIvyPortal/portal-components/cms/cms_fr.yaml index 59a7e3eaa35..a218ebfd9e1 100644 --- a/AxonIvyPortal/portal-components/cms/cms_fr.yaml +++ b/AxonIvyPortal/portal-components/cms/cms_fr.yaml @@ -83,7 +83,6 @@ Dialogs: ProcessNotFound: Le processus défini est introuvable. ProcessType: CASE_MAP: Carte de cas - EXPRESS_PROCESS: Flux de travail express EXTERNAL_LINK: Lien externe IVY_PROCESS: Processus d'entreprise ProcessViewerIFrameTitle: Cadre de visualisation du processus diff --git a/AxonIvyPortal/portal-components/src/com/axonivy/portal/components/constant/CustomFields.java b/AxonIvyPortal/portal-components/src/com/axonivy/portal/components/constant/CustomFields.java index 567ee0b34aa..ac82f64fca6 100644 --- a/AxonIvyPortal/portal-components/src/com/axonivy/portal/components/constant/CustomFields.java +++ b/AxonIvyPortal/portal-components/src/com/axonivy/portal/components/constant/CustomFields.java @@ -1,7 +1,6 @@ package com.axonivy.portal.components.constant; public class CustomFields { - public static final String IS_EXPRESS_PROCESS = "isExpress"; public static final String IS_DASHBOARD_PROCESS = "isDashboardProcess"; public static final String BUSINESS_DETAILS = "businessDetails"; } diff --git a/AxonIvyPortal/portal-components/src/com/axonivy/portal/components/enums/PortalVariable.java b/AxonIvyPortal/portal-components/src/com/axonivy/portal/components/enums/PortalVariable.java index d3fcb1cbc05..da1bfa9ce3b 100644 --- a/AxonIvyPortal/portal-components/src/com/axonivy/portal/components/enums/PortalVariable.java +++ b/AxonIvyPortal/portal-components/src/com/axonivy/portal/components/enums/PortalVariable.java @@ -7,7 +7,6 @@ public enum PortalVariable { STATISTIC_CHART("Portal.StatisticCharts"), WIDGET_FILTER("Portal.Dashboard.WidgetFilters"), EXTERNAL_LINK("Portal.Processes.ExternalLinks"), - EXPRESS_PROCESS("Portal.Processes.ExpressProcesses"), TASK_DETAIL("Portal.TaskDetails"), CASE_DETAIL("Portal.CaseDetails"), DASHBOARD("Portal.Dashboard"), diff --git a/AxonIvyPortal/portal-components/src/com/axonivy/portal/components/enums/ProcessType.java b/AxonIvyPortal/portal-components/src/com/axonivy/portal/components/enums/ProcessType.java index c82a29c3d91..4476822caaf 100644 --- a/AxonIvyPortal/portal-components/src/com/axonivy/portal/components/enums/ProcessType.java +++ b/AxonIvyPortal/portal-components/src/com/axonivy/portal/components/enums/ProcessType.java @@ -7,7 +7,6 @@ import ch.ivyteam.ivy.environment.Ivy; public enum ProcessType { - EXPRESS_PROCESS("ExpressProcess"), EXTERNAL_LINK("ExternalLink"), CASE_MAP("casemap"), IVY_PROCESS("process-start"); diff --git a/AxonIvyPortal/portal-components/src/com/axonivy/portal/components/service/CaseDocumentService.java b/AxonIvyPortal/portal-components/src/com/axonivy/portal/components/service/CaseDocumentService.java index 2878713fb26..6de97e0fb89 100644 --- a/AxonIvyPortal/portal-components/src/com/axonivy/portal/components/service/CaseDocumentService.java +++ b/AxonIvyPortal/portal-components/src/com/axonivy/portal/components/service/CaseDocumentService.java @@ -30,7 +30,6 @@ public class CaseDocumentService { - public static final String EXPRESS_UPLOAD_FOLDER = "AxonIvyExpress"; private ICase iCase; private CaseDocumentService(ICase iCase) { @@ -51,15 +50,7 @@ public IDocument upload(String filename, InputStream content) { } public List getAll() { - List documents = new ArrayList<>(getAllDocumentsOf(iCase)); - List expressDocs = new ArrayList<>(); - for (IDocument doc : documents) { - if (doc.getPath().asString().contains(EXPRESS_UPLOAD_FOLDER)) { - expressDocs.add(doc); - } - } - documents.removeAll(expressDocs); - return new ArrayList<>(documents); + return new ArrayList<>(getAllDocumentsOf(iCase)); } /** @@ -74,7 +65,7 @@ public StreamedContent download(IvyDocument document) { public boolean doesDocumentExist(String filename) { IDocument document = documentsOf(iCase).get(new Path(filename)); - return document != null && !document.getPath().asString().contains(EXPRESS_UPLOAD_FOLDER); + return document != null; } public static boolean isDocumentTypeValid(String filename, String allowedFileTypes) { diff --git a/AxonIvyPortal/portal-components/src/com/axonivy/portal/components/util/ProcessViewerUtils.java b/AxonIvyPortal/portal-components/src/com/axonivy/portal/components/util/ProcessViewerUtils.java index ced7c4a9102..228a5620f9f 100644 --- a/AxonIvyPortal/portal-components/src/com/axonivy/portal/components/util/ProcessViewerUtils.java +++ b/AxonIvyPortal/portal-components/src/com/axonivy/portal/components/util/ProcessViewerUtils.java @@ -7,10 +7,8 @@ import java.util.function.Predicate; import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.StringUtils; -import com.axonivy.portal.components.constant.CustomFields; import com.axonivy.portal.components.dto.ProcessViewerDTO; import com.axonivy.portal.components.service.impl.ProcessService; @@ -132,11 +130,6 @@ private static List getWebStartables() { return Optional.ofNullable(webStartables).orElse(new ArrayList<>()); } - public static boolean isExpressCase(ICase iCase) { - return iCase != null - && BooleanUtils.toBoolean(iCase.customFields().stringField(CustomFields.IS_EXPRESS_PROCESS).getOrNull()); - } - public static ICaseMap findCaseMapByCase(ICase caze) { if (Objects.isNull(caze)) { return null; @@ -149,7 +142,7 @@ public static boolean hasCaseMap(IBusinessCase businessCase) { } public static boolean isViewerAllowed(ICase caze) { - if (caze == null || isExpressCase(caze) || !caze.isBusinessCase()) { + if (caze == null || !caze.isBusinessCase()) { return false; } else if (hasCaseMap(caze.getBusinessCase())) { return true; From 2374cacb3633cded21e7016e7f2a6382f5e980d2 Mon Sep 17 00:00:00 2001 From: Loc Nguyen Date: Thu, 19 Sep 2024 11:01:37 +0700 Subject: [PATCH 06/16] feature/IVYPORTAL-17431-Remove-Express-from-Portal - Make sidestep nicer --- .../ivy/addon/portalkit/component/SideStep/SideStep.xhtml | 3 +-- AxonIvyPortal/portal/webContent/resources/css/portal.css | 7 ++++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/SideStep/SideStep.xhtml b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/SideStep/SideStep.xhtml index e8c9e42e2a4..66dc6e4229e 100644 --- a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/SideStep/SideStep.xhtml +++ b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/SideStep/SideStep.xhtml @@ -116,8 +116,7 @@ - + Date: Thu, 19 Sep 2024 14:52:15 +0700 Subject: [PATCH 07/16] feature/IVYPORTAL-17431-Remove-Express-from-Portal - Remove from case action, process infromation --- .../Start Processes/PortalStart.p.json | 4 -- .../addon/portalkit/bean/CaseActionBean.java | 19 +----- .../portalkit/bean/ProcessWidgetBean.java | 58 ------------------- .../portalkit/constant/CustomFields.java | 1 - .../DashboardProcessCaseLazyDataModel.java | 4 +- .../DashboardProcessTaskLazyDataModel.java | 4 +- .../CombinedProcessDashboardWidget.java | 4 +- .../DashboardProcessCaseSearchCriteria.java | 14 +---- .../DashboardProcessTaskSearchCriteria.java | 19 ++---- .../DashboardWidgetInformationService.java | 4 -- .../portalkit/service/IFrameService.java | 10 ---- .../util/PortalProcessViewerUtils.java | 4 +- .../layouts/SearchResultsTemplate.xhtml | 2 +- 13 files changed, 17 insertions(+), 130 deletions(-) diff --git a/AxonIvyPortal/portal/processes/Start Processes/PortalStart.p.json b/AxonIvyPortal/portal/processes/Start Processes/PortalStart.p.json index fba685d3460..115ea4beff4 100644 --- a/AxonIvyPortal/portal/processes/Start Processes/PortalStart.p.json +++ b/AxonIvyPortal/portal/processes/Start Processes/PortalStart.p.json @@ -1205,10 +1205,6 @@ " if (!in.isTaskStartedInDetails || in.backFromTaskDetails) {", " SecurityServiceUtils.removeSessionAttribute(taskEndInfoSessionAttributeKey);", " }", - " ", - " if (in.isTaskFinished) {", - " in.callbackUrl = taskWithTaskEndInfo.customFields().stringField(CustomFields.EXPRESS_END_PAGE_URL.toString()).getOrDefault(\"\");", - " }", " }", " in.caseSelected = task.getCase();", "} else {", diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bean/CaseActionBean.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bean/CaseActionBean.java index 9a5fb700f83..b3a82791d21 100644 --- a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bean/CaseActionBean.java +++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bean/CaseActionBean.java @@ -16,13 +16,10 @@ import javax.faces.bean.ManagedBean; import javax.faces.bean.RequestScoped; -import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.StringUtils; import ch.ivy.addon.portal.generic.navigation.PortalNavigator; -import ch.ivy.addon.portalkit.constant.CustomFields; import ch.ivy.addon.portalkit.enums.GlobalVariable; -import ch.ivy.addon.portalkit.service.ExpressProcessService; import ch.ivy.addon.portalkit.service.GlobalSettingService; import ch.ivy.addon.portalkit.service.exception.PortalException; import ch.ivy.addon.portalkit.util.PermissionUtils; @@ -51,14 +48,7 @@ public void initCaseActions() { } public String getAdditionalCaseDetailsPageUri(ICase iCase) { - String additionalCaseDetailsPageUri = EMPTY; - if (isExpressCase(iCase)) { - additionalCaseDetailsPageUri = - ExpressProcessService.getInstance().findExpressBusinessViewStartLink() + "?uuid=" + iCase.uuid(); - } else { - additionalCaseDetailsPageUri = getBusinessDetailUrlFromCustomField(iCase); - } - return additionalCaseDetailsPageUri; + return getBusinessDetailUrlFromCustomField(iCase); } @@ -197,13 +187,8 @@ public String getProcessViewerPageUri(ICase selectedCase) { return PortalProcessViewerUtils.getStartProcessViewerPageUri(selectedCase); } - private boolean isExpressCase(ICase iCase) { - return BooleanUtils.toBoolean(iCase.customFields().stringField(CustomFields.IS_EXPRESS_PROCESS).getOrNull()); - } - public boolean showProcessOverviewLink(ICase iCase) { - return GlobalSettingService.getInstance().findGlobalSettingValueAsBoolean(GlobalVariable.SHOW_PROCESS_INFORMATION) - && !isExpressCase(iCase) && iCase.isBusinessCase(); + return GlobalSettingService.getInstance().findGlobalSettingValueAsBoolean(GlobalVariable.SHOW_PROCESS_INFORMATION); } public String getProcessOverviewPageUri(ICase iCase) { diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bean/ProcessWidgetBean.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bean/ProcessWidgetBean.java index 3be6aee9b4a..8c744e2fdb3 100644 --- a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bean/ProcessWidgetBean.java +++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bean/ProcessWidgetBean.java @@ -2,7 +2,6 @@ import static org.apache.commons.lang3.StringUtils.EMPTY; -import java.io.IOException; import java.io.Serializable; import java.text.Collator; import java.util.ArrayList; @@ -34,23 +33,19 @@ import com.axonivy.portal.service.GlobalSearchService; import com.axonivy.portal.util.ExternalLinkUtils; -import ch.ivy.addon.portalkit.bo.ExpressProcess; import ch.ivy.addon.portalkit.bo.ExternalLinkProcessItem; import ch.ivy.addon.portalkit.bo.IvyProcess; -import ch.ivy.addon.portalkit.bo.PortalExpressProcess; import ch.ivy.addon.portalkit.bo.Process; import ch.ivy.addon.portalkit.configuration.ExternalLink; import ch.ivy.addon.portalkit.configuration.GlobalSetting; import ch.ivy.addon.portalkit.dto.DisplayName; import ch.ivy.addon.portalkit.enums.GlobalVariable; -import ch.ivy.addon.portalkit.enums.PortalPermission; import ch.ivy.addon.portalkit.enums.ProcessMode; import ch.ivy.addon.portalkit.enums.ProcessType; import ch.ivy.addon.portalkit.ivydata.mapper.SecurityMemberDTOMapper; import ch.ivy.addon.portalkit.ivydata.service.impl.UserSettingService; import ch.ivy.addon.portalkit.jsf.Attrs; import ch.ivy.addon.portalkit.jsf.ManagedBeans; -import ch.ivy.addon.portalkit.service.ExpressProcessService; import ch.ivy.addon.portalkit.service.ExternalLinkService; import ch.ivy.addon.portalkit.service.GlobalSettingService; import ch.ivy.addon.portalkit.util.DisplayNameConvertor; @@ -58,8 +53,6 @@ import ch.ivy.addon.portalkit.util.PermissionUtils; import ch.ivy.addon.portalkit.util.UserUtils; import ch.ivyteam.ivy.environment.Ivy; -import ch.ivyteam.ivy.security.exec.Sudo; -import ch.ivyteam.ivy.workflow.IProcessStart; import ch.ivyteam.ivy.workflow.start.IWebStartable; import ch.ivyteam.util.Pair; @@ -82,7 +75,6 @@ public class ProcessWidgetBean extends AbstractProcessBean implements Serializab private List selectedSecurityMemberDTOsWhenEditingExternalLink; private List selectedPermissionsWhenEditingExternalLink; private List selectedPermissionsForSavingEditedExternalLink; - private IProcessStart createExpressWorkflowProcessStart; private Map> processesByAlphabet; private String warningText; @@ -90,7 +82,6 @@ public class ProcessWidgetBean extends AbstractProcessBean implements Serializab public void initConfiguration() { initProcessViewMode(); - createExpressWorkflowProcessStart = ExpressProcessService.getInstance().findExpressCreationProcess(); } public void initProcesses() { @@ -238,40 +229,23 @@ public String getDisplayNameOfPermissionsWhenEditingExternalLink() { return String.join(", ", displayNames); } - public void editExpressWorkflow(ExpressProcess process) throws IOException { - String editLink = ExpressProcessService.getInstance().findExpressWorkflowEditLink(process.getId()); - FacesContext.getCurrentInstance().getExternalContext().redirect(editLink); - } - public void deleteProcessWorkflow() { if (this.deletedProcess == null) { return; } switch (deletedProcess.getType()) { - case EXPRESS_PROCESS -> deleteExpressWorkflow(); case EXTERNAL_LINK -> deleteExternalLink(); default -> {} } } - public void deleteExpressWorkflow() { - String workflowId = this.deletedProcess.getId(); - ExpressProcessService.getInstance().delete(workflowId); - getPortalProcesses().removeIf(process -> process.getId().equals(deletedProcess.getId())); - groupProcessesByAlphabetIndex(getPortalProcesses()); - } - public void updateProcessData() { if (this.editedProcess == null) { return; } String oldProcessName = this.editedProcess.getName(); switch (this.editedProcess.getType()) { - case EXPRESS_PROCESS -> { - ExpressProcess expressProcess = updateExpressProcess(editedProcess.getId()); - this.editedProcess = new PortalExpressProcess(expressProcess); - } case EXTERNAL_LINK -> { ExternalLink externalLink = updateExternalLink(editedProcess.getId()); this.editedProcess = new ExternalLinkProcessItem(externalLink); @@ -283,17 +257,6 @@ public void updateProcessData() { this.editedProcess = null; } - private ExpressProcess updateExpressProcess(String processId) { - ExpressProcessService service = ExpressProcessService.getInstance(); - ExpressProcess expressProcess = service.findById(processId); - if (expressProcess != null) { - expressProcess.setIcon(this.selectedIconProcess); - service.save(expressProcess); - } - PermissionUtils.checkAbleToStartAndAbleToEditExpressWorkflow(expressProcess); - return expressProcess; - } - private ExternalLink updateExternalLink(String processId) { ExternalLinkService externalLinkService = ExternalLinkService.getInstance(); ExternalLink externalLink = externalLinkService.findById(processId); @@ -404,23 +367,6 @@ public void deleteExternalLink() { groupProcessesByAlphabetIndex(getPortalProcesses()); } - public String getCreateExpessWorkflowLink() { - return Sudo.get(() -> { - return (createExpressWorkflowProcessStart != null) ? createExpressWorkflowProcessStart.getLink().getRelative() - : StringUtils.EMPTY; - }); - } - - public void startExpressWorkflowCreationLink() throws IOException { - FacesContext.getCurrentInstance().getExternalContext().redirect(getCreateExpessWorkflowLink()); - return; - } - - public boolean canCreateExpessWorkflow() { - return createExpressWorkflowProcessStart != null - && PermissionUtils.hasPortalPermission(PortalPermission.EXPRESS_CREATE_WORKFLOW); - } - public Process getDeletedProcess() { return deletedProcess; } @@ -494,10 +440,6 @@ public void setUserProcessByAlphabet(Map> processesByAlpha this.processesByAlphabet = processesByAlphabet; } - public IProcessStart getCreateExpressWorkflowProcessStart() { - return createExpressWorkflowProcessStart; - } - public Map getAllAlphabeticalCharacters() { Map processGroups = new LinkedHashMap<>(); if (processesByAlphabet == null) { diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/constant/CustomFields.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/constant/CustomFields.java index 6d64821d27d..b9901a3a0cc 100644 --- a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/constant/CustomFields.java +++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/constant/CustomFields.java @@ -6,7 +6,6 @@ public class CustomFields { public static final String CUSTOM_TIMESTAMP_FIELD5 = "CustomTimestampField5"; public static final String EMBED_IN_FRAME = "embedInFrame"; - public static final String IS_EXPRESS_PROCESS = "isExpress"; public static final String EXPRESS_END_PAGE_URL = "expressEndPageUrl"; public static final String PROCESS_IMAGE = "processImage"; public static final String PROCESS_INFORMATION = "portalProcessInfo"; diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/datamodel/DashboardProcessCaseLazyDataModel.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/datamodel/DashboardProcessCaseLazyDataModel.java index 6a04f8a3f4c..2ad124ceef3 100644 --- a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/datamodel/DashboardProcessCaseLazyDataModel.java +++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/datamodel/DashboardProcessCaseLazyDataModel.java @@ -27,8 +27,8 @@ public class DashboardProcessCaseLazyDataModel extends LazyDataModel7 { private List cases; private CompletableFuture future; - public DashboardProcessCaseLazyDataModel(Long processStartId, String processName) { - criteria = new DashboardProcessCaseSearchCriteria(processStartId, processName); + public DashboardProcessCaseLazyDataModel(Long processStartId) { + criteria = new DashboardProcessCaseSearchCriteria(processStartId); cases = new ArrayList<>(); } diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/datamodel/DashboardProcessTaskLazyDataModel.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/datamodel/DashboardProcessTaskLazyDataModel.java index 3d40cc12ca5..38b6cf1bbd4 100644 --- a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/datamodel/DashboardProcessTaskLazyDataModel.java +++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/datamodel/DashboardProcessTaskLazyDataModel.java @@ -27,8 +27,8 @@ public class DashboardProcessTaskLazyDataModel extends LazyDataModel7 { private List tasks; private CompletableFuture future; - public DashboardProcessTaskLazyDataModel(Long processStartId, String expressProcessName) { - criteria = new DashboardProcessTaskSearchCriteria(processStartId, expressProcessName); + public DashboardProcessTaskLazyDataModel(Long processStartId) { + criteria = new DashboardProcessTaskSearchCriteria(processStartId); tasks = new ArrayList<>(); } diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/dto/dashboard/CombinedProcessDashboardWidget.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/dto/dashboard/CombinedProcessDashboardWidget.java index 840d5f83e62..a2a7167ac58 100644 --- a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/dto/dashboard/CombinedProcessDashboardWidget.java +++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/dto/dashboard/CombinedProcessDashboardWidget.java @@ -56,9 +56,9 @@ public void setProcess(DashboardProcess process) { super.setProcess(process); if (getProcess() != null) { this.taskDataModel = - new DashboardProcessTaskLazyDataModel(getProcess().getProcessStartId(), getProcess().getName()); + new DashboardProcessTaskLazyDataModel(getProcess().getProcessStartId()); this.caseDataModel = - new DashboardProcessCaseLazyDataModel(getProcess().getProcessStartId(), getProcess().getName()); + new DashboardProcessCaseLazyDataModel(getProcess().getProcessStartId()); } } diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/ivydata/searchcriteria/DashboardProcessCaseSearchCriteria.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/ivydata/searchcriteria/DashboardProcessCaseSearchCriteria.java index a5ddca3cd40..6377773a96f 100644 --- a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/ivydata/searchcriteria/DashboardProcessCaseSearchCriteria.java +++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/ivydata/searchcriteria/DashboardProcessCaseSearchCriteria.java @@ -1,9 +1,7 @@ package ch.ivy.addon.portalkit.ivydata.searchcriteria; -import ch.ivy.addon.portalkit.constant.CustomFields; import ch.ivy.addon.portalkit.enums.DashboardStandardCaseColumn; import ch.ivy.addon.portalkit.util.CaseUtils; -import ch.ivyteam.ivy.workflow.category.CategoryPath; import ch.ivyteam.ivy.workflow.caze.CaseBusinessState; import ch.ivyteam.ivy.workflow.query.CaseQuery; import ch.ivyteam.ivy.workflow.query.CaseQuery.IFilterQuery; @@ -12,13 +10,11 @@ public class DashboardProcessCaseSearchCriteria { private Long processStartId; - private String processName; private String sortField; private boolean sortDescending; - public DashboardProcessCaseSearchCriteria(Long processStartId, String processName) { + public DashboardProcessCaseSearchCriteria(Long processStartId) { this.processStartId = processStartId; - this.processName = processName; } public CaseQuery buildQuery() { @@ -32,8 +28,6 @@ public CaseQuery buildQueryWithoutOrderByClause() { CaseQuery query = CaseQuery.businessCases(); if (this.processStartId != null) { queryProcessStartId(query); - } else { - queryExpressProcessCasesByCategoryPath(query); } queryStates(query); queryIsInvolved(query); @@ -54,12 +48,6 @@ private void queryProcessStartId(CaseQuery query) { query.where().taskStartId().isEqual(processStartId); } - private void queryExpressProcessCasesByCategoryPath(CaseQuery query) { - String categoryPath = new CategoryPath("ExpressWorkflow/" + this.processName).getValidRawPath(); - query.where().customField().stringField(CustomFields.IS_EXPRESS_PROCESS).isEqual("true"); - query.where().category().isEqual(categoryPath); - } - private void queryIsInvolved(CaseQuery query) { query.where().currentUserIsInvolved(); } diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/ivydata/searchcriteria/DashboardProcessTaskSearchCriteria.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/ivydata/searchcriteria/DashboardProcessTaskSearchCriteria.java index c506deb5d26..314809d095c 100644 --- a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/ivydata/searchcriteria/DashboardProcessTaskSearchCriteria.java +++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/ivydata/searchcriteria/DashboardProcessTaskSearchCriteria.java @@ -1,8 +1,6 @@ package ch.ivy.addon.portalkit.ivydata.searchcriteria; -import ch.ivy.addon.portalkit.constant.CustomFields; import ch.ivy.addon.portalkit.enums.DashboardStandardTaskColumn; -import ch.ivyteam.ivy.workflow.category.CategoryPath; import ch.ivyteam.ivy.workflow.query.CaseQuery; import ch.ivyteam.ivy.workflow.query.TaskQuery; import ch.ivyteam.ivy.workflow.query.TaskQuery.OrderByColumnQuery; @@ -10,13 +8,11 @@ public class DashboardProcessTaskSearchCriteria { private Long processStartId; - private String processName; private String sortField; private boolean sortDescending; - public DashboardProcessTaskSearchCriteria(Long processStartId, String processName) { + public DashboardProcessTaskSearchCriteria(Long processStartId) { this.processStartId = processStartId; - this.processName = processName; } public TaskQuery buildQuery() { @@ -28,7 +24,10 @@ public TaskQuery buildQuery() { public TaskQuery buildQueryWithoutOrderByClause() { TaskQuery query = TaskQuery.create(); - CaseQuery caseQuery = this.processStartId != null ? queryProcessStartId() : queryExpressProcessCasesByCategoryPath(); + CaseQuery caseQuery = CaseQuery.businessCases(); + if (this.processStartId != null) { + queryProcessStartId(); + } query.where().cases(caseQuery); queryCanWorkOn(query); return query; @@ -38,14 +37,6 @@ private CaseQuery queryProcessStartId() { return CaseQuery.businessCases().where().taskStartId().isEqual(processStartId); } - private CaseQuery queryExpressProcessCasesByCategoryPath() { - String categoryPath = new CategoryPath("ExpressWorkflow/" + this.processName).getValidRawPath(); - CaseQuery caseQuery = CaseQuery.businessCases(); - caseQuery.where().customField().stringField(CustomFields.IS_EXPRESS_PROCESS).isEqual("true"); - caseQuery.where().category().isEqual(categoryPath); - return caseQuery; - } - private void queryCanWorkOn(TaskQuery query) { query.where().currentUserCanWorkOn(); } diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/service/DashboardWidgetInformationService.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/service/DashboardWidgetInformationService.java index ccb64749b3b..5e854758fdb 100644 --- a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/service/DashboardWidgetInformationService.java +++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/service/DashboardWidgetInformationService.java @@ -205,19 +205,15 @@ public Map buildStatisticOfProcessByType(List processByTypeStatistic = new HashMap<>(); Long numberOfIvyProcesses = 0l; - Long numberOfExpressProcesses = 0l; Long numberOfExternalLink = 0l; for (var process : processes) { if (process.getType().equals(ProcessType.IVY_PROCESS)) { numberOfIvyProcesses++; - } else if (process.getType().equals(ProcessType.EXPRESS_PROCESS)) { - numberOfExpressProcesses++; } else { numberOfExternalLink++; } } processByTypeStatistic.put(ProcessType.IVY_PROCESS, numberOfIvyProcesses); - processByTypeStatistic.put(ProcessType.EXPRESS_PROCESS, numberOfExpressProcesses); processByTypeStatistic.put(ProcessType.EXTERNAL_LINK, numberOfExternalLink); return processByTypeStatistic; } diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/service/IFrameService.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/service/IFrameService.java index ed8d94fba21..c2ae5c739f2 100644 --- a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/service/IFrameService.java +++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/service/IFrameService.java @@ -16,11 +16,6 @@ public static boolean embedInFrame(Long taskId) { if (task == null) { return true; } - boolean isExpress = Boolean - .parseBoolean(task.getCase().customFields().stringField(CustomFields.IS_EXPRESS_PROCESS).getOrDefault("false")); - if (isExpress) { - return false; - } Boolean isIFrameCustomField = getEmbedInIFrameCustomField(task); if (isIFrameCustomField != null) { @@ -35,11 +30,6 @@ public static boolean embedInFrame(String taskUUID) { if (task == null) { return true; } - boolean isExpress = Boolean - .parseBoolean(task.getCase().customFields().stringField(CustomFields.IS_EXPRESS_PROCESS).getOrDefault("false")); - if (isExpress) { - return false; - } Boolean isIFrameCustomField = getEmbedInIFrameCustomField(task); if (isIFrameCustomField != null) { diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/util/PortalProcessViewerUtils.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/util/PortalProcessViewerUtils.java index ff83e080225..8cd28c4510a 100644 --- a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/util/PortalProcessViewerUtils.java +++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/util/PortalProcessViewerUtils.java @@ -21,14 +21,14 @@ public class PortalProcessViewerUtils { public static final String DEFAULT_LINK = "#"; public static String getStartProcessViewerPageUri(ICase selectedCase) { - if (Objects.isNull(selectedCase) || Objects.isNull(selectedCase.getProcessStart()) || ProcessViewerUtils.isExpressCase(selectedCase)) { + if (Objects.isNull(selectedCase) || Objects.isNull(selectedCase.getProcessStart())) { return DEFAULT_LINK; } return buildPortalProcessViewerUrl(null, selectedCase.getId(), selectedCase.getProcessStart().getLink().getRelative()); } public static String getStartProcessViewerPageUri(ITask selectedTask) { - if (Objects.isNull(selectedTask) || Objects.isNull(selectedTask.getCase()) || Objects.isNull(selectedTask.getCase().getProcessStart()) || ProcessViewerUtils.isExpressCase(selectedTask.getCase())) { + if (Objects.isNull(selectedTask) || Objects.isNull(selectedTask.getCase()) || Objects.isNull(selectedTask.getCase().getProcessStart())) { return DEFAULT_LINK; } return buildPortalProcessViewerUrl(selectedTask.getId(), null, null); diff --git a/AxonIvyPortal/portal/webContent/layouts/SearchResultsTemplate.xhtml b/AxonIvyPortal/portal/webContent/layouts/SearchResultsTemplate.xhtml index 69505faac6d..aeba11d2df8 100644 --- a/AxonIvyPortal/portal/webContent/layouts/SearchResultsTemplate.xhtml +++ b/AxonIvyPortal/portal/webContent/layouts/SearchResultsTemplate.xhtml @@ -44,7 +44,7 @@ rendered="#{compactProcessWidgetBean.displayShowAllProcessesLink and compactProcessWidgetBean.globalSearchScope}">
+ processListStyleClass="process-in-search" />
From 3b3f94ee3dd0e636df1133b3bac4f536c3dbf2c9 Mon Sep 17 00:00:00 2001 From: Loc Nguyen Date: Thu, 19 Sep 2024 18:24:30 +0700 Subject: [PATCH 08/16] feature/IVYPORTAL-17431-Remove-Express-from-Portal - Remove Express Management, cms --- AxonIvyPortal/portal/cms/cms.yaml | 189 +------ AxonIvyPortal/portal/cms/cms_de.yaml | 189 +------ AxonIvyPortal/portal/cms/cms_en.yaml | 189 +------ AxonIvyPortal/portal/cms/cms_es.yaml | 189 +------ AxonIvyPortal/portal/cms/cms_fr.yaml | 189 +------ AxonIvyPortal/portal/config/variables.yaml | 7 - .../addon/portal/generic/menu/MenuView.java | 21 - .../portal/generic/bean/UserMenuBean.java | 17 - .../portalkit/bean/AbstractProcessBean.java | 23 +- .../portalkit/bean/AdminSettingBean.java | 22 - .../portalkit/bean/ExpressManagementBean.java | 178 ------- .../bean/PortalPermissionInitBean.java | 3 - .../portalkit/bo/ExpressFormElement.java | 93 ---- .../addon/portalkit/bo/ExpressProcess.java | 142 ------ .../portalkit/bo/ExpressTaskDefinition.java | 94 ---- .../addon/portalkit/bo/ExpressUserEmail.java | 66 --- .../portalkit/bo/PortalExpressProcess.java | 148 ------ .../portalkit/constant/CustomFields.java | 1 - .../portalkit/constant/PortalConstants.java | 2 - .../portalkit/dto/ExpressAttachment.java | 70 --- .../addon/portalkit/enums/BreadCrumbKind.java | 2 +- .../enums/ExpressEmailAttachmentStatus.java | 6 - .../portalkit/enums/ExpressMessageType.java | 29 -- .../addon/portalkit/enums/GlobalVariable.java | 1 - .../portalkit/enums/PortalPermission.java | 1 - .../enums/PortalPermissionGroup.java | 3 +- .../addon/portalkit/enums/PortalVariable.java | 1 - .../addon/portalkit/enums/ProcessType.java | 1 - .../portalkit/mapper/UserProcessMapper.java | 13 - .../portalkit/security/PortalSecurity.java | 2 +- .../service/CaseDocumentService.java | 13 +- .../service/ExpressProcessService.java | 116 ----- .../addon/portalkit/util/CategoryUtils.java | 16 - .../util/ExpressManagementUtils.java | 474 ------------------ .../addon/portalkit/util/PermissionUtils.java | 65 --- .../admin/AdminSettings/AdminSettings.xhtml | 6 - .../ExpressManagement/ExpressManagement.xhtml | 178 ------- .../ExpressManagementData.d.json | 6 - .../ExpressManagementProcess.p.json | 29 -- .../ProcessWidget/ProcessWidgetData.d.json | 4 - .../ForgotPassword/ForgotPassword.xhtml | 2 +- .../webContent/resources/css/module.css | 24 - .../webContent/resources/css/portal.css | 24 - 43 files changed, 12 insertions(+), 2836 deletions(-) delete mode 100644 AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bean/ExpressManagementBean.java delete mode 100644 AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bo/ExpressFormElement.java delete mode 100644 AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bo/ExpressProcess.java delete mode 100644 AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bo/ExpressTaskDefinition.java delete mode 100644 AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bo/ExpressUserEmail.java delete mode 100644 AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bo/PortalExpressProcess.java delete mode 100644 AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/dto/ExpressAttachment.java delete mode 100644 AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/enums/ExpressEmailAttachmentStatus.java delete mode 100644 AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/enums/ExpressMessageType.java delete mode 100644 AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/service/ExpressProcessService.java delete mode 100644 AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/util/ExpressManagementUtils.java delete mode 100644 AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/ExpressManagement/ExpressManagement.xhtml delete mode 100644 AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/ExpressManagement/ExpressManagementData.d.json delete mode 100644 AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/ExpressManagement/ExpressManagementProcess.p.json diff --git a/AxonIvyPortal/portal/cms/cms.yaml b/AxonIvyPortal/portal/cms/cms.yaml index c5cc687a8c1..7eac27a47f5 100644 --- a/AxonIvyPortal/portal/cms/cms.yaml +++ b/AxonIvyPortal/portal/cms/cms.yaml @@ -1,8 +1,3 @@ -Categories: - CreateExpressWorkflow: - name: Create Express Workflow - ExpressWorkflow: - name: Express Workflow ch.ivy.addon.portal.generic: CaseDetailsTemplate: noCaseId: No case-Id specified @@ -193,7 +188,6 @@ ch.ivy.addon.portalkit.ui.jsf: enableProcessViewer: Set this property to true to enable process viewer option in Task/Case actions enableScriptCheckingForUploadedDocumentNote: Set to true to enable script checking for uploaded document. Currently this function supports checking for PDF, Excel, Word. enableVirusScannerForUploadedDocumentNote: Set to true to enable virus scanner for uploaded document. Currently this function is using API VIRUSTOTAL. - expressEndPageNote: Display the custom end page at the end of each Express process. hideCaseDocument: Set to true, the document section in case detail page will be hidden, otherwise it will be shown. hideChangePasswordButtonNote: Set this variable to true to hide the "Change Password" option in the top menu and the "Forgotten Password" option on the login page. If set to false, these options will be shown. hideLogoutButtonNote: If true, the logout button on top menu will be hidden, otherwise it will be shown. @@ -537,45 +531,6 @@ ch.ivy.addon.portalkit.ui.jsf:
    {2}
tooltipHelper: Click to show all users which own this role directly or indirectly userOfRoleTitle: User of {0} group - expressManagement: - deployButton: Deploy - deployMessage: 'Deploying processes ... ' - exportExpress: Export Express - exportExpressProcessTitle: Export Express Processes - expressExportName: AXONIVY_Dataset_ExpressWorkflow_{0}.json - expressManagement: Express Management - expressMessages: - deployErrorLog: Error while deploying {0} - deploymentFinishedLog: Process(es) of file {0} successful deployed into Portal in {1}ms - endDeployLog: Deployment Express finished - invalidVersionLog: Non supported version {0} of Express - process: - duplicateProcessNameLog: '- Duplicate process name {0}' - installProcessFailedLog: '- Deploy process {0} failed' - installProcessFinishedLog: Installing process {0} successfully - installedProcessLog: Process installed {0} - startDeployProcessLog: Start deploying process {0} - startDeployLog: Start deploying the Express process(es) of file {0} to Portal - status: - error: Error - failed: Failed - info: Info - successful: Success - warning: Warning - validate: - validateExpressVersion: Could not find the Express Version variable in System. Please contact your adminstrator. - validateProcessCoOwnerLog: '- Validate Process Co-Owner of {0}, user {1} is not available in system' - validateProcessOwnerLog: '- Validate Process Owner of {0}, user {1} is not available in system, change process owner to {2}' - validateProcessPermissionLog: '- Validate Process Permission of {0}, user {1} is not available in system' - validateTaskDefUserLog: '- Validate Task Definition Responsibles of {0}, user {1} is not available in system' - versionLog: 'Version of Express: {0}' - fileEmptyMessage: File is empty - importDialogHeaderTitle: Choose a Dataset of Express workflow, it should be a JSON file. - importExpress: Import Express - importExpressProcessTitle: Import Express Processes - importHeaderTitle: 'List of Express processes will be exported:' - processCount: process(es) - waitingMessage: 'Data is collecting ... ' processChain: currentStepIsNotDefined: Current step ({0}) of process chain is not defined statisticWidget: @@ -784,6 +739,7 @@ ch.ivy.addon.portalkit.ui.jsf: processElementId: Process element Id stackTrace: StackTrace forgotPassword: + EmailAddress: E-Mail address empty: Empty forgotPassword: Forgot my password forgotPasswordError: An error occurred while processing your request. Please try again later. @@ -1228,54 +1184,11 @@ Dialogs: CaseDescription: Edit an existing workflow CaseName: Edit workflow Tasks: - CreateWorkflow: - TaskDescription: Workflow has been created - TaskName: Workflow has been created - EditWorkflow: - TaskDescription: A process has been edited. - TaskName: Process edited - FinalReview: - TaskName: Final Review - FinalWorkflowTask: - taskDescription: The workflow {0} has been finished! - FormDefinition: - TaskDescription: Please define the form! - TaskName: Form creation! - SaveWorkflow: - TaskName: Express workflow creation in progress TaskDetail: DataDescription: Data and Description restoreToDefaultSettings: Restore to default settings switchToEditMode: Edit switchToViewMode: Save - WorkflowProperties: - TaskDescription: Please configure the workflow properties! - TaskName: Workflow properties - WorkflowExecution: - ApprovalForm: - Approve: Approve! - ApproveComment: Approved - CommentLabel: Comment of approver - FieldSetApplicant: Requester - FieldSetForm: Form - FinishedTasks: Finished Tasks - Fullname: Full name - Reject: Reject! - RejectComment: Rejected - FinalReviewForm: - approvalStatus: Approval status - approver: Approver - noticed: Acknowledged! - FinishedTasksForm: - Applicant: Applicant - ApprovalResult: Approval result - FinishedTasks: Finished Tasks - FormDetails: Form Details - UserTaskForm: - ApprovalResult: - Approved: Approved - Rejected: Rejected - Formular: Form agileBPM: TooltipForOriginalTask: Your current task will return once previous steps of the ad hoc workflow are finished. define_WF: @@ -1295,14 +1208,6 @@ Dialogs: ch: ivy: addon: - express: - generic: - endpage: - subtitle: The last task was completed successfully - title: Task completed successfully! - expressNoItem: There is no completed Express Task yet - expressNoItemDescription: The results of completed tasks are displayed here - expressWorkflowName: 'Business Details of Case #{0}' portal: generic: GlobalSearch: @@ -1369,98 +1274,6 @@ Dialogs: general: MaxLabelLenght: '35' maxOptionsLength: '20' - workflowCreation: - FormDefinition: - AddCheckboxField: Add new field - AddOptionboxField: Append new option - AllowedFiletypes: Allowed file types - BroadFooterArea: Wide footer - BroadHeaderArea: Wide Header - CheckboxFields: Checkbox fields - CreateField: Create - DataProvider: Data provider - DragAndDropTooltip: Drag and Drop the available elements to the Header, left column, right column or to the Footer! - ElementLabel: Label - ElementName: Name of element - Email: - Attachment: Attachment - EmailAddress: E-Mail address - EmailText: Email text - ResponseTo: Response to - Subject: Subject - ExecuteWorkflow: Execute workflow directly - ExecuteWorkflowWarning: You have to fulfil all tasks before execute this workflow - FieldSetAvailableFormelements: Form elements - FieldSetFormelements: Create form element - FieldSetFormelementsPlacing: Placement of form elements - FieldSetPreviewArea: Preview of the defined form - FinishWorkflow: Finish Workflow - InputArea: Input area - InputCheckbox: Checkbox - InputField: Input field - InputFileUpload: File upload - InputOptions: Radio button - InputType: Input type - InputTypes: - DateSelection: Date picker - NumberField: Number field - TextBox: Text field - LeftColumn: left column - NoCheckboxFieldYet: No checkbox field types are defined yet - NoDataProvider: Special static data provider - NoFormelementsAvailable: No form elements are available! - NoOptionboxFieldsYet: No checkbox types are defined yet - NumberOfFiles: Number of files - NumberOfRows: Number of rows - OptionboxFields: Radio buttons - OptionboxPlaceholder: Option - Preview: Preview - RightColumn: right column - SaveWorkflow: Save Workflow - UploadFileFormat: - Excel: Excel (xls/xlsx) - OtherFormats: Other file formats - PDF: PDF (pdf) - Word: Word (doc/docx) - cancelCreateForm: Do you really want to cancel? All your data will be lost! - otherFiletype: Other file types - ProcessName: Create Express Workflow - TaskType: - Approval: Approval - Email: Information E-mail - Review: Review - UserTask: User task - UserTaskWithEmail: User task with E-mail - WorkflowDefinition: - AddProcessStep: Add process step - ChooseAssignee: - AddUserOrRole: 'Select a group or a user, please:' - SelectedAssigneesFieldSet: Selected assignees - UserTooltip: User - DefaultTemplateDescription: Below is the default template - DeleteProcessStep: Remove process step - Description: Describe your process - DueTimeInDays: Expiry in days - EndStep: End - FormDefinitionStep: Form definition - ProcessNameExists: This process name was used before - Processdescription: Process description - Processdetails: Process properties - Processflow: Process flow - Processstep: Process step - Processtype: Type of process - ProcesstypeRepeating: Repeatable - TaskType: Task Type - UntilDaysTooltip: After expiry, the task will be assigned to Everybody and its priority becomes High. - UserInterface: - ChangeSettingWarning: All defined tasks will be deleted. Are you sure? - CreateOwn: Create own - UseDefault: Use default - UserInterface: User Interface - WorkflowPropertiesStep: Workflow properties - requiredMsgs: - ReqMsgGeneric: ' is a required field!' - processStep: Process Step Labels: AppendTask-Explain: The task is added to the sequence after my task. AppendTheTask: Append the task diff --git a/AxonIvyPortal/portal/cms/cms_de.yaml b/AxonIvyPortal/portal/cms/cms_de.yaml index e50d229962a..6715ed31e6d 100644 --- a/AxonIvyPortal/portal/cms/cms_de.yaml +++ b/AxonIvyPortal/portal/cms/cms_de.yaml @@ -1,8 +1,3 @@ -Categories: - CreateExpressWorkflow: - name: Express Workflow erstellen - ExpressWorkflow: - name: Express-Workflow ch.ivy.addon.portal.generic: CaseDetailsTemplate: noCaseId: Keine Vorgangs-ID spezifiziert @@ -241,7 +236,6 @@ ch.ivy.addon.portalkit.ui.jsf: enableProcessViewer: Setzen Sie diese Einstellung auf true, um die Prozess-Viewer-Option in Aufgaben-/Vorgang-Aktionen zu aktivieren enableScriptCheckingForUploadedDocumentNote: 'Auf "true" setzen, um die Skriptüberprüfung zu aktivieren. Es werden die Formate PDF, Excel und Word unterstützt. ' enableVirusScannerForUploadedDocumentNote: Auf true setzen, um den Virenscanner für das hochgeladene Dokument zu aktivieren. Derzeit verwendet diese Funktion die API VIRUSTOTAL. - expressEndPageNote: Anzeigen der angepassten Endseite nach dem Ende eines Express Prozesses. hideCaseCreator: | Auf true setzen, um den Fallersteller in der Fallliste, dem Fall-Widget und den Falldetails auszublenden. Diese Einstellung wirkt sich auf alle Fallabfragen aus, z. B. für Fallliste, globale Suche, Statistik. @@ -640,45 +634,6 @@ ch.ivy.addon.portalkit.ui.jsf: noUser: Es sind keine Benutzer vorhanden. tooltipHelper: Klicken Sie hier, um alle Benutzer anzuzeigen, die diese Rolle direkt oder indirekt besitzen userOfRoleTitle: Benutzer der Gruppe {0} - expressManagement: - deployButton: Hochladen - deployMessage: Prozesse werden deployt - exportExpress: Export Express - exportExpressProcessTitle: Export Express Prozesse - expressExportName: AXONIVY_Dataset_ExpressWorkflow_{0}.json - expressManagement: Express Management - expressMessages: - deployErrorLog: Fehler beim Deployen {0} - deploymentFinishedLog: Prozess(e) der Datei {0} erfolgreich im Portal deployt in {1}ms - endDeployLog: Express Deployment beendet - invalidVersionLog: Nicht unterstützte Version {0} von Express - process: - duplicateProcessNameLog: '- Duplizierter Prozessname {0}' - installProcessFailedLog: '- Prozessdeployment {0} fehlgeschlagen' - installProcessFinishedLog: Installation von Prozess {0} erfolgreich - installedProcessLog: Prozess installiert {0} - startDeployProcessLog: Start des Deployments von Prozess {0} - startDeployLog: Start des Deployments des/der Express-Prozesses(e) der Datei {0} ins Portal - status: - error: Fehler - failed: Fehlgeschlagen - info: Info - successful: Erfolg - warning: Warnung - validate: - validateExpressVersion: Die Variable Express-Version konnte im System nicht gefunden werden. Bitte kontaktieren Sie Ihren Administrator. - validateProcessCoOwnerLog: '- Validierung des Prozesses Co-Owner von {0}, Benutzer {1} ist nicht im System verfügbar' - validateProcessOwnerLog: '- Validierung des Prozesses Owner von {0}, Benutzer {1} ist nicht im System verfügbar, ändern Sie den Prozesseigner auf {2}' - validateProcessPermissionLog: '- Validierung der Prozessberechtigung von {0}, Benutzer {1} ist im System nicht verfügbar' - validateTaskDefUserLog: '- Validierung der Task-Definition Verantwortliche von {0},Benutzer {1} ist im System nicht verfügbar' - versionLog: 'Express Version: {0}' - fileEmptyMessage: Datei ist leer - importDialogHeaderTitle: Wählen Sie ein Dataset für den Express-Workflow, es sollte eine JSON-Datei sein. - importExpress: Express importieren - importExpressProcessTitle: Express Prozess importieren - importHeaderTitle: 'Liste von Express Prozessen werden exportiert:' - processCount: Prozess(e) - waitingMessage: Daten werden gesammelt… passwordValidation: criteria: Kriterien enablePasswordValidation: Kennwortüberprüfung einschalten @@ -961,6 +916,7 @@ ch.ivy.addon.portalkit.ui.jsf: processElementId: Prozesselement Id stackTrace: StackTrace forgotPassword: + EmailAddress: E-Mail Adresse empty: Leer forgotPassword: Ich habe mein Passwort vergessen. forgotPasswordError: Bei der Bearbeitung Ihrer Anfrage ist ein Fehler aufgetreten. Bitte versuchen Sie es später erneut. @@ -1459,54 +1415,11 @@ Dialogs: CaseDescription: Bearbeiten eines existierenden Workflows CaseName: Workflow editieren Tasks: - CreateWorkflow: - TaskDescription: Workflow wurde angelegt - TaskName: Workflow wurde angelegt - EditWorkflow: - TaskDescription: Ein Prozess wurde bearbeitet - TaskName: Prozess bearbeitet - FinalReview: - TaskName: Schlusskontrolle - FinalWorkflowTask: - taskDescription: Der Prozess {0} wurde beendet! - FormDefinition: - TaskDescription: Bitte definieren Sie das Formular! - TaskName: Formulardefinition! - SaveWorkflow: - TaskName: Ein Express Workflowprozess ist gerade am Entstehen TaskDetail: DataDescription: Daten und Beschreibung restoreToDefaultSettings: Standardeinstellungen wiederherstellen switchToEditMode: Bearbeiten switchToViewMode: Speichern - WorkflowProperties: - TaskDescription: Bitte definieren Sie die Workfloweigenschaften! - TaskName: Workflow Einstellungen - WorkflowExecution: - ApprovalForm: - Approve: Genehmigen! - ApproveComment: Genehmigen - CommentLabel: Kommentar des Genehmigers - FieldSetApplicant: Antragssteller - FieldSetForm: Formular - FinishedTasks: Erledigte Aufgaben - Fullname: vollständiger Name - Reject: Ablehnen! - RejectComment: Ablehnen - FinalReviewForm: - approvalStatus: Freigabestatus - approver: Genehmiger - noticed: Zur Kenntnis genommen! - FinishedTasksForm: - Applicant: Antragssteller - ApprovalResult: Freigabestatus - FinishedTasks: Erledigte Aufgaben - FormDetails: Formulardetails - UserTaskForm: - ApprovalResult: - Approved: Genehmigt - Rejected: Abgelehnt - Formular: Formular agileBPM: TooltipForOriginalTask: Ihre aktuelle Aufgabe wird wieder auftauchen sobald der Ad hoc Workflow fertiggestellt ist. define_WF: @@ -1526,14 +1439,6 @@ Dialogs: ch: ivy: addon: - express: - generic: - endpage: - subtitle: Die letzte Aufgabe wurde erfolgreich abgeschlossen - title: Aufgabe erfolgreich abgeschlossen! - expressNoItem: Es gibt noch keine abgeschlossene Express Aufgabe - expressNoItemDescription: Hier werden die Ergebnisse der abgeschlossenen Aufgaben angezeigt - expressWorkflowName: 'Business Details des Vorgangs: #{0}' portal: generic: GlobalSearch: @@ -1643,98 +1548,6 @@ Dialogs: invalidFileMessage: Dateityp nicht gültig! invalidSizeMessage: Datei zu groß! maximumFileUploadElement: Es gibt bereits ein Datei-Upload-Element - workflowCreation: - FormDefinition: - AddCheckboxField: Neues Feld hinzufügen - AddOptionboxField: Neue Option hinzufügen - AllowedFiletypes: Erlaubte Dateiformate - BroadFooterArea: Breiter Footer Bereich - BroadHeaderArea: Breiter Header Bereich - CheckboxFields: Auswahlfelder - CreateField: Erstellen - DataProvider: Datenanbieter - DragAndDropTooltip: Ziehen Sie per Drag and Drop die verfügbaren Elemente in den Header, die linke Spalte, die rechte Spalte oder in den Footer um sie zu platzieren! - ElementLabel: Label - ElementName: Elementbezeichnung - Email: - Attachment: Anhang - EmailAddress: E-Mail Adresse - EmailText: Emailnachricht - ResponseTo: Antwort an - Subject: Betreff - ExecuteWorkflow: Workflow direkt ausführen - ExecuteWorkflowWarning: Sie müssen alle Aufgaben ausführen, bevor Sie diesen Workflow ausführen können - FieldSetAvailableFormelements: Formularelemente - FieldSetFormelements: Formularelemente erstellen - FieldSetFormelementsPlacing: Platzierung der Formularelemente - FieldSetPreviewArea: Formularvorschau - FinishWorkflow: Workflowende - InputArea: Eingabebereich - InputCheckbox: Auswahlfeld - InputField: Eingabefeld - InputFileUpload: Dateiupload - InputOptions: Optionsfeld - InputType: Eingabe-Typ - InputTypes: - DateSelection: Datumsauswahl - NumberField: Nummernfeld - TextBox: Textfeld - LeftColumn: Linke Spalte - NoCheckboxFieldYet: Bisher keine Auswahlfelder angelegt - NoDataProvider: 'Daten Provider ' - NoFormelementsAvailable: Keine Formularelemente verfügbar! - NoOptionboxFieldsYet: Bisher keine Auswahloptionen angelegt - NumberOfFiles: Dateianzahl - NumberOfRows: Zeilenanzahl - OptionboxFields: Optionsfelder - OptionboxPlaceholder: Option - Preview: Vorschau - RightColumn: Rechte Spalte - SaveWorkflow: Workflow speichern - UploadFileFormat: - Excel: Excel (xls/xlsx) - OtherFormats: Andere Dateiformate - PDF: PDF (pdf) - Word: Word (doc/docx) - cancelCreateForm: Wollen Sie wirklich abbrechen? Alle Daten gehen verloren! - otherFiletype: Andere Dateiformate - ProcessName: Express Workflow erstellen - TaskType: - Approval: Genehmigung - Email: Information E-Mail - Review: Überprüfung - UserTask: Aufgabe - UserTaskWithEmail: Aufgabe mit E-Mail Schritt - WorkflowDefinition: - AddProcessStep: Prozessschritt hinzufügen - ChooseAssignee: - AddUserOrRole: 'Wählen Sie eine Gruppe oder Benutzer aus, bitte:' - SelectedAssigneesFieldSet: Ausgewählte Genehmiger - UserTooltip: Benutzer - DefaultTemplateDescription: Unten befindet sich das Standard Template - DeleteProcessStep: Prozessschritt löschen - Description: Beschriben Sie Ihren Prozess - DueTimeInDays: Fälligkeitsfrist in Tagen - EndStep: Ende - FormDefinitionStep: Formular-definition - ProcessNameExists: Dieser Prozessname wurde bereits benutzt - Processdescription: Prozessbeschreibung - Processdetails: Prozesseigenschaften - Processflow: Prozessfluss - Processstep: Prozessschritt - Processtype: Prozessart - ProcesstypeRepeating: Wiederkehrend - TaskType: Aufgabentyp - UntilDaysTooltip: Nach Ablauf wird die Aufgabe an die Rolle Everybody zugeteilt, und ihre Priorität auf Hoch gesetzt. - UserInterface: - ChangeSettingWarning: Alle definierten Aufgaben werden gelöscht. Sind Sie sicher? - CreateOwn: Erstellen - UseDefault: Standardoberfläche - UserInterface: Benutzeroberfläche - WorkflowPropertiesStep: Workfloweigenschaften - requiredMsgs: - ReqMsgGeneric: ' ist ein erforderliches Feld!' - processStep: Prozessschritt Labels: AppendTask-Explain: Die Aufgabe wird in der Sequenz nach meiner Aufgabe hinzugefügt. AppendTheTask: Aufgabe anhängen diff --git a/AxonIvyPortal/portal/cms/cms_en.yaml b/AxonIvyPortal/portal/cms/cms_en.yaml index 4f66bb5ea44..be733a3398a 100644 --- a/AxonIvyPortal/portal/cms/cms_en.yaml +++ b/AxonIvyPortal/portal/cms/cms_en.yaml @@ -1,8 +1,3 @@ -Categories: - CreateExpressWorkflow: - name: Create Express Workflow - ExpressWorkflow: - name: Express Workflow ch.ivy.addon.portal.generic: CaseDetailsTemplate: noCaseId: No case-Id specified @@ -240,7 +235,6 @@ ch.ivy.addon.portalkit.ui.jsf: enableProcessViewer: Set this property to true to enable process viewer option in Task/Case actions enableScriptCheckingForUploadedDocumentNote: Set to true to enable script checking for uploaded document. Currently this function supports checking for PDF, Excel, Word. enableVirusScannerForUploadedDocumentNote: Set to true to enable virus scanner for uploaded document. Currently this function is using API VIRUSTOTAL. - expressEndPageNote: Display the custom end page at the end of each Express process. hideCaseCreator: |- Set to true to hide case creator in case list, case widget and case details. This setting affects all case queries, e.g. for case list, global search, statistic. @@ -644,45 +638,6 @@ ch.ivy.addon.portalkit.ui.jsf:
    {2}
tooltipHelper: Click to show all users which own this role directly or indirectly userOfRoleTitle: User of {0} group - expressManagement: - deployButton: Deploy - deployMessage: 'Deploying processes ... ' - exportExpress: Export Express - exportExpressProcessTitle: Export Express Processes - expressExportName: AXONIVY_Dataset_ExpressWorkflow_{0}.json - expressManagement: Express Management - expressMessages: - deployErrorLog: Error while deploying {0} - deploymentFinishedLog: Process(es) of file {0} successful deployed into Portal in {1}ms - endDeployLog: Deployment Express finished - invalidVersionLog: Non supported version {0} of Express - process: - duplicateProcessNameLog: '- Duplicate process name {0}' - installProcessFailedLog: '- Deploy process {0} failed' - installProcessFinishedLog: Installing process {0} successfully - installedProcessLog: Process installed {0} - startDeployProcessLog: Start deploying process {0} - startDeployLog: Start deploying the Express process(es) of file {0} to Portal - status: - error: Error - failed: Failed - info: Info - successful: Success - warning: Warning - validate: - validateExpressVersion: Could not find the Express Version variable in System. Please contact your adminstrator. - validateProcessCoOwnerLog: '- Validate Process Co-Owner of {0}, user {1} is not available in system' - validateProcessOwnerLog: '- Validate Process Owner of {0}, user {1} is not available in system, change process owner to {2}' - validateProcessPermissionLog: '- Validate Process Permission of {0}, user {1} is not available in system' - validateTaskDefUserLog: '- Validate Task Definition Responsibles of {0}, user {1} is not available in system' - versionLog: 'Version of Express: {0}' - fileEmptyMessage: File is empty - importDialogHeaderTitle: Choose a Dataset of Express workflow, it should be a JSON file. - importExpress: Import Express - importExpressProcessTitle: Import Express Processes - importHeaderTitle: 'List of Express processes will be exported:' - processCount: process(es) - waitingMessage: 'Data is collecting ... ' passwordValidation: criteria: Criteria enablePasswordValidation: Enable password validation @@ -963,6 +918,7 @@ ch.ivy.addon.portalkit.ui.jsf: processElementId: Process element Id stackTrace: StackTrace forgotPassword: + EmailAddress: E-Mail address empty: Empty forgotPassword: Forgot my password forgotPasswordError: An error occurred while processing your request. Please try again later. @@ -1460,54 +1416,11 @@ Dialogs: CaseDescription: Edit an existing workflow CaseName: Edit workflow Tasks: - CreateWorkflow: - TaskDescription: Workflow has been created - TaskName: Workflow has been created - EditWorkflow: - TaskDescription: A process has been edited. - TaskName: Process edited - FinalReview: - TaskName: Final Review - FinalWorkflowTask: - taskDescription: The workflow {0} has been finished! - FormDefinition: - TaskDescription: Please define the form! - TaskName: Form creation! - SaveWorkflow: - TaskName: Express workflow creation in progress TaskDetail: DataDescription: Data and Description restoreToDefaultSettings: Restore to default settings switchToEditMode: Edit switchToViewMode: Save - WorkflowProperties: - TaskDescription: Please configure the workflow properties! - TaskName: Workflow properties - WorkflowExecution: - ApprovalForm: - Approve: Approve! - ApproveComment: Approved - CommentLabel: Comment of approver - FieldSetApplicant: Requester - FieldSetForm: Form - FinishedTasks: Finished Tasks - Fullname: Full name - Reject: Reject! - RejectComment: Rejected - FinalReviewForm: - approvalStatus: Approval status - approver: Approver - noticed: Acknowledged! - FinishedTasksForm: - Applicant: Applicant - ApprovalResult: Approval result - FinishedTasks: Finished Tasks - FormDetails: Form Details - UserTaskForm: - ApprovalResult: - Approved: Approved - Rejected: Rejected - Formular: Form agileBPM: TooltipForOriginalTask: Your current task will return once previous steps of the ad hoc workflow are finished. define_WF: @@ -1527,14 +1440,6 @@ Dialogs: ch: ivy: addon: - express: - generic: - endpage: - subtitle: The last task was completed successfully - title: Task completed successfully! - expressNoItem: There is no completed Express Task yet - expressNoItemDescription: The results of completed tasks are displayed here - expressWorkflowName: 'Business Details of Case #{0}' portal: generic: GlobalSearch: @@ -1647,98 +1552,6 @@ Dialogs: general: MaxLabelLenght: '35' maxOptionsLength: '20' - workflowCreation: - FormDefinition: - AddCheckboxField: Add new field - AddOptionboxField: Append new option - AllowedFiletypes: Allowed file types - BroadFooterArea: Wide footer - BroadHeaderArea: Wide Header - CheckboxFields: Checkbox fields - CreateField: Create - DataProvider: Data provider - DragAndDropTooltip: Drag and Drop the available elements to the Header, left column, right column or to the Footer! - ElementLabel: Label - ElementName: Name of element - Email: - Attachment: Attachment - EmailAddress: E-Mail address - EmailText: Email text - ResponseTo: Response to - Subject: Subject - ExecuteWorkflow: Execute workflow directly - ExecuteWorkflowWarning: You have to fulfil all tasks before execute this workflow - FieldSetAvailableFormelements: Form elements - FieldSetFormelements: Create form element - FieldSetFormelementsPlacing: Placement of form elements - FieldSetPreviewArea: Preview of the defined form - FinishWorkflow: Finish Workflow - InputArea: Input area - InputCheckbox: Checkbox - InputField: Input field - InputFileUpload: File upload - InputOptions: Radio button - InputType: Input type - InputTypes: - DateSelection: Date picker - NumberField: Number field - TextBox: Text field - LeftColumn: left column - NoCheckboxFieldYet: No checkbox field types are defined yet - NoDataProvider: Special static data provider - NoFormelementsAvailable: No form elements are available! - NoOptionboxFieldsYet: No checkbox types are defined yet - NumberOfFiles: Number of files - NumberOfRows: Number of rows - OptionboxFields: Radio buttons - OptionboxPlaceholder: Option - Preview: Preview - RightColumn: right column - SaveWorkflow: Save Workflow - UploadFileFormat: - Excel: Excel (xls/xlsx) - OtherFormats: Other file formats - PDF: PDF (pdf) - Word: Word (doc/docx) - cancelCreateForm: Do you really want to cancel? All your data will be lost! - otherFiletype: Other file types - ProcessName: Create Express Workflow - TaskType: - Approval: Approval - Email: Information E-mail - Review: Review - UserTask: User task - UserTaskWithEmail: User task with E-mail - WorkflowDefinition: - AddProcessStep: Add process step - ChooseAssignee: - AddUserOrRole: 'Select a group or a user, please:' - SelectedAssigneesFieldSet: Selected assignees - UserTooltip: User - DefaultTemplateDescription: Below is the default template - DeleteProcessStep: Remove process step - Description: Describe your process - DueTimeInDays: Expiry in days - EndStep: End - FormDefinitionStep: Form definition - ProcessNameExists: This process name was used before - Processdescription: Process description - Processdetails: Process properties - Processflow: Process flow - Processstep: Process step - Processtype: Type of process - ProcesstypeRepeating: Repeatable - TaskType: Task Type - UntilDaysTooltip: After expiry, the task will be assigned to Everybody and its priority becomes High. - UserInterface: - ChangeSettingWarning: All defined tasks will be deleted. Are you sure? - CreateOwn: Create own - UseDefault: Use default - UserInterface: User Interface - WorkflowPropertiesStep: Workflow properties - requiredMsgs: - ReqMsgGeneric: ' is a required field!' - processStep: Process Step Labels: AppendTask-Explain: The task is added to the sequence after my task. AppendTheTask: Append the task diff --git a/AxonIvyPortal/portal/cms/cms_es.yaml b/AxonIvyPortal/portal/cms/cms_es.yaml index ae2f5f956e4..3027f015e13 100644 --- a/AxonIvyPortal/portal/cms/cms_es.yaml +++ b/AxonIvyPortal/portal/cms/cms_es.yaml @@ -1,8 +1,3 @@ -Categories: - CreateExpressWorkflow: - name: Crear Express Workflow - ExpressWorkflow: - name: Flujo de trabajo exprés ch.ivy.addon.portal.generic: CaseDetailsTemplate: noCaseId: No hay ID de caso especificado @@ -242,7 +237,6 @@ ch.ivy.addon.portalkit.ui.jsf: enableProcessViewer: Defina esta propiedad como true para habilitar la opción de visor de procesos en las acciones de Tarea/Caso enableScriptCheckingForUploadedDocumentNote: 'Cambiar a "True" para activar el control de anexos permitidos. De momento se pueden controlar archivos en PDF, word y excel. ' enableVirusScannerForUploadedDocumentNote: Cambiar a "true" para habilitar el escáner de virus para el documento cargado. Actualmente esta función utiliza la API VIRUSTOTAL. - expressEndPageNote: Mostrar la página de final de flujo de trabajo express propia. hideCaseCreator: |- Establecer a true para ocultar el creador de casos en la lista de casos, widget de casos y detalles de casos. Este ajuste afecta a todas las consultas de casos, por ejemplo, para la lista de casos, la búsqueda global o la estadística. @@ -641,45 +635,6 @@ ch.ivy.addon.portalkit.ui.jsf: noUser: No hay usuarios tooltipHelper: Click para ver todos los usuarios que tienen este rol de forma directa o indirecta userOfRoleTitle: 'Usuarios del rol {0} ' - expressManagement: - deployButton: Desplegar - deployMessage: Desplegando procesos - exportExpress: Export Express - exportExpressProcessTitle: 'Exportar procesos Express ' - expressExportName: AXONIVY_Dataset_ExpressWorkflow_{0}.json - expressManagement: Gestionar Express - expressMessages: - deployErrorLog: Error durante el despliegue {0} - deploymentFinishedLog: Proceso(s) del archivo {0} han sido desplegados con éxito en {1}ms - endDeployLog: Despliegue Express finalizado - invalidVersionLog: Versión de Express {0} no apoyada - process: - duplicateProcessNameLog: Nombre de proceso duplicado {0} - installProcessFailedLog: Error al desplegar proceso {0} - installProcessFinishedLog: Instalación de proceso {0} con éxito. - installedProcessLog: Procesos instalados {0} - startDeployProcessLog: Comienzo de la instalación del proceso {0} - startDeployLog: Empezando el despliegue de los procesos del documento {0} - status: - error: Error - failed: Error - info: Info - successful: Éxito - warning: Atención - validate: - validateExpressVersion: La variable "Version Express" no ha sido encontrada. Por favor contacte a su administrador. - validateProcessCoOwnerLog: '- Validación del copropietario del proceso {0}. Usuario {1} no existe en el sistema' - validateProcessOwnerLog: '- Validación del propietario del proceso {0}. Usuario {1} no existe en el sistema. Cambie el propietario a {2}' - validateProcessPermissionLog: '- Validación del permiso para el proceso {0}. Usuario {1} no existe en el sistema' - validateTaskDefUserLog: '- Validación del responsable de tarea {0}. Usuario {1} no existe en el sistema' - versionLog: 'Versión de Express: {0}' - fileEmptyMessage: Archivo está vacío - importDialogHeaderTitle: Seleccione un archivo de procesos Express. El formato tiene que ser JSON. - importExpress: Importar Express - importExpressProcessTitle: Importar procesos Express - importHeaderTitle: 'Lista de procesos Express será exportada:' - processCount: proceso(s) - waitingMessage: Coleccionando datos… passwordValidation: criteria: Criterios enablePasswordValidation: Activar la validación de contraseñas @@ -960,6 +915,7 @@ ch.ivy.addon.portalkit.ui.jsf: processElementId: ID del elemento del proceso stackTrace: Conjunto de trazas forgotPassword: + EmailAddress: Dirección de E-Mail empty: Vacío forgotPassword: Olvidé mi contraseña forgotPasswordError: Ha habido un error mientras se procesaba su solicitud. Por favor inténtelo más tarde. @@ -1461,54 +1417,11 @@ Dialogs: CaseDescription: Editar un flujo de trabajo existente CaseName: Editar flujo de trabajo Tasks: - CreateWorkflow: - TaskDescription: Flujo de trabajo ha sido creado - TaskName: Flujo de trabajo ha sido creado - EditWorkflow: - TaskDescription: Un flujo de trabajo ha sido editado - TaskName: Flujo de trabajo editado - FinalReview: - TaskName: Control final - FinalWorkflowTask: - taskDescription: ¡El flujo de trabajo {0} ha sido {1}! - FormDefinition: - TaskDescription: ¡Por favor define el formulario! - TaskName: ¡Creación de formulario! - SaveWorkflow: - TaskName: El flujo de trabajo express en tramitación TaskDetail: DataDescription: Datos y Descripción restoreToDefaultSettings: 'Restablecer la configuración por defecto ' switchToEditMode: Editar switchToViewMode: Guardar - WorkflowProperties: - TaskDescription: ¡Por favor configure las propiedades del flujo de trabajo! - TaskName: Propiedades del flujo de trabajo - WorkflowExecution: - ApprovalForm: - Approve: Aprobar - ApproveComment: Aprobar - CommentLabel: Comentario del aprobador - FieldSetApplicant: Solicitante - FieldSetForm: Formulario - FinishedTasks: Tareas terminadas - Fullname: Nombre completo - Reject: Rechazar - RejectComment: Rechazar - FinalReviewForm: - approvalStatus: Estado del aprobado - approver: Aprovador - noticed: Verificado - FinishedTasksForm: - Applicant: Solicitante - ApprovalResult: Estado del aprobado - FinishedTasks: Tareas terminadas - FormDetails: Detalles del formulario - UserTaskForm: - ApprovalResult: - Approved: Aprobado - Rejected: Rechazado - Formular: Formulario agileBPM: TooltipForOriginalTask: Su tarea actual volverá a evaluarse cuando estén completados los flujos de trabajo ad hoc previos. define_WF: @@ -1528,14 +1441,6 @@ Dialogs: ch: ivy: addon: - express: - generic: - endpage: - subtitle: La última tarea se completó con éxito. - title: ¡Tarea completada con éxito! - expressNoItem: Aún no se ha completado ninguna Tarea Express - expressNoItemDescription: Aquí se mostrarán los resultados de las tareas completadas - expressWorkflowName: 'Detalles de negocio del caso #{0}' portal: generic: GlobalSearch: @@ -1645,98 +1550,6 @@ Dialogs: invalidFileMessage: Tipo de archivo no permitido invalidSizeMessage: ¡El archivo es muy grande! maximumFileUploadElement: Ya existe un elemento de subir documentos - workflowCreation: - FormDefinition: - AddCheckboxField: Agregar nuevo campo - AddOptionboxField: Anexar nueva opción - AllowedFiletypes: Tipos de Archivo permitidos - BroadFooterArea: Pie de pagina amplio - BroadHeaderArea: Encabezado amplio - CheckboxFields: Campos de casillas de verificación - CreateField: Crear - DataProvider: Proveedor de datos - DragAndDropTooltip: Arrastre y suelte los elementos disponibles al encabezado, columna de la izquierda o de la derecha o al pie de página - ElementLabel: Etiqueta - ElementName: Nombre del elemento - Email: - Attachment: Anexo - EmailAddress: Dirección de E-Mail - EmailText: Texto de E-Mail - ResponseTo: Respuesta a - Subject: Asunto - ExecuteWorkflow: Ejecutar flujo de trabajo directamente - ExecuteWorkflowWarning: Tiene que procesar todas las tareas antes de poder ejecutar este processo - FieldSetAvailableFormelements: Elementos del formulario - FieldSetFormelements: Crear elementos de formulario - FieldSetFormelementsPlacing: Ubicación de elementos de formulario - FieldSetPreviewArea: Vista previa del formulario definido - FinishWorkflow: Fin del flujo de trabajo - InputArea: Área de entrada - InputCheckbox: Casilla de verificación - InputField: Campo de entrada - InputFileUpload: Carga de archivo - InputOptions: Botón Radial - InputType: Tipo de Entrada - InputTypes: - DateSelection: Seleccionador de Fecha - NumberField: Campo de numero - TextBox: Campo de texto - LeftColumn: Columna izquierda - NoCheckboxFieldYet: No hay campos de verificación definidos todavía - NoDataProvider: Proveedor de datos - NoFormelementsAvailable: ¡No hay elementos de formulario disponibles! - NoOptionboxFieldsYet: No hay tipos de casillas de verificación definidos todavía - NumberOfFiles: Numero de archivos - NumberOfRows: Numero de filas - OptionboxFields: Botones Radiales - OptionboxPlaceholder: Opción - Preview: Vista previa - RightColumn: Columna derecha - SaveWorkflow: Guardar Flujo de trabajo - UploadFileFormat: - Excel: Excel (xls/xlsx) - OtherFormats: Otros formatos de archivo - PDF: PDF (pdf) - Word: Word (doc/docx) - cancelCreateForm: 'Seguro que quiere cancelar? Perderá todos los datos. ' - otherFiletype: Otros tipos de archivos - ProcessName: Crear Flujo de Trabajo Express - TaskType: - Approval: Aprobado - Email: E-Mail de información - Review: Comprobación - UserTask: Tarea - UserTaskWithEmail: 'Tarea con E-Mail ' - WorkflowDefinition: - AddProcessStep: Agregar paso de proceso - ChooseAssignee: - AddUserOrRole: 'Selecione un grupo o usuario porfavor:' - SelectedAssigneesFieldSet: Usuarios seleccionados - UserTooltip: Usuario - DefaultTemplateDescription: Abajo verá el patrón estandard - DeleteProcessStep: Retirar paso del proceso - Description: Describa su proceso - DueTimeInDays: Expiración en días - EndStep: Terminar - FormDefinitionStep: Definición de formulario - ProcessNameExists: Este nombre para el flujo de trabajo ya ha sido seleccionado - Processdescription: Descripción de proceso - Processdetails: Propiedades del proceso - Processflow: Flujo de proceso - Processstep: Paso del proceso - Processtype: Tipo de proceso - ProcesstypeRepeating: Recurrente - TaskType: Tipo de tarea - UntilDaysTooltip: Después de la fecha de caducidad, esta tarea será asignada al grupo "todos" y su prioridad será alta - UserInterface: - ChangeSettingWarning: Todas las tareas definidas serán borradas, desea proceder? - CreateOwn: Crear propia - UseDefault: Usar patrón estandard - UserInterface: Interfaz de usuario - WorkflowPropertiesStep: Propiedades del flujo de trabajo - requiredMsgs: - ReqMsgGeneric: ¡Es un campo requerido! - processStep: Paso del proceso Labels: AppendTask-Explain: La tarea es añadida a la secuencia después de mi tarea. AppendTheTask: Anexar la tarea diff --git a/AxonIvyPortal/portal/cms/cms_fr.yaml b/AxonIvyPortal/portal/cms/cms_fr.yaml index ee000687ee4..c5a978f7570 100644 --- a/AxonIvyPortal/portal/cms/cms_fr.yaml +++ b/AxonIvyPortal/portal/cms/cms_fr.yaml @@ -1,8 +1,3 @@ -Categories: - CreateExpressWorkflow: - name: Créer un workflow express - ExpressWorkflow: - name: Flux de travail express ch.ivy.addon.portal.generic: CaseDetailsTemplate: noCaseId: Aucun numéro de dossier n'a été indiqué @@ -239,7 +234,6 @@ ch.ivy.addon.portalkit.ui.jsf: enableProcessViewer: Définissez cette propriété à true pour activer l'option de visualisation de processus dans les actions de Task/Case. enableScriptCheckingForUploadedDocumentNote: Défini sur true pour activer la vérification de script pour le document téléchargé. Actuellement, cette fonction prend en charge la vérification de PDF, Excel, Word. enableVirusScannerForUploadedDocumentNote: Définie sur true pour activer le scanner de virus pour le document téléchargé. Actuellement, cette fonction utilise l'API VIRUSTOTAL. - expressEndPageNote: Affiche la page de fin personnalisée à la fin de chaque processus Express. hideCaseCreator: |- La valeur "true" permet de masquer le créateur du dossier dans la liste des dossiers, le widget du dossier et les détails du dossier. Ce paramètre affecte toutes les requêtes de cas, par exemple pour la liste des cas, la recherche globale, les statistiques. @@ -638,45 +632,6 @@ ch.ivy.addon.portalkit.ui.jsf: noUser: Il n'y a pas d'utilisateurs. tooltipHelper: Cliquez pour afficher tous les utilisateurs qui possèdent ce rôle directement ou indirectement userOfRoleTitle: Utilisateur du groupe {0} - expressManagement: - deployButton: Déployer - deployMessage: 'Déploiement des processus en cours ... ' - exportExpress: Export Express - exportExpressProcessTitle: Exporter des processus express - expressExportName: AXONIVY_Dataset_ExpressWorkflow_{0}.json - expressManagement: Gestion de l'express - expressMessages: - deployErrorLog: Erreur lors du déploiement {0} - deploymentFinishedLog: Processus du fichier {0} déployé avec succès dans Portal en {1}ms - endDeployLog: Déploiement Express terminé - invalidVersionLog: Version non supportée {0} d'Express - process: - duplicateProcessNameLog: '- Nom du processus dupliqué {0}' - installProcessFailedLog: '- Le déploiement du processus {0} a échoué' - installProcessFinishedLog: Installation du processus {0} réussie - installedProcessLog: Processus installé {0} - startDeployProcessLog: Commencer à déployer le processus {0} - startDeployLog: Commencez à déployer le(s) processus Express du fichier {0} vers Portal - status: - error: Erreur - failed: Echoué - info: Info - successful: Succès - warning: Attention - validate: - validateExpressVersion: Impossible de trouver la variable Express Version dans le système. Veuillez contacter votre administrateur. - validateProcessCoOwnerLog: '- Valider le processus Copropriétaire de {0}, l''utilisateur {1} n''est pas disponible dans le système' - validateProcessOwnerLog: '- Valider le propriétaire du processus de {0}, l''utilisateur {1} n''est pas disponible dans le système, changer le propriétaire du processus pour {2}.' - validateProcessPermissionLog: '- Valider la permission de processus de {0}, l''utilisateur {1} n''est pas disponible dans le système' - validateTaskDefUserLog: '- Valider les responsabilités de la définition de tâche de {0}, l''utilisateur {1} n''est pas disponible dans le système' - versionLog: 'Version de l''Express : {0}' - fileEmptyMessage: Le fichier est vide - importDialogHeaderTitle: Choisissez un Dataset de workflow Express, il doit s'agir d'un fichier JSON. - importExpress: Importation Express - importExpressProcessTitle: Importation de processus express - importHeaderTitle: 'La liste des processus Express sera exportée :' - processCount: processus(s) - waitingMessage: Les données sont recueillies … passwordValidation: criteria: Critères enablePasswordValidation: Activer la validation du mot de passe @@ -957,6 +912,7 @@ ch.ivy.addon.portalkit.ui.jsf: processElementId: Id de l'élément de processus stackTrace: StackTrace forgotPassword: + EmailAddress: Adresse e-mail empty: Vide forgotPassword: J'ai oublié mon mot de pas forgotPasswordError: Une erreur s'est produite lors du traitement de votre demande. Veuillez réessayer plus tard. @@ -1455,54 +1411,11 @@ Dialogs: CaseDescription: Modifier un workflow existant CaseName: Modifier workflow Tasks: - CreateWorkflow: - TaskDescription: Le workflow a été créé - TaskName: Le workflow a été créé - EditWorkflow: - TaskDescription: Un processus a été modifié. - TaskName: Processus modifié - FinalReview: - TaskName: Finales chèques - FinalWorkflowTask: - taskDescription: Le workflow {0} a été terminé! - FormDefinition: - TaskDescription: Veuillez définir le formulaire ! - TaskName: Création du formulaire! - SaveWorkflow: - TaskName: Création de workflow express en cours TaskDetail: DataDescription: Données et description restoreToDefaultSettings: Rétablir les paramètres par défaut switchToEditMode: Editer switchToViewMode: Enregistrer - WorkflowProperties: - TaskDescription: Veuillez configurer les propriétés du workflow ! - TaskName: Propriétés de workflow - WorkflowExecution: - ApprovalForm: - Approve: Approuver ! - ApproveComment: Approuver - CommentLabel: Commentaire de l'approbateur - FieldSetApplicant: Demandeur - FieldSetForm: Formulaire - FinishedTasks: Tâches finies - Fullname: Nom complet - Reject: Refuser ! - RejectComment: Refuser - FinalReviewForm: - approvalStatus: Statut d'approbation - approver: Approbateur - noticed: Prendre acte! - FinishedTasksForm: - Applicant: Demandeur - ApprovalResult: Résultat d'approbation - FinishedTasks: Tãches finies - FormDetails: Détails du formulaire - UserTaskForm: - ApprovalResult: - Approved: Approuvé - Rejected: Refusé - Formular: Formulaire agileBPM: TooltipForOriginalTask: 'Votre tâche actuelle réapparaîtra dès que le workflow ad hoc sera terminé. ' define_WF: @@ -1522,14 +1435,6 @@ Dialogs: ch: ivy: addon: - express: - generic: - endpage: - subtitle: La dernière tâche a été accomplie avec succès - title: Tâche terminée avec succès! - expressNoItem: Pas de tâche Express terminée - expressNoItemDescription: Les résultats des tâches terminées sont affichés ici - expressWorkflowName: 'Détails de cas #{0}' portal: generic: GlobalSearch: @@ -1639,98 +1544,6 @@ Dialogs: invalidFileMessage: Ce type de fichier n'est pas accepté! invalidSizeMessage: Le fichier est trop volumineux ! maximumFileUploadElement: Il existe déjà un élément de téléchargement de fichiers - workflowCreation: - FormDefinition: - AddCheckboxField: Ajouter un nouveau champs - AddOptionboxField: Ajouter une nouvelle option - AllowedFiletypes: Types de fichier autorisés - BroadFooterArea: Zone de bas de page large - BroadHeaderArea: En-tête large - CheckboxFields: Champs de cases à cocher - CreateField: Créer - DataProvider: Fournisseur de données - DragAndDropTooltip: Veuillez placer les éléments disponibles par glisser/déposer dans l’en-tête, dans la colonne de droite ou en pied de page. - ElementLabel: Label - ElementName: Nom de l’élément - Email: - Attachment: Pièce jointe - EmailAddress: Adresse e-mail - EmailText: Texte d'email - ResponseTo: Réponse à - Subject: Sujet - ExecuteWorkflow: Lancer le workflow directement - ExecuteWorkflowWarning: Vous devez effectuer toutes les tâches avant de pouvoir exécuter ce workflow - FieldSetAvailableFormelements: Éléments de formulaire - FieldSetFormelements: Créer un élément de formulaire - FieldSetFormelementsPlacing: Placer les éléments de formulaire - FieldSetPreviewArea: Pré-visualiser le formulaire - FinishWorkflow: Fin de workflow - InputArea: Zone de texte - InputCheckbox: Case d’option à cocher - InputField: Champ de texte - InputFileUpload: Téléchargement de fichier - InputOptions: Bouton radio - InputType: Type d’entrée - InputTypes: - DateSelection: Calendrier - NumberField: Champ numérique - TextBox: Champ de texte - LeftColumn: Colonne de gauche - NoCheckboxFieldYet: Aucun type de champ de case d’option à cocher n’est pour l’instant défini - NoDataProvider: Fournisseur de données statiques spéciales - NoFormelementsAvailable: Aucun élément de formulaire n’est disponible ! - NoOptionboxFieldsYet: Aucun type de case d’’option à cocher n’est pour l’instant défini - NumberOfFiles: Nombre de fichiers - NumberOfRows: Nombre de lignes - OptionboxFields: Boutons radio - OptionboxPlaceholder: Option - Preview: Aperçu - RightColumn: Colonne de droite - SaveWorkflow: Sauvegarder le workflow - UploadFileFormat: - Excel: Excel (xls/xlsx) - OtherFormats: Autres formats de fichier - PDF: PDF (pdf) - Word: Word (doc/docx) - cancelCreateForm: Voulez-vous vraiment annuler? Toutes vos données seront perdues! - otherFiletype: Autres types de fichier - ProcessName: Créer un flux de travail Express - TaskType: - Approval: Approbation - Email: email d'information - Review: Revue - UserTask: Tâche - UserTaskWithEmail: Tâche avec email - WorkflowDefinition: - AddProcessStep: Ajouter une étape de processus - ChooseAssignee: - AddUserOrRole: 'Veuillez sélectionner un groupe ou un utilisateur :' - SelectedAssigneesFieldSet: Cessionnaires sélectionnés - UserTooltip: Utilisateur - DefaultTemplateDescription: Voici le modèle par défaut - DeleteProcessStep: Supprimer l’étape de processus - Description: Décrivez votre processus - DueTimeInDays: Expiration en jours - EndStep: Fin - FormDefinitionStep: Définition du formulaire - ProcessNameExists: Ce nom de processus a été utilisé avant - Processdescription: Description du processus - Processdetails: Propriétés du processus - Processflow: Flux du processus - Processstep: Étape de processus - Processtype: Type de processus - ProcesstypeRepeating: Rrépétitif - TaskType: Type de tâche - UntilDaysTooltip: Après expiration, la tâche sera assignée au role “Everybody” et sa priorité sera passée en “haute”. - UserInterface: - ChangeSettingWarning: Toutes les tâches définies seront supprimées. Êtes-vous sûr? - CreateOwn: Créer propre - UseDefault: Coutume - UserInterface: Iinterface utilisateur - WorkflowPropertiesStep: Propriétés du workflow ! - requiredMsgs: - ReqMsgGeneric: est un champ obligatoire ! - processStep: Étape du processus Labels: AppendTask-Explain: La tâche est ajoutée à la séquence après ma tâche. AppendTheTask: Ajouter la tâche diff --git a/AxonIvyPortal/portal/config/variables.yaml b/AxonIvyPortal/portal/config/variables.yaml index 2413a3697dd..01d501e6498 100644 --- a/AxonIvyPortal/portal/config/variables.yaml +++ b/AxonIvyPortal/portal/config/variables.yaml @@ -33,9 +33,6 @@ Variables: # For switch on/off the display icon in button. ShowButtonIcon: true - # Display the custom end page at the end of each Express process. - ExpressEndPage: true - # This setting is using for SecurityMemberDisplayName component. # If the SecurityMember is a role, set this setting to true to list out all users of this role. # If set to true, icon info is shown beside the role name. @@ -106,10 +103,6 @@ Variables: # [file: json] ExternalLinks: - # The standard express processes of Portal. - # [file: json] - ExpressProcesses: - # Set to true to disable link to Show Information of process on Processes page (grid mode) and Case Details. ShowInformation: true diff --git a/AxonIvyPortal/portal/src/ch/addon/portal/generic/menu/MenuView.java b/AxonIvyPortal/portal/src/ch/addon/portal/generic/menu/MenuView.java index 060210c7591..2272604d94b 100644 --- a/AxonIvyPortal/portal/src/ch/addon/portal/generic/menu/MenuView.java +++ b/AxonIvyPortal/portal/src/ch/addon/portal/generic/menu/MenuView.java @@ -1,7 +1,6 @@ package ch.addon.portal.generic.menu; import static ch.ivy.addon.portalkit.util.DashboardUtils.DASHBOARD_MENU_ITEM_PATTERN; - import static ch.ivy.addon.portalkit.util.DashboardUtils.DASHBOARD_MENU_JS_CLASS; import static ch.ivy.addon.portalkit.util.DashboardUtils.DASHBOARD_MENU_PATTERN; import static ch.ivy.addon.portalkit.util.DashboardUtils.DASHBOARD_PAGE_URL; @@ -277,9 +276,7 @@ public void loadBreadcrumb(String viewName, ITask userTask, ICase userCase) { case STATISTICS -> buildBreadCrumbForStatistic(); case TASK_DETAIL -> buildBreadCrumbForTaskDetails(userTask); case CASE_DETAIL -> buildBreadCrumbForCaseDetails(userCase); - case EXPRESS -> buildBreadCrumbForExpress(); case USER_PROFILE -> buildBreadCrumbForUserProfile(); - case EXPRESS_BUSINESS -> buildBreadCrumbForExpressBusiness(userCase); case ABSENCES_MANAGEMENT -> buildBreadCrumbForAbsences(); case DASHBOARD_CONFIGURATION -> buildBreadCrumbForDashboardConfiguration(); case EDIT_DASHBOARD_DETAILS -> buildBreadCrumbForEditDashboardDetail(); @@ -378,16 +375,6 @@ private void buildBreadCrumbForCaseDetails(ICase userCase) { breadcrumbModel.getElements().add(buildCaseDetailsMenuItem(userCase)); } - private void buildBreadCrumbForExpress() { - setPortalHomeMenuToBreadcrumbModel(); - breadcrumbModel.getElements().add(buildGenericMenuItem("/Categories/ExpressWorkflow/name")); - } - - private void buildBreadCrumbForExpressBusiness(ICase userCase) { - setPortalHomeMenuToBreadcrumbModel(); - breadcrumbModel.getElements().add(buildExpressBusinessMenuItem(Long.toString(userCase.getId()))); - } - private void buildBreadCrumbForDashboardConfiguration() { setPortalHomeMenuToBreadcrumbModel(); breadcrumbModel.getElements() @@ -455,14 +442,6 @@ private MenuItem buildCaseDetailsMenuItem(ICase userCase) { .build(); } - private MenuItem buildExpressBusinessMenuItem(String caseId) { - return DefaultMenuItem.builder() - .value(Ivy.cms().co("/Dialogs/ch/ivy/addon/express/generic/expressWorkflowName", Arrays.asList(caseId))) - .url("#") - .disabled(true) - .build(); - } - private MenuItem buildGenericMenuItem(String cms) { return DefaultMenuItem.builder() .value(Ivy.cms().co(cms)) diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portal/generic/bean/UserMenuBean.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portal/generic/bean/UserMenuBean.java index e600c320266..ac4daad3bde 100644 --- a/AxonIvyPortal/portal/src/ch/ivy/addon/portal/generic/bean/UserMenuBean.java +++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portal/generic/bean/UserMenuBean.java @@ -24,13 +24,11 @@ import ch.ivy.addon.portal.generic.navigation.PortalNavigator; import ch.ivy.addon.portalkit.bean.IvyComponentLogicCaller; import ch.ivy.addon.portalkit.bean.PortalExceptionBean; -import ch.ivy.addon.portalkit.bo.ExpressProcess; import ch.ivy.addon.portalkit.dto.UserMenu; import ch.ivy.addon.portalkit.enums.GlobalVariable; import ch.ivy.addon.portalkit.jsf.Attrs; import ch.ivy.addon.portalkit.jsf.ManagedBeans; import ch.ivy.addon.portalkit.service.AnnouncementService; -import ch.ivy.addon.portalkit.service.ExpressProcessService; import ch.ivy.addon.portalkit.service.GlobalSettingService; import ch.ivy.addon.portalkit.service.IvyCacheService; import ch.ivy.addon.portalkit.util.PermissionUtils; @@ -49,7 +47,6 @@ public class UserMenuBean implements Serializable { public static final long TIME_BEFORE_LOST_SESSION = 3 * DateUtils.MILLIS_PER_MINUTE; // 3 minutes public static final String TASK_LEAVE_WARNING_COMPONENT = "task-leave-warning-component"; - private static String expressStartLink; private String targetPage = StringUtils.EMPTY; private String loggedInUser; private boolean isShowGlobalSearch; @@ -315,25 +312,11 @@ private String getURLFromUserMenu(UserMenu menu) { if (menuUrl.contains("http")) { return menuUrl; } - if (StringUtils.isNotBlank(getExpressStartLink())) { - ExpressProcess workflow = ExpressProcessService.getInstance().findExpressProcessByName(menuUrl); - if (workflow != null && PermissionUtils.checkAbleToStartAndAbleToEditExpressWorkflow(workflow) - && StringUtils.isNotBlank(workflow.getId())) { - menu.setUrl(getExpressStartLink() + "?workflowID=" + workflow.getId()); - } - } return menu.getUrl(); } return ""; } - private static String getExpressStartLink() { - if (StringUtils.isEmpty(expressStartLink)) { - expressStartLink = ExpressProcessService.getInstance().findExpressWorkflowStartLink(); - } - return expressStartLink; - } - public void navigateToNotificationOrDisplayWorkingTaskWarning(boolean isWorkingOnATask, ITask task) { if (isWorkingOnATask && task.getState() != TaskState.DONE) { openTaskLosingConfirmationDialog(); diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bean/AbstractProcessBean.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bean/AbstractProcessBean.java index 0654185ea5c..96c5d1375e4 100644 --- a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bean/AbstractProcessBean.java +++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bean/AbstractProcessBean.java @@ -15,9 +15,7 @@ import ch.ivy.addon.portal.generic.navigation.PortalNavigator; import ch.ivy.addon.portal.generic.util.ProcessStepUtils; -import ch.ivy.addon.portalkit.bo.ExpressProcess; import ch.ivy.addon.portalkit.bo.ExternalLinkProcessItem; -import ch.ivy.addon.portalkit.bo.PortalExpressProcess; import ch.ivy.addon.portalkit.bo.Process; import ch.ivy.addon.portalkit.bo.ProcessStep; import ch.ivy.addon.portalkit.configuration.ExternalLink; @@ -26,10 +24,8 @@ import ch.ivy.addon.portalkit.enums.GlobalVariable; import ch.ivy.addon.portalkit.enums.ProcessType; import ch.ivy.addon.portalkit.mapper.UserProcessMapper; -import ch.ivy.addon.portalkit.service.ExpressProcessService; import ch.ivy.addon.portalkit.service.ExternalLinkService; import ch.ivy.addon.portalkit.service.GlobalSettingService; -import ch.ivy.addon.portalkit.util.PermissionUtils; import ch.ivyteam.ivy.workflow.start.IWebStartable; public abstract class AbstractProcessBean implements Serializable { @@ -44,7 +40,6 @@ public abstract class AbstractProcessBean implements Serializable { public synchronized void init() { List processes = new ArrayList<>(); processes.addAll(findProcesses()); - processes.addAll(findExpressProcesses()); processes.addAll(findExternalLink()); portalProcesses = new CopyOnWriteArrayList(sortProcesses(processes)); } @@ -61,22 +56,6 @@ public String getProcessInformationPageUrl(Process process) { protected abstract List findProcesses(); - protected List findExpressProcesses() { - List processes = new ArrayList<>(); - String expressStartLink = ExpressProcessService.getInstance().findExpressWorkflowStartLink(); - if (StringUtils.isNotBlank(expressStartLink)) { - List workflows = ExpressProcessService.getInstance().findReadyToExecuteProcessOrderByName(); - for (ExpressProcess wf : workflows) { - if (PermissionUtils.checkAbleToStartAndAbleToEditExpressWorkflow(wf)) { - processes.add(wf); - } - } - } - List defaultPortalProcesses = new ArrayList<>(); - processes.forEach(process -> defaultPortalProcesses.add(new PortalExpressProcess(process))); - return defaultPortalProcesses; - } - protected List findExternalLink() { List privateExternalLinks = ExternalLinkService.getInstance().getPrivateConfig(); List externalLinks = new ArrayList<>(privateExternalLinks); @@ -98,7 +77,7 @@ public String getProcessIcon(Process process) { public void startProcess(Process process) throws IOException { String link = process.getStartLink(); - if (process.getType() == ProcessType.EXPRESS_PROCESS || process.getType() == ProcessType.EXTERNAL_LINK) { + if (process.getType() == ProcessType.EXTERNAL_LINK) { FacesContext.getCurrentInstance().getExternalContext().redirect(link); return; } diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bean/AdminSettingBean.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bean/AdminSettingBean.java index a9bcd338b16..b19717afd60 100644 --- a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bean/AdminSettingBean.java +++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bean/AdminSettingBean.java @@ -19,7 +19,6 @@ import ch.ivy.addon.portalkit.enums.GlobalVariable.Option; import ch.ivy.addon.portalkit.enums.PortalPermission; import ch.ivy.addon.portalkit.jsf.Attrs; -import ch.ivy.addon.portalkit.service.ExpressProcessService; import ch.ivy.addon.portalkit.util.PermissionUtils; import ch.ivy.addon.portalkit.util.PrimeFacesUtils; import ch.ivyteam.ivy.environment.Ivy; @@ -33,10 +32,8 @@ public class AdminSettingBean implements Serializable { public static final String APPLICATION_TAB_ID = "application-tab"; public static final String ADMIN_SETTING_TAB_ID = "setting-tab"; public static final String ANNOUNCEMENT_SETTING_TAB_ID = "announcement-tab"; - public static final String EXPRESS_MANAGEMENT_TAB_ID = "express-management-tab"; public static final String ROLE_MANAGEMENT_TAB_ID = "role-management-tab"; public static final String PASSWORD_VALIDATION_TAB_ID = "password-validation-tab"; - private boolean isShowExpressManagementTab; private boolean isShowRoleManagementTab; private boolean isTabChangeEventTriggered; private boolean isShowPasswordValidationTab; @@ -46,7 +43,6 @@ public void initAdminTabViewConfig() { isTabChangeEventTriggered = false; return; } - isShowExpressManagementTab = ExpressProcessService.getInstance().findExpressCreationProcess() != null; isShowRoleManagementTab = canSeeRoleManagement(); isShowPasswordValidationTab = canSeePasswordValidation(); initApplicationTab(); @@ -65,11 +61,6 @@ public void onTabChange(TabChangeEvent tabChangeEvent) { case ANNOUNCEMENT_SETTING_TAB_ID: initAnnouncementTab(); break; - case EXPRESS_MANAGEMENT_TAB_ID: - if (isShowExpressManagementTab) { - initExpressManagementTab(); - } - break; case ROLE_MANAGEMENT_TAB_ID: break; case PASSWORD_VALIDATION_TAB_ID: @@ -85,10 +76,6 @@ private void initApplicationTab() { invokeAdminSettingsComponentLogic("#{logic.initApplicationSettings}", new Object[] {}); } - private void initExpressManagementTab() { - PrimeFacesUtils.executeScript("refreshExpressManagement()"); - } - private void initAnnouncementTab() { invokeAdminSettingsComponentLogic("#{logic.initAnnouncementSettings}", new Object[] {}); } @@ -142,15 +129,6 @@ public String getDropdownItemlabel(Object item) { return String.valueOf(item); } - public boolean isShowExpressManagementTab() { - return isShowExpressManagementTab; - } - - public void setShowExpressManagementTab(boolean isShowExpressManagementTab) { - this.isShowExpressManagementTab = isShowExpressManagementTab; - } - - public boolean isShowRoleManagementTab() { return isShowRoleManagementTab; } diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bean/ExpressManagementBean.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bean/ExpressManagementBean.java deleted file mode 100644 index 7bfcb6bcdd0..00000000000 --- a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bean/ExpressManagementBean.java +++ /dev/null @@ -1,178 +0,0 @@ -package ch.ivy.addon.portalkit.bean; - -import java.io.Serializable; -import java.util.List; -import java.util.Map; -import java.util.Optional; - -import javax.faces.application.FacesMessage; -import javax.faces.bean.ManagedBean; -import javax.faces.bean.ViewScoped; -import javax.faces.context.FacesContext; - -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.StringUtils; -import org.primefaces.event.FileUploadEvent; -import org.primefaces.model.StreamedContent; -import org.primefaces.model.file.UploadedFile; - -import com.axonivy.portal.components.dto.SecurityMemberDTO; -import com.axonivy.portal.components.util.FacesMessageUtils; -import com.axonivy.portal.util.UploadDocumentUtils; - -import ch.ivy.addon.portalkit.bo.ExpressProcess; -import ch.ivy.addon.portalkit.constant.PortalConstants; -import ch.ivy.addon.portalkit.enums.ExpressMessageType; -import ch.ivy.addon.portalkit.util.ExpressManagementUtils; -import ch.ivy.addon.portalkit.util.UserUtils; -import ch.ivyteam.ivy.environment.Ivy; -import ch.ivyteam.ivy.process.call.SubProcessCall; -import ch.ivyteam.ivy.security.IUser; - -@ManagedBean -@ViewScoped -public class ExpressManagementBean implements Serializable { - - private static final long serialVersionUID = -6072339110563610370L; - - private List activeMemberList; - private List expressProcesses; - private List selectedExpressProcesses; - private StreamedContent exportExpressFile; - private UploadedFile importExpressFile; - private String importOutput; - private String importStatus; - private FacesMessage validateMessage; - - public void initWorkflowSummaryTable() { - activeMemberList = findAllActiveUser(); - setExpressProcesses(ExpressManagementUtils.findExpressProcesses()); - } - - @SuppressWarnings("unchecked") - private List findAllActiveUser() { - if (activeMemberList == null) { - return SubProcessCall.withPath(PortalConstants.SECURITY_SERVICE_CALLABLE) - .withStartName("findSecurityMembers") - .withParam("query", "") - .withParam("startIndex", 0) - .withParam("count", PortalConstants.MAX_USERS_IN_AUTOCOMPLETE) - .call() - .get("members", List.class); - } - return activeMemberList; - } - - /** - * Get a display name by activator name - * - * @param activatorName - * @return display name - */ - public String getUserDisplayName(String activatorName) { - if (StringUtils.isBlank(activatorName)) { - return Ivy.cms().co("/ch.ivy.addon.portalkit.ui.jsf/common/notAvailable"); - } - - String displayName = activatorName; - if (CollectionUtils.isNotEmpty(activeMemberList)) { - Optional activeUser = activeMemberList.stream().filter(user -> user.getMemberName().equalsIgnoreCase(activatorName)) - .findFirst(); - if (activeUser.isPresent()) { - displayName = StringUtils.isBlank(activeUser.get().getDisplayName()) ? activeUser.get().getName() : activeUser.get().getDisplayName(); - } else { - displayName = Ivy.cms().co("/ch.ivy.addon.portalkit.ui.jsf/common/notAvailable"); - } - } else { - IUser user = UserUtils.findUserByUsername(activatorName); - displayName = StringUtils.isBlank(user.getDisplayName()) ? user.getName() : user.getDisplayName(); - } - return displayName; - } - - public void importExpress(FileUploadEvent event) { - importExpressFile = event.getFile(); - String validateStr = UploadDocumentUtils.validateUploadedFile(importExpressFile); - if (StringUtils.isNotEmpty(validateStr)) { - validateMessage = FacesMessageUtils.sanitizedMessage(FacesMessage.SEVERITY_ERROR, validateStr, null); - displayedMessage(); - } else { - importExpressProcesses(); - } - } - - public StreamedContent exportExpress() { - if (selectedExpressProcesses != null && !selectedExpressProcesses.isEmpty()) { - exportExpressFile = ExpressManagementUtils.exportExpressProcess(selectedExpressProcesses); - } - return exportExpressFile; - } - - private void displayedMessage() { - FacesContext.getCurrentInstance().addMessage("import-express-form:import-express-dialog-message", validateMessage); - importStatus = ExpressMessageType.FAILED.getLabel(); - } - - @SuppressWarnings("unchecked") - private void importExpressProcesses() { - Map results = ExpressManagementUtils.importExpressProcesses(importExpressFile); - try { - importStatus = results.get(ExpressMessageType.IMPORT_STATUS).toString(); - importOutput = results.get(ExpressMessageType.IMPORT_RESULT).toString(); - if (!importStatus.equalsIgnoreCase(ExpressMessageType.FAILED.getLabel())) { - expressProcesses.addAll((List) results.get(ExpressMessageType.IMPORT_EXPRESS_PROCESSES)); - } - } catch (Exception e) { - importStatus = ExpressMessageType.FAILED.getLabel(); - importOutput = e.getMessage(); - } - } - - public List getExpressProcesses() { - return expressProcesses; - } - - public void setExpressProcesses(List expressProcesses) { - this.expressProcesses = expressProcesses; - } - - public String getImportOutput() { - return importOutput; - } - - public void setImportOutput(String importOutput) { - this.importOutput = importOutput; - } - - public List getSelectedExpressProcesses() { - return selectedExpressProcesses; - } - - public void setSelectedExpressProcesses(List selectedExpressProcesses) { - this.selectedExpressProcesses = selectedExpressProcesses; - } - - public StreamedContent getExportExpressFile() { - return exportExpressFile; - } - - public void setExportExpressFile(StreamedContent exportExpressFile) { - this.exportExpressFile = exportExpressFile; - } - - public String getImportStatus() { - return importStatus; - } - - public void setImportStatus(String importStatus) { - this.importStatus = importStatus; - } - - public UploadedFile getImportExpressFile() { - return importExpressFile; - } - - public void setImportExpressFile(UploadedFile importExpressFile) { - this.importExpressFile = importExpressFile; - } -} diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bean/PortalPermissionInitBean.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bean/PortalPermissionInitBean.java index 447df1229fc..de5110b0435 100644 --- a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bean/PortalPermissionInitBean.java +++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bean/PortalPermissionInitBean.java @@ -68,14 +68,11 @@ private void recreateAndGrantPermissions() { createPermissionsGroup(portalPermissionGroup, PortalPermissionGroup.ABSENCE_AND_SUBSTITUTE_GROUP); IPermissionGroup statisticsPermissionGroup = createPermissionsGroup(portalPermissionGroup, PortalPermissionGroup.STATISTIC_GROUP); - IPermissionGroup expressPermissionGroup = - createPermissionsGroup(portalPermissionGroup, PortalPermissionGroup.EXPRESS_GROUP); initSystemPermission(taskPermissionGroup, getTaskPermissions()); initSystemPermission(casePermissionGroup, getCasePermissions()); initSystemPermission(generalPermissionGroup, getGeneralPermissions()); initSystemPermission(absenceAndSubPermissionGroup, getAbsenceAndSubstitutePermissions()); initSystemPermission(statisticsPermissionGroup, getPortalPermissionsByGroup(PortalPermissionGroup.STATISTIC_GROUP)); - initSystemPermission(expressPermissionGroup, getPortalPermissionsByGroup(PortalPermissionGroup.EXPRESS_GROUP)); } private void initSystemPermission(IPermissionGroup permissionGroup, List permissions) { diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bo/ExpressFormElement.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bo/ExpressFormElement.java deleted file mode 100644 index 8503d2a281b..00000000000 --- a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bo/ExpressFormElement.java +++ /dev/null @@ -1,93 +0,0 @@ -package ch.ivy.addon.portalkit.bo; - -import java.io.Serializable; -import java.util.List; - -import com.fasterxml.jackson.annotation.JsonInclude; - -@JsonInclude(JsonInclude.Include.NON_NULL) -public class ExpressFormElement implements Serializable { - - private static final long serialVersionUID = -1048666544578490353L; - private String elementID; - private String name; - private String label; - private boolean required; - private int intSetting; - private String elementType; - private List optionStrs; - private String elementPosition; - private int indexInPanel; - - public String getElementID() { - return elementID; - } - - public void setElementID(String elementID) { - this.elementID = elementID; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getLabel() { - return label; - } - - public void setLabel(String label) { - this.label = label; - } - - public boolean isRequired() { - return required; - } - - public void setRequired(boolean required) { - this.required = required; - } - - public int getIntSetting() { - return intSetting; - } - - public void setIntSetting(int intSetting) { - this.intSetting = intSetting; - } - - public String getElementType() { - return elementType; - } - - public void setElementType(String elementType) { - this.elementType = elementType; - } - - public String getElementPosition() { - return elementPosition; - } - - public void setElementPosition(String elementPosition) { - this.elementPosition = elementPosition; - } - - public List getOptionStrs() { - return optionStrs; - } - - public void setOptionStrs(List optionStrs) { - this.optionStrs = optionStrs; - } - - public int getIndexInPanel() { - return indexInPanel; - } - - public void setIndexInPanel(int indexInPanel) { - this.indexInPanel = indexInPanel; - } -} diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bo/ExpressProcess.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bo/ExpressProcess.java deleted file mode 100644 index a996256ee9e..00000000000 --- a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bo/ExpressProcess.java +++ /dev/null @@ -1,142 +0,0 @@ -package ch.ivy.addon.portalkit.bo; - -import java.io.Serializable; -import java.util.List; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; - -import ch.ivy.addon.portalkit.configuration.AbstractConfiguration; -import ch.ivy.addon.portalkit.util.SecurityMemberDisplayNameUtils; -import ch.ivy.addon.portalkit.util.UserUtils; -import ch.ivyteam.ivy.security.IUser; - -@JsonInclude(JsonInclude.Include.NON_NULL) -public class ExpressProcess extends AbstractConfiguration implements Serializable { - - private static final long serialVersionUID = -7412792174579848169L; - private String processName; - private String processDescription; - private String processType; - private List processPermissions; - private String processOwner; - private boolean isUseDefaultUI; - private String processFolder; - private boolean readyToExecute; - private List processCoOwners; - private String icon; - @JsonIgnore - private boolean isAbleToEdit; - private List taskDefinitions; - @JsonIgnore - private IUser processOwnerUser; - - - public ExpressProcess() { - setIsPublic(true); - } - - public String getProcessName() { - return processName; - } - - public void setProcessName(String processName) { - this.processName = processName; - } - - public String getProcessDescription() { - return processDescription; - } - - public void setProcessDescription(String processDescription) { - this.processDescription = processDescription; - } - - public String getProcessType() { - return processType; - } - - public void setProcessType(String processType) { - this.processType = processType; - } - - public List getProcessPermissions() { - return processPermissions; - } - - public void setProcessPermissions(List processPermissions) { - this.processPermissions = processPermissions; - } - - public String getProcessOwner() { - return processOwner; - } - - public void setProcessOwner(String processOwner) { - this.processOwner = processOwner; - } - - public boolean isUseDefaultUI() { - return isUseDefaultUI; - } - - public void setUseDefaultUI(boolean isUseDefaultUI) { - this.isUseDefaultUI = isUseDefaultUI; - } - - public String getProcessFolder() { - return processFolder; - } - - public void setProcessFolder(String processFolder) { - this.processFolder = processFolder; - } - - public boolean isReadyToExecute() { - return readyToExecute; - } - - public void setReadyToExecute(boolean readyToExecute) { - this.readyToExecute = readyToExecute; - } - - public boolean isAbleToEdit() { - return isAbleToEdit; - } - - public void setAbleToEdit(boolean isAbleToEdit) { - this.isAbleToEdit = isAbleToEdit; - } - - public List getProcessCoOwners() { - return processCoOwners; - } - - public void setProcessCoOwners(List processCoOwners) { - this.processCoOwners = processCoOwners; - } - - public String getIcon() { - return icon; - } - - public void setIcon(String icon) { - this.icon = icon; - } - - public List getTaskDefinitions() { - return taskDefinitions; - } - - public void setTaskDefinitions(List taskDefinitions) { - this.taskDefinitions = taskDefinitions; - } - - public IUser getProcessOwnerUser() { - if (processOwnerUser == null) { - processOwnerUser = UserUtils.findUserByUsername(SecurityMemberDisplayNameUtils.stripSharpCharacterFromSecurityMemberName(processOwner)); - } - return processOwnerUser; - } - -} diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bo/ExpressTaskDefinition.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bo/ExpressTaskDefinition.java deleted file mode 100644 index 86bc641d27a..00000000000 --- a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bo/ExpressTaskDefinition.java +++ /dev/null @@ -1,94 +0,0 @@ -package ch.ivy.addon.portalkit.bo; - -import java.io.Serializable; -import java.util.List; - -import com.fasterxml.jackson.annotation.JsonInclude; - -@JsonInclude(JsonInclude.Include.NON_NULL) -public class ExpressTaskDefinition implements Serializable { - - private static final long serialVersionUID = 6708062804413815719L; - private String type; - private List responsibles; - private String subject; - private String description; - private int taskPosition; - private int untilDays; - private String responsibleDisplayName; - private ExpressUserEmail email; - private List formElements; - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public List getResponsibles() { - return responsibles; - } - - public void setResponsibles(List responsibles) { - this.responsibles = responsibles; - } - - public String getSubject() { - return subject; - } - - public void setSubject(String subject) { - this.subject = subject; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getTaskPosition() { - return taskPosition; - } - - public void setTaskPosition(int taskPosition) { - this.taskPosition = taskPosition; - } - - public int getUntilDays() { - return untilDays; - } - - public void setUntilDays(int untilDays) { - this.untilDays = untilDays; - } - - public String getResponsibleDisplayName() { - return responsibleDisplayName; - } - - public void setResponsibleDisplayName(String responsibleDisplayName) { - this.responsibleDisplayName = responsibleDisplayName; - } - - public ExpressUserEmail getEmail() { - return email; - } - - public void setEmail(ExpressUserEmail email) { - this.email = email; - } - - public List getFormElements() { - return formElements; - } - - public void setFormElements(List formElements) { - this.formElements = formElements; - } - -} diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bo/ExpressUserEmail.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bo/ExpressUserEmail.java deleted file mode 100644 index fe6e3387352..00000000000 --- a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bo/ExpressUserEmail.java +++ /dev/null @@ -1,66 +0,0 @@ -package ch.ivy.addon.portalkit.bo; - -import java.io.Serializable; -import java.util.List; - -import org.apache.commons.lang3.StringUtils; - -import com.fasterxml.jackson.annotation.JsonInclude; - -import ch.ivy.addon.portalkit.dto.ExpressAttachment; - -@JsonInclude(JsonInclude.Include.NON_NULL) -public class ExpressUserEmail implements Serializable { - - private static final long serialVersionUID = 55870461406887925L; - private String recipients; - private String responseTo; - private String subject; - private String content; - private List attachments; - - public String getRecipients() { - return recipients; - } - - public void setRecipients(String recipients) { - this.recipients = recipients; - } - - public String getResponseTo() { - return responseTo; - } - - public void setResponseTo(String responseTo) { - this.responseTo = responseTo; - } - - public String getSubject() { - return subject; - } - - public void setSubject(String subject) { - this.subject = subject; - } - - public String getContent() { - return content; - } - - public void setContent(String content) { - this.content = content; - } - - public List getAttachments() { - return attachments; - } - - public void setAttachments(List attachments) { - this.attachments = attachments; - } - - public boolean isEmpty() { - return StringUtils.isEmpty(this.subject) || StringUtils.isEmpty(this.content); - } - -} diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bo/PortalExpressProcess.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bo/PortalExpressProcess.java deleted file mode 100644 index 526f66bb930..00000000000 --- a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bo/PortalExpressProcess.java +++ /dev/null @@ -1,148 +0,0 @@ -package ch.ivy.addon.portalkit.bo; - -import java.util.Optional; - -import org.apache.commons.lang3.StringUtils; - -import ch.ivy.addon.portalkit.enums.DefaultImage; -import ch.ivy.addon.portalkit.enums.ProcessType; -import ch.ivy.addon.portalkit.service.ExpressProcessService; -import ch.ivy.addon.portalkit.util.CategoryUtils; -import ch.ivy.addon.portalkit.util.ExpressManagementUtils; -import ch.ivyteam.ivy.application.IApplication; -import ch.ivyteam.ivy.environment.Ivy; -import ch.ivyteam.ivy.security.ISecurityContext; -import ch.ivyteam.ivy.security.ISecurityMember; -import ch.ivyteam.ivy.security.IUser; -import ch.ivyteam.ivy.workflow.category.Category; - -/* - * Used for merging express process and ivy process into a process list - */ -public class PortalExpressProcess implements Process { - - public static final String DEFAULT_ICON = "si si-startup-launch"; - private static final String NOT_AVAILABLE_CMS = "/ch.ivy.addon.portalkit.ui.jsf/common/notAvailable"; - private static final String EXPRESS_WORKFLOW_ID_PARAM = "?workflowID="; - private ExpressProcess process; - private String processOwnerDisplayName; - private String ableToStart; - private String application; - private Category category; - - public PortalExpressProcess(ExpressProcess process) { - this.process = process; - String processOwner = ExpressManagementUtils.getValidMemberName(process.getProcessOwner()); - String processOwnerName = StringUtils.isNotBlank(processOwner) ? processOwner.substring(1) : null; - - IUser user = processOwnerName != null ? ISecurityContext.current().users().find(processOwnerName) : null; - - this.processOwnerDisplayName = Optional.ofNullable(user).map(IUser::getDisplayName).orElse(Ivy.cms().co(NOT_AVAILABLE_CMS)); - - for (String username : this.process.getProcessPermissions()) { - ISecurityMember assignee = ISecurityContext.current().members().find(username); - String ableStartName = Optional.ofNullable(assignee).map(ISecurityMember::getDisplayName).orElse(Ivy.cms().co(NOT_AVAILABLE_CMS)); - this.ableToStart = StringUtils.isBlank(ableToStart) ? ableStartName : String.join(";", ableToStart, ableStartName); - } - - application = IApplication.current().getName(); - category = CategoryUtils.buildExpressCategory(process.getProcessName()); - } - - @Override - public String getStartLink() { - return generateWorkflowStartLink(); - } - - @Override - public String getDescription() { - StringBuilder builder = new StringBuilder(); - if (StringUtils.isNotBlank(process.getProcessDescription())) { - builder.append(process.getProcessDescription()).append(". "); - } - return builder.append(Ivy.cms().co("/ch.ivy.addon.portalkit.ui.jsf/caseList/defaultColumns/CREATOR")) - .append(": ") - .append(this.processOwnerDisplayName) - .toString(); - } - - private String generateWorkflowStartLink() { - return ExpressProcessService.getInstance().findExpressWorkflowStartLink() + EXPRESS_WORKFLOW_ID_PARAM + this.process.getId(); - } - - @Override - public String getName() { - return process.getProcessName(); - } - - @Override - public ExpressProcess getProcess() { - return process; - } - - @Override - public String getId() { - return process.getId(); - } - - @Override - public ProcessType getType() { - return ProcessType.EXPRESS_PROCESS; - } - - @Override - public String getTypeName() { - return ProcessType.EXPRESS_PROCESS.name(); - } - - public String getProcessOwnerDisplayName() { - return processOwnerDisplayName; - } - - public void setProcessOwnerDisplayName(String processOwenerDisplayName) { - this.processOwnerDisplayName = processOwenerDisplayName; - } - - @Override - public String getIcon() { - String icon = this.process.getIcon(); - return StringUtils.isBlank(icon) ? DEFAULT_ICON : icon; - } - - public String getAbleToStart() { - return ableToStart; - } - - public void setAbleToStart(String ableToStart) { - this.ableToStart = ableToStart; - } - - @Override - public Category getCategory() { - return category; - } - - @Override - public String getImageUrl() { - return getContentImageUrl(DefaultImage.NASASTART.getPath()); - } - - @Override - public String getApplication() { - return application; - } - - public void setApplication(String application) { - this.application = application; - } - - @Override - public String getSortIndex() { - return null; - } - - @Override - public String getPortalProcessInformation() { - return null; - } -} diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/constant/CustomFields.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/constant/CustomFields.java index b9901a3a0cc..20ea8f8fadb 100644 --- a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/constant/CustomFields.java +++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/constant/CustomFields.java @@ -6,7 +6,6 @@ public class CustomFields { public static final String CUSTOM_TIMESTAMP_FIELD5 = "CustomTimestampField5"; public static final String EMBED_IN_FRAME = "embedInFrame"; - public static final String EXPRESS_END_PAGE_URL = "expressEndPageUrl"; public static final String PROCESS_IMAGE = "processImage"; public static final String PROCESS_INFORMATION = "portalProcessInfo"; public static final String SORT_INDEX = "portalSortIndex"; diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/constant/PortalConstants.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/constant/PortalConstants.java index 4af982f2065..62573a1fb07 100644 --- a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/constant/PortalConstants.java +++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/constant/PortalConstants.java @@ -8,8 +8,6 @@ public final class PortalConstants { public static final String RESET_TASK_CONFIRMATION_DIALOG = "reset-task-confirmation-dialog"; public static final String PORTAL_LIBRARY_ID = "com.axonivy.portal:portal"; public static final int CUSTOM_STRING_FIELD_MAX_LENGTH = 2000; - public static final Integer[] EXPRESS_INVALID_VERSION = {0}; - public static final int EXPRESS_VERSION = 1; public static final int MAX_USERS_IN_AUTOCOMPLETE = 101; private PortalConstants() {} diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/dto/ExpressAttachment.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/dto/ExpressAttachment.java deleted file mode 100644 index e7113167c51..00000000000 --- a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/dto/ExpressAttachment.java +++ /dev/null @@ -1,70 +0,0 @@ -package ch.ivy.addon.portalkit.dto; - - -import ch.ivy.addon.portalkit.enums.ExpressEmailAttachmentStatus; - -import java.io.Serializable; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; - -@JsonInclude(JsonInclude.Include.NON_NULL) -public class ExpressAttachment implements Serializable { - - private static final long serialVersionUID = 7156983624283465272L; - private String name; - @JsonIgnore - private byte[] content; - private String size; - private String path; - private ExpressEmailAttachmentStatus status; - private String contentType; - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public byte[] getContent() { - return content; - } - - public void setContent(byte[] content) { - this.content = content; - } - - public String getSize() { - return size; - } - - public void setSize(String size) { - this.size = size; - } - - public String getPath() { - return path; - } - - public void setPath(String path) { - this.path = path; - } - - public ExpressEmailAttachmentStatus getStatus() { - return status; - } - - public void setStatus(ExpressEmailAttachmentStatus status) { - this.status = status; - } - - public String getContentType() { - return contentType; - } - - public void setContentType(String contentType) { - this.contentType = contentType; - } -} diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/enums/BreadCrumbKind.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/enums/BreadCrumbKind.java index d26aa5f599b..030acdee864 100644 --- a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/enums/BreadCrumbKind.java +++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/enums/BreadCrumbKind.java @@ -1,6 +1,6 @@ package ch.ivy.addon.portalkit.enums; public enum BreadCrumbKind { - HOME, PROCESS, TASK, TASK_DETAIL, CASE_DETAIL, CASE, TECHNICAL_CASE, RELATED_TASK, STATISTICS, EXPRESS, USER_PROFILE, EXPRESS_BUSINESS, + HOME, PROCESS, TASK, TASK_DETAIL, CASE_DETAIL, CASE, TECHNICAL_CASE, RELATED_TASK, STATISTICS, USER_PROFILE, ABSENCES_MANAGEMENT, DASHBOARD_CONFIGURATION, EDIT_DASHBOARD_DETAILS, PROCESS_VIEWER, PORTAL_MANAGEMENT, NOTIFICATION; } diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/enums/ExpressEmailAttachmentStatus.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/enums/ExpressEmailAttachmentStatus.java deleted file mode 100644 index ed6760789b9..00000000000 --- a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/enums/ExpressEmailAttachmentStatus.java +++ /dev/null @@ -1,6 +0,0 @@ -package ch.ivy.addon.portalkit.enums; - -public enum ExpressEmailAttachmentStatus { - ADDED, - DELETED; -} diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/enums/ExpressMessageType.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/enums/ExpressMessageType.java deleted file mode 100644 index 9b9ee3fc200..00000000000 --- a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/enums/ExpressMessageType.java +++ /dev/null @@ -1,29 +0,0 @@ -package ch.ivy.addon.portalkit.enums; - -import ch.ivyteam.ivy.environment.Ivy; - -public enum ExpressMessageType { - INFO("INFO", "/ch.ivy.addon.portalkit.ui.jsf/components/expressManagement/expressMessages/status/info"), - WARNING("WARNING", "/ch.ivy.addon.portalkit.ui.jsf/components/expressManagement/expressMessages/status/warning"), - ERROR("WARNING", "/ch.ivy.addon.portalkit.ui.jsf/components/expressManagement/expressMessages/status/error"), - FAILED("FAILED","/ch.ivy.addon.portalkit.ui.jsf/components/expressManagement/expressMessages/status/failed"), - IMPORT_STATUS("import_status", "Import Status"), - IMPORT_EXPRESS_PROCESSES("import_express_processes","Import express processes"), - IMPORT_RESULT("import_result","Import result"); - - private final String value; - private final String label; - - ExpressMessageType(String value, String label) { - this.value = value; - this.label = label; - } - - public String getValue() { - return value; - } - - public String getLabel() { - return Ivy.cms().co(label); - } -} diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/enums/GlobalVariable.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/enums/GlobalVariable.java index 3c8c2fad2d3..8725049d1fc 100644 --- a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/enums/GlobalVariable.java +++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/enums/GlobalVariable.java @@ -50,7 +50,6 @@ public enum GlobalVariable { SHOW_CASE_DURATION_TIME("Portal.CaseDetails.ShowDurationTime", GlobalVariableType.SELECTION, Option.TRUE.toString(), "showCaseDurationTime"), HIDE_UPLOAD_DOCUMENT_FOR_DONE_CASE("Portal.CaseDetails.HideUploadDocumentForDoneCase", GlobalVariableType.SELECTION, Option.FALSE.toString(), "hideUploadDocumentForDoneCaseNote"), DISPLAY_MESSAGE_AFTER_FINISH_TASK("Portal.DisplayMessageAfterFinishTask", GlobalVariableType.SELECTION, Option.TRUE.toString(), "displayMessageAfterFinishOrLeaveTask"), - EXPRESS_END_PAGE("Portal.ExpressEndPage", GlobalVariableType.SELECTION, Option.TRUE.toString(), "expressEndPageNote"), EMBED_IN_FRAME("Portal.EmbedInFrame", GlobalVariableType.SELECTION, Option.TRUE.toString(), "embedInFrame"), SHOW_GLOBAL_SEARCH("Portal.ShowGlobalSearch", GlobalVariableType.SELECTION, Option.TRUE.toString(), "showGlobalSearch"), SHOW_QUICK_GLOBAL_SEARCH("Portal.ShowQuickGlobalSearch", GlobalVariableType.SELECTION, Option.FALSE.toString(), "showQuickGlobalSearch"), diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/enums/PortalPermission.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/enums/PortalPermission.java index 417178d46fb..7e17a6fbf67 100644 --- a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/enums/PortalPermission.java +++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/enums/PortalPermission.java @@ -17,7 +17,6 @@ public enum PortalPermission { TASK_DISPLAY_ADDITIONAL_OPTIONS("TaskDisplayAdditionalOptions", PortalPermissionGroup.TASK_PERMISSIONS_GROUP), STATISTIC_ADD_DASHBOARD_CHART("StatisticAddDashboardChart", PortalPermissionGroup.STATISTIC_GROUP), STATISTIC_ANALYZE_TASK("StatisticAnalyzeTask", PortalPermissionGroup.STATISTIC_GROUP), - EXPRESS_CREATE_WORKFLOW("ExpressCreateWorkflow", PortalPermissionGroup.EXPRESS_GROUP), ACCESS_FULL_PROCESS_LIST("AccessFullProcessList", PortalPermissionGroup.GENERAL_PERMISSIONS_GROUP), ACCESS_FULL_TASK_LIST("AccessFullTaskList", PortalPermissionGroup.GENERAL_PERMISSIONS_GROUP), ACCESS_FULL_CASE_LIST("AccessFullCaseList", PortalPermissionGroup.GENERAL_PERMISSIONS_GROUP), diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/enums/PortalPermissionGroup.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/enums/PortalPermissionGroup.java index 2e243d205a9..27cdb2d98c9 100644 --- a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/enums/PortalPermissionGroup.java +++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/enums/PortalPermissionGroup.java @@ -6,8 +6,7 @@ public enum PortalPermissionGroup { CASE_PERMISSIONS_GROUP("PortalCasePermissions"), GENERAL_PERMISSIONS_GROUP("PortalGeneralPermissions"), ABSENCE_AND_SUBSTITUTE_GROUP("PortalAbsenceAndSubstitutePermissions"), - STATISTIC_GROUP("PortalStatisticsPermissions"), - EXPRESS_GROUP("PortalExpressPermissions"); + STATISTIC_GROUP("PortalStatisticsPermissions"); private String value; diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/enums/PortalVariable.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/enums/PortalVariable.java index af68f81ee96..3735477c05a 100644 --- a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/enums/PortalVariable.java +++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/enums/PortalVariable.java @@ -7,7 +7,6 @@ public enum PortalVariable { STATISTIC_CHART("Portal.StatisticCharts"), WIDGET_FILTER("Portal.Dashboard.WidgetFilters"), EXTERNAL_LINK("Portal.Processes.ExternalLinks"), - EXPRESS_PROCESS("Portal.Processes.ExpressProcesses"), TASK_DETAIL("Portal.TaskDetails"), CASE_DETAIL("Portal.CaseDetails"), DASHBOARD("Portal.Dashboard"), diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/enums/ProcessType.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/enums/ProcessType.java index 133bb3ad388..aa218d1c77d 100644 --- a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/enums/ProcessType.java +++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/enums/ProcessType.java @@ -7,7 +7,6 @@ import ch.ivyteam.ivy.environment.Ivy; public enum ProcessType { - EXPRESS_PROCESS("ExpressProcess"), EXTERNAL_LINK("ExternalLink"), IVY_PROCESS("IvyProcess"); diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/mapper/UserProcessMapper.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/mapper/UserProcessMapper.java index 8d6e55fb6f4..914f9487d14 100644 --- a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/mapper/UserProcessMapper.java +++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/mapper/UserProcessMapper.java @@ -5,7 +5,6 @@ import org.apache.commons.lang3.StringUtils; -import ch.ivy.addon.portalkit.bo.ExpressProcess; import ch.ivy.addon.portalkit.bo.Process; import ch.ivy.addon.portalkit.configuration.ExternalLink; import ch.ivy.addon.portalkit.configuration.UserProcess; @@ -50,18 +49,6 @@ public static UserProcess toUserProcess(DashboardProcess process) { return userProcess; } - public static UserProcess toUserProcess(ExpressProcess expressProcess, String expressStartLink) { - String startLink = expressStartLink + "?workflowID=" + expressProcess.getId(); - UserProcess userProcess = new UserProcess(); - userProcess.setProcessId(expressProcess.getId()); - userProcess.setProcessType(ProcessType.EXPRESS_PROCESS); - userProcess.setProcessName(stripHtmlTags(expressProcess.getProcessName())); - userProcess.setLink(startLink); - userProcess.setDescription(expressProcess.getProcessDescription()); - userProcess.setIcon(expressProcess.getIcon()); - return userProcess; - } - public static UserProcess toUserProcess(ExternalLink externalLink) { UserProcess userProcess = new UserProcess(); userProcess.setProcessId(externalLink.getId().toString()); diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/security/PortalSecurity.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/security/PortalSecurity.java index 3368f4c7f3c..77c23d7ba29 100644 --- a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/security/PortalSecurity.java +++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/security/PortalSecurity.java @@ -69,7 +69,7 @@ private static class Permissions { IPermission.USER_READ_OWN_SUBSTITUTIONS); private static final List EVERYBODY_PERMISSIONS = Arrays.asList( - PortalPermission.STATISTIC_ADD_DASHBOARD_CHART, PortalPermission.EXPRESS_CREATE_WORKFLOW, + PortalPermission.STATISTIC_ADD_DASHBOARD_CHART, PortalPermission.ACCESS_FULL_CASE_LIST, PortalPermission.ACCESS_FULL_TASK_LIST, PortalPermission.ACCESS_FULL_PROCESS_LIST, PortalPermission.ACCESS_FULL_STATISTICS_LIST, PortalPermission.TASK_CASE_ADD_NOTE, PortalPermission.TASK_CASE_SHOW_MORE_NOTE, diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/service/CaseDocumentService.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/service/CaseDocumentService.java index 1aefe9d00ed..ee5deb2758a 100644 --- a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/service/CaseDocumentService.java +++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/service/CaseDocumentService.java @@ -25,7 +25,6 @@ public class CaseDocumentService { - public static final String EXPRESS_UPLOAD_FOLDER = "AxonIvyExpress"; private ICase iCase; private CaseDocumentService(ICase iCase) { @@ -46,15 +45,7 @@ public IDocument upload(String filename, InputStream content) { } public List getAll() { - List documents = new ArrayList<>(getAllDocumentsOf(iCase)); - List expressDocs = new ArrayList<>(); - for (IDocument doc : documents) { - if (doc.getPath().asString().contains(EXPRESS_UPLOAD_FOLDER)) { - expressDocs.add(doc); - } - } - documents.removeAll(expressDocs); - return new ArrayList<>(documents); + return getAllDocumentsOf(iCase); } /** @@ -73,7 +64,7 @@ public StreamedContent download(IvyDocument document) { public boolean doesDocumentExist(String filename) { IDocument document = documentsOf(iCase).get(new Path(filename)); - return document != null && !document.getPath().asString().contains(EXPRESS_UPLOAD_FOLDER); + return document != null; } public static boolean isDocumentTypeValid(String filename) { diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/service/ExpressProcessService.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/service/ExpressProcessService.java deleted file mode 100644 index 9aa96d6c59e..00000000000 --- a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/service/ExpressProcessService.java +++ /dev/null @@ -1,116 +0,0 @@ -package ch.ivy.addon.portalkit.service; - -import java.util.Comparator; -import java.util.List; -import java.util.function.Predicate; -import java.util.stream.Collectors; - -import org.apache.commons.lang3.StringUtils; - -import com.axonivy.portal.components.publicapi.ProcessStartAPI; -import com.axonivy.portal.components.util.ProcessStartUtils; - -import ch.ivy.addon.portalkit.bo.ExpressProcess; -import ch.ivy.addon.portalkit.configuration.UserProcess; -import ch.ivy.addon.portalkit.enums.PortalVariable; -import ch.ivy.addon.portalkit.enums.ProcessType; -import ch.ivy.addon.portalkit.util.ExpressManagementUtils; -import ch.ivyteam.ivy.workflow.IProcessStart; - -public class ExpressProcessService extends JsonConfigurationService { - - private static final String EXPRESS_PROCESSES = PortalVariable.EXPRESS_PROCESS.key; - private static final String EXPRESS_CREATE_FRIENDLY_REQUEST_PATH = - "Start Processes/CreateWorkflow/AxonIvyExpressWF.ivp"; - private static final String EXPRESS_WORKFLOW_FRIENDLY_REQUEST_PATH = - "Start Processes/GenericPredefinedWorkflowStart/GenericPredefinedProcessStart.ivp"; - private static final String EXPRESS_WORKFLOW_EDIT_REQUEST_PATH = - "Start Processes/GenericPredefinedWorkflowStart/GenericEditProcessStart.ivp"; - private static final String EXPRESS_BUSINESS_VIEW_REQUEST_PATH = - "Start Processes/ExpressStart/startExpressBusinessView.ivp"; - private static ExpressProcessService instance; - - public static ExpressProcessService getInstance() { - if (instance == null) { - instance = new ExpressProcessService(); - } - return instance; - } - - public List findReadyToExecuteProcessOrderByName() { - List expressProcesses = findAll(); - return expressProcesses.stream() - .filter(ExpressProcess::isReadyToExecute) - .sorted(Comparator.comparing(ExpressProcess::getProcessName)) - .collect(Collectors.toList()); - } - - public ExpressProcess findReadyToExecuteProcessByName(String processName) { - List readyToExecuteProcesses = findReadyToExecuteProcessOrderByName(); - return readyToExecuteProcesses.stream() - .filter(filterByName(processName)) - .findFirst().orElse(null); - } - - private Predicate filterByName(String processName) { - return process -> process.getProcessName().equals(processName); - } - - public ExpressProcess findExpressProcessByName(String processName) { - return findAll().stream().filter(filterByName(processName)).findFirst().orElse(null); - } - - public List findReadyToExecuteProcessByProcessType(String processType) { - List readyToExecuteProcesses = findReadyToExecuteProcessOrderByName(); - return readyToExecuteProcesses.stream() - .filter(process -> process.getProcessType().equals(processType)) - .collect(Collectors.toList()); - } - - public ExpressProcess findExpressProcessById(String id) { - ExpressProcess result = findById(id); - if (result != null) { - result.setProcessOwner(ExpressManagementUtils.getValidMemberName(result.getProcessOwner())); - result.setProcessCoOwners(ExpressManagementUtils.getValidMemberNames(result.getProcessCoOwners())); - result.setProcessPermissions(ExpressManagementUtils.getValidMemberNames(result.getProcessPermissions())); - } - return result; - } - - @Override - public Class getType() { - return ExpressProcess.class; - } - - @Override - public String getConfigKey() { - return EXPRESS_PROCESSES; - } - - public static boolean isExpressProcessAdded(ExpressProcess expressProcess, List userProcesses) { - return userProcesses.stream() - .filter(process -> (process.getProcessType() == ProcessType.EXPRESS_PROCESS) && StringUtils.isNoneBlank(process.getProcessId()) && process.getProcessId().equals(expressProcess.getId())) - .findFirst() - .isPresent(); - } - - public String findExpressWorkflowStartLink() { - return ProcessStartAPI.findRelativeUrlByProcessStartFriendlyRequestPath(EXPRESS_WORKFLOW_FRIENDLY_REQUEST_PATH); - } - - public String findExpressBusinessViewStartLink() { - return ProcessStartAPI.findRelativeUrlByProcessStartFriendlyRequestPath(EXPRESS_BUSINESS_VIEW_REQUEST_PATH); - } - - public IProcessStart findExpressCreationProcess() { - return ProcessStartUtils.findProcessStartByUserFriendlyRequestPath(EXPRESS_CREATE_FRIENDLY_REQUEST_PATH); - } - - public String findExpressWorkflowEditLink(String workflowId) { - String url = ProcessStartAPI.findRelativeUrlByProcessStartFriendlyRequestPath(EXPRESS_WORKFLOW_EDIT_REQUEST_PATH); - if (StringUtils.isNotBlank(url)) { - return String.format("%s?workflowID=%s", url, workflowId); - } - return StringUtils.EMPTY; - } -} \ No newline at end of file diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/util/CategoryUtils.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/util/CategoryUtils.java index 199d389db69..df92fdd93c0 100644 --- a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/util/CategoryUtils.java +++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/util/CategoryUtils.java @@ -11,10 +11,7 @@ import com.axonivy.portal.bo.ItemByCategoryStatistic; import ch.ivy.addon.portalkit.bo.CategoryNode; -import ch.ivyteam.ivy.cm.exec.LocalizedTextResolverFactory; import ch.ivyteam.ivy.environment.Ivy; -import ch.ivyteam.ivy.workflow.category.Category; -import ch.ivyteam.ivy.workflow.category.CategoryPath; import ch.ivyteam.ivy.workflow.category.CategoryTree; public class CategoryUtils { @@ -145,19 +142,6 @@ private static void filterSelectedNode(CheckboxTreeNode node, List node.getChildren().forEach(child -> filterSelectedNode((CheckboxTreeNode) child, selectedNodeValues)); } - public static Category buildExpressCategory(String processName) { - String categoryName = processName; - if (processName.contains(CATEGORY_PATH_DELIMITER)) { - String[] processNameArray = processName.split(CATEGORY_PATH_DELIMITER); - categoryName = processNameArray[processNameArray.length - 1]; - } - - CategoryPath rootExpress = new CategoryPath("ExpressWorkflow"); - CategoryPath process = rootExpress.append(categoryName.trim()); - return Category.createFor(process, - new LocalizedTextResolverFactory().createFor("Categories", Ivy.request().getProcessModelVersion())); - } - private static ItemByCategoryStatistic getNoCategoryCase(CategoryTree category) { var nonEmptyChildrenCount = category.getChildren().stream().map(CategoryTree::count).mapToInt(Long::intValue).sum(); var emptyChildrenCount = category.count() - nonEmptyChildrenCount; diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/util/ExpressManagementUtils.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/util/ExpressManagementUtils.java deleted file mode 100644 index 0d8fcc6858c..00000000000 --- a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/util/ExpressManagementUtils.java +++ /dev/null @@ -1,474 +0,0 @@ -package ch.ivy.addon.portalkit.util; - -import static ch.ivy.addon.portalkit.enums.ExpressMessageType.ERROR; -import static ch.ivy.addon.portalkit.enums.ExpressMessageType.IMPORT_EXPRESS_PROCESSES; -import static ch.ivy.addon.portalkit.enums.ExpressMessageType.IMPORT_RESULT; -import static ch.ivy.addon.portalkit.enums.ExpressMessageType.IMPORT_STATUS; -import static ch.ivy.addon.portalkit.enums.ExpressMessageType.INFO; -import static ch.ivy.addon.portalkit.enums.ExpressMessageType.WARNING; -import static org.apache.commons.lang3.StringUtils.LF; -import static org.apache.commons.lang3.StringUtils.SPACE; - -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.nio.charset.StandardCharsets; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.Optional; -import java.util.stream.Collectors; - -import javax.ws.rs.core.MediaType; - -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.io.FilenameUtils; -import org.apache.commons.lang3.StringUtils; -import org.apache.commons.lang3.time.StopWatch; -import org.primefaces.model.DefaultStreamedContent; -import org.primefaces.model.StreamedContent; -import org.primefaces.model.file.UploadedFile; - -import com.fasterxml.jackson.databind.JsonNode; - -import ch.ivy.addon.portalkit.bo.ExpressFormElement; -import ch.ivy.addon.portalkit.bo.ExpressProcess; -import ch.ivy.addon.portalkit.bo.ExpressTaskDefinition; -import ch.ivy.addon.portalkit.constant.PortalConstants; -import com.axonivy.portal.components.dto.SecurityMemberDTO; -import ch.ivy.addon.portalkit.enums.ExpressMessageType; -import ch.ivy.addon.portalkit.persistence.converter.BusinessEntityConverter; -import ch.ivy.addon.portalkit.service.DateTimeGlobalSettingService; -import ch.ivy.addon.portalkit.service.ExpressProcessService; -import ch.ivyteam.ivy.environment.Ivy; -import ch.ivyteam.ivy.security.ISecurityContext; -import ch.ivyteam.ivy.security.ISecurityMember; -import ch.ivyteam.ivy.security.IUser; -import ch.ivyteam.ivy.security.query.UserQuery; - -public class ExpressManagementUtils { - - private static final String VERSION = "version"; - private static final String EXPRESS_WORKFLOW = "expressWorkflow"; - private static final String PATTERN = Ivy.cms().coLocale("/patterns/dateTimePattern", Locale.ENGLISH); - private static final String REPEAT_EXPRESS = "AHWF"; - private static final String JSON_EXTENSION = "json"; - private static final String EXTERNAL_ID_PREFIX = " externalId:"; - - /** - * Find express repeat workflow list which are ready to execute and start - * - * @return List of Express workflow - */ - public static List findExpressProcesses() { - List expressProcesses = new ArrayList<>(); - List workflows = ExpressProcessService.getInstance().findReadyToExecuteProcessByProcessType(REPEAT_EXPRESS); - for (ExpressProcess wf : workflows) { - if (PermissionUtils.checkAbleToStartAndAbleToEditExpressWorkflow(wf)) { - expressProcesses.add(wf); - } - } - return expressProcesses; - } - - /** - * Check if process name is existed or not - * @param processName - * @return true if process name was used, false if process name is available - */ - public static boolean isProcessNameDuplicated(String processName) { - return ExpressProcessService.getInstance().findExpressProcessByName(processName) != null; - } - - /** - * Import Express workflow list from JSON file. - * - * @param expressData file contains express workflow list - * @return output messages after run import process - */ - public static Map importExpressProcesses(UploadedFile expressData) { - Map outputMessages = initOutputMessage(); - StringBuilder importResult = (StringBuilder) outputMessages.get(IMPORT_RESULT); - StopWatch sw = new StopWatch(); - sw.start(); - - if (expressData == null || !FilenameUtils.isExtension(expressData.getFileName(), JSON_EXTENSION)) { - StringBuilder message = (StringBuilder) outputMessages.get(IMPORT_RESULT); - message.append(addResultLog(cms(expressData != null ? "/Dialogs/components/CaseDocument/invalidFileMessage" : "/ch.ivy.addon.portalkit.ui.jsf/components/expressManagement/fileEmptyMessage"), ERROR)); - return outputMessages; - } - - importResult.append(addResultLog(cms("/ch.ivy.addon.portalkit.ui.jsf/components/expressManagement/expressMessages/startDeployLog", Arrays.asList(expressData.getFileName())), INFO)); - - try { - installExpressWorkflows(expressData.getInputStream(), outputMessages); - - importResult.append(addResultLog(cms("/ch.ivy.addon.portalkit.ui.jsf/components/expressManagement/expressMessages/endDeployLog"), INFO)); - sw.stop(); - importResult.append(addResultLog(cms("/ch.ivy.addon.portalkit.ui.jsf/components/expressManagement/expressMessages/deploymentFinishedLog", Arrays.asList(expressData.getFileName(),sw.getTime())), INFO)); - } catch (Exception e) { - importResult.append(addResultLog(cms("/ch.ivy.addon.portalkit.ui.jsf/components/expressManagement/expressMessages/deployErrorLog",Arrays.asList(expressData.getFileName())), ERROR)); - importResult.append(addResultLog(e.getMessage(), ERROR)); - Ivy.log().error(e); - } - - importResult.append(LF); - outputMessages.put(IMPORT_RESULT, importResult); - return outputMessages; - } - - public static Map initOutputMessage() { - Map outputMessages = new HashMap<>(); - outputMessages.put(IMPORT_STATUS, cms("/ch.ivy.addon.portalkit.ui.jsf/components/expressManagement/expressMessages/status/failed")); - outputMessages.put(IMPORT_RESULT, new StringBuilder()); - outputMessages.put(IMPORT_EXPRESS_PROCESSES, new ArrayList()); - return outputMessages; - } - - public static Map installExpressWorkflows(InputStream expressInputstream, Map outputMessages) { - JsonNode jsonNode = extractJsonObject(expressInputstream); - if (jsonNode != null) { - var version = jsonNode.get(VERSION).asInt(); - if (!validateExpressVersion(outputMessages, version)) { - List expressProcesses = new ArrayList<>(); - var expressWorkflowNode = jsonNode.get(EXPRESS_WORKFLOW); - if (version == 1) { - expressProcesses = proceedForOldWorkflow(expressWorkflowNode); - } else if (version == 2) { - expressProcesses = BusinessEntityConverter.jsonValueToEntities(expressWorkflowNode.toString(), ExpressProcess.class); - } - processExpressJsonObject(outputMessages, expressProcesses); - } - } - return outputMessages; - } - - private static JsonNode extractJsonObject(InputStream expressInputstream) { - try { - return BusinessEntityConverter.getObjectMapper().readTree(expressInputstream); - } catch (IOException e) { - e.printStackTrace(); - Ivy.log().error("Cannot paste JSON", e.getMessage()); - } - return null; - } - - private static List proceedForOldWorkflow(JsonNode expressWorkflowNode) { - List expressProcesses = new ArrayList<>(); - if (expressWorkflowNode.isArray()) { - var expressIterator = expressWorkflowNode.iterator(); - while (expressIterator.hasNext()) { - JsonNode jsonNode = expressIterator.next(); - ExpressProcess process = BusinessEntityConverter.jsonValueToEntity(jsonNode.get("expressProcess").toString(), ExpressProcess.class); - Map expressTaskDefinitionMap = proceedOldTaskDefinition(jsonNode); - process.setTaskDefinitions(new ArrayList<>(expressTaskDefinitionMap.values())); - expressProcesses.add(process); - } - } - return expressProcesses; - } - - private static Map proceedOldTaskDefinition(JsonNode jsonNode) { - Map expressTaskDefinitionMap = new HashMap<>(); - var expressTaskDefinitionNode = jsonNode.get("expressTaskDefinitions"); - if (expressTaskDefinitionNode.isArray()) { - var taskDefinitionIterator = expressTaskDefinitionNode.iterator(); - while (taskDefinitionIterator.hasNext()) { - var taskDefinitionNode = taskDefinitionIterator.next(); - int taskPosition = taskDefinitionNode.get("taskPosition").asInt(); - expressTaskDefinitionMap.put(taskPosition, BusinessEntityConverter.jsonValueToEntity(taskDefinitionNode.toString(), ExpressTaskDefinition.class)); - } - } - - var expressFormElementNode = jsonNode.get("expressFormElements"); - if (expressFormElementNode.isArray()) { - var formElementIterator = expressFormElementNode.iterator(); - while (formElementIterator.hasNext()) { - var formElementNode = formElementIterator.next(); - int taskPosition = formElementNode.get("taskPosition").asInt(); - ExpressTaskDefinition expressTaskDefinition = expressTaskDefinitionMap.get(taskPosition); - if (expressTaskDefinition.getFormElements() == null) { - expressTaskDefinition.setFormElements(new ArrayList<>()); - } - expressTaskDefinition.getFormElements().add(BusinessEntityConverter.jsonValueToEntity(formElementNode.toString(), ExpressFormElement.class)); - } - } - return expressTaskDefinitionMap; - } - - private static void processExpressJsonObject(Map outputMessages, List expressProcesses) { - if (expressProcesses != null) { - int errorCounts = deployExpressWorkflows(outputMessages, expressProcesses); - if (errorCounts == 0) { - outputMessages.put(IMPORT_STATUS, cms("/ch.ivy.addon.portalkit.ui.jsf/components/expressManagement/expressMessages/status/successful")); - } else if (errorCounts < expressProcesses.size()) { - outputMessages.put(IMPORT_STATUS, cms("/ch.ivy.addon.portalkit.ui.jsf/components/expressManagement/expressMessages/status/warning")); - } - } - } - - private static boolean validateExpressVersion(Map outputMessages, Integer version) { - StringBuilder importResult = (StringBuilder) outputMessages.get(IMPORT_RESULT); - if (validateExpressVersion(version)) { - importResult.append(addResultLog(cms("/ch.ivy.addon.portalkit.ui.jsf/components/expressManagement/expressMessages/versionLog", Arrays.asList(version)), INFO)); - importResult.append(LF); - } else { - importResult.append(addResultLog(cms("/ch.ivy.addon.portalkit.ui.jsf/components/expressManagement/expressMessages/invalidVersionLog", Arrays.asList(version)), ERROR)); - importResult.append(LF); - return true; - } - return false; - } - - private static boolean validateExpressVersion(Integer expressVersion) { - for (Integer version : PortalConstants.EXPRESS_INVALID_VERSION) { - if (version == expressVersion) { - return false; - } - } - return true; - } - - private static List getExpressMember() { - List securityResultDTOList = SecurityMemberUtils.findSecurityMembers("", 0, -1); - return securityResultDTOList.stream().map(SecurityMemberDTO::getMemberName).collect(Collectors.toList()); - } - - @SuppressWarnings("unchecked") - private static int deployExpressWorkflows(Map outputMessages, List expressProcesses) { - StringBuilder importResult = (StringBuilder) outputMessages.get(IMPORT_RESULT); - List outputExpressProcessList = (List) outputMessages.get(IMPORT_EXPRESS_PROCESSES); - List memberList = getExpressMember(); - - int errorCounts = 0; - // Save to BusinessData - for (ExpressProcess expressProcess : expressProcesses) { - importResult.append(LF); - importResult.append(addResultLog(cms("/ch.ivy.addon.portalkit.ui.jsf/components/expressManagement/expressMessages/process/startDeployProcessLog", Arrays.asList(expressProcess.getProcessName())), INFO)); - - if (isProcessNameDuplicated(expressProcess.getProcessName())) { - errorCounts++; - importResult.append(addResultLog(cms("/ch.ivy.addon.portalkit.ui.jsf/components/expressManagement/expressMessages/process/duplicateProcessNameLog", Arrays.asList(expressProcess.getProcessName())), ERROR)); - importResult.append(addResultLog(cms("/ch.ivy.addon.portalkit.ui.jsf/components/expressManagement/expressMessages/process/installProcessFailedLog", Arrays.asList(expressProcess.getProcessName())), ERROR)); - continue; - } - - importResult.append(addResultLog(cms("/ch.ivy.addon.portalkit.ui.jsf/components/expressManagement/expressMessages/process/installedProcessLog", Arrays.asList( expressProcess.getProcessName())), INFO)); - importResult.append(LF); - - // Validate user - validateUsersForProcess(importResult, memberList, expressProcess); - expressProcess.getTaskDefinitions().forEach(taskDefinition -> { - validateUserForTaskDef(importResult, memberList, expressProcess, taskDefinition); - - taskDefinition.setResponsibles(updateExternalIdsToSecurityMemberNames(taskDefinition.getResponsibles())); - }); - - // Save process - ExpressProcess workflowSaved = new ExpressProcess(); - String newId = workflowSaved.getId(); - workflowSaved = expressProcess; - workflowSaved.setId(newId); - workflowSaved.setProcessPermissions(updateExternalIdsToSecurityMemberNames(expressProcess.getProcessPermissions())); - workflowSaved.setProcessOwner(updateExternalIdToSecurityMemberName(expressProcess.getProcessOwner())); - workflowSaved.setProcessCoOwners(updateExternalIdsToSecurityMemberNames(expressProcess.getProcessCoOwners())); - ExpressProcessService.getInstance().save(workflowSaved); - - importResult.append(addResultLog(cms("/ch.ivy.addon.portalkit.ui.jsf/components/expressManagement/expressMessages/process/installedProcessLog", Arrays.asList(expressProcess.getProcessName())), INFO)); - importResult.append(LF); - - // Update output process - outputExpressProcessList.add(expressProcess); - } - - return errorCounts; - } - - private static void validateUserForTaskDef(StringBuilder importResult, List memberList, - ExpressProcess expressProcess, ExpressTaskDefinition taskDefinition) { - taskDefinition.getResponsibles().forEach(userName -> { - if (!memberList.contains(userName)) { - importResult.append(addResultLog(cms("/ch.ivy.addon.portalkit.ui.jsf/components/expressManagement/expressMessages/validate/validateTaskDefUserLog", Arrays.asList(expressProcess.getProcessName(), userName)), WARNING)); - } - }); - } - - private static void validateUsersForProcess(StringBuilder importResult, List memberList, - ExpressProcess expressProcess) { - expressProcess.getProcessPermissions().forEach(userName -> { - if (!memberList.contains(userName)) { - importResult.append(addResultLog(cms("/ch.ivy.addon.portalkit.ui.jsf/components/expressManagement/expressMessages/validate/validateProcessPermissionLog", Arrays.asList(expressProcess.getProcessName(), userName)), WARNING)); - } - }); - - expressProcess.getProcessCoOwners().forEach(userName -> { - if (!memberList.contains(userName)) { - importResult.append(addResultLog(cms("/ch.ivy.addon.portalkit.ui.jsf/components/expressManagement/expressMessages/validate/validateProcessCoOwnerLog", Arrays.asList( expressProcess.getProcessName(), userName)), WARNING)); - } - }); - - if (!memberList.contains(expressProcess.getProcessOwner())) { - IUser importUser = Ivy.request().getSession().getSessionUser(); - expressProcess.setProcessOwner(importUser.getMemberName()); - String importUserName = importUser.getDisplayName() != null ? importUser.getDisplayName() : importUser.getName(); - importResult.append(addResultLog(cms("/ch.ivy.addon.portalkit.ui.jsf/components/expressManagement/expressMessages/validate/validateProcessOwnerLog", Arrays.asList(expressProcess.getProcessName(), expressProcess.getProcessOwner(), importUserName)), WARNING)); - } - } - - private static String addResultLog(String message, ExpressMessageType messageType) { - StringBuilder importExpressResult = new StringBuilder(); - String pattern = DateTimeGlobalSettingService.getInstance().getGlobalDateTimePattern(); - String curentDate = new SimpleDateFormat(pattern).format(new Date()); - importExpressResult.append(curentDate).append(SPACE); - - switch (messageType) { - case INFO: - importExpressResult.append(INFO.getLabel()).append(":").append(SPACE); - break; - case ERROR: - importExpressResult.append(ERROR.getLabel()).append(":").append(SPACE); - break; - case WARNING: - importExpressResult.append(WARNING.getLabel()).append(":").append(SPACE); - break; - default: - break; - } - importExpressResult.append(message); - importExpressResult.append(LF); - return importExpressResult.toString(); - } - - /** - * Export Express process to JSON file. - * - * @param selectedExpressProcesses - * @return a StreamedContent with content type as a JSON file - */ - public static StreamedContent exportExpressProcess(List selectedExpressProcesses) { - var rootNode = BusinessEntityConverter.getObjectMapper().createObjectNode(); - rootNode.put(VERSION, 2); - var arrayExpress = rootNode.putArray(EXPRESS_WORKFLOW); - CollectionUtils.emptyIfNull(selectedExpressProcesses).forEach(express -> { - var expressAsJson = BusinessEntityConverter.entityToJsonValue(express); - JsonNode expressNode = null; - try { - expressNode = BusinessEntityConverter.getObjectMapper().readTree(expressAsJson); - } catch (Exception e) { - Ivy.log().warn("Cannot paste express object", e.getMessage()); - } - if (expressNode != null) { - arrayExpress.add(expressNode); - } - }); - - InputStream inputStream = new ByteArrayInputStream(rootNode.toString().getBytes(StandardCharsets.UTF_8)); - return DefaultStreamedContent - .builder() - .stream(() -> inputStream) - .contentType(MediaType.APPLICATION_JSON) - .name(getExportFileName()).build(); - } - - private static String getExportFileName() { - String curentDate = new SimpleDateFormat(PATTERN).format(new Date()); - return cms("/ch.ivy.addon.portalkit.ui.jsf/components/expressManagement/expressExportName", Arrays.asList(curentDate)); - } - - /** - * Some users have external security ID, - * need to add correspond external security ID of those user into security members list instead of username. - * - * @param securityNames - * @return names of security members with external ID. - */ - public static List updateExternalIdsToSecurityMemberNames(List securityNames) { - List result = new ArrayList<>(); - securityNames.forEach(securityName -> { - result.add(updateExternalIdToSecurityMemberName(securityName)); - }); - return result; - } - - /** - * Try to get external ID of security member, - * If there is no external ID, use old securityName instead. - * - * @param securityName - * @return name of security member with external ID. - */ - public static String updateExternalIdToSecurityMemberName(String securityName) { - if (securityName.startsWith("#")) { - IUser securityMember = UserUtils.findUserByUsername(securityName.substring(1)); - if (securityMember != null) { - return StringUtils.isBlank(securityMember.getExternalId()) ? securityName : securityName.concat(EXTERNAL_ID_PREFIX).concat(securityMember.getExternalId()); - } else { - return securityName; - } - } else { - ISecurityMember securityMember = ISecurityContext.current().members().find(securityName); - return securityMember == null ? securityName : securityMember.getMemberName(); - } - } - - /** - * Find valid member name with external lookup - * - * @param memberName - * @return valid member name - */ - public static String getValidMemberName(String memberName) { - String result = ""; - if (StringUtils.isBlank(memberName)) { - return result; - } - - ISecurityMember responsible; - if (memberName.contains(EXTERNAL_ID_PREFIX)) { - UserQuery query = ISecurityContext.current().users().query(); - responsible = query.where().externalId().isEqual(memberName.split(EXTERNAL_ID_PREFIX)[1]).executor().firstResult(); - result = Optional.ofNullable(responsible).map(ISecurityMember::getMemberName).orElse(""); - } else { - responsible = ISecurityContext.current().members().find(memberName); - if (responsible != null) { - result = Optional.ofNullable(responsible).map(ISecurityMember::getMemberName).orElse(""); - } - } - return result; - } - - /** - * Find valid member names with external lookup - * - * @param memberNames - * @return valid member names - */ - public static List getValidMemberNames(List memberNames) { - List result = new ArrayList<>(); - if (CollectionUtils.isEmpty(memberNames)) { - return result; - } - - memberNames.forEach(name -> { - String updatedMemberName = getValidMemberName(name); - if(StringUtils.isNotBlank(updatedMemberName)) { - result.add(updatedMemberName); - } - }); - - return result; - } - - private static String cms(String cmsUri) { - return Ivy.cms().co(cmsUri); - } - - private static String cms(String cmsUri, List params) { - return Ivy.cms().co(cmsUri, params); - } -} diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/util/PermissionUtils.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/util/PermissionUtils.java index 8ad546ef60c..f83bcea6a8b 100644 --- a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/util/PermissionUtils.java +++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/util/PermissionUtils.java @@ -1,20 +1,12 @@ package ch.ivy.addon.portalkit.util; -import java.util.Collection; import java.util.Objects; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.StringUtils; - -import ch.ivy.addon.portalkit.bo.ExpressProcess; import ch.ivy.addon.portalkit.enums.PortalPermission; import ch.ivyteam.ivy.environment.Ivy; import ch.ivyteam.ivy.security.IPermission; -import ch.ivyteam.ivy.security.IRole; import ch.ivyteam.ivy.security.ISecurityContext; import ch.ivyteam.ivy.security.ISecurityDescriptor; -import ch.ivyteam.ivy.security.ISecurityMember; -import ch.ivyteam.ivy.security.IUser; import ch.ivyteam.ivy.security.exec.Sudo; import ch.ivyteam.ivy.security.restricted.permission.IPermissionRepository; import ch.ivyteam.ivy.workflow.ICase; @@ -22,7 +14,6 @@ public class PermissionUtils { private static final String ADMIN_ROLE = "AXONIVY_PORTAL_ADMIN"; - private static final String EXTERNAL_ID_PREFIX = " externalId:"; private PermissionUtils() {} @@ -83,62 +74,6 @@ public static boolean checkDestroyTaskPermission() { return hasPermission(IPermission.TASK_DESTROY); } - /** - * Check if user can start an Express workflow - * and set permission if user able to edit/delete express WF - * - * @param workflow - * @return True: has permission to start Express workflow, False: Do not have permission to start Express workflow - */ - public static boolean checkAbleToStartAndAbleToEditExpressWorkflow(ExpressProcess workflow) { - String validProcessOwnerName = ExpressManagementUtils.getValidMemberName(workflow.getProcessOwner()); - boolean isWorkflowOwner = StringUtils.isNotBlank(validProcessOwnerName) ? Ivy.session().canActAsUser( - ISecurityContext.current().users().find(validProcessOwnerName.substring(1))) : false; - boolean hasAdminRole = isSessionUserHasAdminRole(); - - if (isWorkflowOwner || hasAdminRole) { - workflow.setAbleToEdit(true); - return true; - } - Collection ableToStartResponsibles = CollectionUtils.emptyIfNull(workflow.getProcessPermissions()); - Collection processOwners = CollectionUtils.emptyIfNull(workflow.getProcessCoOwners()); - - for (String memberName : processOwners) { - if(isSessionUserBelongsToPermissionGroup(memberName)) { - workflow.setAbleToEdit(true); - return true; - } - } - - for (String memberName : ableToStartResponsibles) { - if(isSessionUserBelongsToPermissionGroup(memberName)) { - return true; - } - } - - return false; - } - - private static boolean isSessionUserBelongsToPermissionGroup(String memberName) { - if(memberName == null) { - return false; - } - - String memberNameWithoutExternalId = getMemberNameWithoutExternalId(memberName); - ISecurityMember member = ISecurityContext.current().members().find(memberNameWithoutExternalId); - if(member != null) { - boolean isAssignedUser = member.isUser() && Ivy.session().canActAsUser((IUser) member); - boolean hasAssignedRole = !member.isUser() && Ivy.session().hasRole((IRole) member, false); - return isAssignedUser || hasAssignedRole; - } - return false; - } - - private static String getMemberNameWithoutExternalId(String memberName) { - int indexOfExternalId = memberName.indexOf(EXTERNAL_ID_PREFIX); - return indexOfExternalId > -1 ? memberName.substring(0, indexOfExternalId) : memberName; - } - public static boolean isSessionUserHasAdminRole() { return doesSessionUserHaveRole(ADMIN_ROLE); } diff --git a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/admin/AdminSettings/AdminSettings.xhtml b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/admin/AdminSettings/AdminSettings.xhtml index 9bca1156ba5..b86912dce50 100644 --- a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/admin/AdminSettings/AdminSettings.xhtml +++ b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/admin/AdminSettings/AdminSettings.xhtml @@ -176,12 +176,6 @@ - - - - - diff --git a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/ExpressManagement/ExpressManagement.xhtml b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/ExpressManagement/ExpressManagement.xhtml deleted file mode 100644 index c6920d44428..00000000000 --- a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/ExpressManagement/ExpressManagement.xhtml +++ /dev/null @@ -1,178 +0,0 @@ - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - -
- - - - -
-
#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/components/expressManagement/importHeaderTitle')} #{expressManagementBean.selectedExpressProcesses.size()} - #{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/components/expressManagement/processCount')}
-
- -
-
- #{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/components/expressManagement/waitingMessage')} -
-
- -
- -
  • #{process.processName}
    • -     -
    -     - - - - - - - - - - -     - - - - -
    -
    #{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/components/expressManagement/importDialogHeaderTitle')}
    -
    - -
    - -
    - -
    - - -
    - -
    -
    - #{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/components/expressManagement/deployMessage')} -
    -
    - -
    -
    #{expressManagementBean.importStatus}
    - - 
    #{expressManagementBean.importOutput}
    -
    -     -     - - - - -     - - -     - \ No newline at end of file diff --git a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/ExpressManagement/ExpressManagementData.d.json b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/ExpressManagement/ExpressManagementData.d.json deleted file mode 100644 index e555993be1b..00000000000 --- a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/ExpressManagement/ExpressManagementData.d.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "$schema" : "https://json-schema.axonivy.com/data-class/11.4.0/data-class.json", - "simpleName" : "ExpressManagementData", - "namespace" : "ch.ivy.addon.portalkit.component.ExpressManagement", - "isBusinessCaseData" : false -} \ No newline at end of file diff --git a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/ExpressManagement/ExpressManagementProcess.p.json b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/ExpressManagement/ExpressManagementProcess.p.json deleted file mode 100644 index 084597a5d92..00000000000 --- a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/ExpressManagement/ExpressManagementProcess.p.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "$schema" : "https://json-schema.axonivy.com/process/11.3.0/process.json", - "id" : "16F7F951DB019946", - "kind" : "HTML_DIALOG", - "config" : { - "data" : "ch.ivy.addon.portalkit.component.ExpressManagement.ExpressManagementData" - }, - "elements" : [ { - "id" : "f1", - "type" : "HtmlDialogEnd", - "visual" : { - "at" : { "x" : 280, "y" : 96 } - } - }, { - "id" : "f0", - "type" : "HtmlDialogStart", - "name" : "start()", - "config" : { - "signature" : "start", - "guid" : "16F82C1E20E8A359" - }, - "visual" : { - "at" : { "x" : 96, "y" : 96 } - }, - "connect" : [ - { "id" : "f12", "to" : "f1" } - ] - } ] -} \ No newline at end of file diff --git a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/ProcessWidget/ProcessWidgetData.d.json b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/ProcessWidget/ProcessWidgetData.d.json index 230ab65ee69..2964cf0a0d7 100644 --- a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/ProcessWidget/ProcessWidgetData.d.json +++ b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/ProcessWidget/ProcessWidgetData.d.json @@ -7,9 +7,5 @@ "name" : "processes", "type" : "java.util.List", "modifiers" : [ "PERSISTENT" ] - }, { - "name" : "expressProcesses", - "type" : "java.util.List", - "modifiers" : [ "PERSISTENT" ] } ] } \ No newline at end of file diff --git a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/singleapp/general/ForgotPassword/ForgotPassword.xhtml b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/singleapp/general/ForgotPassword/ForgotPassword.xhtml index e626bb649cc..be37892276b 100644 --- a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/singleapp/general/ForgotPassword/ForgotPassword.xhtml +++ b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/singleapp/general/ForgotPassword/ForgotPassword.xhtml @@ -24,7 +24,7 @@ + placeholder="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/forgotPassword/EmailAddress')}"> diff --git a/AxonIvyPortal/portal/webContent/resources/css/module.css b/AxonIvyPortal/portal/webContent/resources/css/module.css index 503b1a7d088..d3ab9da3295 100644 --- a/AxonIvyPortal/portal/webContent/resources/css/module.css +++ b/AxonIvyPortal/portal/webContent/resources/css/module.css @@ -4803,30 +4803,6 @@ body .ui-dialog.ui-widget.export-express-dialog .ui-dialog-titlebar.ui-widget-he align-items: center; } -.express-workflow-summary-table .ui-paginator.ui-paginator-top, -.express-workflow-summary-table tbody tr td { - padding: 4px 10px !important; -} - -.express-workflow-summary-table .ui-selection-column.express-selection-column { - text-align: center; -} - -.express-workflow-summary-table td.ui-selection-column.express-selection-column .ui-chkbox.ui-widget { - margin: auto; - margin-top: 4px; -} - -.express-workflow-summary-table .express-selection-column { - width: 50px !important; - text-align:center; -} - -.express-workflow-summary-table tbody tr td, -.express-process-upload .ui-fileupload-row>div { - word-break: break-all; -} - .express-management-form { position: relative; overflow: hidden; diff --git a/AxonIvyPortal/portal/webContent/resources/css/portal.css b/AxonIvyPortal/portal/webContent/resources/css/portal.css index 0cfdda62632..0ef22476561 100644 --- a/AxonIvyPortal/portal/webContent/resources/css/portal.css +++ b/AxonIvyPortal/portal/webContent/resources/css/portal.css @@ -1355,30 +1355,6 @@ ul.users-in-role { .import-express-dialog .import-status.Failed { color: var(--express-import-status-failed); } -.express-workflow-summary-table .ui-paginator.ui-paginator-top { - background-color: var(--express-import-paginator-background-color); - border-color: var(--express-import-paginator-background-color); - color: var(--express-import-paginator-text-color); } - .express-workflow-summary-table .ui-paginator.ui-paginator-top a { - color: var(--express-import-paginator-text-color); } - .express-workflow-summary-table .ui-paginator.ui-paginator-top a.ui-state-hover { - background-color: var(--express-import-paginator-hover-button-background-color); } - .express-workflow-summary-table .ui-paginator.ui-paginator-top .ui-paginator-pages { - color: var(--express-import-paginator-text-color); } - .express-workflow-summary-table .ui-paginator.ui-paginator-top .ui-paginator-pages a.ui-paginator-page.ui-state-active { - background-color: var(--express-import-paginator-hover-button-background-color); } - .express-workflow-summary-table .ui-paginator.ui-paginator-top .ui-paginator-pages a.ui-paginator-page.ui-state-hover { - background-color: var(--express-import-paginator-hover-button-background-color); } - -.express-workflow-summary-table tr.ui-datatable-selectable.ui-state-highlight td, -.express-workflow-summary-table tr.ui-datatable-selectable.ui-state-hover td { - border-bottom-color: var(--ivy-primary-color-grey-medium); } - -.express-workflow-summary-table tr.ui-datatable-selectable.ui-state-highlight th:not(:last-child), .express-workflow-summary-table tr.ui-datatable-selectable.ui-state-highlight td:not(:last-child), -.express-workflow-summary-table tr.ui-datatable-selectable.ui-state-hover th:not(:last-child), -.express-workflow-summary-table tr.ui-datatable-selectable.ui-state-hover td:not(:last-child) { - border-right-color: var(--ivy-primary-color-grey-medium); } - .express-helper-loading-container .si-lg { font-size: var(--express-helper-loading-container-si-lg-font-size); } From 7773ac3afff9407294da4e21fa103aadf4401510 Mon Sep 17 00:00:00 2001 From: Loc Nguyen Date: Fri, 20 Sep 2024 11:21:35 +0700 Subject: [PATCH 09/16] feature/IVYPORTAL-17427-Remove-old-statistics-Area - Remove gui test part 1 --- ...sResponsible.d.json => Responsible.d.json} | 2 +- .../resources/js/document-screenshot.js | 42 -- .../testFile/express-wf-request-resource.json | 1 - .../portal/selenium/common/BaseTest.java | 7 +- .../screenshot/AdhocScreenshotTest.java | 104 ---- .../PortalExpressScreenshotTest.java | 270 --------- .../selenium/page/AdminSettingsPage.java | 7 - .../portal/selenium/page/CaseDetailsPage.java | 8 - .../portal/selenium/page/CaseWidgetPage.java | 6 - .../portal/selenium/page/ChatPage.java | 6 +- .../selenium/page/DefaultExpresTaskPage.java | 26 - .../selenium/page/DefaultExpressTaskPage.java | 23 - .../selenium/page/ExpressApprovalPage.java | 38 -- .../page/ExpressBusinessViewPage.java | 74 --- .../portal/selenium/page/ExpressEndPage.java | 14 - .../page/ExpressFormDefinitionPage.java | 240 -------- .../selenium/page/ExpressManagementPage.java | 62 --- .../selenium/page/ExpressProcessPage.java | 191 ------- .../selenium/page/ExpressReviewPage.java | 57 -- .../portal/selenium/page/ExpressTaskPage.java | 61 -- .../selenium/page/GlobalSearchResultPage.java | 56 -- .../selenium/page/ProcessWidgetPage.java | 45 -- .../selenium/page/TaskIFrameTemplatePage.java | 61 -- .../selenium/page/TaskTemplatePage.java | 57 -- .../portal/selenium/page/TaskWidgetPage.java | 6 - .../page/UserTaskWithMailFormPage.java | 47 -- .../portal/selenium/test/ChatTest.java | 8 +- .../selenium/test/DisabledUserTest.java | 23 - .../portal/selenium/test/GlobalGrowlTest.java | 98 ---- .../selenium/test/ProcessViewerTest.java | 20 - .../test/UserMenuConfigurationTest.java | 15 - .../selenium/test/caze/CaseDetailsTest.java | 10 - .../test/express/AdhocExpressTest.java | 116 ---- .../test/express/ExpressManagementTest.java | 152 ----- .../selenium/test/express/ExpressTest.java | 147 ----- .../test/express/PortalExpressTest.java | 519 ------------------ 36 files changed, 11 insertions(+), 2608 deletions(-) rename AxonIvyPortal/portal-selenium-test/dataclasses/ch/ivyteam/ivy/project/portal/test/{ExpressResponsible.d.json => Responsible.d.json} (88%) delete mode 100644 AxonIvyPortal/portal-selenium-test/resources/testFile/express-wf-request-resource.json delete mode 100644 AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/document/screenshot/AdhocScreenshotTest.java delete mode 100644 AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/document/screenshot/PortalExpressScreenshotTest.java delete mode 100644 AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/DefaultExpresTaskPage.java delete mode 100644 AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/DefaultExpressTaskPage.java delete mode 100644 AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/ExpressApprovalPage.java delete mode 100644 AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/ExpressBusinessViewPage.java delete mode 100644 AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/ExpressEndPage.java delete mode 100644 AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/ExpressFormDefinitionPage.java delete mode 100644 AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/ExpressManagementPage.java delete mode 100644 AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/ExpressProcessPage.java delete mode 100644 AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/ExpressReviewPage.java delete mode 100644 AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/ExpressTaskPage.java delete mode 100644 AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/UserTaskWithMailFormPage.java delete mode 100644 AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/express/AdhocExpressTest.java delete mode 100644 AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/express/ExpressManagementTest.java delete mode 100644 AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/express/ExpressTest.java delete mode 100644 AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/express/PortalExpressTest.java diff --git a/AxonIvyPortal/portal-selenium-test/dataclasses/ch/ivyteam/ivy/project/portal/test/ExpressResponsible.d.json b/AxonIvyPortal/portal-selenium-test/dataclasses/ch/ivyteam/ivy/project/portal/test/Responsible.d.json similarity index 88% rename from AxonIvyPortal/portal-selenium-test/dataclasses/ch/ivyteam/ivy/project/portal/test/ExpressResponsible.d.json rename to AxonIvyPortal/portal-selenium-test/dataclasses/ch/ivyteam/ivy/project/portal/test/Responsible.d.json index ed7888ec412..d2ac71c96a2 100644 --- a/AxonIvyPortal/portal-selenium-test/dataclasses/ch/ivyteam/ivy/project/portal/test/ExpressResponsible.d.json +++ b/AxonIvyPortal/portal-selenium-test/dataclasses/ch/ivyteam/ivy/project/portal/test/Responsible.d.json @@ -1,6 +1,6 @@ { "$schema" : "https://json-schema.axonivy.com/data-class/11.4.0/data-class.json", - "simpleName" : "ExpressResponsible", + "simpleName" : "Responsible", "namespace" : "ch.ivyteam.ivy.project.portal.test", "isBusinessCaseData" : false, "fields" : [ { diff --git a/AxonIvyPortal/portal-selenium-test/resources/js/document-screenshot.js b/AxonIvyPortal/portal-selenium-test/resources/js/document-screenshot.js index 1f3d7eb1efb..fa23c64eacb 100644 --- a/AxonIvyPortal/portal-selenium-test/resources/js/document-screenshot.js +++ b/AxonIvyPortal/portal-selenium-test/resources/js/document-screenshot.js @@ -374,44 +374,6 @@ function highlightResetToDefault() { createRedMediumOutline($("[id$=':reset-details-settings-button']")); } -function highlightShowWorkflowEvents() { - createRedMediumOutline($("a[id$=':task-workflow-event-command']")); -} - -function highlightCreateExpressWorkflow() { - createRedMediumOutline($("[id$='process-widget:create-express-link']")); -} - -function highlightExpressTaskResponsible(stepNumber) { - var taskResponsible = '.task-responsible:eq(' + stepNumber + ')'; - createRedMediumOutline($(taskResponsible)); -} - -function highlightManagementExpressTab() { - $("a[href$=':adminTabView:express-management-tab']").parent().addClass("red-medium-border"); -} - -function highlightDeployExpress() { - createRedMediumOutline($(".ui-fileupload-upload")); -} - -function highlightExportExpress() { - var expressTable = $("[id$=':express-management-component:express-management-form:express-workflow-summary-table']"); - var checkAll = expressTable.find(".express-selection-column:eq(0)").find(".ui-chkbox-box"); - createRedMediumOutline(checkAll); - appendStepAnnotation(checkAll, 1, -10, checkAll.width() + 10); - - var exportButton = $("[id$=':express-management-component:express-management-form:export-express-btn']"); - appendStepAnnotation(exportButton, 2, -10, exportButton.width() + 15); -} - -function cleanHighlightExportExpress() { - var expressTable = $("[id$=':express-management-component:express-management-form:express-workflow-summary-table']"); - var checkAll = expressTable.find(".express-selection-column:eq(0)").find(".ui-chkbox-box"); - checkAll.removeClass("red-medium-outline"); - $('.marker').remove(); -} - function scrollToMiddleOfLayoutContent() { window.scrollTo(0, document.body.scrollHeight/2); } @@ -494,10 +456,6 @@ function highlightShowAllProcesses() { createRedThickOutlineWithOffset($('.layout-menu .PROCESS')); } -function highlightShowAdditionalLink() { - createRedMediumOutline($("[id$='case-item:case-item-action-form:action-step-component:show-additional-case-details-link']")); -} - function highlightTaskExportToExcelButton() { createRedMediumOutline($("[id$=':task-export-to-excel-form']")); } diff --git a/AxonIvyPortal/portal-selenium-test/resources/testFile/express-wf-request-resource.json b/AxonIvyPortal/portal-selenium-test/resources/testFile/express-wf-request-resource.json deleted file mode 100644 index eac3c5099aa..00000000000 --- a/AxonIvyPortal/portal-selenium-test/resources/testFile/express-wf-request-resource.json +++ /dev/null @@ -1 +0,0 @@ -{"version":1,"expressWorkflow":[{"expressProcess":{"id":"d623ed55776a4d70a94f38383c9ef9e0","processName":"Request new Resources - Express process","processDescription":"Express process test ","processType":"AHWF","processPermissions":["#demo","#david"],"processOwner":"#admin","isUseDefaultUI":false,"processFolder":"f647d845-6f04-48c8-82df-5db1ec7da1a4","readyToExecute":true,"processCoOwners":["Everybody"],"isAbleToEdit":true},"expressTaskDefinitions":[{"id":"ee61f6e8907b456786e343b6e864e4e0","processID":"d623ed55776a4d70a94f38383c9ef9e0","type":"USER_TASK","responsibles":["#demo","#david"],"subject":"Promote new resource","description":"Request new resource - Task 1","taskPosition":1,"untilDays":1},{"id":"10006b755bb74e6b8636182d064f7150","processID":"d623ed55776a4d70a94f38383c9ef9e0","type":"USER_TASK_WITH_EMAIL","responsibles":["Everybody"],"subject":"Send email to HR","description":"Send email to HR for review - Task 2","taskPosition":2,"untilDays":1},{"id":"5fd26253cb0046e7a3141f1cd3ffbca6","processID":"d623ed55776a4d70a94f38383c9ef9e0","type":"USER_TASK","responsibles":["#admin"],"subject":"HR review","description":"Wait HR review - Task 3","taskPosition":3,"untilDays":2},{"id":"8fdee4750b864260a5878cbac12e1510","processID":"d623ed55776a4d70a94f38383c9ef9e0","type":"APPROVAL","responsibles":["#admin","Everybody"],"subject":"Approval Request","description":"Approval Request","taskPosition":4,"untilDays":1}],"expressFormElements":[{"id":"ec21202fd937424094f4831dd3caacd8","processID":"d623ed55776a4d70a94f38383c9ef9e0","elementID":"Applicant name2020-07-07 09:29:29","taskPosition":1,"label":"Applicant name","required":true,"intSetting":0,"elementType":"InputFieldText","optionStrs":[""],"elementPosition":"HEADER","indexInPanel":0,"counter":0},{"id":"e4537a5f9f4c44d9b99a99868808f7dc","processID":"d623ed55776a4d70a94f38383c9ef9e0","elementID":"Email2020-07-07 09:29:43","taskPosition":1,"label":"Email","required":false,"intSetting":0,"elementType":"InputFieldText","optionStrs":[""],"elementPosition":"LEFTPANEL","indexInPanel":0,"counter":0},{"id":"dfef3f165b6049bb91a92534ceb80ea7","processID":"d623ed55776a4d70a94f38383c9ef9e0","elementID":"Address2020-07-07 09:29:35","taskPosition":1,"label":"Address","required":true,"intSetting":0,"elementType":"InputFieldText","optionStrs":[""],"elementPosition":"RIGHTPANEL","indexInPanel":0,"counter":0},{"id":"904ee50d831a42438254d382af788c0d","processID":"d623ed55776a4d70a94f38383c9ef9e0","elementID":"Welcome2020-07-07 09:30:25","taskPosition":2,"label":"Welcome","required":true,"intSetting":0,"elementType":"InputFieldText","optionStrs":[""],"elementPosition":"HEADER","indexInPanel":0,"counter":0},{"id":"3d69886d2eb0466fb2ee1888f1d35aed","processID":"d623ed55776a4d70a94f38383c9ef9e0","elementID":"Start date2020-07-07 09:30:37","taskPosition":2,"label":"Start date","required":true,"intSetting":0,"elementType":"InputFieldDate","optionStrs":[""],"elementPosition":"LEFTPANEL","indexInPanel":0,"counter":0},{"id":"9b911a68e81246bb91216f557c4e9280","processID":"d623ed55776a4d70a94f38383c9ef9e0","elementID":"Comment2020-07-07 09:31:05","taskPosition":3,"label":"Comment","required":true,"intSetting":0,"elementType":"InputFieldText","optionStrs":[""],"elementPosition":"LEFTPANEL","indexInPanel":0,"counter":0},{"id":"840d8b5224e541e8b1afc26e4da04fc0","processID":"d623ed55776a4d70a94f38383c9ef9e0","elementID":"Approval date2020-07-07 09:31:15","taskPosition":3,"label":"Approval date","required":true,"intSetting":0,"elementType":"InputFieldDate","optionStrs":[""],"elementPosition":"RIGHTPANEL","indexInPanel":0,"counter":0}]}]} \ No newline at end of file diff --git a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/common/BaseTest.java b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/common/BaseTest.java index bc5d20ce0a8..47d3900018e 100644 --- a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/common/BaseTest.java +++ b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/common/BaseTest.java @@ -1,7 +1,6 @@ package com.axonivy.portal.selenium.common; import static com.codeborne.selenide.Condition.exist; - import static com.codeborne.selenide.Selenide.$; import static com.codeborne.selenide.Selenide.open; import static com.codeborne.selenide.Selenide.refresh; @@ -23,7 +22,7 @@ import ch.ivy.addon.portalkit.enums.PortalPermission; import ch.ivy.addon.portalkit.enums.PortalVariable; -import ch.ivyteam.ivy.project.portal.test.ExpressResponsible; +import ch.ivyteam.ivy.project.portal.test.Responsible; /** * A base test that other tests extend it. It will test on browser IE by default. It provides feature to take screenshot @@ -362,8 +361,8 @@ public WebDriverWait webDriverWait() { return new WebDriverWait(WebDriverRunner.getWebDriver(), DEFAULT_TIMEOUT); } - public ExpressResponsible setExpressResponsible(String userName, boolean isGroup) { - ExpressResponsible user = new ExpressResponsible(); + public Responsible setResponsible(String userName, boolean isGroup) { + Responsible user = new Responsible(); user.setResponsibleName(userName); user.setIsGroup(isGroup); return user; diff --git a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/document/screenshot/AdhocScreenshotTest.java b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/document/screenshot/AdhocScreenshotTest.java deleted file mode 100644 index a4f1f317510..00000000000 --- a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/document/screenshot/AdhocScreenshotTest.java +++ /dev/null @@ -1,104 +0,0 @@ -package com.axonivy.portal.selenium.document.screenshot; - -import java.io.IOException; -import java.util.Arrays; -import java.util.List; - -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.openqa.selenium.Dimension; - -import com.axonivy.ivy.webtest.IvyWebTest; -import com.axonivy.portal.selenium.common.ScreenshotBaseTest; -import com.axonivy.portal.selenium.common.ScreenshotMargin; -import com.axonivy.portal.selenium.common.ScreenshotUtils; -import com.axonivy.portal.selenium.common.TestAccount; -import com.axonivy.portal.selenium.page.DefaultExpressTaskPage; -import com.axonivy.portal.selenium.page.ExpressProcessPage; -import com.axonivy.portal.selenium.page.MainMenuPage; -import com.axonivy.portal.selenium.page.NewDashboardPage; -import com.axonivy.portal.selenium.page.TaskTemplatePage; -import com.axonivy.portal.selenium.page.TaskWidgetPage; - -import ch.ivyteam.ivy.project.portal.test.ExpressResponsible; - -@IvyWebTest -public class AdhocScreenshotTest extends ScreenshotBaseTest { - - @Override - @BeforeEach - public void setup() { - super.setup(); - redirectToRelativeLink(createTestingTasksUrl); - login(TestAccount.DEMO_USER); - } - - @Test - public void takeScreenshotAdhoc() throws IOException { - String mainTask = "Sick Leave Request"; - String defaultTaskName1 = "Adhoc-Ask permission from CEO"; - String defaultTaskName2 = "Adhoc-Inform team member"; - String defaultTaskComment1 = "Get approve from CEO"; - String defaultTaskComment2 = "Inform team"; - - ScreenshotUtils.resizeBrowser(new Dimension(1200, 580)); - showNewDashboard(); - MainMenuPage menuPage = new MainMenuPage(); - TaskWidgetPage taskWidget = menuPage.openTaskList(); - taskWidget.openTask(mainTask); - TaskTemplatePage taskTemplatePage = new TaskTemplatePage(); - taskTemplatePage.clickActionButton(); - ScreenshotUtils.capturePageScreenshot(ScreenshotUtils.EXPRESS_FOLDER + "adhoc-start"); - - taskTemplatePage.clickOnStartAdhocLink(); - taskTemplatePage.clickAdhocOkButton(); - - // create tasks in adhoc page - ScreenshotUtils.resizeBrowser(new Dimension(1500, 1200)); - ExpressProcessPage expressPage = new ExpressProcessPage(); - - ExpressResponsible responsible = setExpressResponsible(TestAccount.DEMO_USER.getUsername(), false); - - List responsibles = Arrays.asList(responsible); - expressPage.createDefaultTask(0, defaultTaskName1, responsibles); - expressPage.addNewTask(0); - expressPage.createDefaultTask(1, defaultTaskName2, responsibles); - ScreenshotUtils.capturePageScreenshot(ScreenshotUtils.EXPRESS_FOLDER + "adhoc-define"); - expressPage.clickSave(); - - // first task of adhoc - DefaultExpressTaskPage defaultExpressTaskPage = new DefaultExpressTaskPage(); - defaultExpressTaskPage.enterTextToDefaultTask(defaultTaskComment1); - ScreenshotUtils.resizeBrowser(new Dimension(1500, 600)); - ScreenshotUtils.capturePageScreenshot(ScreenshotUtils.EXPRESS_FOLDER + "adhoc-first-task"); - defaultExpressTaskPage.clickOK(); - - // approval task of adhoc - NewDashboardPage homePage = new NewDashboardPage(); - homePage.waitForCaseWidgetLoaded(); - menuPage = new MainMenuPage(); - taskWidget = menuPage.openTaskList(); - taskWidget.openTask(defaultTaskName2); - - defaultExpressTaskPage = new DefaultExpressTaskPage(); - defaultExpressTaskPage.enterTextToDefaultTask(defaultTaskComment2); - ScreenshotUtils.resizeBrowser(new Dimension(1500, 1000)); - ScreenshotUtils.capturePageScreenshot(ScreenshotUtils.EXPRESS_FOLDER + "adhoc-finish"); - defaultExpressTaskPage.clickOK(); - - showNewDashboard(); - homePage = new NewDashboardPage(); - homePage.waitForCaseWidgetLoaded(); - menuPage = new MainMenuPage(); - taskWidget = menuPage.openTaskList(); - taskWidget.openTask(mainTask); - - ScreenshotUtils.resizeBrowser(new Dimension(1200, 800)); - taskTemplatePage.closeAdhocHistoryDialog(); - taskTemplatePage.clickActionButton(); - ScreenshotUtils.capturePageScreenshot(ScreenshotUtils.EXPRESS_FOLDER + "adhoc-show-history"); - ScreenshotUtils.maximizeBrowser(); - ScreenshotUtils.captureElementWithMarginOptionScreenshot(taskTemplatePage.openAdhocHistoryDialog(), - ScreenshotUtils.EXPRESS_FOLDER + "adhoc-process-history", new ScreenshotMargin(20)); - } -} diff --git a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/document/screenshot/PortalExpressScreenshotTest.java b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/document/screenshot/PortalExpressScreenshotTest.java deleted file mode 100644 index c291b418112..00000000000 --- a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/document/screenshot/PortalExpressScreenshotTest.java +++ /dev/null @@ -1,270 +0,0 @@ -package com.axonivy.portal.selenium.document.screenshot; - -import java.io.IOException; -import java.util.Arrays; - -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.openqa.selenium.Dimension; -import org.openqa.selenium.WebElement; - -import com.axonivy.ivy.webtest.IvyWebTest; -import com.axonivy.portal.selenium.common.FileHelper; -import com.axonivy.portal.selenium.common.ScreenshotBaseTest; -import com.axonivy.portal.selenium.common.ScreenshotMargin; -import com.axonivy.portal.selenium.common.ScreenshotUtils; -import com.axonivy.portal.selenium.common.TestAccount; -import com.axonivy.portal.selenium.page.AdminSettingsPage; -import com.axonivy.portal.selenium.page.CaseWidgetPage; -import com.axonivy.portal.selenium.page.ExpressApprovalPage; -import com.axonivy.portal.selenium.page.ExpressBusinessViewPage; -import com.axonivy.portal.selenium.page.ExpressFormDefinitionPage; -import com.axonivy.portal.selenium.page.ExpressManagementPage; -import com.axonivy.portal.selenium.page.ExpressProcessPage; -import com.axonivy.portal.selenium.page.ExpressReviewPage; -import com.axonivy.portal.selenium.page.ExpressTaskPage; -import com.axonivy.portal.selenium.page.MainMenuPage; -import com.axonivy.portal.selenium.page.NewDashboardPage; -import com.axonivy.portal.selenium.page.ProcessWidgetPage; -import com.axonivy.portal.selenium.page.UserTaskWithMailFormPage; -import com.codeborne.selenide.SelenideElement; - -import ch.ivyteam.ivy.project.portal.test.ExpressResponsible; - -@IvyWebTest -public class PortalExpressScreenshotTest extends ScreenshotBaseTest { - - private static final int USER_TASK_INDEX = 0; - private static final int USER_TASK_WITH_EMAIL_INDEX = 1; - private static final int INFORMATION_EMAIL_INDEX = 2; - public static final String REQUEST_NEW_RESOURCE_PROCESS = "Request new Resources - Express process"; - public static final String FIRST_COMMENT = "This is great news"; - public static final String SECOND_COMMENT = "I totally agree"; - - @Override - @BeforeEach - public void setup() { - super.setup(); - redirectToRelativeLink(createTestingTasksUrl); - login(TestAccount.ADMIN_USER); - showNewDashboard(); - } - - @Test - public void screenshotStartCreateExpressWorkflow() throws IOException { - NewDashboardPage homePage = new NewDashboardPage(); - homePage.waitForCaseWidgetLoaded(); - - MainMenuPage mainMenuPage = new MainMenuPage(); - mainMenuPage.expandMainMenu(); - ScreenshotUtils.resizeBrowser(new Dimension(1400, 800)); - ScreenshotUtils.executeDecorateJs("highlightShowAllProcesses()"); - ScreenshotUtils.captureHalfLeftPageScreenShot(ScreenshotUtils.EXPRESS_FOLDER + "navigate-to-axon-ivy-express"); - - mainMenuPage.closeMainMenu(); - ProcessWidgetPage processWidget = mainMenuPage.openProcessList(); - processWidget.waitUtilProcessWidgetDisplayed(); - - ScreenshotUtils.executeDecorateJs("highlightCreateExpressWorkflow()"); - ScreenshotUtils.captureHalfTopPageScreenShot(ScreenshotUtils.EXPRESS_FOLDER + "start-link-for-axon-ivy-express", - new Dimension(1100, 1000)); - - ExpressProcessPage expressProcessPage = processWidget.openExpressPage(); - ScreenshotUtils.resizeBrowser(new Dimension(1100, 800)); - ScreenshotUtils.capturePageScreenshot(ScreenshotUtils.EXPRESS_FOLDER + "express-workflow-process-properties"); - - ScreenshotUtils.executeDecorateJs("highlightExpressTaskResponsible(0)"); - WebElement taskStep1 = expressProcessPage.getDefineTaskStep(0); - ScreenshotUtils.captureElementScreenshot(taskStep1, ScreenshotUtils.EXPRESS_FOLDER + "express-able-to-start"); - expressProcessPage.fillProcessProperties(true, true, "Request new resources process", "Request description"); - - ExpressResponsible responsible1 = setExpressResponsible(TestAccount.DEMO_USER.getUsername(), false); - - expressProcessPage.createTask(0, USER_TASK_INDEX, "Request resource", "Task request description", - Arrays.asList(responsible1)); - ScreenshotUtils.resizeBrowser(new Dimension(1100, 1200)); - refreshPage(); - expressProcessPage.waitUntilExpressProcessDisplay(); - expressProcessPage.addNewTask(0); - - ExpressResponsible responsible2 = setExpressResponsible(TestAccount.ADMIN_USER.getUsername(), false); - - expressProcessPage.createTask(1, USER_TASK_WITH_EMAIL_INDEX, "Approval request", "Approval request description", - Arrays.asList(responsible2)); - ScreenshotUtils.executeDecorateJs("highlightExpressTaskResponsible(1)"); - WebElement taskStep2 = expressProcessPage.getDefineTaskStep(1); - ScreenshotUtils.captureElementWithMarginOptionScreenshot(taskStep2, - ScreenshotUtils.EXPRESS_FOLDER + "express-task-responsible", new ScreenshotMargin(20, 20, 0, 20)); - - refreshPage(); - ScreenshotUtils.resizeBrowser(new Dimension(1100, 1100)); - expressProcessPage.waitUntilExpressProcessDisplay(); - ScreenshotUtils.capturePageScreenshot(ScreenshotUtils.EXPRESS_FOLDER + "define-express-workflow-process-steps"); - - ScreenshotUtils.resizeBrowser(new Dimension(1100, 1100)); - ExpressFormDefinitionPage formDefinition = expressProcessPage.goToFormDefinitionDefaultResolution(); - formDefinition.createUploadComponent("Upload"); - formDefinition.countElementPrepareToDrag(1); - formDefinition.moveAllElementToDragAndDrogPanel(); - formDefinition.countElementPrepareToDrag(0); - ScreenshotUtils.capturePageScreenshot(ScreenshotUtils.EXPRESS_FOLDER + "express-workflow-dialog-editor"); - - - showNewDashboard(); - mainMenuPage = new MainMenuPage(); - processWidget = mainMenuPage.openProcessList(); - - ScreenshotUtils.resizeBrowser(new Dimension(1400, 1200)); - processWidget.openExpressPage(); - expressProcessPage = new ExpressProcessPage(); - expressProcessPage.fillProcessProperties(true, true, "Request new resources process", "Request description"); - - responsible1 = setExpressResponsible(TestAccount.DEMO_USER.getUsername(), false); - expressProcessPage.createTask(0, USER_TASK_INDEX, "Request resource", "Task request description", - Arrays.asList(responsible1)); - - expressProcessPage.addNewTask(0); - expressProcessPage.createTask(1, INFORMATION_EMAIL_INDEX, null, null, null); - ExpressFormDefinitionPage expressFormDefinition = expressProcessPage.goToFormDefinitionDefaultResolution(); - expressFormDefinition.nextStep(); - expressFormDefinition.waitForEmailEditorDisplayed(); - ScreenshotUtils.capturePageScreenshot(ScreenshotUtils.EXPRESS_FOLDER + "express-workflow-email-editor"); - } - - @Test - public void screenshotExpressManagement() throws IOException { - ScreenshotUtils.resizeBrowser(new Dimension(1200, 800)); - NewDashboardPage homePage = new NewDashboardPage(); - homePage.waitForCaseWidgetLoaded(); - - AdminSettingsPage adminSettingsPage = homePage.openAdminSettings(); - adminSettingsPage.openExpressManagementTab(); - ScreenshotUtils.executeDecorateJs("highlightManagementExpressTab()"); - ScreenshotUtils.capturePageScreenshot(ScreenshotUtils.EXPRESS_MANAGEMENT_FOLDER + "express-management-tab"); - - refreshPage(); - ExpressManagementPage expressManagementPage = adminSettingsPage.openExpressManagementTab(); - expressManagementPage.openImportDialog(); - ScreenshotUtils.captureElementWithMarginOptionScreenshot(expressManagementPage.getImportExpressDialog(), - ScreenshotUtils.EXPRESS_MANAGEMENT_FOLDER + "import-selection", new ScreenshotMargin(40)); - expressManagementPage.selectJSONFile(FileHelper.getAbsolutePathToTestFile("express-test.json")); - - ScreenshotUtils.executeDecorateJs("highlightDeployExpress()"); - ScreenshotUtils.captureElementWithMarginOptionScreenshot(expressManagementPage.getImportExpressDialog(), - ScreenshotUtils.EXPRESS_MANAGEMENT_FOLDER + "import-deployment", new ScreenshotMargin(40)); - - expressManagementPage.clickOnDeployExpress(); - ScreenshotUtils.captureElementWithMarginOptionScreenshot(expressManagementPage.getImportExpressDialog(), - ScreenshotUtils.EXPRESS_MANAGEMENT_FOLDER + "deployment-result", new ScreenshotMargin(40)); - - expressManagementPage.clickOnCloseButton(); - expressManagementPage.clickOnSelectAllExpresses(); - ScreenshotUtils.executeDecorateJs("highlightExportExpress()"); - ScreenshotUtils.captureElementWithMarginOptionScreenshot(adminSettingsPage.getAdminSettingContainer(), - ScreenshotUtils.EXPRESS_MANAGEMENT_FOLDER + "express-export-tab", new ScreenshotMargin(60)); - - ScreenshotUtils.executeDecorateJs("cleanHighlightExportExpress()"); - expressManagementPage.clickOnExportButton(); - ScreenshotUtils.captureElementWithMarginOptionScreenshot(expressManagementPage.getExportExpressDialog(), - ScreenshotUtils.EXPRESS_MANAGEMENT_FOLDER + "export-list-summary", new ScreenshotMargin(60)); - - ScreenshotUtils.maximizeBrowser(); - refreshPage(); - - expressManagementPage = adminSettingsPage.openExpressManagementTab(); - expressManagementPage.openImportDialog(); - expressManagementPage.selectJSONFile(FileHelper.getAbsolutePathToTestFile("express-wf-request-resource.json")); - expressManagementPage.clickOnDeployExpress(); - expressManagementPage.clickOnCloseButton(); - - MainMenuPage mainMenu = new MainMenuPage(); - ProcessWidgetPage processWidget = mainMenu.openProcessList(); - processWidget.waitForStartListShow(); - processWidget.startProcessByName(REQUEST_NEW_RESOURCE_PROCESS); - ScreenshotUtils.resizeBrowser(new Dimension(1920, 1080)); - completeExpressWorkflowTasks(FIRST_COMMENT, SECOND_COMMENT); - - ScreenshotUtils.resizeBrowser(new Dimension(1050, 600)); - showNewDashboard(); - homePage = new NewDashboardPage(); - homePage.waitForCaseWidgetLoaded(); - mainMenu = new MainMenuPage(); - CaseWidgetPage caseWidgetPage = mainMenu.openCaseList(); - SelenideElement actionMenu = caseWidgetPage.openActionStepMenu(0); - ScreenshotUtils.executeDecorateJs("highlightShowAdditionalLink()"); - ScreenshotUtils.capturePageScreenshot(ScreenshotUtils.EXPRESS_FOLDER + "express-case"); - - caseWidgetPage.openAdditionalCaseDetails(actionMenu); - caseWidgetPage.switchLastBrowserTab(); - - ScreenshotUtils.resizeBrowser(new Dimension(1050, 1000)); - ExpressBusinessViewPage expressBusinessView = new ExpressBusinessViewPage(); - expressBusinessView.clickOnLegendOfFieldset(1); - expressBusinessView.clickOnLegendOfFieldset(2); - expressBusinessView.clickTaskTitle(); - ScreenshotUtils.capturePageScreenshot(ScreenshotUtils.EXPRESS_FOLDER + "express-business-summary"); - } - - public void completeExpressWorkflowTasks(String firstComment, String secondComment) { - executePromoteResourceTask(); - - NewDashboardPage homePage = new NewDashboardPage(); - homePage.waitForCaseWidgetLoaded(); - - homePage.selectTaskWidget("Your Tasks").openTask("Send email to HR"); - executeSendEmailTask(); - - homePage.selectTaskWidget("Your Tasks").openTask("HR review"); - executeReviewTask(); - - homePage.selectTaskWidget("Your Tasks").openTask("Approval Request"); - executeApprovalTask(firstComment); - - homePage.selectTaskWidget("Your Tasks").openTask("Approval Request"); - executeApprovalTask(secondComment); - - homePage.selectTaskWidget("Your Tasks").openTask("Request new Resources - Express process: Final Review"); - executeFinalReviewTask(); - } - - public void executePromoteResourceTask() { - ExpressTaskPage expressTaskPage = new ExpressTaskPage(); - expressTaskPage.waitForExpressFieldSetDisplay(); - expressTaskPage.enterRequiredInputFieldByLabel("Applicant name", "David Rafi"); - expressTaskPage.enterRequiredInputFieldByLabel("Email", "David@email.com"); - expressTaskPage.enterRequiredInputFieldByLabel("Address", "39b Truong Son, Tan Binh"); - expressTaskPage.finish(); - } - - private void executeSendEmailTask() { - ExpressTaskPage expressTaskPage = new ExpressTaskPage(); - expressTaskPage.waitForExpressFieldSetDisplay(); - expressTaskPage.enterRequiredInputFieldByLabel("Welcome", "Welcome Mr.David to axon"); - expressTaskPage.enterRequiredInputFieldByLabel("Start date", "01/09/2023 10:35"); - - UserTaskWithMailFormPage userTaskWithMail = new UserTaskWithMailFormPage(); - userTaskWithMail.selectEmailTab(); - userTaskWithMail.inputData("hr@email.com", "Please review this applicant", "Hello HR team, please proceed."); - userTaskWithMail.finish(); - } - - private void executeReviewTask() { - ExpressTaskPage expressTaskPage = new ExpressTaskPage(); - expressTaskPage.waitForExpressFieldSetDisplay(); - expressTaskPage.enterRequiredInputFieldByLabel("Comment", "Mr.David to axon"); - expressTaskPage.enterRequiredInputFieldByLabel("Approval date", "01/09/2023 10:35"); - expressTaskPage.finish(); - } - - private void executeApprovalTask(String comment) { - ExpressApprovalPage expressApproval = new ExpressApprovalPage(); - expressApproval.waitForCommentContainerDisplay(); - expressApproval.comment(comment); - expressApproval.clickOnApprove(); - } - - private void executeFinalReviewTask() { - ExpressReviewPage expressReview = new ExpressReviewPage(); - expressReview.finish(); - } -} diff --git a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/AdminSettingsPage.java b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/AdminSettingsPage.java index fb655bdace4..bda89abb789 100644 --- a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/AdminSettingsPage.java +++ b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/AdminSettingsPage.java @@ -104,13 +104,6 @@ public AnnouncementPage openAnnouncementTab() { return new AnnouncementPage(); } - public ExpressManagementPage openExpressManagementTab() { - waitForElementClickableThenClick( - $(By.xpath(("//a[@href='#admin-setting-component:adminTabView:express-management-tab']")))); - waitForElementPresent(By.id("admin-setting-component:adminTabView:express-management-tab"), true); - return new ExpressManagementPage(); - } - public RoleManagementPage openRoleManagementTab() { waitForElementDisplayed(By.cssSelector("[id$='admin-setting-component:adminTabView']"), true); waitForElementClickableThenClick("a[href='#admin-setting-component:adminTabView:role-management-tab']"); diff --git a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/CaseDetailsPage.java b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/CaseDetailsPage.java index 466fe8117ac..eba786e3fb3 100644 --- a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/CaseDetailsPage.java +++ b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/CaseDetailsPage.java @@ -676,14 +676,6 @@ public void clickRelatedTaskActionButton(String taskName) { waitForElementDisplayed(By.cssSelector(actionPanel), true); } - public ExpressProcessPage addAdHocTask(int index) { - String commandButton = - String.format("[id$='task-widget:related-tasks:%d:additional-options:task-additional-actions']", index); - waitForElementDisplayed(By.cssSelector(commandButton), true); - findElementByCssSelector(commandButton).click(); - return new ExpressProcessPage(); - } - public int getTaskRowIndexFromDetailPage(String taskName) { List taskNames = $$(".task-name-value"); int taskIndex = IntStream.range(0, taskNames.size()).filter(i -> taskNames.get(i).getText().equals(taskName)) diff --git a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/CaseWidgetPage.java b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/CaseWidgetPage.java index cd167086bfa..d9b50c8f574 100644 --- a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/CaseWidgetPage.java +++ b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/CaseWidgetPage.java @@ -1,7 +1,6 @@ package com.axonivy.portal.selenium.page; import static com.codeborne.selenide.Condition.appear; - import static com.codeborne.selenide.Condition.disappear; import static com.codeborne.selenide.Condition.text; import static com.codeborne.selenide.Selenide.$; @@ -435,11 +434,6 @@ public SelenideElement openActionStepMenu(int index) { return $(menuPanelSelector).shouldBe(appear, DEFAULT_TIMEOUT); } - public void openAdditionalCaseDetails(SelenideElement actionMenu) { - actionMenu.$("[id$=':show-additional-case-details-link']").shouldBe(getClickableCondition(), DEFAULT_TIMEOUT) - .click(); - } - public SelenideElement getSaveFilterDialog() { $(By.id(caseWidgetId + ":filter-save-action")).shouldBe(getClickableCondition()).click(); $(By.id(caseWidgetId + ":filter-save-form:save-filter-set-name-input")).shouldBe(Condition.visible, diff --git a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/ChatPage.java b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/ChatPage.java index 69707066a97..d266508dda6 100644 --- a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/ChatPage.java +++ b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/ChatPage.java @@ -17,7 +17,7 @@ import com.codeborne.selenide.ElementsCollection; import com.codeborne.selenide.SelenideElement; -import ch.ivyteam.ivy.project.portal.test.ExpressResponsible; +import ch.ivyteam.ivy.project.portal.test.Responsible; public class ChatPage extends TemplatePage { @@ -34,9 +34,9 @@ public void openFirstGroupChat() { } } - public void addUserToChatGroup(List responsibles) { + public void addUserToChatGroup(List responsibles) { waitForElementDisplayed(By.id("chat-assignee-dialog"), true); - for (ExpressResponsible responsible : responsibles) { + for (Responsible responsible : responsibles) { chooseResponsible(responsible.getResponsibleName(), responsible.getIsGroup()); } } diff --git a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/DefaultExpresTaskPage.java b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/DefaultExpresTaskPage.java deleted file mode 100644 index 2e87d840a01..00000000000 --- a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/DefaultExpresTaskPage.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.axonivy.portal.selenium.page; - -import static com.codeborne.selenide.Selenide.$; - -import org.openqa.selenium.By; - -public class DefaultExpresTaskPage extends TaskIFrameTemplatePage { - - @Override - protected String getLoadedLocator() { - return "[id='form:cancel-btn']"; - } - - public void enterTextToDefaultTask(String text) { - var textArea = findElementByCssSelector("#form\\:user-task-dyna-form textarea[id$='input-text-area']"); - textArea.clear(); - textArea.sendKeys(text); - var textAreaId = textArea.getAttribute(ID_PROPERTY); - textAreaId.replace(":", "\\\\:"); - } - - public void finishDefaultTask() { - waitForElementClickableThenClick($(By.id("form:ok-btn"))); - } - -} diff --git a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/DefaultExpressTaskPage.java b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/DefaultExpressTaskPage.java deleted file mode 100644 index 4f488571e89..00000000000 --- a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/DefaultExpressTaskPage.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.axonivy.portal.selenium.page; - -import static com.codeborne.selenide.Condition.appear; -import static com.codeborne.selenide.Selenide.$; - -public class DefaultExpressTaskPage extends TemplatePage { - - @Override - protected String getLoadedLocator() { - return "[id='form:cancel-btn']"; - } - - public void enterTextToDefaultTask(String text) { - var textArea = $("[id='form:user-task-dyna-form']").shouldBe(appear, DEFAULT_TIMEOUT) - .$("textarea[id$=':input-text-area']").shouldBe(getClickableCondition(), DEFAULT_TIMEOUT); - textArea.clear(); - textArea.sendKeys(text); - } - - public void clickOK() { - $("[id='form:ok-btn']").shouldBe(getClickableCondition(), DEFAULT_TIMEOUT).click(); - } -} diff --git a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/ExpressApprovalPage.java b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/ExpressApprovalPage.java deleted file mode 100644 index 4ec6902225a..00000000000 --- a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/ExpressApprovalPage.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.axonivy.portal.selenium.page; - -import static com.codeborne.selenide.Condition.appear; -import static com.codeborne.selenide.Selenide.$; - -import com.axonivy.portal.selenium.common.WaitHelper; - -public class ExpressApprovalPage extends TemplatePage { - - @Override - protected String getLoadedLocator() { - return "[id='form']"; - } - - public void approve() { - WaitHelper.waitForNavigation(() -> clickOnApprove()); - - } - - public void clickOnApprove() { - $("button[id$='approve-btn']").shouldBe(getClickableCondition(), DEFAULT_TIMEOUT).click(); - } - - public void reject() { - WaitHelper.waitForNavigation( - () -> $("[id='form:refuse-btn']").shouldBe(getClickableCondition(), DEFAULT_TIMEOUT).click()); - } - - public void waitForCommentContainerDisplay() { - $(".approval-comment-container").shouldBe(appear, DEFAULT_TIMEOUT); - } - - public void comment(String comment) { - $("textarea[id$='comment']").shouldBe(appear, DEFAULT_TIMEOUT).clear(); - $("textarea[id$='comment']").click(); - $("textarea[id$='comment']").sendKeys(comment); - } -} diff --git a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/ExpressBusinessViewPage.java b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/ExpressBusinessViewPage.java deleted file mode 100644 index eb878776ccf..00000000000 --- a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/ExpressBusinessViewPage.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.axonivy.portal.selenium.page; - -import static com.codeborne.selenide.Condition.appear; -import static com.codeborne.selenide.Selenide.$; - -import java.util.stream.Collectors; - -import org.openqa.selenium.WebElement; - -import com.axonivy.portal.selenium.common.WaitHelper; -import com.codeborne.selenide.SelenideElement; - -public class ExpressBusinessViewPage extends TemplatePage { - - @Override - protected String getLoadedLocator() { - return "[id='express-view-form']"; - } - - public SelenideElement getEmptyFinishedTask() { - return $("[id$='express-view-form:empty-finished-tasks-container']").shouldBe(appear, DEFAULT_TIMEOUT); - } - - public String getEmptyFinishedTaskMessage() { - return getEmptyFinishedTask().$(".no-item-header").shouldBe(appear, DEFAULT_TIMEOUT).getText(); - } - - public void clickOnCloseButton() { - WaitHelper.waitForNavigation( - () -> $("[id$='express-view-form:cancel-btn']").shouldBe(getClickableCondition(), DEFAULT_TIMEOUT).click()); - } - - public SelenideElement getLegendFisnishedTaskFieldset(int index) { - return $( - String.format("span[id$=':finished-tasks-component:approval-result:%d:finished-task-fieldset-legend']", index)) - .shouldBe(appear, DEFAULT_TIMEOUT); - } - - public String getTextOfLegendFinishedTask(int index) { - return getLegendFisnishedTaskFieldset(index).getText(); - } - - public String getTextOfLegendApprovalResult(int index) { - return $(String.format("span[id$=':approval-result-container:0:approval-result-fieldset-legend']", index)) - .shouldBe(appear, DEFAULT_TIMEOUT).getText(); - } - - public void clickOnLegendOfFieldset(int index) { - getLegendFisnishedTaskFieldset(index).shouldBe(getClickableCondition(), DEFAULT_TIMEOUT).click(); - } - - public String getApprovalResultsText() { - return $(".approval-result-content").shouldBe(appear, DEFAULT_TIMEOUT) - .$$("tbody[id$=':approval-result-table_data'] td").asFixedIterable().stream().map(WebElement::getText) - .collect(Collectors.joining(",")); - } - - public Integer getIndexOfCurrentProcessChain() { - SelenideElement processChainContainer = - $("[id$='process-chain-component:process-chain-component-id']").shouldBe(appear, DEFAULT_TIMEOUT); - - for (var step : processChainContainer.$$("div[id^='process-chain-component:step-info-']")) { - if (step.getAttribute(CLASS_PROPERTY).contains("current")) { - String stepId = step.getAttribute("id"); - return Integer.valueOf(stepId.replace("process-chain-component:step-info-", "").trim()).intValue(); - } - } - return 0; - } - - public void clickTaskTitle() { - $("[id='task-template-title']").should(appear, DEFAULT_TIMEOUT).click(); - } -} diff --git a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/ExpressEndPage.java b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/ExpressEndPage.java deleted file mode 100644 index 696e8a087e4..00000000000 --- a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/ExpressEndPage.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.axonivy.portal.selenium.page; - -import org.openqa.selenium.By; - -public class ExpressEndPage extends TemplatePage { - @Override - protected String getLoadedLocator() { - return "[id$='form:close-button']"; - } - - public void finish() { - waitForElementClickableThenClick(By.id("form:close-button")); - } -} diff --git a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/ExpressFormDefinitionPage.java b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/ExpressFormDefinitionPage.java deleted file mode 100644 index c294d24e996..00000000000 --- a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/ExpressFormDefinitionPage.java +++ /dev/null @@ -1,240 +0,0 @@ -package com.axonivy.portal.selenium.page; - -import static com.codeborne.selenide.Condition.appear; -import static com.codeborne.selenide.Selenide.$; -import static com.codeborne.selenide.Selenide.$$; - -import java.util.Random; - -import org.openqa.selenium.By; -import org.openqa.selenium.JavascriptExecutor; -import org.openqa.selenium.WebElement; -import org.openqa.selenium.interactions.Action; -import org.openqa.selenium.interactions.Actions; - -import com.axonivy.portal.selenium.common.WaitHelper; -import com.codeborne.selenide.CollectionCondition; -import com.codeborne.selenide.Condition; -import com.codeborne.selenide.WebDriverRunner; - -public class ExpressFormDefinitionPage extends TemplatePage { - - private static final String LEFT_POSITION = "leftpanel"; - private static final String RIGHT_POSITION = "rightpanel"; - private static final String HEADER_POSITION = "header"; - private static final String FOOTER_POSITION = "footer"; - private static final String[] POSITIONS = {LEFT_POSITION, HEADER_POSITION, FOOTER_POSITION}; - - @Override - protected String getLoadedLocator() { - return "[id='form:create-tabs']"; - } - - public void createUploadComponent(String label) { - clickOnFormCreationTabIndex(5); - $("input[id$='form:create-tabs:file-upload-label']").sendKeys(label); - $("[id='form:create-tabs:add-upload-file-btn']").shouldBe(getClickableCondition(), DEFAULT_TIMEOUT).click(); - $("input[id$='form:create-tabs:file-upload-label']").shouldBe(Condition.empty); - } - - public void moveAllElementToDragAndDrogPanel() { - int size = $$(By.xpath("//div[@id='form:available-form-elements_content']/ul/li")).size(); - long startIndex = size - 1; - - for (long i = startIndex; i >= 0; i--) { - String panelSelector = "[id='" + String.format("form:available-form-elements:%d:pnl", i) + "']"; - $(panelSelector).shouldBe(appear, DEFAULT_TIMEOUT); - - if (i == startIndex) { - moveFormElementToPanel(i, RIGHT_POSITION); - } else { - moveFormElementToPanel(i, getRandomPosition()); - } - $$(panelSelector).shouldBe(CollectionCondition.empty); - } - } - - public void countElementPrepareToDrag(int size) { - $$(By.xpath("//div[@id='form:available-form-elements_content']/ul/li")).shouldBe(CollectionCondition.size(size), - DEFAULT_TIMEOUT); - } - - private void moveFormElementToPanel(long index, String position) { - // TODO Need to be fixed - Workaround for scroll-bar issue - JavascriptExecutor jse = (JavascriptExecutor) WebDriverRunner.getWebDriver(); - jse.executeScript("window.scrollTo(0, document.body.scrollHeight);"); - - var formElementSelector = String.format("[id$='form:available-form-elements:%d:pnl_content']", index); - // If elements is FileUpload, move to footer - if (formElementIsFileUpload($(formElementSelector).shouldBe(appear, DEFAULT_TIMEOUT))) { - position = FOOTER_POSITION; - } - - var panelSelector = String.format("[id='form:selected-form-elements-%s-panel']", position); - - Actions builder = new Actions(WebDriverRunner.getWebDriver()); - Action moveProcessSequence = builder.dragAndDrop($(formElementSelector), $(panelSelector)).build(); - moveProcessSequence.perform(); - } - - private boolean formElementIsFileUpload(WebElement formElement) { - WebElement icon = formElement.findElement(By.tagName("img")); - return icon.getAttribute("src").contains("FileUpload"); - } - - private String getRandomPosition() { - int idx = new Random().nextInt(POSITIONS.length); - return (POSITIONS[idx]); - } - - public void nextStep() { - $("[id='next-button']").shouldBe(getClickableCondition(), DEFAULT_TIMEOUT).click(); - } - - public void waitForEmailEditorDisplayed() { - $("[id='form:information-email:email-container']").shouldBe(appear, DEFAULT_TIMEOUT); - } - - public WebElement getPageElement() { - return $(".portal-layout-container").shouldBe(appear, DEFAULT_TIMEOUT); - } - - public void executeWorkflow() { - waitForElementClickableThenClick(By.id("execute-button")); - waitForElementDisplayed(By.id("form:dynaform-fieldset"), true); - } - - public void createTextInputField(String label, int inputFieldTypeIndex, boolean isRequired) { - waitForElementClickableThenClick(By.xpath("//*[@id='form:create-tabs']/ul/li[@role='tab'][1]")); - waitForElementDisplayed(By.id("form:create-tabs:create-input-field-tab"), true); - $(By.id("form:create-tabs:input-field-label")).sendKeys(label); - chooseInputFieldType(inputFieldTypeIndex); - if (isRequired) { - waitForElementClickableThenClick(By.cssSelector("div[id='form:create-tabs:input-field-required']")); - } - waitForElementClickableThenClick(By.id("form:create-tabs:add-input-text-btn")); - } - - private void chooseInputFieldType(int inputTypeIndex) { - waitForElementClickableThenClick(By.id("form:create-tabs:input-field-type_label")); - waitForElementDisplayed(By.id("form:create-tabs:input-field-type_panel"), true); - waitForElementClickableThenClick(By.id(String.format("form:create-tabs:input-field-type_%d", inputTypeIndex))); - } - - public void finishWorkflow() { - waitForElementClickableThenClick(By.id("finish-button")); - new NewDashboardPage().isDisplayed(); - } - - public NewDashboardPage save() { - waitForElementClickableThenClick(By.id("save-button")); - return new NewDashboardPage(); - } - - public NewDashboardPage cancel() { - waitForElementClickableThenClick(By.id("cancel-button")); - waitForElementDisplayed(By.id("yes-button"), true); - waitForElementClickableThenClick(By.id("yes-button")); - return new NewDashboardPage(); - } - - public void createRadioButtonField(String label, int numberOfOption) { - clickOnFormCreationTabIndex(4); - waitForElementDisplayed(By.id("form:create-tabs:one-radio-label"), true); - addRadioOptions(numberOfOption); - $("input[id$='form:create-tabs:one-radio-label']").sendKeys(label); - waitForElementClickableThenClick(By.id("form:create-tabs:add-radio-btn")); - $("input[id$='form:create-tabs:one-radio-label']").shouldBe(Condition.empty); - } - - private void addRadioOptions(int numberOfOptions) { - for (int i = 1; i <= numberOfOptions; i++) { - waitForElementClickableThenClick(By.id("form:create-tabs:one-radio-options:add-radio-option-btn")); - $(By.xpath(String.format("//*[@id='form:create-tabs:one-radio-options_data']/tr[%d]/td/input", i))) - .sendKeys("Radio " + i); - } - } - - public void createCheckboxField(String label, int numberOfSelection) { - clickOnFormCreationTabIndex(3); - waitForElementDisplayed(By.id("form:create-tabs:many-checkbox-options"), true); - $("input[id='form:create-tabs:many-checkbox-label']").sendKeys(label); - addCheckboxOptions(numberOfSelection); - waitForElementClickableThenClick(By.id("form:create-tabs:add-checkbox-btn")); - $("input[id='form:create-tabs:many-checkbox-label']").shouldBe(Condition.empty); - } - - private void addCheckboxOptions(int numberOfSelection) { - for (int i = 1; i <= numberOfSelection; i++) { - waitForElementClickableThenClick(By.id("form:create-tabs:many-checkbox-options:add-checkbox-option-btn")); - $(By.xpath(String.format("//*[@id='form:create-tabs:many-checkbox-options_data']/tr[%d]/td/input", i))) - .sendKeys("Option " + i); - } - } - - public void createTextAreaField(String label, boolean isRequired) { - clickOnFormCreationTabIndex(2); - waitForElementDisplayed(By.id("form:create-tabs:create-input-area-tab"), true); - $(By.id("form:create-tabs:input-area-label")).sendKeys(label); - if (isRequired) { - waitForElementClickableThenClick(By.cssSelector("div[id='form:create-tabs:input-area-required']")); - } - waitForElementClickableThenClick(By.id("form:create-tabs:add-text-area-btn")); - $(By.id("form:create-tabs:input-area-label")).shouldBe(Condition.empty); - } - - public void createCheckboxFieldWithDataProvider(String label) { - fillDataForCheckboxProvider(label); - waitForElementClickableThenClick(By.id("form:create-tabs:add-checkbox-btn")); - $(By.id("form:create-tabs:many-checkbox-label")).shouldBe(Condition.empty); - } - - public void fillDataForCheckboxProvider(String label) { - clickOnFormCreationTabIndex(3); - waitForElementDisplayed(By.id("form:create-tabs:create-many-checkbox-tab"), true); - waitForElementClickableThenClick(By.id("form:create-tabs:DataProvider_label")); - waitForElementClickableThenClick(By.xpath("//*[@data-label='TestDataProviderForPortalExpress']")); - waitForElementDisplayed(By.cssSelector("div[id$='value-checkbox-label']"), false); - waitForElementDisplayed(By.id("form:create-tabs:many-checkbox-label"), true); - $(By.id("form:create-tabs:many-checkbox-label")).sendKeys(label); - } - - public int countNumberOfElementsInPreviewDialog() { - waitForElementClickableThenClick(By.id("form:show-preview-button")); - waitForElementDisplayed(By.id("form:preview-dialog"), true); - WebElement previewDialog = findElementById("form:preview-dialog"); - int numberOfInput = previewDialog.findElements(By.xpath("//table[@id='form:dyna-form']//input")).size(); - int numberOfTextArea = previewDialog.findElements(By.xpath("//table[@id='form:dyna-form']//textarea")).size(); - int numberOfUploadFile = - previewDialog.findElements(By.xpath("//div[contains(@id,'fileUploadComponent:document-table')]")).size(); - return numberOfInput + numberOfTextArea + numberOfUploadFile; - } - - public int countNumberOfSteps() { - return driver.findElements(By.xpath("//div[@id='defined-task-container']//button")).size(); - } - - public void inputMailRecipient(String content) { - findElementById("form:information-email:email-recipients").sendKeys(content); - } - - public void inputMailSubject(String content) { - findElementById("form:information-email:email-subject").sendKeys(content); - } - - public void inputMailContent(String content) { - ((JavascriptExecutor) WebDriverRunner.getWebDriver()).executeScript( - "document.querySelector(\"input[name='form:information-email:email-content_input'\").value='" + content + "';"); - } - - public void executeWorkflowAndWaitForUserTaskWithEmailDisplay() { - waitForElementClickableThenClick(By.id("execute-button")); - waitForElementDisplayed(By.id("task-form:task-view:dyna-form-fieldset"), true); - } - - private void clickOnFormCreationTabIndex(int tabIndex) { - WaitHelper.waitForActionComplete("#form\\:create-tabs ul", () -> waitForElementClickableThenClick( - By.xpath("//*[@id='form:create-tabs']/ul/li[@role='tab'][" + tabIndex + "]"))); - } - -} diff --git a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/ExpressManagementPage.java b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/ExpressManagementPage.java deleted file mode 100644 index 06185d7730b..00000000000 --- a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/ExpressManagementPage.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.axonivy.portal.selenium.page; - -import static com.codeborne.selenide.Condition.appear; -import static com.codeborne.selenide.Condition.disappear; -import static com.codeborne.selenide.Selenide.$; -import static com.codeborne.selenide.Selenide.$$; - -import org.openqa.selenium.WebElement; - -import com.codeborne.selenide.CollectionCondition; - -public class ExpressManagementPage extends TemplatePage { - - @Override - protected String getLoadedLocator() { - return "[id='admin-setting-component:adminTabView:express-management-component:express-management-form']"; - } - - public void openImportDialog() { - $("button[id$=':express-management-form:import-express-btn']").shouldBe(getClickableCondition(), DEFAULT_TIMEOUT) - .click(); - $("[id$=':import-express-form:express-process-upload_label']").shouldBe(appear, DEFAULT_TIMEOUT); - } - - public WebElement getImportExpressDialog() { - return $("[id$=':express-management-component:import-express-dialog']").shouldBe(appear, DEFAULT_TIMEOUT); - } - - public void selectJSONFile(String pathToFile) { - $("*[id$=':express-process-upload_input']").sendKeys(pathToFile); - $$(".ui-fileupload-upload").shouldBe(CollectionCondition.size(1), DEFAULT_TIMEOUT); - } - - public void clickOnDeployExpress() { - $("[id='admin-setting-component:adminTabView:express-management-component:import-express-dialog']") - .$(".ui-fileupload-upload").shouldBe(getClickableCondition(), DEFAULT_TIMEOUT).click(); - $("[id='admin-setting-component:adminTabView:express-management-component:import-express-form:impress-export-output'] pre.express-import-result") - .shouldBe(appear, DEFAULT_TIMEOUT); - } - - public void clickOnCloseButton() { - $("*[id$=':close-import-express']").shouldBe(getClickableCondition(), DEFAULT_TIMEOUT).click(); - $("[id='admin-setting-component:adminTabView:express-management-component:import-express-dialog']") - .shouldBe(disappear, DEFAULT_TIMEOUT); - } - - public void clickOnSelectAllExpresses() { - $("[id='admin-setting-component:adminTabView:express-management-component:express-management-form:express-workflow-summary-table_head_checkbox']") - .shouldBe(getClickableCondition(), DEFAULT_TIMEOUT).click(); - } - - public void clickOnExportButton() { - $("[id$=':express-management-component:express-management-form:export-express-btn']") - .shouldBe(getClickableCondition(), DEFAULT_TIMEOUT).click(); - $("[id='admin-setting-component:adminTabView:express-management-component:export-express-dialog']").shouldBe(appear, - DEFAULT_TIMEOUT); - } - - public WebElement getExportExpressDialog() { - return $("[id$=':express-management-component:export-express-dialog']").shouldBe(appear, DEFAULT_TIMEOUT); - } -} diff --git a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/ExpressProcessPage.java b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/ExpressProcessPage.java deleted file mode 100644 index 9750a4903df..00000000000 --- a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/ExpressProcessPage.java +++ /dev/null @@ -1,191 +0,0 @@ -package com.axonivy.portal.selenium.page; - -import static com.codeborne.selenide.Condition.appear; -import static com.codeborne.selenide.Condition.disappear; -import static com.codeborne.selenide.Selenide.$; - -import java.util.List; - -import org.openqa.selenium.By; -import org.openqa.selenium.Dimension; -import org.openqa.selenium.WebElement; - -import com.axonivy.portal.selenium.common.ScreenshotUtils; -import com.codeborne.selenide.Condition; - -import ch.ivyteam.ivy.project.portal.test.ExpressResponsible; - -public class ExpressProcessPage extends TemplatePage { - - @Override - protected String getLoadedLocator() { - return "[id='form:process-setting-fieldset']"; - } - - public void createDefaultTask(int taskIndex, String taskName, List responsibles) { - if (taskName != null) { - $("[id='" + String.format("form:defined-tasks-list:%d:default-task-name", taskIndex) + "']") - .shouldBe(getClickableCondition(), DEFAULT_TIMEOUT).sendKeys(taskName); - } - $("[id='" + String.format("form:defined-tasks-list:%d:default-task-responsible-link", taskIndex) + "']") - .shouldBe(getClickableCondition(), DEFAULT_TIMEOUT).click(); - addResponsible(responsibles); - } - - private void addResponsible(List responsibles) { - $("[id='choose-responsible-dialog']").shouldBe(appear, DEFAULT_TIMEOUT); - for (ExpressResponsible responsible : responsibles) { - chooseResponsible(responsible.getResponsibleName(), responsible.getIsGroup()); - } - $("[id='assignee-selection-form:save-assignee-button']").shouldBe(getClickableCondition(), DEFAULT_TIMEOUT).click(); - $("[id='choose-responsible-dialog']").shouldBe(disappear, DEFAULT_TIMEOUT); - } - - private void chooseResponsible(String responsible, boolean isGroup) { - if (isGroup) { - $("label[for='assignee-selection-form:assignee-type:1']").shouldBe(getClickableCondition(), DEFAULT_TIMEOUT) - .click(); - $("[id='assignee-selection-form:role-selection-component:role-selection_input']") - .shouldBe(getClickableCondition(), DEFAULT_TIMEOUT).clear(); - $("[id='assignee-selection-form:role-selection-component:role-selection_input']").sendKeys(responsible); - $("[id='assignee-selection-form:role-selection-component:role-selection_panel']").shouldBe(appear, - DEFAULT_TIMEOUT); - $("span[id='assignee-selection-form:role-selection-component:role-selection_panel'] .gravatar") - .shouldBe(getClickableCondition(), DEFAULT_TIMEOUT).click(); - $("span[id='assignee-selection-form:role-selection-component:role-selection_panel'] .gravatar") - .shouldBe(disappear, DEFAULT_TIMEOUT); - } else { - $("[id='assignee-selection-form:user-selection-component:user-selection_input']") - .shouldBe(getClickableCondition(), DEFAULT_TIMEOUT).clear(); - $("[id='assignee-selection-form:user-selection-component:user-selection_input']").sendKeys(responsible); - $("[id='assignee-selection-form:user-selection-component:user-selection_panel']").shouldBe(appear, - DEFAULT_TIMEOUT); - $("span[id='assignee-selection-form:user-selection-component:user-selection_panel'] .gravatar") - .shouldBe(appear, DEFAULT_TIMEOUT).click(); - $("span[id='assignee-selection-form:user-selection-component:user-selection_panel'] .gravatar") - .shouldBe(disappear, DEFAULT_TIMEOUT); - } - - $("[id='assignee-selection-form:add-assignee-button']").shouldBe(getClickableCondition(), DEFAULT_TIMEOUT).click(); - $(".assignee-name-col").shouldBe(appear, DEFAULT_TIMEOUT); - } - - public void addNewTask(int currentTaskIndex) { - $("[id='" + String.format("form:defined-tasks-list:%d:add-step-button", currentTaskIndex) + "']") - .shouldBe(getClickableCondition(), DEFAULT_TIMEOUT).click(); - $("[id='" + String.format("form:defined-tasks-list:%d:process-flow-field", currentTaskIndex + 1) + "']") - .shouldBe(appear, DEFAULT_TIMEOUT); - } - - public void clickSave() { - $("[id='form:save']").shouldBe(getClickableCondition(), DEFAULT_TIMEOUT); - clickByJavaScript($("[id='form:save']")); - $("[id='form:save']").shouldBe(Condition.disappear, DEFAULT_TIMEOUT); - } - - public ExpressFormDefinitionPage goToFormDefinition() { - goToFormDefinitionDefaultResolution(); - ScreenshotUtils.resizeBrowser(new Dimension(2560, 1440)); - return new ExpressFormDefinitionPage(); - } - - public ExpressFormDefinitionPage goToFormDefinitionDefaultResolution() { - clickSave(); - return new ExpressFormDefinitionPage(); - } - - public WebElement getDefineTaskStep(int stepIndex) { - String defineTaskStepId = String.format(":defined-tasks-list:%s:process-flow-field", stepIndex); - return $("[id$='" + defineTaskStepId + "']").shouldBe(appear, DEFAULT_TIMEOUT); - } - - public void fillProcessProperties(boolean isAdhocWF, boolean isCreateOwn, String processName, - String processDescription) { - if (isAdhocWF) { - $("div[id='form:process-type']").shouldBe(getClickableCondition(), DEFAULT_TIMEOUT).click(); - $("span[id='form:process-type-group']").$(".switch-active").shouldBe(Condition.text("One time"), DEFAULT_TIMEOUT); - } - - if (!isCreateOwn) { - $("div[id='form:user-interface-type']").shouldBe(getClickableCondition(), DEFAULT_TIMEOUT).click(); - agreeToDeleteAllDefineTasks(); - - } - $("[id='form:process-name']").shouldBe(appear, DEFAULT_TIMEOUT).sendKeys(processName); - $("[id='form:process-description']").shouldBe(appear, DEFAULT_TIMEOUT).sendKeys(processDescription); - } - - private void agreeToDeleteAllDefineTasks() { - $("[id='delete-all-defined-tasks-warning']").shouldBe(appear, DEFAULT_TIMEOUT); - $("[id='delete-all-defined-tasks-warning-ok']").shouldBe(getClickableCondition(), DEFAULT_TIMEOUT).click(); - $("[id='delete-all-defined-tasks-warning']").shouldBe(disappear, DEFAULT_TIMEOUT); - } - - public void createTask(int taskIndex, int typeIndex, String taskName, String taskDescription, - List responsibles) { - final String TASK_NAME_FORMAT = "input[id$='%d:task-name']"; - final int INFORMATION_EMAIL_INDEX = 2; - - chooseTaskType(taskIndex, typeIndex); - if (typeIndex != INFORMATION_EMAIL_INDEX) { - $("[id='" + String.format("form:defined-tasks-list:%d:task-responsible-link", taskIndex) + "']") - .shouldBe(clickable(), DEFAULT_TIMEOUT).click(); - $("[id='choose-responsible-dialog']").shouldBe(appear, DEFAULT_TIMEOUT); - addResponsible(responsibles); - - $(String.format(TASK_NAME_FORMAT, taskIndex)).shouldBe(appear, DEFAULT_TIMEOUT).sendKeys(taskName); - $(String.format("input[id$='%d:task-description']", taskIndex)).shouldBe(appear, DEFAULT_TIMEOUT) - .sendKeys(taskDescription); - } - } - - private void chooseTaskType(int taskIndex, int typeIndex) { - if (typeIndex == 0) { - // If the selected task type is already task type? ignore click on the drop-down - return; - } - - final String TASK_TYPE_FORMAT = "li[id$=':%d:task-type_%d']"; - final String TASK_TYPE_LABEL_FORMAT = "span[id$=':%d:task-type_label']"; - - $(String.format(TASK_TYPE_LABEL_FORMAT, taskIndex)).shouldBe(appear, DEFAULT_TIMEOUT) - .shouldBe(getClickableCondition()).click(); - $(String.format("[id$=':%d:task-type_panel']", taskIndex)).shouldBe(appear, DEFAULT_TIMEOUT); - $(String.format(TASK_TYPE_FORMAT, taskIndex, typeIndex)).shouldBe(appear, DEFAULT_TIMEOUT) - .shouldBe(getClickableCondition(), DEFAULT_TIMEOUT).click(); - } - - public void waitUntilExpressProcessDisplay() { - $("[id='form:process-setting-fieldset']").shouldBe(appear, DEFAULT_TIMEOUT); - } - - public String getProcessName() { - return findElementById("form:process-name").getAttribute("value"); - } - - public String getProcessOwnerNames() { - return findElementById("form:process-owner-link").getText(); - } - - public String getAbleToStartNames() { - return getResponsiblesOfTask(0); - } - - public String getResponsiblesOfTask(int taskIndex) { - return findElementById(String.format("form:defined-tasks-list:%d:task-responsible-link", taskIndex)).getText(); - } - - public void executeDirectly() { - waitForElementClickableThenClick("[id$='form:save']"); - } - - public NewDashboardPage cancelWorkflowDefinition() { - waitForElementClickableThenClick(By.id("form:cancel-workflow-button")); - return new NewDashboardPage(); - } - - public void fillProcessOwners(List responsibles) { - waitForElementClickableThenClick(By.id("form:process-owner-link")); - addResponsible(responsibles); - } -} diff --git a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/ExpressReviewPage.java b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/ExpressReviewPage.java deleted file mode 100644 index f330a392b46..00000000000 --- a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/ExpressReviewPage.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.axonivy.portal.selenium.page; - -import static com.codeborne.selenide.Condition.appear; -import static com.codeborne.selenide.Selenide.$; -import static com.codeborne.selenide.Selenide.$$; - -import java.util.stream.Collectors; - -import com.axonivy.portal.selenium.common.WaitHelper; -import com.codeborne.selenide.CollectionCondition; -import com.codeborne.selenide.Condition; -import com.codeborne.selenide.ElementsCollection; -import com.codeborne.selenide.SelenideElement; - -public class ExpressReviewPage extends TemplatePage { - - @Override - protected String getLoadedLocator() { - return "[id='form:acknowledged']"; - } - - public void finish() { - WaitHelper.waitForNavigation( - () -> $("button[id$='acknowledged']").shouldBe(getClickableCondition(), DEFAULT_TIMEOUT).click()); - } - - public void clickOnOkButton() { - WaitHelper.waitForNavigation( - () -> $("button[id$='close-button']").shouldBe(getClickableCondition(), DEFAULT_TIMEOUT).click()); - } - - public String getApprovalResult() { - $$("fieldset[id *= ':approval-result-fieldset'] .ui-icon-plusthick").asFixedIterable().forEach(elem -> { - elem.shouldBe(getClickableCondition(), DEFAULT_TIMEOUT).click(); - elem.ancestor("fieldset").$(".ui-fieldset-content").shouldBe(appear, DEFAULT_TIMEOUT); - }); - $$("div[id*='approval-result'] td").shouldBe(CollectionCondition.sizeGreaterThanOrEqual(1), DEFAULT_TIMEOUT).get(0) - .shouldNotHave(Condition.empty, DEFAULT_TIMEOUT); - return $$("div[id*='approval-result'] td").asFixedIterable().stream().map(SelenideElement::getText) - .collect(Collectors.joining(",")); - } - - public void checkApprovalResult() { - $$("fieldset[id *= ':approval-result-fieldset'] .ui-icon-plusthick").asFixedIterable().forEach(elem -> { - elem.shouldBe(getClickableCondition(), DEFAULT_TIMEOUT).click(); - elem.ancestor("fieldset").$(".ui-fieldset-content").shouldBe(appear, DEFAULT_TIMEOUT); - }); - $$("div[id*='approval-result'] td").shouldBe(CollectionCondition.sizeGreaterThanOrEqual(1), DEFAULT_TIMEOUT).get(0) - .shouldNotHave(Condition.empty, DEFAULT_TIMEOUT); - } - - public ElementsCollection getApprovalResults(int index) { - return $( - "[id$='form:finished-tasks-component:approval-result:1:approval-result-component:approval-result-container:" - + index + ":approval-result-fieldset']").shouldBe(appear, DEFAULT_TIMEOUT).$$("tr.ui-widget-content"); - } -} diff --git a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/ExpressTaskPage.java b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/ExpressTaskPage.java deleted file mode 100644 index 244b840af72..00000000000 --- a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/ExpressTaskPage.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.axonivy.portal.selenium.page; - -import static com.codeborne.selenide.Condition.appear; -import static com.codeborne.selenide.Selenide.$; - -import org.openqa.selenium.By; - -import com.codeborne.selenide.SelenideElement; - -public class ExpressTaskPage extends TemplatePage { - - @Override - protected String getLoadedLocator() { - return ".task-template-container"; - } - - public SelenideElement findExpressTask() { - return $(".js-task-header-container").shouldBe(appear, DEFAULT_TIMEOUT).$("div[id='task-template-title']"); - } - - public void waitForExpressFieldSetDisplay() { - $(".express-fieldset").shouldBe(appear, DEFAULT_TIMEOUT); - } - - public void enterRequiredInputFieldByLabel(String label, String data) { - $(String.format("input[data-p-rmsg*='%s']", label)).shouldBe(appear, DEFAULT_TIMEOUT).sendKeys(data); - } - - public void finish() { - $("[id='form:ok-btn']").shouldBe(getClickableCondition(), DEFAULT_TIMEOUT).click(); - } - - public boolean isDocumentTableVisible() { - return isElementPresent(By.xpath("//div[contains(@id, 'fileUploadComponent:document-table')]")); - } - - public boolean isDocumentUploadButtonVisible() { - return isElementPresent(By.xpath("//div[contains(@id, 'fileUploadComponent:document-upload')]")); - } - - public void clickTaskActionMenu() { - clickByJavaScript($("button[id$='horizontal-task-actions']")); - waitForElementDisplayed(By.cssSelector("[id$=':horizontal-task-action-menu']"), true); - } - - public void clickChatGroup() { - $("a[id$='chat-group']").shouldBe(getClickableCondition(), DEFAULT_TIMEOUT).click(); - } - - public void clickCreateGroupChatBtn() { - waitForElementDisplayed(By.id("chat-assignee-selection-form:chat-group-create-button"), true); - waitForElementClickableThenClick(By.id("chat-assignee-selection-form:chat-group-create-button")); - waitForElementDisplayed(By.id("chat-assignee-selection-form:chat-group-create-button"), false); - } - - public void joinProcessChatAlreadyCreated() { - waitForElementDisplayed(By.id("chat-group-join-form:chat-group-join-button"), true); - waitForElementClickableThenClick($(By.id("chat-group-join-form:chat-group-join-button"))); - waitForElementDisplayed(By.id("chat-form:group-chat-container"), true); - } -} diff --git a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/GlobalSearchResultPage.java b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/GlobalSearchResultPage.java index acc376a1e0b..107dea36275 100644 --- a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/GlobalSearchResultPage.java +++ b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/GlobalSearchResultPage.java @@ -6,18 +6,12 @@ import static com.codeborne.selenide.Selenide.$$; import org.openqa.selenium.By; -import org.openqa.selenium.WebElement; import com.codeborne.selenide.Condition; import com.codeborne.selenide.SelenideElement; public class GlobalSearchResultPage extends TemplatePage { - private final String INFO_EXPRESS_WORKFlOW = "span[id$='info-workflow']"; - private final String EDIT_EXPRESS_WORKFlOW = "a[id$='edit-express-workflow']"; - private final String DELETE_EXPRESS_WORKFlOW = "a[id$='delete-express-workflow']"; - private final String EXPRESS_PROCESS_LOGO = "span[id$='express-process-logo']"; - @Override protected String getLoadedLocator() { return "#search-results-tabview"; @@ -135,56 +129,6 @@ private ProcessWidgetPage getProcessWidget() { return new ProcessWidgetPage("search-results-tabview:process-results"); } - public boolean isInfoWorkflowIcon() { - ProcessWidgetPage processWidget = getProcessWidget(); - if (processWidget.isImageModeActivated()) { - SelenideElement icon = $(".express-workflow").$(".process-image-view-icon"); - return icon.getAttribute("class").contains("si si si-startup-launch"); - } - - WebElement element = findElementByCssSelector(INFO_EXPRESS_WORKFlOW); - return element.getAttribute("class").contains("si-information-circle"); - } - - public boolean isEditExpressWorkflow(String processName) { - ProcessWidgetPage processWidget = getProcessWidget(); - if (processWidget.isImageModeActivated()) { - SelenideElement actionMenu = getImageProcessActionMenuPanel(processName); - SelenideElement icon = actionMenu.$("a[id$=':image-process-action-component:edit-process']"); - return icon != null; - } - SelenideElement element = findElementByCssSelector(EDIT_EXPRESS_WORKFlOW); - return element.getAttribute("class").contains("si-graphic-tablet-drawing-pen"); - } - - private SelenideElement getImageProcessActionMenuPanel(String processName) { - var selectedProcess = $$("span.process-image-view-name").asFixedIterable().stream() - .filter(process -> processName.equalsIgnoreCase(process.getText())).findFirst().orElse(null); - var processActionMenuId = selectedProcess.getAttribute(ID_PROPERTY).replace("process-item-name", ""); - processActionMenuId = processActionMenuId.concat("process-item:image-process-action-component:process-action-menu"); - return findElementByCssSelector(String.format("div[id$='%s']", processActionMenuId)); - } - - public boolean isDeleteExpressWorkflown(String processName) { - ProcessWidgetPage processWidget = getProcessWidget(); - if (processWidget.isImageModeActivated()) { - SelenideElement actionMenu = getImageProcessActionMenuPanel(processName); - SelenideElement icon = actionMenu.$("a[id$=':image-process-action-component:delete-process']"); - return icon != null; - } - SelenideElement element = findElementByCssSelector(DELETE_EXPRESS_WORKFlOW); - return element.getAttribute("class").contains("si-bin-1"); - } - - public boolean isExpressProcessLogo() { - ProcessWidgetPage processWidget = getProcessWidget(); - if (processWidget.isImageModeActivated()) { - return isInfoWorkflowIcon(); - } - SelenideElement element = findElementByCssSelector(EXPRESS_PROCESS_LOGO); - return element.getAttribute("class").contains("si-startup-launch"); - } - public boolean isTaskCategoryColumnDisplayed() { return findElementByCssSelector("span[id$=':task-category-cell']").isDisplayed(); } diff --git a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/ProcessWidgetPage.java b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/ProcessWidgetPage.java index 31fd86824e2..90b12800086 100644 --- a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/ProcessWidgetPage.java +++ b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/ProcessWidgetPage.java @@ -197,14 +197,6 @@ public SelenideElement getFilterTextfield() { return $("[id='process-widget:process-search:non-ajax-keyword-filter']").shouldBe(appear, DEFAULT_TIMEOUT); } - public ExpressProcessPage openExpressPage() { - WaitHelper.waitForNavigation(() -> { - clickByJavaScript( - $("[id='process-widget:create-express-workflow']").shouldBe(getClickableCondition(), DEFAULT_TIMEOUT)); - }); - return new ExpressProcessPage(); - } - public void startProcessByName(String processName) { WaitHelper.waitForNavigation(() -> getProcessItem(processName).$("[id$=':start-button']") .shouldBe(getClickableCondition(), DEFAULT_TIMEOUT).click()); @@ -442,41 +434,4 @@ private void loadLiveSearchTextField() { liveSearchTextField = findElementById(processWidgetId + ":process-search:non-ajax-keyword-filter"); } - public ExpressProcessPage editExpressWF(String wfName) { - int numberOfRefesh = 5; - for (int i = 0; i < numberOfRefesh; i++) { - waitForElementDisplayed(By.id(processWidgetId + ":process-search:non-ajax-keyword-filter"), true); - enterSearchKeyword(wfName); - if (isImageModeActivated()) { - SelenideElement processForm = $("form.image-view-form.is-express"); - var processFormID = processForm.getAttribute("id"); - waitForElementClickableThenClick( - "[id$='" + processFormID + ":image-process-action-component:process-action-button']"); - waitForElementDisplayed(By.cssSelector(".process-action-menu.ui-connected-overlay-enter-done"), true); - if (isElementDisplayed( - By.cssSelector("div[id$='" + processFormID + ":image-process-action-component:process-action-menu']"))) { - SelenideElement actionMenu = - $("div[id$='" + processFormID + ":image-process-action-component:process-action-menu']"); - SelenideElement icon = actionMenu.$("a[id$=':process-item:image-process-action-component:edit-process']"); - icon.click(); - waitForElementDisplayed(By.cssSelector("[id$='process-widget:edit-process-dialog']"), true); - waitForElementClickableThenClick("a[id$='process-widget:edit-process-form:edit-express-workflow']"); - break; - } - } else { - if (isElementDisplayed(By.cssSelector("[id$='edit-express-workflow']"))) { - waitForElementClickableThenClick($("[id$='edit-express-workflow']")); - break; - } - } - - // refresh(); - } - return new ExpressProcessPage(); - } - - public boolean hasCreateNewExpressWorkflowLink() { - return isElementPresent(By.id("process-widget:create-express-workflow")); - } - } diff --git a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/TaskIFrameTemplatePage.java b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/TaskIFrameTemplatePage.java index 81a48ba7e75..5f5bb27f241 100644 --- a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/TaskIFrameTemplatePage.java +++ b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/TaskIFrameTemplatePage.java @@ -86,23 +86,6 @@ public void clickOnStartAdhocLink() { $("div[id$='adhoc-task-reset-confirmation-dialog_content']").shouldBe(appear, DEFAULT_TIMEOUT); } - public void clickAdhocOkButton() { - $("button[id$='start-adhoc-ok-button']").shouldBe(getClickableCondition(), DEFAULT_TIMEOUT).click(); - $("div[id$='adhoc-task-reset-confirmation-dialog_content']").shouldBe(disappear, DEFAULT_TIMEOUT); - } - - public void closeAdhocHistoryDialog() { - $("button[id$='close-adhoc-dialog-button']").shouldBe(getClickableCondition(), DEFAULT_TIMEOUT).click(); - $("div[id$='adhoc-task-history-dialog']").shouldBe(disappear, DEFAULT_TIMEOUT); - } - - public WebElement openAdhocHistoryDialog() { - clickActionButton(); - $("[id='horizontal-task-action-form:show-adhoc-history']").shouldBe(getClickableCondition(), DEFAULT_TIMEOUT) - .click(); - return $("div[id$='adhoc-task-history-dialog']").shouldBe(appear, DEFAULT_TIMEOUT); - } - // moved public void clickChatGroup() { $("a[id$='chat-group']").shouldBe(getClickableCondition(), DEFAULT_TIMEOUT).click(); @@ -270,50 +253,6 @@ public void clickOnCancelButton() { switchBackToParent(); } - public void clickAdhocCreationButton() { - clickTaskActionMenu(); - clickOnStartAdhocLink(); - } - - public boolean isShowAdhocHistoryBtnNotExist() { - String adhocHistoryBtnCSSSelection = "a[id$='show-adhoc-history']"; - return !$(By.cssSelector(adhocHistoryBtnCSSSelection)).exists(); - } - - public boolean isStartAdhocBtnNotExist() { - String startAdhocBtnCSSSelection = "a[id$='start-adhoc']"; - return !$(By.cssSelector(startAdhocBtnCSSSelection)).exists(); - } - - public boolean isAdhocHistoryDialogExistWhenOpenTaskFirstTime() { - return findElementByCssSelector("div[id$='adhoc-task-history-dialog']").isDisplayed(); - } - - public SelenideElement getAdhocHistoryDialog() { - return $("div[id$='adhoc-task-history-dialog']"); - } - - public void clickShowAdhocHistoryBtn() { - waitForElementClickableThenClick("#horizontal-task-actions"); - waitForElementDisplayed(By.cssSelector("a[id$='show-adhoc-history']"), true); - waitForElementClickableThenClick("a[id$='show-adhoc-history']"); - } - - public String getAdhocCreationMessage() { - String adhocCreationMessageCSSSelector = "div[id$='adhoc-creation-message']"; - return findDisplayedElementByCssSelector(adhocCreationMessageCSSSelector).getText(); - } - - public String getTaskNameOfAdhocHistoryRow(int index) { - SelenideElement elem = $$(By.cssSelector(ADHOC_HISTORY_TABLE_CSS_SELECTOR)).get(index); - return elem.findAll(By.xpath("td")).get(2).getText(); - } - - public String getCommentOfAdhocHistoryRow(int index) { - SelenideElement elem = $$(By.cssSelector(ADHOC_HISTORY_TABLE_CSS_SELECTOR)).get(index); - return elem.findAll(By.xpath("td")).get(3).getText(); - } - // moved public void joinProcessChatAlreadyCreated() { waitForElementDisplayed(By.id("chat-group-join-form:chat-group-join-button"), true); diff --git a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/TaskTemplatePage.java b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/TaskTemplatePage.java index d256fbb13ca..68fe0494e92 100644 --- a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/TaskTemplatePage.java +++ b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/TaskTemplatePage.java @@ -75,29 +75,6 @@ public void clickActionButton() { $("div[id$='horizontal-task-action-form:horizontal-task-action-menu']").shouldBe(appear, DEFAULT_TIMEOUT); } - public void clickOnStartAdhocLink() { - $("div[id$='horizontal-task-action-form:horizontal-task-action-menu']").$("a[id$='start-adhoc']") - .shouldBe(getClickableCondition(), DEFAULT_TIMEOUT).click(); - $("div[id$='adhoc-task-reset-confirmation-dialog_content']").shouldBe(appear, DEFAULT_TIMEOUT); - } - - public void clickAdhocOkButton() { - $("button[id$='start-adhoc-ok-button']").shouldBe(getClickableCondition(), DEFAULT_TIMEOUT).click(); - $("div[id$='adhoc-task-reset-confirmation-dialog_content']").shouldBe(disappear, DEFAULT_TIMEOUT); - } - - public void closeAdhocHistoryDialog() { - $("button[id$='close-adhoc-dialog-button']").shouldBe(getClickableCondition(), DEFAULT_TIMEOUT).click(); - $("div[id$='adhoc-task-history-dialog']").shouldBe(disappear, DEFAULT_TIMEOUT); - } - - public WebElement openAdhocHistoryDialog() { - clickActionButton(); - $("[id='horizontal-task-action-form:show-adhoc-history']").shouldBe(getClickableCondition(), DEFAULT_TIMEOUT) - .click(); - return $("div[id$='adhoc-task-history-dialog']").shouldBe(appear, DEFAULT_TIMEOUT); - } - // moved public void clickChatGroup() { $("a[id$='chat-group']").shouldBe(getClickableCondition(), DEFAULT_TIMEOUT).click(); @@ -260,40 +237,6 @@ public void clickOnSubmitButton() { switchBackToParent(); } - public void clickAdhocCreationButton() { - clickTaskActionMenu(); - clickOnStartAdhocLink(); - } - - public boolean isShowAdhocHistoryBtnNotExist() { - String adhocHistoryBtnCSSSelection = "a[id$='show-adhoc-history']"; - return !$(By.cssSelector(adhocHistoryBtnCSSSelection)).exists(); - } - - public boolean isStartAdhocBtnNotExist() { - String startAdhocBtnCSSSelection = "a[id$='start-adhoc']"; - return !$(By.cssSelector(startAdhocBtnCSSSelection)).exists(); - } - - public boolean isAdhocHistoryDialogExistWhenOpenTaskFirstTime() { - return findElementByCssSelector("div[id$='adhoc-task-history-dialog']").isDisplayed(); - } - - public SelenideElement getAdhocHistoryDialog() { - return $("div[id$='adhoc-task-history-dialog']"); - } - - public void clickShowAdhocHistoryBtn() { - waitForElementClickableThenClick("#horizontal-task-actions"); - waitForElementDisplayed(By.cssSelector("a[id$='show-adhoc-history']"), true); - waitForElementClickableThenClick("a[id$='show-adhoc-history']"); - } - - public String getAdhocCreationMessage() { - String adhocCreationMessageCSSSelector = "div[id$='adhoc-creation-message']"; - return findDisplayedElementByCssSelector(adhocCreationMessageCSSSelector).getText(); - } - public String getTaskNameOfAdhocHistoryRow(int index) { SelenideElement elem = $$(By.cssSelector(ADHOC_HISTORY_TABLE_CSS_SELECTOR)).get(index); return elem.findAll(By.xpath("td")).get(2).getText(); diff --git a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/TaskWidgetPage.java b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/TaskWidgetPage.java index fccd263b443..382cfceff9e 100644 --- a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/TaskWidgetPage.java +++ b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/TaskWidgetPage.java @@ -372,12 +372,6 @@ public boolean isActionLinkEnable() { return !$(".action-link").getAttribute("class").contains("ui-state-disabled"); } - public ExpressTaskPage startExpressTask(int index) { - waitTaskAppearThenClick(index); - $(By.id(TASK_ACTION)).shouldBe(appear, DEFAULT_TIMEOUT); - return new ExpressTaskPage(); - } - public TaskIFrameTemplatePage startTaskIFrame(int index) { waitTaskAppearThenClick(index); $(By.id(TASK_ACTION)).shouldBe(appear, DEFAULT_TIMEOUT); diff --git a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/UserTaskWithMailFormPage.java b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/UserTaskWithMailFormPage.java deleted file mode 100644 index 70cfefaa09d..00000000000 --- a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/UserTaskWithMailFormPage.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.axonivy.portal.selenium.page; - -import static com.codeborne.selenide.Condition.appear; -import static com.codeborne.selenide.Selenide.$; - -import org.openqa.selenium.JavascriptExecutor; - -import com.codeborne.selenide.WebDriverRunner; - -public class UserTaskWithMailFormPage extends TemplatePage { - - @Override - protected String getLoadedLocator() { - return "[id='task-form']"; - } - - public void selectEmailTab() { - $("a[href*='mail-tab']").shouldBe(getClickableCondition(), DEFAULT_TIMEOUT).click(); - $("div[id$='information-email:email-content_editor']").shouldBe(appear, DEFAULT_TIMEOUT); - } - - public void inputData(String recipient, String subject, String content) { - inputRecipient(recipient); - inputSubject(subject); - inputContent(content); - } - - private void inputRecipient(String recipient) { - $("[id='task-form:task-view:information-email:email-recipients']").shouldBe(appear, DEFAULT_TIMEOUT) - .sendKeys(recipient); - } - - private void inputSubject(String content) { - $("[id='task-form:task-view:information-email:email-subject']").shouldBe(appear, DEFAULT_TIMEOUT).sendKeys(content); - } - - private void inputContent(String content) { - JavascriptExecutor jse = (JavascriptExecutor) WebDriverRunner.getWebDriver(); - jse.executeScript( - "document.querySelector(\"input[name='task-form:task-view:information-email:email-content_input'\").value='" - + content + "';"); - } - - public void finish() { - $("[id='task-form:ok-btn']").shouldBe(getClickableCondition(), DEFAULT_TIMEOUT).click(); - } -} diff --git a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/ChatTest.java b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/ChatTest.java index c64ec90b423..307f5f103f1 100644 --- a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/ChatTest.java +++ b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/ChatTest.java @@ -17,7 +17,7 @@ import com.axonivy.portal.selenium.page.NewDashboardPage; import com.axonivy.portal.selenium.page.TaskWidgetPage; -import ch.ivyteam.ivy.project.portal.test.ExpressResponsible; +import ch.ivyteam.ivy.project.portal.test.Responsible; @IvyWebTest public class ChatTest extends BaseTest { @@ -39,7 +39,7 @@ public void setup() { @Test public void chatAddGroup() { - ExpressResponsible chatUser1 = setExpressResponsible(TestAccount.ADMIN_USER.getUsername(), false); + Responsible chatUser1 = setResponsible(TestAccount.ADMIN_USER.getUsername(), false); ChatPage chatPage = enableChatGroup(); createChatGroup(TestAccount.DEMO_USER); joinChatGroupWhichAlreadyHadChatGroup(TestAccount.ADMIN_USER); @@ -52,7 +52,7 @@ public void chatAddGroup() { openNewTabOrWindow(WindowType.WINDOW); launchBrowserAndGotoRelativeLink(NewDashboardPage.PORTAL_HOME_PAGE_URL); - ExpressResponsible chatGroupEveryBody = setExpressResponsible("Everybody", true); + Responsible chatGroupEveryBody = setResponsible("Everybody", true); createChatGroup(TestAccount.GUEST_USER, chatUser1, chatGroupEveryBody); login(TestAccount.ADMIN_USER); @@ -121,7 +121,7 @@ public void joinChatGroupAlreadyCreated() { new NewDashboardPage().getChat().isNotificationContactChat(); } - private ChatPage createChatGroup(TestAccount creatorChatGroup, ExpressResponsible... participants) { + private ChatPage createChatGroup(TestAccount creatorChatGroup, Responsible... participants) { redirectToRelativeLink(createTestingCaseUrlForDefaultAdditionalCaseDetails); login(creatorChatGroup); redirectToRelativeLink(NewDashboardPage.PORTAL_HOME_PAGE_URL); diff --git a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/DisabledUserTest.java b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/DisabledUserTest.java index 150cf46e5cc..1f91436141e 100644 --- a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/DisabledUserTest.java +++ b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/DisabledUserTest.java @@ -9,17 +9,12 @@ import com.axonivy.ivy.webtest.IvyWebTest; import com.axonivy.portal.selenium.common.BaseTest; -import com.axonivy.portal.selenium.common.FileHelper; import com.axonivy.portal.selenium.common.NavigationHelper; import com.axonivy.portal.selenium.common.TestAccount; import com.axonivy.portal.selenium.common.WaitHelper; import com.axonivy.portal.selenium.page.AbsencePage; -import com.axonivy.portal.selenium.page.AdminSettingsPage; import com.axonivy.portal.selenium.page.CaseWidgetPage; -import com.axonivy.portal.selenium.page.ExpressManagementPage; -import com.axonivy.portal.selenium.page.ExpressProcessPage; import com.axonivy.portal.selenium.page.NewDashboardPage; -import com.axonivy.portal.selenium.page.ProcessWidgetPage; import com.axonivy.portal.selenium.page.TaskWidgetPage; import com.codeborne.selenide.Condition; @@ -71,24 +66,6 @@ public void testFilterByDisabledUserInCaseCreatorFilter() { } - @Test - public void testExpressWfWithDisabledUser() { - redirectToNewDashBoard(); - AdminSettingsPage adminSettingsPage = new NewDashboardPage().openAdminSettings(); - ExpressManagementPage expressManagementPage = adminSettingsPage.openExpressManagementTab(); - expressManagementPage.openImportDialog(); - expressManagementPage.selectJSONFile(FileHelper.getAbsolutePathToTestFile("express-wf-with-disabled-user.json")); - expressManagementPage.clickOnDeployExpress(); - redirectToRelativeLink(NewDashboardPage.PORTAL_HOME_PAGE_URL); - new NewDashboardPage().waitPageLoaded(); - ProcessWidgetPage processPage = NavigationHelper.navigateToProcessList(); - ExpressProcessPage expressPage = processPage.editExpressWF("Test disabled user"); - assertEquals("Test disabled user", expressPage.getProcessName()); - assertTrue(expressPage.getProcessOwnerNames().contains(DISABLED_VISIBILITY_USER_BRIEF_DISPLAY_NAME)); - assertTrue(expressPage.getAbleToStartNames().contains(DISABLED_VISIBILITY_USER_BRIEF_DISPLAY_NAME)); - assertTrue(expressPage.getResponsiblesOfTask(1).contains(DISABLED_VISIBILITY_USER_BRIEF_DISPLAY_NAME)); - } - @Test public void testAbsenceWithDisabledUser() { redirectToRelativeLink(cleanUpAbsencesAndSubstituesLink); diff --git a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/GlobalGrowlTest.java b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/GlobalGrowlTest.java index 37bfdd3e90f..3b11fd25604 100644 --- a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/GlobalGrowlTest.java +++ b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/GlobalGrowlTest.java @@ -2,35 +2,23 @@ import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; -import java.util.Arrays; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.openqa.selenium.Dimension; import com.axonivy.ivy.webtest.IvyWebTest; import com.axonivy.portal.selenium.common.BaseTest; import com.axonivy.portal.selenium.common.DateTimePattern; import com.axonivy.portal.selenium.common.NavigationHelper; -import com.axonivy.portal.selenium.common.ScreenshotUtils; import com.axonivy.portal.selenium.common.TestAccount; import com.axonivy.portal.selenium.common.WaitHelper; -import com.axonivy.portal.selenium.page.ExpressFormDefinitionPage; -import com.axonivy.portal.selenium.page.ExpressProcessPage; import com.axonivy.portal.selenium.page.GlobalGrowlIframeTemplatePage; -import com.axonivy.portal.selenium.page.MainMenuPage; import com.axonivy.portal.selenium.page.NewDashboardPage; -import com.axonivy.portal.selenium.page.SearchResultPage; import com.axonivy.portal.selenium.page.TaskIFrameTemplatePage; import com.axonivy.portal.selenium.page.TaskWidgetPage; import com.axonivy.portal.selenium.page.TemplatePage; -import com.axonivy.portal.selenium.page.TemplatePage.GlobalSearch; -import com.axonivy.portal.selenium.page.WorkingTaskDialogPage; -import com.axonivy.portal.selenium.page.WorkingTaskDialogPageOfApplicationMenu; import com.codeborne.selenide.Condition; -import ch.ivyteam.ivy.project.portal.test.ExpressResponsible; - @IvyWebTest public class GlobalGrowlTest extends BaseTest { @@ -103,92 +91,6 @@ public void waitForTemplateRender() { WaitHelper.waitForPresenceOfElementLocatedInFrame("[class$='task-template-container']"); } - @Test - public void testSaveExpressFormDefinition() { - redirectToRelativeLink(expressStartLink); - ExpressProcessPage expressProcessPage = new ExpressProcessPage(); - expressProcessPage.fillProcessProperties(false, true, "Test approval", "Test description"); - ExpressFormDefinitionPage formDefinition = configureExpressProcess(expressProcessPage); - NewDashboardPage newDashboardPage = formDefinition.save(); - assertGrowlMessage(newDashboardPage, FINISH_MESSAGE_WITH_DETAILS); - } - - @Test - public void testFinishExpressFormDefinition() { - redirectToRelativeLink(expressStartLink); - ExpressProcessPage expressProcessPage = new ExpressProcessPage(); - expressProcessPage.fillProcessProperties(false, true, "Test approval1", "Test description"); - ExpressFormDefinitionPage formDefinition = configureExpressProcess(expressProcessPage); - formDefinition.finishWorkflow(); - NewDashboardPage newDashboardPage = new NewDashboardPage(); - assertGrowlMessage(newDashboardPage, FINISH_MESSAGE); - } - - @Test - public void testTaskLeft() { - leftTaskWhenClickingOnLogo(); - leftTaskWhenClickingOnMenu(); - leftTaskWhenGlobalSearch(); - leftExpressWorkflowDefinition(); - leftExpressFormDefinition(); - } - - private ExpressFormDefinitionPage configureExpressProcess(ExpressProcessPage expressProcessPage) { - ExpressResponsible responsible = setExpressResponsible(TestAccount.DEMO_USER.getUsername(), false); - expressProcessPage.createTask(0, 0, "Task 1", "Task 1 description", Arrays.asList(responsible)); - ExpressFormDefinitionPage formDefinition = expressProcessPage.goToFormDefinition(); - ScreenshotUtils.resizeBrowser(new Dimension(2560, 1440)); - formDefinition.createTextInputField("Input Text", 0, false); - formDefinition.countElementPrepareToDrag(1); - formDefinition.moveAllElementToDragAndDrogPanel(); - formDefinition.countElementPrepareToDrag(0); - return formDefinition; - } - - private void leftExpressWorkflowDefinition() { - redirectToRelativeLink(expressStartLink); - ExpressProcessPage expressProcessPage = new ExpressProcessPage(); - NewDashboardPage newDashboardPage = expressProcessPage.cancelWorkflowDefinition(); - assertGrowlMessage(newDashboardPage, CANCEL_MESSAGE); - } - - private void leftTaskWhenGlobalSearch() { - redirectToRelativeLink(expressStartLink); - ExpressProcessPage expressProcessPage = new ExpressProcessPage(); - GlobalSearch globalSearch = expressProcessPage.getGlobalSearch(); - SearchResultPage searchResultPage = globalSearch.inputSearchKeywordForWorkingTask("a"); - assertGrowlMessage(searchResultPage, CANCEL_MESSAGE); - } - - private void leftTaskWhenClickingOnMenu() { - redirectToRelativeLink(expressStartLink); - ExpressProcessPage expressProcessPage = new ExpressProcessPage(); - MainMenuPage mainMenuPage = expressProcessPage.openMainMenu(); - WorkingTaskDialogPageOfApplicationMenu leaveTaskDialogOfMenu = mainMenuPage.selectDashboardMenu(); - NewDashboardPage newDashboardPage = leaveTaskDialogOfMenu.leaveTask(); - assertGrowlMessage(newDashboardPage, CANCEL_MESSAGE); - } - - private void leftTaskWhenClickingOnLogo() { - redirectToRelativeLink(expressStartLink); - ExpressProcessPage expressProcessPage = new ExpressProcessPage(); - expressProcessPage.clickOnLogo(); - WorkingTaskDialogPage dialogPage = new WorkingTaskDialogPage(); - NewDashboardPage newDashboardPage = dialogPage.leaveTask(); - assertGrowlMessage(newDashboardPage, CANCEL_MESSAGE); - } - - private void leftExpressFormDefinition() { - redirectToRelativeLink(expressStartLink); - ExpressProcessPage expressProcessPage = new ExpressProcessPage(); - expressProcessPage.fillProcessProperties(true, true, "Test approval", "Test description"); - expressProcessPage.createTask(0, 0, "Task 1", "Task 1 description", - Arrays.asList(setExpressResponsible(TestAccount.DEMO_USER.getUsername(), false))); - ExpressFormDefinitionPage expressFormDefinitionPage = expressProcessPage.goToFormDefinition(); - NewDashboardPage newDashboardPage = expressFormDefinitionPage.cancel(); - assertGrowlMessage(newDashboardPage, CANCEL_MESSAGE); - } - private void assertGrowlMessage(TemplatePage templatePage, String message) { templatePage.getGlobalGrowlMessage().shouldBe(Condition.text(message)); } diff --git a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/ProcessViewerTest.java b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/ProcessViewerTest.java index d761564d169..2d7c9197aa3 100644 --- a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/ProcessViewerTest.java +++ b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/ProcessViewerTest.java @@ -6,14 +6,12 @@ import com.axonivy.ivy.webtest.IvyWebTest; import com.axonivy.portal.selenium.common.BaseTest; import com.axonivy.portal.selenium.common.NavigationHelper; -import com.axonivy.portal.selenium.common.TestAccount; import com.axonivy.portal.selenium.common.WaitHelper; import com.axonivy.portal.selenium.page.CaseWidgetPage; import com.axonivy.portal.selenium.page.NewDashboardPage; import com.axonivy.portal.selenium.page.ProcessViewerPage; import com.axonivy.portal.selenium.page.TaskWidgetPage; import com.axonivy.portal.selenium.page.component.ProcessViewerComponentPage; -import com.axonivy.portal.selenium.test.express.ExpressManagementTest; @IvyWebTest public class ProcessViewerTest extends BaseTest { @@ -109,24 +107,6 @@ public void testNotShowProcessViewerForTechnicalCase() { assertTrue(!detailPageSteps.contains(PROCESS_VIEWER), PROCESS_VIEWER_IS_FOUND_ON_CASE_DETAILS_PAGE); } - @Test - public void testNotShowProcessViewerForExpressCase() { - login(TestAccount.ADMIN_USER); - var expressManagementTest = new ExpressManagementTest(); - expressManagementTest.prepareExpressWorkflowStep(); - expressManagementTest.executePromoteResourceTask(); - redirectToRelativeLink(NewDashboardPage.PORTAL_HOME_PAGE_URL); - gotoCaseList(); - caseWidgetPage.openActionStepMenu(); - var steps = caseWidgetPage.getAvailableActionSteps(); - assertTrue(!steps.contains(PROCESS_VIEWER), PROCESS_VIEWER_IS_FOUND_IN_CASE_LIST); - - var caseDetailsPage = caseWidgetPage.openDetailsOfCaseHasName("Request new Resources - Express process"); - caseDetailsPage.openActionMenu(); - var detailPageSteps = caseDetailsPage.getAvailableActionSteps(); - assertTrue(!detailPageSteps.contains(PROCESS_VIEWER), PROCESS_VIEWER_IS_FOUND_ON_CASE_DETAILS_PAGE); - } - @Test public void testCanSeeProcessViewerInTaskAction() { createTestingTasks(); diff --git a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/UserMenuConfigurationTest.java b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/UserMenuConfigurationTest.java index 77c932bc854..34fe41e61b4 100644 --- a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/UserMenuConfigurationTest.java +++ b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/UserMenuConfigurationTest.java @@ -6,7 +6,6 @@ import com.axonivy.ivy.webtest.IvyWebTest; import com.axonivy.portal.selenium.common.BaseTest; import com.axonivy.portal.selenium.common.TestAccount; -import com.axonivy.portal.selenium.page.ExpressTaskPage; import com.axonivy.portal.selenium.page.MainMenuPage; import com.axonivy.portal.selenium.page.NewDashboardPage; import com.axonivy.portal.selenium.page.TaskTemplatePage; @@ -52,18 +51,4 @@ public void testUserMenuIvyProcessStarts() { templatePage.switchToIFrameOfTask(); templatePage.getElementInPortalIFramTask("[id$=':investment-table']").shouldBe(Condition.appear); } - - @Test - public void testUserMenuPortalExpressProcess() { - login(TestAccount.ADMIN_USER); - createJSonFile("custom-user-menu.json", PortalVariable.USER_MENU.key); - createJSonFile("custom-express.json", PortalVariable.EXPRESS_PROCESS.key); - newDashboardPage.waitForAbsencesGrowlMessageDisplay(); - mainMenuPage.openUserSettingMenu(); - UserMenuPage userMenu = new UserMenuPage(); - userMenu.findMenu("Portal Express process").shouldBe(Condition.appear); - userMenu.accessMenu("Portal Express process"); - ExpressTaskPage expressTaskPage = new ExpressTaskPage(); - expressTaskPage.findExpressTask().shouldHave(Condition.text("Express user task")); - } } diff --git a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/caze/CaseDetailsTest.java b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/caze/CaseDetailsTest.java index 37c049e9950..35cfef391fd 100644 --- a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/caze/CaseDetailsTest.java +++ b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/caze/CaseDetailsTest.java @@ -25,7 +25,6 @@ import com.axonivy.portal.selenium.page.AdditionalCaseDetailsPage; import com.axonivy.portal.selenium.page.CaseDetailsPage; import com.axonivy.portal.selenium.page.CaseWidgetPage; -import com.axonivy.portal.selenium.page.ExpressProcessPage; import com.axonivy.portal.selenium.page.MainMenuPage; import com.axonivy.portal.selenium.page.NewDashboardPage; import com.axonivy.portal.selenium.page.NoteHistoryPage; @@ -369,15 +368,6 @@ public void testRelatedTaskOpenWorkflowEvents() { WaitHelper.assertTrueWithWait(() -> detailsPage.isRelatedTaskWorkflowEventsOpened()); } - @Test - public void testRelatedTaskAddAdHocTask() { - createTestingTask(); - detailsPage.clickRelatedTaskActionButton(SICK_LEAVE_REQUEST_TASK); - ExpressProcessPage expressProcessPage = - detailsPage.addAdHocTask(detailsPage.getTaskRowIndex(SICK_LEAVE_REQUEST_TASK)); - assertTrue(expressProcessPage.getProcessName().endsWith(SICK_LEAVE_REQUEST_TASK)); - } - @Test public void testRelatedTaskExportToExcel() { createTestingTask(); diff --git a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/express/AdhocExpressTest.java b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/express/AdhocExpressTest.java deleted file mode 100644 index b542ed42fcf..00000000000 --- a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/express/AdhocExpressTest.java +++ /dev/null @@ -1,116 +0,0 @@ -package com.axonivy.portal.selenium.test.express; - -import java.util.Arrays; -import java.util.List; - -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; - -import com.axonivy.ivy.webtest.IvyWebTest; -import com.axonivy.portal.selenium.common.BaseTest; -import com.axonivy.portal.selenium.common.NavigationHelper; -import com.axonivy.portal.selenium.common.TestAccount; -import com.axonivy.portal.selenium.page.DefaultExpresTaskPage; -import com.axonivy.portal.selenium.page.ExpressProcessPage; -import com.axonivy.portal.selenium.page.TaskIFrameTemplatePage; -import com.axonivy.portal.selenium.page.TaskWidgetPage; -import com.axonivy.portal.selenium.page.WorkingTaskDialogPage; -import com.codeborne.selenide.CollectionCondition; -import com.codeborne.selenide.Condition; - -import ch.ivyteam.ivy.project.portal.test.ExpressResponsible; - -@IvyWebTest -public class AdhocExpressTest extends BaseTest { - - @Override - @BeforeEach - public void setup() { - super.setup(); - redirectToRelativeLink(createTestingTasksUrl); - } - - @Test - public void testAddAdhocForTask() { - String taskNamePrefix = "Maternity"; - String defaultTaskName1 = "Task 1"; - String defaultTaskName2 = "Task 2"; - String defaultTaskComment1 = "good"; - String defaultTaskComment2 = "it's okay"; - - // check if task Maternity exists - TaskWidgetPage taskWidgetPage = NavigationHelper.navigateToTaskList(); - taskWidgetPage.filterTasksInExpandedModeBy(taskNamePrefix, 1); - taskWidgetPage.countTasks().shouldHave(CollectionCondition.size(1)); - String taskId = taskWidgetPage.getTaskId(); - TaskIFrameTemplatePage taskTemplatePage = taskWidgetPage.startTaskIFrame(0); - - // create adhoc from Maternity task - assertEquals(true, taskTemplatePage.isShowAdhocHistoryBtnNotExist()); - taskTemplatePage.clickAdhocCreationButton(); - assertEquals("You may lose your work in progress and start the Ad-hoc process. Do you want to continue?", - taskTemplatePage.getAdhocCreationMessage()); - taskTemplatePage.clickAdhocOkButton(); - - // create tasks in adhoc page - ExpressProcessPage expressPage = new ExpressProcessPage(); - String processName = expressPage.getProcessName(); - assertTrue(processName.startsWith(String.format("AdHoc Process for Task %s -", taskId))); - ExpressResponsible responsible = setExpressResponsible(TestAccount.DEMO_USER.getUsername(), false); - - List responsibles = Arrays.asList(responsible); - expressPage.createDefaultTask(0, defaultTaskName1, responsibles); - expressPage.addNewTask(0); - expressPage.createDefaultTask(1, defaultTaskName2, responsibles); - expressPage.executeDirectly(); - - // first task of adhoc - DefaultExpresTaskPage defaultExpressTaskPage = new DefaultExpresTaskPage(); - defaultExpressTaskPage.enterTextToDefaultTask(defaultTaskComment1); - defaultExpressTaskPage.finishDefaultTask(); - - // approval task of adhoc - taskWidgetPage = NavigationHelper.navigateToTaskList(); - taskWidgetPage.filterTasksInExpandedModeBy(defaultTaskName2, 1); - taskWidgetPage.countTasks().shouldHave(CollectionCondition.size(1)); - taskWidgetPage.startTask(0); - defaultExpressTaskPage = new DefaultExpresTaskPage(); - defaultExpressTaskPage.enterTextToDefaultTask(defaultTaskComment2); - defaultExpressTaskPage.finishDefaultTask(); - new TaskWidgetPage(); - - // check if task Maternity task - taskWidgetPage = NavigationHelper.navigateToTaskList(); - taskWidgetPage.filterTasksInExpandedModeBy(taskNamePrefix, 1); - taskWidgetPage.countTasks().shouldHave(CollectionCondition.size(1)); - taskWidgetPage.startTask(0); - - // check adhoc history - assertEquals(true, taskTemplatePage.isAdhocHistoryDialogExistWhenOpenTaskFirstTime()); - assertEquals(defaultTaskName2, taskTemplatePage.getTaskNameOfAdhocHistoryRow(0)); - assertEquals(defaultTaskComment2, taskTemplatePage.getCommentOfAdhocHistoryRow(0)); - assertEquals(defaultTaskName1, taskTemplatePage.getTaskNameOfAdhocHistoryRow(1)); - assertEquals(defaultTaskComment1, taskTemplatePage.getCommentOfAdhocHistoryRow(1)); - - // open again by clicking adhoc dialog icon - taskTemplatePage.closeAdhocHistoryDialog(); - taskTemplatePage.clickShowAdhocHistoryBtn(); - taskTemplatePage.getAdhocHistoryDialog().shouldBe(Condition.appear, DEFAULT_TIMEOUT); - taskTemplatePage.closeAdhocHistoryDialog(); - - // open Maternity task again and make sure adhoc history dialog doesn't appear - taskTemplatePage.clickOnLogo(); - WorkingTaskDialogPage dialogPage = new WorkingTaskDialogPage(); - dialogPage.leaveTask(); - taskWidgetPage = NavigationHelper.navigateToTaskList(); - taskTemplatePage = taskWidgetPage.startTaskIFrame(0); - - taskTemplatePage.getAdhocHistoryDialog().shouldBe(Condition.disappear, DEFAULT_TIMEOUT); - - // click adhoc creation button and check warning message - taskTemplatePage.clickAdhocCreationButton(); - assertEquals("There is already an adhoc process for this task, do you want to create another one?", - taskTemplatePage.getAdhocCreationMessage()); - } - -} diff --git a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/express/ExpressManagementTest.java b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/express/ExpressManagementTest.java deleted file mode 100644 index 996f3a0fa1d..00000000000 --- a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/express/ExpressManagementTest.java +++ /dev/null @@ -1,152 +0,0 @@ -package com.axonivy.portal.selenium.test.express; - -import java.io.UnsupportedEncodingException; -import java.net.URLEncoder; -import java.time.Duration; -import java.util.Arrays; - -import org.junit.jupiter.api.BeforeEach; -import org.openqa.selenium.support.ui.WebDriverWait; - -import com.axonivy.ivy.webtest.IvyWebTest; -import com.axonivy.portal.selenium.common.BaseTest; -import com.axonivy.portal.selenium.common.FileHelper; -import com.axonivy.portal.selenium.common.NavigationHelper; -import com.axonivy.portal.selenium.common.TestAccount; -import com.axonivy.portal.selenium.page.CaseDetailsPage; -import com.axonivy.portal.selenium.page.CaseWidgetPage; -import com.axonivy.portal.selenium.page.ExpressApprovalPage; -import com.axonivy.portal.selenium.page.ExpressReviewPage; -import com.axonivy.portal.selenium.page.ExpressTaskPage; -import com.axonivy.portal.selenium.page.NewDashboardPage; -import com.axonivy.portal.selenium.page.ProcessWidgetPage; -import com.axonivy.portal.selenium.page.TaskWidgetPage; -import com.axonivy.portal.selenium.page.UserTaskWithMailFormPage; -import com.codeborne.selenide.WebDriverRunner; - -@IvyWebTest -public class ExpressManagementTest extends BaseTest { - - public static final String REQUEST_NEW_RESOURCE_PROCESS = "Request new Resources - Express process"; - public static final String FIRST_COMMENT = "This is great news"; - public static final String SECOND_COMMENT = "I totally agree"; - - private NewDashboardPage newDashboardPage; - private ProcessWidgetPage processWidget; - private TaskWidgetPage taskWidgetPage; - - @Override - @BeforeEach - public void setup() { - super.setup(); - login(TestAccount.ADMIN_USER); - this.newDashboardPage = new NewDashboardPage(); - } - - public void prepareExpressWorkflowStep() { - try { - importExpressFile(FileHelper.getAbsolutePathToTestFile("express-wf-request-resource.json")); - } catch (UnsupportedEncodingException e) { - e.printStackTrace(); - } - startExpressHelperProcess(REQUEST_NEW_RESOURCE_PROCESS); - } - - private void importExpressFile(String pathName) throws UnsupportedEncodingException { - String filepath = URLEncoder.encode(pathName, "UTF-8"); - redirectToRelativeLink( - "PortalKitTestHelper/153CACC26D0D4C3D/createSampleExpressWorkflowProcess.ivp?filePath=" + filepath); - } - - private void startExpressHelperProcess(String processName) { - newDashboardPage = new NewDashboardPage(); - processWidget = NavigationHelper.navigateToProcessList(); - assertTrue(processWidget.isExpandedMode()); - processWidget.enterSearchKeyword(processName); - new WebDriverWait(WebDriverRunner.getWebDriver(), Duration.ofSeconds(30)) - .until((driver) -> processWidget.isProcessDisplay(processName)); - processWidget.startProcess(processName); - } - - public void openAdditionalBusinessPage(String caseName) { - redirectToRelativeLink(NewDashboardPage.PORTAL_HOME_PAGE_URL); - newDashboardPage = new NewDashboardPage(); - CaseWidgetPage caseWidgetPage = newDashboardPage.openCaseList(); - CaseDetailsPage caseDetailsPage = caseWidgetPage.openCaseDetailsFromActionMenuByCaseName(caseName); - caseDetailsPage.openActionMenu(); - caseDetailsPage.openAdditionalCaseDetailsPage(); - new WebDriverWait(WebDriverRunner.getWebDriver(), Duration.ofSeconds(30)) - .until((driver) -> newDashboardPage.countBrowserTab() > 1); - newDashboardPage.switchLastBrowserTab(); - } - - public void completeExpressWorkflowTasks(String firstComment, String secondComment) { - executePromoteResourceTask(); - // Filter open Task - gotoTaskList(); - taskWidgetPage.clickOnTaskStatesAndApply(Arrays.asList("Suspended")); - executeSendEmailTask(); - executeReviewTask(); - taskWidgetPage.resetFilter(); - taskWidgetPage.clickOnTaskStatesAndApply(Arrays.asList("Suspended")); - executeApprovalTask(firstComment); - executeApprovalTask(secondComment); - executeFinalReviewTask(); - } - - private void gotoTaskList() { - newDashboardPage = new NewDashboardPage(); - taskWidgetPage = NavigationHelper.navigateToTaskList(); - } - - private void executeFinalReviewTask() { - taskWidgetPage = new TaskWidgetPage(); - taskWidgetPage.clickOnStartTaskLink(0); - ExpressReviewPage expressReview = new ExpressReviewPage(); - expressReview.finish(); - redirectToRelativeLink(NewDashboardPage.PORTAL_HOME_PAGE_URL); - } - - private void executeApprovalTask(String comment) { - taskWidgetPage = new TaskWidgetPage(); - taskWidgetPage.clickOnStartTaskLink(0); - ExpressApprovalPage expressApproval = new ExpressApprovalPage(); - expressApproval.waitForCommentContainerDisplay(); - expressApproval.comment(comment); - expressApproval.clickOnApprove(); - } - - private void executeReviewTask() { - taskWidgetPage = new TaskWidgetPage(); - taskWidgetPage.clickOnStartTaskLink(0); - ExpressTaskPage expressTaskPage = new ExpressTaskPage(); - expressTaskPage.waitForExpressFieldSetDisplay(); - expressTaskPage.enterRequiredInputFieldByLabel("Comment", "Mr.David to axon"); - expressTaskPage.finish(); - } - - private void executeSendEmailTask() { - taskWidgetPage.clickOnStartTaskLink(0); - ExpressTaskPage expressTaskPage = new ExpressTaskPage(); - expressTaskPage.waitForExpressFieldSetDisplay(); - expressTaskPage.enterRequiredInputFieldByLabel("Welcome", "Welcome Mr.David to axon"); - - UserTaskWithMailFormPage userTaskWithMail = new UserTaskWithMailFormPage(); - userTaskWithMail.selectEmailTab(); - userTaskWithMail.inputData("hr@email.com", "Please review this applicant", "Hello HR team, please proceed."); - userTaskWithMail.finish(); - taskWidgetPage = new TaskWidgetPage(); - taskWidgetPage.filterTasksInExpandedModeBy("HR", 1); - taskWidgetPage.waitForActionGroupDisplay(); - } - - public void executePromoteResourceTask() { - ExpressTaskPage expressTaskPage = new ExpressTaskPage(); - expressTaskPage.waitForExpressFieldSetDisplay(); - expressTaskPage.enterRequiredInputFieldByLabel("Applicant name", "David Rafi"); - expressTaskPage.enterRequiredInputFieldByLabel("Email", "David@email.com"); - expressTaskPage.enterRequiredInputFieldByLabel("Address", "39b Truong Son, Tan Binh"); - expressTaskPage.finish(); - } - -} diff --git a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/express/ExpressTest.java b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/express/ExpressTest.java deleted file mode 100644 index 6635c4aaaf4..00000000000 --- a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/express/ExpressTest.java +++ /dev/null @@ -1,147 +0,0 @@ -package com.axonivy.portal.selenium.test.express; - -import java.util.Arrays; - -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; - -import com.axonivy.ivy.webtest.IvyWebTest; -import com.axonivy.portal.selenium.common.BaseTest; -import com.axonivy.portal.selenium.common.NavigationHelper; -import com.axonivy.portal.selenium.common.TestAccount; -import com.axonivy.portal.selenium.page.ExpressApprovalPage; -import com.axonivy.portal.selenium.page.ExpressEndPage; -import com.axonivy.portal.selenium.page.ExpressFormDefinitionPage; -import com.axonivy.portal.selenium.page.ExpressProcessPage; -import com.axonivy.portal.selenium.page.ExpressReviewPage; -import com.axonivy.portal.selenium.page.ExpressTaskPage; -import com.axonivy.portal.selenium.page.NewDashboardPage; -import com.axonivy.portal.selenium.page.TaskWidgetPage; -import com.codeborne.selenide.ElementsCollection; - -import ch.ivyteam.ivy.project.portal.test.ExpressResponsible; - -@IvyWebTest -public class ExpressTest extends BaseTest { - private static final int USER_TASK_INDEX = 0; - private static final int APPROVAL_INDEX = 3; - - private static final int INPUT_TEXT_TYPE_INDEX = 0; - private static final int INPUT_NUMBER_TYPE_INDEX = 1; - - private NewDashboardPage newDashboardPage; - private TaskWidgetPage taskWidgetPage; - ExpressResponsible responsible1 = setExpressResponsible(TestAccount.ADMIN_USER.getUsername(), false); - - @Override - @BeforeEach - public void setup() { - super.setup(); - newDashboardPage = new NewDashboardPage(); - } - - @Test - public void testAdhocMultiApprovalWhenMultiTask() { - goToExpressCreationPage(); - ExpressProcessPage expressProcessPage = new ExpressProcessPage(); - expressProcessPage.fillProcessProperties(true, true, "Test approval", "Test description"); - ExpressFormDefinitionPage formDefinition = configureExpressProcessWhenMultiApproval(expressProcessPage); - formDefinition.executeWorkflow(); - executeExpressProcessWhenMultiApproval(); - } - - @Test - public void testBreadCrumb() { - goToExpressCreationPage(); - ExpressProcessPage expressProcessPage = new ExpressProcessPage(); - assertEquals("Express Workflow", expressProcessPage.getTextOfCurrentBreadcrumb()); - - expressProcessPage.fillProcessProperties(true, true, "Test approval", "Test description"); - ExpressResponsible responsible1 = setExpressResponsible(TestAccount.ADMIN_USER.getUsername(), false); - expressProcessPage.createTask(0, USER_TASK_INDEX, "Task 1", "Task 1 description", Arrays.asList(responsible1)); - ExpressFormDefinitionPage formDefinition = expressProcessPage.goToFormDefinition(); - assertEquals("Express Workflow", formDefinition.getTextOfCurrentBreadcrumb()); - - newDashboardPage = formDefinition.goToHomeFromBreadcrumbWithWarning(); - assertEquals(true, newDashboardPage.isDisplayed()); - } - - private ExpressFormDefinitionPage configureExpressProcessWhenMultiApproval(ExpressProcessPage expressProcessPage) { - ExpressResponsible responsible1 = setExpressResponsible(TestAccount.ADMIN_USER.getUsername(), false); - ExpressResponsible responsible2 = setExpressResponsible(TestAccount.DEMO_USER.getUsername(), false); - - expressProcessPage.createTask(0, USER_TASK_INDEX, "Task 1", "Task 1 description", - Arrays.asList(responsible1, responsible2)); - - expressProcessPage.addNewTask(0); - expressProcessPage.createTask(1, APPROVAL_INDEX, "Task 2", "Task 2 description", Arrays.asList(responsible2)); - - expressProcessPage.addNewTask(1); - expressProcessPage.createTask(2, APPROVAL_INDEX, "Task 3", "Task 3 description", - Arrays.asList(responsible1, responsible2)); - ExpressFormDefinitionPage formDefinition = expressProcessPage.goToFormDefinition(); - formDefinition.createTextInputField("Input Text 1", INPUT_TEXT_TYPE_INDEX, false); - formDefinition.createTextInputField("Input Number 2", INPUT_NUMBER_TYPE_INDEX, false); - formDefinition.countElementPrepareToDrag(2); - formDefinition.moveAllElementToDragAndDrogPanel(); - formDefinition.countElementPrepareToDrag(0); - return formDefinition; - } - - private void executeExpressProcessWhenMultiApproval() { - ExpressTaskPage expressTaskPage = new ExpressTaskPage(); - expressTaskPage.finish(); - login(TestAccount.ADMIN_USER); - newDashboardPage.waitPageLoaded(); - executeUserTask(); - // work-around so that engine has more time to finish the task (we do not want - // spend too much time on this test) - NavigationHelper.navigateToCaseList(); - login(TestAccount.DEMO_USER); - executeApproval("Approved at first level", TestAccount.DEMO_USER.getFullName()); - executeApproval("Approved at second level", TestAccount.DEMO_USER.getFullName()); - login(TestAccount.ADMIN_USER); - executeApproval("Approved at second level", "Task 3", 1, 0, TestAccount.ADMIN_USER.getFullName()); - login(TestAccount.DEMO_USER); - - taskWidgetPage = NavigationHelper.navigateToTaskList(); - taskWidgetPage.clearFilterInput(); - taskWidgetPage.startTask(0); - ExpressReviewPage reviewPage = new ExpressReviewPage(); - ElementsCollection task2 = reviewPage.getApprovalResults(0); - assertEquals("Portal Demo User Approved at first level Yes", task2.get(0).getText()); - ElementsCollection task3 = reviewPage.getApprovalResults(1); - assertEquals("Portal Demo User Approved at second level Yes", task3.get(0).getText()); - assertEquals("Portal Admin User Approved at second level Yes", task3.get(1).getText()); - reviewPage.finish(); - new ExpressEndPage().finish(); - } - - private void executeUserTask() { - TaskWidgetPage taskWidgetPage = NavigationHelper.navigateToTaskList(); - taskWidgetPage.filterByResponsible(TestAccount.ADMIN_USER.getFullName()); - taskWidgetPage.startTask(0); - ExpressTaskPage expressTaskPage = new ExpressTaskPage(); - expressTaskPage.finish(); - new TaskWidgetPage(); - } - - private void executeApproval(String comment, String responsible) { - executeApproval(comment, "Task", 1, 0, responsible); - } - - private void executeApproval(String comment, String taskNameFilter, int expectedNumber, int startTaskIndex, - String responsible) { - taskWidgetPage = NavigationHelper.navigateToTaskList(); - taskWidgetPage.filterByResponsible(responsible); - taskWidgetPage.filterTasksInExpandedModeBy(taskNameFilter, expectedNumber); - taskWidgetPage.startTask(startTaskIndex); - ExpressApprovalPage approvalPage1 = new ExpressApprovalPage(); - approvalPage1.comment(comment); - approvalPage1.approve(); - } - - private void goToExpressCreationPage() { - redirectToRelativeLink(expressStartLink); - } -} diff --git a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/express/PortalExpressTest.java b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/express/PortalExpressTest.java deleted file mode 100644 index 19dccccf28c..00000000000 --- a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/express/PortalExpressTest.java +++ /dev/null @@ -1,519 +0,0 @@ -package com.axonivy.portal.selenium.test.express; - -import static com.codeborne.selenide.Selenide.$; - -import java.util.Arrays; -import java.util.List; - -import org.apache.commons.lang3.StringUtils; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.openqa.selenium.By; -import org.openqa.selenium.Dimension; - -import com.axonivy.ivy.webtest.IvyWebTest; -import com.axonivy.portal.selenium.common.BaseTest; -import com.axonivy.portal.selenium.common.NavigationHelper; -import com.axonivy.portal.selenium.common.ScreenshotUtils; -import com.axonivy.portal.selenium.common.TestAccount; -import com.axonivy.portal.selenium.common.WaitHelper; -import com.axonivy.portal.selenium.page.DefaultExpresTaskPage; -import com.axonivy.portal.selenium.page.ExpressApprovalPage; -import com.axonivy.portal.selenium.page.ExpressEndPage; -import com.axonivy.portal.selenium.page.ExpressFormDefinitionPage; -import com.axonivy.portal.selenium.page.ExpressProcessPage; -import com.axonivy.portal.selenium.page.ExpressReviewPage; -import com.axonivy.portal.selenium.page.ExpressTaskPage; -import com.axonivy.portal.selenium.page.GlobalSearchResultPage; -import com.axonivy.portal.selenium.page.MainMenuPage; -import com.axonivy.portal.selenium.page.NewDashboardPage; -import com.axonivy.portal.selenium.page.ProcessWidgetPage; -import com.axonivy.portal.selenium.page.SearchResultPage; -import com.axonivy.portal.selenium.page.TaskTemplatePage; -import com.axonivy.portal.selenium.page.TaskWidgetPage; -import com.axonivy.portal.selenium.page.TemplatePage.GlobalSearch; -import com.axonivy.portal.selenium.page.UserTaskWithMailFormPage; -import com.codeborne.selenide.CollectionCondition; -import com.codeborne.selenide.Condition; - -import ch.ivyteam.ivy.project.portal.test.ExpressResponsible; - -@IvyWebTest -public class PortalExpressTest extends BaseTest { - protected static final int USER_TASK_INDEX = 0; - protected static final int USER_TASK_WITH_EMAIL_INDEX = 1; - protected static final int INFORMATION_EMAIL_INDEX = 2; - protected static final int APPROVAL_INDEX = 3; - - protected static final int INPUT_TEXT_TYPE_INDEX = 0; - protected static final int INPUT_NUMBER_TYPE_INDEX = 1; - protected static final int INPUT_DATE_TYPE_INDEX = 2; - final String testProcessName = "Test approval"; - - protected NewDashboardPage newDashboardPage; - protected ProcessWidgetPage processWidget; - protected TaskWidgetPage taskWidgetPage; - - ExpressResponsible responsible1 = setExpressResponsible(TestAccount.ADMIN_USER.getUsername(), false); - ExpressResponsible responsible2 = setExpressResponsible(TestAccount.DEMO_USER.getUsername(), false); - ExpressResponsible groupHr = setExpressResponsible("Human resources department", true); - - - @Override - @BeforeEach - public void setup() { - super.setup(); - redirectToRelativeLink(grantPortalPermission); - newDashboardPage = new NewDashboardPage(); - } - - @Test - public void testOpenProcessWidgetWithoutCreateExpressWorkflowPermission() throws Exception { - String denyAllPermissionsForAdminUserURL = "portalKitTestHelper/14DE09882B540AD5/denyPortalPermission.ivp"; - redirectToRelativeLink(denyAllPermissionsForAdminUserURL); - MainMenuPage mainMenuPage = newDashboardPage.openMainMenu(); - processWidget = mainMenuPage.selectProcessesMenu(); - assertEquals(false, processWidget.hasCreateNewExpressWorkflowLink()); - // run process to grant permission back to normal - String grantAllPermissionsForAdminUserURL = "portalKitTestHelper/14DE09882B540AD5/grantPortalPermission.ivp"; - redirectToRelativeLink(grantAllPermissionsForAdminUserURL); - } - - @Test - public void testCreateDocumentElement() { - goToCreateExpressProcess(); - ExpressProcessPage expressProcessPage = new ExpressProcessPage(); - expressProcessPage.fillProcessProperties(true, true, "Test 1", "Test description"); - - ExpressResponsible responsible1 = setExpressResponsible(TestAccount.DEMO_USER.getUsername(), false); - - expressProcessPage.createTask(0, USER_TASK_INDEX, "Task 1", "Task 1 description", Arrays.asList(responsible1)); - - ExpressFormDefinitionPage formDefinition = expressProcessPage.goToFormDefinition(); - formDefinition.createUploadComponent("Upload"); - formDefinition.countElementPrepareToDrag(1); - formDefinition.moveAllElementToDragAndDrogPanel(); - formDefinition.executeWorkflow(); - ExpressTaskPage expressTaskPage = new ExpressTaskPage(); - assertTrue(expressTaskPage.isDocumentTableVisible()); - assertTrue(expressTaskPage.isDocumentUploadButtonVisible()); - expressTaskPage.finish(); - } - - @Test - public void createFullElementsOfForm() { - goToExpressCreationPage(); - ExpressProcessPage expressProcessPage = new ExpressProcessPage(); - expressProcessPage.fillProcessProperties(true, true, "Test 1", "Test description"); - - ExpressResponsible responsible1 = setExpressResponsible(TestAccount.ADMIN_USER.getUsername(), false); - - expressProcessPage.createTask(0, USER_TASK_INDEX, "Task 1", "Task 1 description", Arrays.asList(responsible1)); - - ExpressFormDefinitionPage formDefinition = expressProcessPage.goToFormDefinition(); - ScreenshotUtils.resizeBrowser(new Dimension(2560, 1440)); - formDefinition.createTextInputField("Input Text", INPUT_TEXT_TYPE_INDEX, false); - formDefinition.createTextInputField("Input number", INPUT_NUMBER_TYPE_INDEX, true); - formDefinition.createTextInputField("Input date", INPUT_DATE_TYPE_INDEX, true); - formDefinition.createRadioButtonField("Radio", 3); - formDefinition.createUploadComponent("Upload"); - formDefinition.createCheckboxField("Checkbox", 3); - formDefinition.createTextAreaField("Text area", true); - formDefinition.createCheckboxFieldWithDataProvider("Checkbox with data provider"); - formDefinition.countElementPrepareToDrag(8); - formDefinition.moveAllElementToDragAndDrogPanel(); - formDefinition.countElementPrepareToDrag(0); - - assertEquals(14, formDefinition.countNumberOfElementsInPreviewDialog()); - $(By.xpath("//label[text()='Data Provider Item 1']")).shouldBe(Condition.exist, DEFAULT_TIMEOUT); - $(By.xpath("//label[text()='Data Provider Item 2']")).shouldBe(Condition.exist, DEFAULT_TIMEOUT); - $(By.xpath("//label[text()='Data Provider Item 3']")).shouldBe(Condition.exist, DEFAULT_TIMEOUT); - } - - @Test - public void createFullTaskType() { - goToExpressCreationPage(); - ExpressProcessPage expressProcessPage = new ExpressProcessPage(); - expressProcessPage.fillProcessProperties(true, true, "Test full task type", "Test description"); - - ExpressResponsible responsible1 = setExpressResponsible(TestAccount.ADMIN_USER.getUsername(), false); - ExpressResponsible responsible2 = setExpressResponsible(TestAccount.DEMO_USER.getUsername(), false); - - expressProcessPage.createTask(0, USER_TASK_INDEX, "Task 1", "Task 1 description", - Arrays.asList(responsible1, responsible2)); - - expressProcessPage.addNewTask(0); - expressProcessPage.createTask(1, USER_TASK_WITH_EMAIL_INDEX, "Task 2", "Task 2 description", - Arrays.asList(responsible2)); - - expressProcessPage.addNewTask(1); - expressProcessPage.createTask(2, INFORMATION_EMAIL_INDEX, null, null, null); - - expressProcessPage.addNewTask(2); - expressProcessPage.createTask(3, APPROVAL_INDEX, "Task 4", "Task 4 description", Arrays.asList(responsible1)); - - ExpressFormDefinitionPage formDefinition = expressProcessPage.goToFormDefinition(); - assertEquals(4, formDefinition.countNumberOfSteps()); - } - - @Test - public void testStartFirstTaskIfCreatorIsAssigned() { - goToExpressCreationPage(); - ExpressProcessPage expressProcessPage = new ExpressProcessPage(); - expressProcessPage.fillProcessProperties(true, true, "Test 1 Process for creator", - "Test description Process for creator"); - expressProcessPage.createTask(0, USER_TASK_INDEX, "Task for creator", "Task 1 description for creator", - Arrays.asList(responsible2)); - - ExpressFormDefinitionPage formDefinition = expressProcessPage.goToFormDefinition(); - formDefinition.createTextInputField("Input Text", INPUT_TEXT_TYPE_INDEX, false); - formDefinition.countElementPrepareToDrag(1); - formDefinition.moveAllElementToDragAndDrogPanel(); - formDefinition.executeWorkflow(); - ExpressTaskPage expressTaskPage = new ExpressTaskPage(); - expressTaskPage.finish(); - NewDashboardPage home = new NewDashboardPage(); - assertTrue(home.isDisplayed()); - } - - @Test - public void createUserDefaultProcess() { - goToExpressCreationPage(); - ExpressProcessPage expressProcessPage = new ExpressProcessPage(); - expressProcessPage.fillProcessProperties(true, false, "Test create default process", "Test description"); - - ExpressResponsible demoResponsible = setExpressResponsible(TestAccount.DEMO_USER.getUsername(), false); - expressProcessPage.createDefaultTask(0, "Default Task", Arrays.asList(demoResponsible)); - expressProcessPage.addNewTask(0); - expressProcessPage.createDefaultTask(1, "Next Default Task", Arrays.asList(demoResponsible)); - WaitHelper.waitForNavigation(() -> { - expressProcessPage.executeDirectly(); - }); - - DefaultExpresTaskPage defaultExpresTaskPage = new DefaultExpresTaskPage(); - defaultExpresTaskPage.enterTextToDefaultTask("Test input"); - defaultExpresTaskPage.finishDefaultTask(); - - taskWidgetPage = new NewDashboardPage().openTaskList(); - taskWidgetPage.filterTasksInExpandedModeBy("Next Default Task"); - taskWidgetPage.startTask(0); - defaultExpresTaskPage = new DefaultExpresTaskPage(); - defaultExpresTaskPage.enterTextToDefaultTask("Comment"); - defaultExpresTaskPage.finishDefaultTask(); - - taskWidgetPage = new TaskWidgetPage(); - taskWidgetPage.filterTasksInExpandedModeBy("Test create default process: Final Review"); - taskWidgetPage.startTask(0); - - ExpressReviewPage reviewPage = new ExpressReviewPage(); - reviewPage.finish(); - } - - @Test - public void testMultiApprovalWhenMultiTask() { - createAdministratedWorkflow(testProcessName, Arrays.asList(responsible1, groupHr), true); - startExpressProcess(testProcessName); - executeExpressProcessWhenMultiApproval(); - } - - @Test - public void testAbleToStartAdministratedWorkflow() { - createAdministratedWorkflow(testProcessName, Arrays.asList(responsible1, groupHr), false); - // responsible1, groupHr is able to start process - login(TestAccount.ADMIN_USER); - startExpressProcess(testProcessName); - login(TestAccount.HR_ROLE_USER); - startExpressProcess(testProcessName); - // creator is able to start process - login(TestAccount.DEMO_USER); - startExpressProcess(testProcessName); - } - - @Test - public void testUserAdminCanViewEditDeleteProcess() { - createAdministratedWorkflow(testProcessName, Arrays.asList(responsible1, groupHr), false); - login(TestAccount.ADMIN_USER); - newDashboardPage = new NewDashboardPage(); - GlobalSearchResultPage searchResultPage = newDashboardPage.inputGlobalSearchKeyword(testProcessName); - searchResultPage.waitForFirstTabFinishedLoading(); - searchResultPage.clickOnActionButton(testProcessName); - - assertTrue(searchResultPage.isInfoWorkflowIcon()); - assertTrue(searchResultPage.isEditExpressWorkflow(testProcessName)); - assertTrue(searchResultPage.isDeleteExpressWorkflown(testProcessName)); - assertTrue(searchResultPage.isExpressProcessLogo()); - } - - @Test - public void testUserCreatorCanViewEditDeleteProcess() { - createAdministratedWorkflow(testProcessName, Arrays.asList(responsible1, groupHr), false); - newDashboardPage = new NewDashboardPage(); - GlobalSearchResultPage searchResultPage = newDashboardPage.inputGlobalSearchKeyword(testProcessName); - searchResultPage.waitForFirstTabFinishedLoading(); - searchResultPage.clickOnActionButton(testProcessName); - - assertTrue(searchResultPage.isInfoWorkflowIcon()); - assertTrue(searchResultPage.isEditExpressWorkflow(testProcessName)); - assertTrue(searchResultPage.isDeleteExpressWorkflown(testProcessName)); - assertTrue(searchResultPage.isExpressProcessLogo()); - } - - @Test - public void testProcessOwnerCanViewAndEditProcess() { - createAdministratedWorkflow(testProcessName, Arrays.asList(responsible1, groupHr), false); - login(TestAccount.HR_ROLE_USER); - newDashboardPage = new NewDashboardPage(); - GlobalSearchResultPage searchResultPage = newDashboardPage.inputGlobalSearchKeyword(testProcessName); - searchResultPage.waitForFirstTabFinishedLoading(); - - assertTrue(searchResultPage.isInfoWorkflowIcon()); - assertTrue(searchResultPage.isExpressProcessLogo()); - - searchResultPage.clickOnActionButton(testProcessName); - - assertTrue(searchResultPage.isEditExpressWorkflow(testProcessName)); - assertTrue(searchResultPage.isDeleteExpressWorkflown(testProcessName)); - } - - @Test - public void testAbleToStartCanViewProcess() { - login(TestAccount.ADMIN_USER); - createAdministratedWorkflow(testProcessName, Arrays.asList(groupHr), false); - login(TestAccount.DEMO_USER); - newDashboardPage = new NewDashboardPage(); - GlobalSearchResultPage searchResultPage = newDashboardPage.inputGlobalSearchKeyword(testProcessName); - searchResultPage.waitForFirstTabFinishedLoading(); - - assertTrue(searchResultPage.isInfoWorkflowIcon()); - assertTrue(searchResultPage.isExpressProcessLogo()); - } - - @Test - public void testRejectedApprovalWhenMultiTask() { - goToExpressCreationPage(); - ExpressProcessPage expressProcessPage = new ExpressProcessPage(); - expressProcessPage.fillProcessProperties(false, true, testProcessName, "Test description"); - expressProcessPage.fillProcessOwners(Arrays.asList(responsible1, groupHr)); - ExpressFormDefinitionPage formDefinition = configureExpressProcessWhenMultiApproval(expressProcessPage); - formDefinition.finishWorkflow(); - startExpressProcess(testProcessName); - rejectWhenMultiApproval(); - } - - @Test - public void testComplexProcess() { - goToExpressCreationPage(); - ExpressProcessPage expressProcessPage = new ExpressProcessPage(); - expressProcessPage.fillProcessProperties(true, true, testProcessName, "Test description"); - ExpressFormDefinitionPage formDefinition = configureComplexProcess(expressProcessPage); - formDefinition.executeWorkflowAndWaitForUserTaskWithEmailDisplay(); - executeComplexProcess(); - } - - protected void goToCreateExpressProcess() { - processWidget = NavigationHelper.navigateToProcessList(); - processWidget.openExpressPage(); - } - - protected void goToExpressCreationPage() { - redirectToRelativeLink(expressStartLink); - } - - private void createAdministratedWorkflow(String expressProcessName, List processOwners, - Boolean isMultiApproved) { - ExpressFormDefinitionPage formDefinition; - goToExpressCreationPage(); - ExpressProcessPage expressProcessPage = new ExpressProcessPage(); - expressProcessPage.fillProcessProperties(false, true, expressProcessName, "Test description"); - expressProcessPage.fillProcessOwners(processOwners); - if (isMultiApproved) { - formDefinition = configureExpressProcessWhenMultiApproval(expressProcessPage); - } else { - formDefinition = configureExpressProcessWhenOneApproval(expressProcessPage); - } - formDefinition.finishWorkflow(); - } - - protected ExpressFormDefinitionPage configureExpressProcessWhenMultiApproval(ExpressProcessPage expressProcessPage) { - ExpressResponsible responsible1 = setExpressResponsible(TestAccount.ADMIN_USER.getUsername(), false); - ExpressResponsible responsible2 = setExpressResponsible(TestAccount.DEMO_USER.getUsername(), false); - - expressProcessPage.createTask(0, USER_TASK_INDEX, "Task 1", "Task 1 description", - Arrays.asList(responsible1, responsible2)); - - expressProcessPage.addNewTask(0); - expressProcessPage.createTask(1, APPROVAL_INDEX, "Task 2", "Task 2 description", Arrays.asList(responsible2)); - - expressProcessPage.addNewTask(1); - expressProcessPage.createTask(2, APPROVAL_INDEX, "Task 3", "Task 3 description", - Arrays.asList(responsible1, responsible2)); - ExpressFormDefinitionPage formDefinition = expressProcessPage.goToFormDefinition(); - formDefinition.createTextInputField("Input Text 1", INPUT_TEXT_TYPE_INDEX, false); - formDefinition.createTextInputField("Input Number 2", INPUT_NUMBER_TYPE_INDEX, false); - formDefinition.countElementPrepareToDrag(2); - formDefinition.moveAllElementToDragAndDrogPanel(); - formDefinition.countElementPrepareToDrag(0); - return formDefinition; - } - - protected ExpressFormDefinitionPage configureExpressProcessWhenOneApproval(ExpressProcessPage expressProcessPage) { - ExpressResponsible responsible1 = setExpressResponsible(TestAccount.ADMIN_USER.getUsername(), false); - ExpressResponsible responsible2 = setExpressResponsible(TestAccount.DEMO_USER.getUsername(), false); - - expressProcessPage.createTask(0, USER_TASK_INDEX, "Task 1", "Task 1 description", - Arrays.asList(responsible1, responsible2)); - ExpressFormDefinitionPage formDefinition = expressProcessPage.goToFormDefinition(); - formDefinition.createTextInputField("Input Text 1", INPUT_TEXT_TYPE_INDEX, false); - formDefinition.createTextInputField("Input Number 2", INPUT_NUMBER_TYPE_INDEX, false); - formDefinition.countElementPrepareToDrag(2); - formDefinition.moveAllElementToDragAndDrogPanel(); - formDefinition.countElementPrepareToDrag(0); - return formDefinition; - } - - protected void startExpressProcess(String processName) { - newDashboardPage = new NewDashboardPage(); - GlobalSearch globalSearch = newDashboardPage.getGlobalSearch(); - SearchResultPage searchResultPage = globalSearch.inputSearchKeyword(processName); - searchResultPage.waitForFirstTabFinishedLoading(); - searchResultPage.startProcess(processName); - new TaskTemplatePage().isDisplayed(); - } - - protected void executeExpressProcessWhenMultiApproval() { - ExpressTaskPage expressTaskPage = new ExpressTaskPage(); - expressTaskPage.finish(); - executeApproval("Approved at first level", 0); - executeApproval("Approved at second level", 0); - login(TestAccount.ADMIN_USER); - executeApproval("Approved at second level", 1, "Task 3", 2); - login(TestAccount.DEMO_USER); - taskWidgetPage = NavigationHelper.navigateToTaskList(); - String approvalResult = executeReview(); - assertEquals( - "Portal Demo User,Approved at first level,Yes," + TestAccount.DEMO_USER.getFullName() - + ",Approved at second level,Yes," + TestAccount.ADMIN_USER.getFullName() + ",Approved at second level,Yes", - approvalResult); - new ExpressEndPage().finish(); - } - - protected void executeApproval(String comment, int taskIndex, String taskNameFilter, int taskCountAfterFiltering) { - taskWidgetPage = NavigationHelper.navigateToTaskList(); - if (taskWidgetPage.countTasks().size() <= taskIndex) { - taskWidgetPage.filterTasksInExpandedModeBy("Task", taskCountAfterFiltering); - } - if (StringUtils.isNotEmpty(taskNameFilter)) { - taskWidgetPage.filterTasksInExpandedModeBy(taskNameFilter, taskCountAfterFiltering); - } - taskWidgetPage.openStateFilter(); - taskWidgetPage.startTask(taskIndex); - ExpressApprovalPage approvalPage1 = new ExpressApprovalPage(); - approvalPage1.comment(comment); - approvalPage1.approve(); - } - - protected void executeApproval(String comment, int taskIndex) { - executeApproval(comment, taskIndex, null, 1); - } - - protected String executeReview() { - taskWidgetPage = new TaskWidgetPage(); - taskWidgetPage.startTask(0); - ExpressReviewPage reviewPage = new ExpressReviewPage(); - String approvalResult = reviewPage.getApprovalResult(); - reviewPage.finish(); - return approvalResult; - } - - protected void rejectWhenMultiApproval() { - ExpressTaskPage expressTaskPage = new ExpressTaskPage(); - expressTaskPage.finish(); - new NewDashboardPage().waitPageLoaded(); - TaskWidgetPage taskWidgetPage = NavigationHelper.navigateToTaskList(); - taskWidgetPage.countTasks().shouldBe(CollectionCondition.size(1)); - rejectApproval("Rejected at first level"); - String approvalResult = executeReview(); - assertEquals("Portal Demo User,Rejected at first level,No", approvalResult); - new ExpressEndPage().finish(); - } - - protected void rejectApproval(String comment) { - taskWidgetPage = new TaskWidgetPage(); - taskWidgetPage.startTask(0); - ExpressApprovalPage approvalPage1 = new ExpressApprovalPage(); - approvalPage1.comment(comment); - approvalPage1.reject(); - } - - - protected ExpressFormDefinitionPage configureComplexProcess(ExpressProcessPage expressProcessPage) { - ExpressResponsible responsible1 = setExpressResponsible(TestAccount.ADMIN_USER.getUsername(), false); - ExpressResponsible responsible2 = setExpressResponsible(TestAccount.DEMO_USER.getUsername(), false); - - expressProcessPage.createTask(0, USER_TASK_WITH_EMAIL_INDEX, "Task 1", "Task 1 description", - Arrays.asList(responsible2)); - - expressProcessPage.addNewTask(0); - expressProcessPage.createTask(1, APPROVAL_INDEX, "Task 2", "Task 2 description", Arrays.asList(responsible2)); - - expressProcessPage.addNewTask(1); - expressProcessPage.createTask(2, INFORMATION_EMAIL_INDEX, "Task 3", "Task 3 description", - Arrays.asList(responsible1, responsible2)); - expressProcessPage.addNewTask(2); - expressProcessPage.createTask(3, USER_TASK_INDEX, "Task 4", "Task 4 description", Arrays.asList(responsible2)); - ExpressFormDefinitionPage formDefinition = expressProcessPage.goToFormDefinition(); - formDefinition.createTextInputField("Input Text", INPUT_TEXT_TYPE_INDEX, false); - formDefinition.countElementPrepareToDrag(1); - formDefinition.moveAllElementToDragAndDrogPanel(); - formDefinition.countElementPrepareToDrag(0); - formDefinition.nextStep(); - formDefinition.inputMailRecipient("wawa@axongroupio.ch"); - formDefinition.inputMailSubject("Information for task 2"); - formDefinition.inputMailContent("Task is finished"); - formDefinition.nextStep(); - formDefinition = new ExpressFormDefinitionPage(); - resizeBrowserTo2kResolution(); - formDefinition.createTextInputField("Input Text 1", INPUT_TEXT_TYPE_INDEX, false); - formDefinition.createTextInputField("Input Number 2", INPUT_NUMBER_TYPE_INDEX, false); - formDefinition.countElementPrepareToDrag(2); - formDefinition.moveAllElementToDragAndDrogPanel(); - formDefinition.countElementPrepareToDrag(0); - return formDefinition; - } - - protected void executeComplexProcess() { - UserTaskWithMailFormPage userTaskWithMailFormPage = new UserTaskWithMailFormPage(); - userTaskWithMailFormPage.waitPageLoaded(); - userTaskWithMailFormPage.selectEmailTab(); - userTaskWithMailFormPage.inputData("wawa@axongroupio.ch", "Task information", "Task is created"); - userTaskWithMailFormPage.finish(); - new NewDashboardPage(); - executeApproval("Approved at first level", 0); - executeUserTask(); - String approvalResult = executeReview("Test approval: Final Review"); - assertEquals("Portal Demo User,Approved at first level,Yes", approvalResult); - new ExpressEndPage().finish(); - } - - protected void executeUserTask() { - taskWidgetPage = new TaskWidgetPage(); - refreshPage(); - taskWidgetPage.countTasks().shouldBe(CollectionCondition.size(1)); - taskWidgetPage.startTask(0); - ExpressTaskPage expressTaskPage = new ExpressTaskPage(); - expressTaskPage.finish(); - taskWidgetPage = new TaskWidgetPage(); - } - - - protected String executeReview(String taskName) { - taskWidgetPage = NavigationHelper.navigateToTaskList(); - taskWidgetPage.filterTasksInExpandedModeBy(taskName); - taskWidgetPage.startTask(0); - ExpressReviewPage reviewPage = new ExpressReviewPage(); - String approvalResult = reviewPage.getApprovalResult(); - reviewPage.finish(); - return approvalResult; - } - -} From 59551cc50258712a7c67b2f3ea7626b99335dbb7 Mon Sep 17 00:00:00 2001 From: Loc Nguyen Date: Fri, 20 Sep 2024 11:51:11 +0700 Subject: [PATCH 10/16] feature/IVYPORTAL-17431-Remove-Express-from-Portal - Fix gui test part 2 --- .../Start Processes/GrantPermissions.p.json | 8 - .../portal/selenium/page/AdhocPage.java | 59 --- .../selenium/page/TaskIFrameTemplatePage.java | 7 - .../selenium/page/TaskTemplatePage.java | 11 - .../portal/selenium/page/TaskWidgetPage.java | 11 - .../portal/selenium/test/ChatTest.java | 386 +++++++++--------- ...nceVisibilityTasksForMemberOfRoleTest.java | 2 +- .../selenium/test/PortalPermissionTest.java | 2 - .../portal/selenium/test/SideStepTest.java | 27 -- .../DashboardTaskWidgetActionTest.java | 13 +- .../selenium/test/task/TaskActionTest.java | 15 +- AxonIvyPortal/portal/cms/cms.yaml | 4 - AxonIvyPortal/portal/cms/cms_de.yaml | 4 - AxonIvyPortal/portal/cms/cms_en.yaml | 4 - AxonIvyPortal/portal/cms/cms_es.yaml | 4 - AxonIvyPortal/portal/cms/cms_fr.yaml | 4 - build/gui-test-new-dashboard/Jenkinsfile | 2 +- 17 files changed, 208 insertions(+), 355 deletions(-) delete mode 100644 AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/AdhocPage.java diff --git a/AxonIvyPortal/PortalKitTestHelper/processes/Start Processes/GrantPermissions.p.json b/AxonIvyPortal/PortalKitTestHelper/processes/Start Processes/GrantPermissions.p.json index 5264911af32..6f110eedaa6 100644 --- a/AxonIvyPortal/PortalKitTestHelper/processes/Start Processes/GrantPermissions.p.json +++ b/AxonIvyPortal/PortalKitTestHelper/processes/Start Processes/GrantPermissions.p.json @@ -451,10 +451,6 @@ " ISecurityContext.current().securityDescriptor().grantPermission(iPermission, ivy.session.getSessionUser());", " }", " ", - "iPermission = IPermissionRepository.instance().findByName(PortalPermission.EXPRESS_CREATE_WORKFLOW.getValue());", - " if (Objects.nonNull(iPermission)){", - " ISecurityContext.current().securityDescriptor().grantPermission(iPermission, ivy.session.getSessionUser());", - " }", "iPermission = IPermissionRepository.instance().findByName(PortalPermission.STATISTIC_ANALYZE_TASK.getValue());", " if (Objects.nonNull(iPermission)){", " ISecurityContext.current().securityDescriptor().grantPermission(iPermission, ivy.session.getSessionUser());", @@ -607,10 +603,6 @@ " if (Objects.nonNull(iPermission)){", " ISecurityContext.current().securityDescriptor().denyPermission(iPermission, ivy.session.getSessionUser());", " }", - " iPermission = IPermissionRepository.instance().findByName(PortalPermission.EXPRESS_CREATE_WORKFLOW.getValue());", - " if (Objects.nonNull(iPermission)){", - " ISecurityContext.current().securityDescriptor().denyPermission(iPermission, ivy.session.getSessionUser());", - " }", " iPermission = IPermissionRepository.instance().findByName(PortalPermission.STATISTIC_ANALYZE_TASK.getValue());", " if (Objects.nonNull(iPermission)){", " ISecurityContext.current().securityDescriptor().denyPermission(iPermission, ivy.session.getSessionUser());", diff --git a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/AdhocPage.java b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/AdhocPage.java deleted file mode 100644 index e9e15d7b396..00000000000 --- a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/AdhocPage.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.axonivy.portal.selenium.page; - -import static com.codeborne.selenide.Condition.appear; -import static com.codeborne.selenide.Condition.disappear; -import static com.codeborne.selenide.Selenide.$; -import static com.codeborne.selenide.Selenide.$$; - -import com.codeborne.selenide.CollectionCondition; -import com.codeborne.selenide.SelenideElement; - -public class AdhocPage extends TaskIFrameTemplatePage { - - @Override - protected String getLoadedLocator() { - return "[id='main-area-panel']"; - } - - public void enterSubject(String subject) { - $("[id='form:defined-tasks-list:0:default-task-name']").sendKeys(subject); - } - - public void addResponsible(String fullname) { - $("[id$=':default-task-responsible-link']").click(); - $("[id='choose-responsible-dialog']").shouldBe(appear, DEFAULT_TIMEOUT); - $("[id='assignee-selection-form:user-selection-component:user-selection_input']").sendKeys(fullname); - SelenideElement panel = $("[id='assignee-selection-form:user-selection-component:user-selection_panel']") - .shouldBe(appear, DEFAULT_TIMEOUT); - panel.click(); - panel.shouldBe(disappear, DEFAULT_TIMEOUT); - $("[id='assignee-selection-form:add-assignee-button']").shouldBe(clickable(), DEFAULT_TIMEOUT).click(); - $$(".ui-panelgrid-cell.assignee-name-col").shouldHave(CollectionCondition.size(1), DEFAULT_TIMEOUT); - $("[id='assignee-selection-form:save-assignee-button']").shouldBe(clickable(), DEFAULT_TIMEOUT).click(); - $("[id='choose-responsible-dialog']").shouldBe(disappear, DEFAULT_TIMEOUT); - } - - public void addTask() { - waitForElementClickableThenClick($("[id$=':add-step-button']")); - } - - public void addComment(String comment) { - findElementByCssSelector("*[id$='" + ":comments']").sendKeys(comment); - } - - public void startWorkflow() { - waitForElementClickableThenClick($("[id='form:save']")); - $("[id='form:save']").shouldBe(disappear, DEFAULT_TIMEOUT); - } - - public TaskWidgetPage send() { - waitForElementClickableThenClick($("*[id$='" + ":send']")); - return new TaskWidgetPage(); - } - - public void addDescription(String description) { - $("[id$=':input-text-area']").sendKeys(description); - $("[id='form:ok-btn']").click(); - $("[id='form:ok-btn']").shouldBe(disappear, DEFAULT_TIMEOUT); - } -} diff --git a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/TaskIFrameTemplatePage.java b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/TaskIFrameTemplatePage.java index 5f5bb27f241..8f3a6c72b31 100644 --- a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/TaskIFrameTemplatePage.java +++ b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/TaskIFrameTemplatePage.java @@ -20,7 +20,6 @@ import com.codeborne.selenide.WebDriverRunner; public class TaskIFrameTemplatePage extends TemplatePage { - private static final String ADHOC_HISTORY_TABLE_CSS_SELECTOR = "div[id*='adhoc-task-history-table'] table>tbody>tr"; @Override protected String getLoadedLocator() { @@ -80,12 +79,6 @@ public void clickActionButton() { $("div[id$='horizontal-task-action-form:horizontal-task-action-menu']").shouldBe(appear, DEFAULT_TIMEOUT); } - public void clickOnStartAdhocLink() { - $("div[id$='horizontal-task-action-form:horizontal-task-action-menu']").$("a[id$='start-adhoc']") - .shouldBe(getClickableCondition(), DEFAULT_TIMEOUT).click(); - $("div[id$='adhoc-task-reset-confirmation-dialog_content']").shouldBe(appear, DEFAULT_TIMEOUT); - } - // moved public void clickChatGroup() { $("a[id$='chat-group']").shouldBe(getClickableCondition(), DEFAULT_TIMEOUT).click(); diff --git a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/TaskTemplatePage.java b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/TaskTemplatePage.java index 68fe0494e92..ed6d5053718 100644 --- a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/TaskTemplatePage.java +++ b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/TaskTemplatePage.java @@ -18,7 +18,6 @@ import com.codeborne.selenide.SelenideElement; public class TaskTemplatePage extends TemplatePage { - private static final String ADHOC_HISTORY_TABLE_CSS_SELECTOR = "div[id*='adhoc-task-history-table'] table>tbody>tr"; @Override protected String getLoadedLocator() { @@ -237,16 +236,6 @@ public void clickOnSubmitButton() { switchBackToParent(); } - public String getTaskNameOfAdhocHistoryRow(int index) { - SelenideElement elem = $$(By.cssSelector(ADHOC_HISTORY_TABLE_CSS_SELECTOR)).get(index); - return elem.findAll(By.xpath("td")).get(2).getText(); - } - - public String getCommentOfAdhocHistoryRow(int index) { - SelenideElement elem = $$(By.cssSelector(ADHOC_HISTORY_TABLE_CSS_SELECTOR)).get(index); - return elem.findAll(By.xpath("td")).get(3).getText(); - } - // moved public void joinProcessChatAlreadyCreated() { waitForElementDisplayed(By.id("chat-group-join-form:chat-group-join-button"), true); diff --git a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/TaskWidgetPage.java b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/TaskWidgetPage.java index 382cfceff9e..9b84ad3b767 100644 --- a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/TaskWidgetPage.java +++ b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/TaskWidgetPage.java @@ -411,10 +411,6 @@ public boolean isTaskReserverDisplayed(boolean expected) { return isTaskActionDisplayed("task-reserve-command", 0, expected); } - public boolean isAdhocSideStepDisplayed(boolean expected) { - return isElementDisplayed(By.cssSelector("a[id$='adhoc-side-step-item']"), expected); - } - public void sideStepMenuOnActionButton(int index) { String actionButton = String.format("[id$='%d\\:task-item\\:task-action\\:additional-options\\:task-side-steps-menu']", index); @@ -755,13 +751,6 @@ public String getTaskListCustomCellValue(int index, String columnId) { return cell.getText(); } - public AdhocPage addAdhoc(int taskIndex) { - waitForElementClickableThenClick("[id$=':task-side-steps-menu']"); - waitForElementClickableThenClick("[id$=':adhoc-side-step-item']"); - waitForElementPresent(By.id(TASK_ACTION), true); - return new AdhocPage(); - } - public void clearFilterInput() { $(KEYWORD_FILTER_SELECTOR_EXPANDED_MODE).click(); $(KEYWORD_FILTER_SELECTOR_EXPANDED_MODE).clear(); diff --git a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/ChatTest.java b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/ChatTest.java index 307f5f103f1..83d0acf2983 100644 --- a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/ChatTest.java +++ b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/ChatTest.java @@ -1,193 +1,193 @@ -package com.axonivy.portal.selenium.test; - -import java.util.Arrays; - -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.openqa.selenium.WindowType; - -import com.axonivy.ivy.webtest.IvyWebTest; -import com.axonivy.portal.selenium.common.BaseTest; -import com.axonivy.portal.selenium.common.NavigationHelper; -import com.axonivy.portal.selenium.common.TestAccount; -import com.axonivy.portal.selenium.common.Variable; -import com.axonivy.portal.selenium.common.WaitHelper; -import com.axonivy.portal.selenium.page.ChatPage; -import com.axonivy.portal.selenium.page.ExpressTaskPage; -import com.axonivy.portal.selenium.page.NewDashboardPage; -import com.axonivy.portal.selenium.page.TaskWidgetPage; - -import ch.ivyteam.ivy.project.portal.test.Responsible; - -@IvyWebTest -public class ChatTest extends BaseTest { - private static final String ENABLE_PRIVATE_CHAT_SETTING = Variable.ENABLE_PRIVATE_CHAT.getKey(); - private static final String ENABLE_GROUP_CHAT_SETTING = Variable.ENABLE_GROUP_CHAT.getKey(); - private static final String CHAT_MESSAGE_USER_DEMO = "Hi i'm demo user"; - private static final String CHAT_MESSAGE_USER_ADMIN = "Hi i'm admin user"; - - @Override - @BeforeEach - public void setup() { - super.setup(); - } - - // Currently still not have any idea how to open two browser with difference session to test chat between multiple - // user - // Tests that still not implement - // TODO chatGroupMultiTabs, chatGroupOnTwoInstanceOfBrowser - - @Test - public void chatAddGroup() { - Responsible chatUser1 = setResponsible(TestAccount.ADMIN_USER.getUsername(), false); - ChatPage chatPage = enableChatGroup(); - createChatGroup(TestAccount.DEMO_USER); - joinChatGroupWhichAlreadyHadChatGroup(TestAccount.ADMIN_USER); - chatMessageInGroup(TestAccount.DEMO_USER, CHAT_MESSAGE_USER_DEMO); - - openNewTabOrWindow(WindowType.WINDOW); - launchBrowserAndGotoRelativeLink(NewDashboardPage.PORTAL_HOME_PAGE_URL); - ChatPage chatPage2 = chatMessageInGroup(TestAccount.ADMIN_USER, CHAT_MESSAGE_USER_ADMIN); - - openNewTabOrWindow(WindowType.WINDOW); - launchBrowserAndGotoRelativeLink(NewDashboardPage.PORTAL_HOME_PAGE_URL); - - Responsible chatGroupEveryBody = setResponsible("Everybody", true); - createChatGroup(TestAccount.GUEST_USER, chatUser1, chatGroupEveryBody); - - login(TestAccount.ADMIN_USER); - assertEquals(2, chatPage2.refreshAndCountGroupChat()); - - login(TestAccount.DEMO_USER); - assertEquals(2, chatPage.refreshAndCountGroupChat()); - } - - // @Test - public void chatGroupOnTwoInstanceOfBrowser() { - ChatPage chatPage = enableChatGroup(); - createChatGroup(TestAccount.DEMO_USER); - joinChatGroupWhichAlreadyHadChatGroup(TestAccount.ADMIN_USER); - chatMessageInGroup(TestAccount.DEMO_USER, CHAT_MESSAGE_USER_DEMO); - - launchBrowserAndGotoRelativeLink(NewDashboardPage.PORTAL_HOME_PAGE_URL); - ChatPage chatPage2 = chatMessageInGroup(TestAccount.ADMIN_USER, CHAT_MESSAGE_USER_ADMIN); - chatPage2.closeChatMessageList(); - - chatPage = chatMessageInGroup(TestAccount.DEMO_USER, CHAT_MESSAGE_USER_DEMO); - chatPage.sendMessage("from 1 to 2"); - - chatPage2 = getChatGroup(TestAccount.ADMIN_USER); - assertChatNotification(chatPage2, true); - - chatPage2.openFirstGroupChat(); - chatPage2.sendMessage("from 2 to 1"); - - chatPage = getChatGroup(TestAccount.DEMO_USER); - assertContainMessage(chatPage, "from 2 to 1"); - chatPage2 = getChatGroup(TestAccount.ADMIN_USER); - assertContainMessage(chatPage2, "from 1 to 2"); - } - - @Test - public void chatDisplay() { - enableChatGroup(); - new NewDashboardPage().isChatDisplayed(); - } - - @Test - public void chatPrivate() { - ChatPage chatPage = enableChatPrivate(); - chatPage.selectChatUser("demo"); - chatPage.sendMessage(CHAT_MESSAGE_USER_ADMIN); - - login(TestAccount.DEMO_USER); - new NewDashboardPage().getChat(); - chatPage.selectChatUser("admin"); - chatPage.sendMessage(CHAT_MESSAGE_USER_DEMO); - } - - @Test - public void joinChatGroupAlreadyCreated() { - ChatPage chatPage = enableChatGroup(); - createChatGroup(TestAccount.DEMO_USER); - joinChatGroupWhichAlreadyHadChatGroup(TestAccount.ADMIN_USER); - chatMessageInGroup(TestAccount.DEMO_USER, CHAT_MESSAGE_USER_DEMO); - chatMessageInGroup(TestAccount.ADMIN_USER, CHAT_MESSAGE_USER_ADMIN); - - assertContainMessage(chatPage, CHAT_MESSAGE_USER_DEMO); - assertContainMessage(chatPage, CHAT_MESSAGE_USER_ADMIN); - - login(TestAccount.DEMO_USER); - new NewDashboardPage().getChat().isNotificationContactChat(); - } - - private ChatPage createChatGroup(TestAccount creatorChatGroup, Responsible... participants) { - redirectToRelativeLink(createTestingCaseUrlForDefaultAdditionalCaseDetails); - login(creatorChatGroup); - redirectToRelativeLink(NewDashboardPage.PORTAL_HOME_PAGE_URL); - ChatPage chatPage = new NewDashboardPage().getChat(); - // Create chat group via task - TaskWidgetPage taskWidgetPage = NavigationHelper.navigateToTaskList(); - ExpressTaskPage taskTemplatePage = taskWidgetPage.startExpressTask(0); - taskTemplatePage.clickTaskActionMenu(); - taskTemplatePage.clickChatGroup(); - if (participants.length != 0) { - chatPage.addUserToChatGroup(Arrays.asList(participants)); - } - taskTemplatePage.clickCreateGroupChatBtn(); - return chatPage; - } - - private ChatPage enableChatGroup() { - updatePortalSetting(ENABLE_GROUP_CHAT_SETTING, "true"); - login(TestAccount.ADMIN_USER); - return new ChatPage(); - } - - private ChatPage enableChatPrivate() { - updatePortalSetting(ENABLE_PRIVATE_CHAT_SETTING, "true"); - login(TestAccount.ADMIN_USER); - new NewDashboardPage().getChat(); - return new ChatPage(); - } - - private void joinChatGroupWhichAlreadyHadChatGroup(TestAccount userJoined) { - login(userJoined); - TaskWidgetPage taskWidgetPage = NavigationHelper.navigateToTaskList(); - taskWidgetPage.filterTasksInExpandedModeBy("Sick Leave Request Default Case Details Page"); - ExpressTaskPage taskTemplatePage = taskWidgetPage.startExpressTask(0); - taskTemplatePage.clickTaskActionMenu(); - taskTemplatePage.clickChatGroup(); - taskTemplatePage.joinProcessChatAlreadyCreated(); - } - - private ChatPage chatMessageInGroup(TestAccount chatUser, String chatMessage) { - ChatPage chatPage = openChatGroup(chatUser); - chatPage.sendMessage(chatMessage); - return chatPage; - } - - private ChatPage openChatGroup(TestAccount chatUser) { - login(chatUser); - redirectToRelativeLink(NewDashboardPage.PORTAL_HOME_PAGE_URL); - ChatPage chatPage = getChatGroup(chatUser); - chatPage.openFirstGroupChat(); - return chatPage; - } - - private ChatPage getChatGroup(TestAccount chatUser) { - login(chatUser); - redirectToRelativeLink(NewDashboardPage.PORTAL_HOME_PAGE_URL); - return new NewDashboardPage().getChat(); - } - - private void assertContainMessage(ChatPage chatPage, String message) { - WaitHelper.assertTrueWithWait(() -> chatPage.getAllMessagesChatLog().contains(message)); - } - - private void assertChatNotification(ChatPage chatPage, boolean hasNotification) { - chatPage.isNotificationBadgeChat(); - chatPage.isNotificationContactChat(); - } - -} +//package com.axonivy.portal.selenium.test; +// +//import java.util.Arrays; +// +//import org.junit.jupiter.api.BeforeEach; +//import org.junit.jupiter.api.Test; +//import org.openqa.selenium.WindowType; +// +//import com.axonivy.ivy.webtest.IvyWebTest; +//import com.axonivy.portal.selenium.common.BaseTest; +//import com.axonivy.portal.selenium.common.NavigationHelper; +//import com.axonivy.portal.selenium.common.TestAccount; +//import com.axonivy.portal.selenium.common.Variable; +//import com.axonivy.portal.selenium.common.WaitHelper; +//import com.axonivy.portal.selenium.page.ChatPage; +//import com.axonivy.portal.selenium.page.ExpressTaskPage; +//import com.axonivy.portal.selenium.page.NewDashboardPage; +//import com.axonivy.portal.selenium.page.TaskWidgetPage; +// +//import ch.ivyteam.ivy.project.portal.test.Responsible; +// +//@IvyWebTest +//public class ChatTest extends BaseTest { +// private static final String ENABLE_PRIVATE_CHAT_SETTING = Variable.ENABLE_PRIVATE_CHAT.getKey(); +// private static final String ENABLE_GROUP_CHAT_SETTING = Variable.ENABLE_GROUP_CHAT.getKey(); +// private static final String CHAT_MESSAGE_USER_DEMO = "Hi i'm demo user"; +// private static final String CHAT_MESSAGE_USER_ADMIN = "Hi i'm admin user"; +// +// @Override +// @BeforeEach +// public void setup() { +// super.setup(); +// } +// +// // Currently still not have any idea how to open two browser with difference session to test chat between multiple +// // user +// // Tests that still not implement +// // TODO chatGroupMultiTabs, chatGroupOnTwoInstanceOfBrowser +// +// @Test +// public void chatAddGroup() { +// Responsible chatUser1 = setResponsible(TestAccount.ADMIN_USER.getUsername(), false); +// ChatPage chatPage = enableChatGroup(); +// createChatGroup(TestAccount.DEMO_USER); +// joinChatGroupWhichAlreadyHadChatGroup(TestAccount.ADMIN_USER); +// chatMessageInGroup(TestAccount.DEMO_USER, CHAT_MESSAGE_USER_DEMO); +// +// openNewTabOrWindow(WindowType.WINDOW); +// launchBrowserAndGotoRelativeLink(NewDashboardPage.PORTAL_HOME_PAGE_URL); +// ChatPage chatPage2 = chatMessageInGroup(TestAccount.ADMIN_USER, CHAT_MESSAGE_USER_ADMIN); +// +// openNewTabOrWindow(WindowType.WINDOW); +// launchBrowserAndGotoRelativeLink(NewDashboardPage.PORTAL_HOME_PAGE_URL); +// +// Responsible chatGroupEveryBody = setResponsible("Everybody", true); +// createChatGroup(TestAccount.GUEST_USER, chatUser1, chatGroupEveryBody); +// +// login(TestAccount.ADMIN_USER); +// assertEquals(2, chatPage2.refreshAndCountGroupChat()); +// +// login(TestAccount.DEMO_USER); +// assertEquals(2, chatPage.refreshAndCountGroupChat()); +// } +// +// // @Test +// public void chatGroupOnTwoInstanceOfBrowser() { +// ChatPage chatPage = enableChatGroup(); +// createChatGroup(TestAccount.DEMO_USER); +// joinChatGroupWhichAlreadyHadChatGroup(TestAccount.ADMIN_USER); +// chatMessageInGroup(TestAccount.DEMO_USER, CHAT_MESSAGE_USER_DEMO); +// +// launchBrowserAndGotoRelativeLink(NewDashboardPage.PORTAL_HOME_PAGE_URL); +// ChatPage chatPage2 = chatMessageInGroup(TestAccount.ADMIN_USER, CHAT_MESSAGE_USER_ADMIN); +// chatPage2.closeChatMessageList(); +// +// chatPage = chatMessageInGroup(TestAccount.DEMO_USER, CHAT_MESSAGE_USER_DEMO); +// chatPage.sendMessage("from 1 to 2"); +// +// chatPage2 = getChatGroup(TestAccount.ADMIN_USER); +// assertChatNotification(chatPage2, true); +// +// chatPage2.openFirstGroupChat(); +// chatPage2.sendMessage("from 2 to 1"); +// +// chatPage = getChatGroup(TestAccount.DEMO_USER); +// assertContainMessage(chatPage, "from 2 to 1"); +// chatPage2 = getChatGroup(TestAccount.ADMIN_USER); +// assertContainMessage(chatPage2, "from 1 to 2"); +// } +// +// @Test +// public void chatDisplay() { +// enableChatGroup(); +// new NewDashboardPage().isChatDisplayed(); +// } +// +// @Test +// public void chatPrivate() { +// ChatPage chatPage = enableChatPrivate(); +// chatPage.selectChatUser("demo"); +// chatPage.sendMessage(CHAT_MESSAGE_USER_ADMIN); +// +// login(TestAccount.DEMO_USER); +// new NewDashboardPage().getChat(); +// chatPage.selectChatUser("admin"); +// chatPage.sendMessage(CHAT_MESSAGE_USER_DEMO); +// } +// +// @Test +// public void joinChatGroupAlreadyCreated() { +// ChatPage chatPage = enableChatGroup(); +// createChatGroup(TestAccount.DEMO_USER); +// joinChatGroupWhichAlreadyHadChatGroup(TestAccount.ADMIN_USER); +// chatMessageInGroup(TestAccount.DEMO_USER, CHAT_MESSAGE_USER_DEMO); +// chatMessageInGroup(TestAccount.ADMIN_USER, CHAT_MESSAGE_USER_ADMIN); +// +// assertContainMessage(chatPage, CHAT_MESSAGE_USER_DEMO); +// assertContainMessage(chatPage, CHAT_MESSAGE_USER_ADMIN); +// +// login(TestAccount.DEMO_USER); +// new NewDashboardPage().getChat().isNotificationContactChat(); +// } +// +// private ChatPage createChatGroup(TestAccount creatorChatGroup, Responsible... participants) { +// redirectToRelativeLink(createTestingCaseUrlForDefaultAdditionalCaseDetails); +// login(creatorChatGroup); +// redirectToRelativeLink(NewDashboardPage.PORTAL_HOME_PAGE_URL); +// ChatPage chatPage = new NewDashboardPage().getChat(); +// // Create chat group via task +// TaskWidgetPage taskWidgetPage = NavigationHelper.navigateToTaskList(); +// ExpressTaskPage taskTemplatePage = taskWidgetPage.startExpressTask(0); +// taskTemplatePage.clickTaskActionMenu(); +// taskTemplatePage.clickChatGroup(); +// if (participants.length != 0) { +// chatPage.addUserToChatGroup(Arrays.asList(participants)); +// } +// taskTemplatePage.clickCreateGroupChatBtn(); +// return chatPage; +// } +// +// private ChatPage enableChatGroup() { +// updatePortalSetting(ENABLE_GROUP_CHAT_SETTING, "true"); +// login(TestAccount.ADMIN_USER); +// return new ChatPage(); +// } +// +// private ChatPage enableChatPrivate() { +// updatePortalSetting(ENABLE_PRIVATE_CHAT_SETTING, "true"); +// login(TestAccount.ADMIN_USER); +// new NewDashboardPage().getChat(); +// return new ChatPage(); +// } +// +// private void joinChatGroupWhichAlreadyHadChatGroup(TestAccount userJoined) { +// login(userJoined); +// TaskWidgetPage taskWidgetPage = NavigationHelper.navigateToTaskList(); +// taskWidgetPage.filterTasksInExpandedModeBy("Sick Leave Request Default Case Details Page"); +// ExpressTaskPage taskTemplatePage = taskWidgetPage.startExpressTask(0); +// taskTemplatePage.clickTaskActionMenu(); +// taskTemplatePage.clickChatGroup(); +// taskTemplatePage.joinProcessChatAlreadyCreated(); +// } +// +// private ChatPage chatMessageInGroup(TestAccount chatUser, String chatMessage) { +// ChatPage chatPage = openChatGroup(chatUser); +// chatPage.sendMessage(chatMessage); +// return chatPage; +// } +// +// private ChatPage openChatGroup(TestAccount chatUser) { +// login(chatUser); +// redirectToRelativeLink(NewDashboardPage.PORTAL_HOME_PAGE_URL); +// ChatPage chatPage = getChatGroup(chatUser); +// chatPage.openFirstGroupChat(); +// return chatPage; +// } +// +// private ChatPage getChatGroup(TestAccount chatUser) { +// login(chatUser); +// redirectToRelativeLink(NewDashboardPage.PORTAL_HOME_PAGE_URL); +// return new NewDashboardPage().getChat(); +// } +// +// private void assertContainMessage(ChatPage chatPage, String message) { +// WaitHelper.assertTrueWithWait(() -> chatPage.getAllMessagesChatLog().contains(message)); +// } +// +// private void assertChatNotification(ChatPage chatPage, boolean hasNotification) { +// chatPage.isNotificationBadgeChat(); +// chatPage.isNotificationContactChat(); +// } +// +//} diff --git a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/EnhanceVisibilityTasksForMemberOfRoleTest.java b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/EnhanceVisibilityTasksForMemberOfRoleTest.java index 8b001569409..45da35e6fd8 100644 --- a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/EnhanceVisibilityTasksForMemberOfRoleTest.java +++ b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/EnhanceVisibilityTasksForMemberOfRoleTest.java @@ -71,7 +71,7 @@ public void testVisibilityTaskInprogress() { assertEquals(countTasksReserved, taskWidgetPageGuest.countTasks().size()); assertFalse(taskWidgetPageGuest.isTaskStartEnabled(0)); assertFalseTaskActionsByTaskState("Reserved", - Arrays.asList("Delegate", "Reset", "Clear expiry", "Add Ad-hoc Task")); + Arrays.asList("Delegate", "Reset", "Clear expiry")); } @Test diff --git a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/PortalPermissionTest.java b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/PortalPermissionTest.java index 5643b03f749..65072343886 100644 --- a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/PortalPermissionTest.java +++ b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/PortalPermissionTest.java @@ -111,7 +111,6 @@ public void testShowHideTaskActions() { assertTrue(taskWidgetPage.isTaskResetDisplayed(false)); assertTrue(taskWidgetPage.isTaskDelegateDisplayed(false)); assertTrue(taskWidgetPage.isTaskReserverDisplayed(false)); - assertTrue(taskWidgetPage.isAdhocSideStepDisplayed(false)); grantTaskActionsPermissions(); taskWidgetPage = NavigationHelper.navigateToTaskList(); @@ -119,7 +118,6 @@ public void testShowHideTaskActions() { assertTrue(taskWidgetPage.isTaskResetDisplayed(true)); assertTrue(taskWidgetPage.isTaskDelegateDisplayed(true)); assertTrue(taskWidgetPage.isTaskReserverDisplayed(true)); - assertTrue(taskWidgetPage.isAdhocSideStepDisplayed(true)); } @Test diff --git a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/SideStepTest.java b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/SideStepTest.java index cd1e599c5ba..be1a8f53785 100644 --- a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/SideStepTest.java +++ b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/SideStepTest.java @@ -6,14 +6,11 @@ import com.axonivy.ivy.webtest.IvyWebTest; import com.axonivy.portal.selenium.common.BaseTest; import com.axonivy.portal.selenium.common.NavigationHelper; -import com.axonivy.portal.selenium.common.TestAccount; -import com.axonivy.portal.selenium.page.AdhocPage; import com.axonivy.portal.selenium.page.CaseWidgetPage; import com.axonivy.portal.selenium.page.MainMenuPage; import com.axonivy.portal.selenium.page.NewDashboardPage; import com.axonivy.portal.selenium.page.TaskTemplatePage; import com.axonivy.portal.selenium.page.TaskWidgetPage; -import com.codeborne.selenide.CollectionCondition; @IvyWebTest public class SideStepTest extends BaseTest { @@ -48,28 +45,4 @@ private TaskTemplatePage startATask() { return taskTemplatePage; } - @Test - public void testAddAdhocTask() { - login(TestAccount.ADMIN_USER); - int firstTask = 0; - final String TASK_NAME = "Case Map Leave Request"; - TaskWidgetPage taskWidgetPage = NavigationHelper.navigateToTaskList(); - taskWidgetPage.countTasks().shouldHave(CollectionCondition.size(2)); - assertEquals(taskWidgetPage.getNameOfTaskAt(0), TASK_NAME); - AdhocPage adhocPage = taskWidgetPage.addAdhoc(firstTask); - adhocPage.enterSubject("Collect Information"); - adhocPage.addResponsible(TestAccount.DEMO_USER.getFullName()); - adhocPage.startWorkflow(); - adhocPage = new AdhocPage(); - login(TestAccount.DEMO_USER); - taskWidgetPage = NavigationHelper.navigateToTaskList(); - taskWidgetPage.countTasks().shouldHave(CollectionCondition.size(1)); - assertEquals(taskWidgetPage.getNameOfTaskAt(0), "Collect Information"); - taskWidgetPage.startTask(0); - adhocPage = new AdhocPage(); - adhocPage.addDescription("Annual leaves are available"); - taskWidgetPage = NavigationHelper.navigateToTaskList(); - taskWidgetPage.countTasks().shouldHave(CollectionCondition.size(1)); - assertEquals(taskWidgetPage.getNameOfTaskAt(0), TASK_NAME); - } } diff --git a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/dashboard/DashboardTaskWidgetActionTest.java b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/dashboard/DashboardTaskWidgetActionTest.java index fece6ed825a..d82c1771c20 100644 --- a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/dashboard/DashboardTaskWidgetActionTest.java +++ b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/dashboard/DashboardTaskWidgetActionTest.java @@ -41,7 +41,6 @@ public class DashboardTaskWidgetActionTest extends BaseTest { static final String CLEAR_EXPIRY = "Clear expiry"; static final String DELEGATE = "Delegate"; static final String RESERVE = "Reserve"; - static final String ADD_AD_HOC_TASK = "Add Ad-hoc Task"; static final String RESET = "Reset"; static final String DESTROY = "Destroy"; static final String WORKFLOW_EVENTS = "Workflow Events"; @@ -76,7 +75,7 @@ public void testVisibilityTaskActionForNormalUser() { removeAllExistingFilter(); taskWidget.applyFilter(); assertTaskActionsByTaskState("Open", - Arrays.asList(DETAILS, DELEGATE, RESERVE, CLEAR_EXPIRY, PROCESS_VIEWER, ADD_AD_HOC_TASK)); + Arrays.asList(DETAILS, DELEGATE, RESERVE, CLEAR_EXPIRY, PROCESS_VIEWER)); // TaskState : Done <=> TaskBusinessState : Done taskWidget.openFilterWidget(); removeAllExistingFilter(); @@ -99,7 +98,7 @@ public void testVisibilityTaskActionForAdminUser() { removeAllExistingFilter(); taskWidget.applyFilter(); assertTaskActionsByTaskStateAndName(OPEN, "Sick Leave Request", Arrays.asList(DETAILS, DELEGATE, RESERVE, - CLEAR_EXPIRY, DESTROY, TRIGGER_ESCALATION, WORKFLOW_EVENTS, PROCESS_VIEWER, ADD_AD_HOC_TASK)); + CLEAR_EXPIRY, DESTROY, TRIGGER_ESCALATION, WORKFLOW_EVENTS, PROCESS_VIEWER)); // Done taskWidget.openFilterWidget(); @@ -113,7 +112,7 @@ public void testVisibilityTaskActionForAdminUser() { removeAllExistingFilter(); taskWidget.applyFilter(); assertTaskActionsByTaskStateAndName(DELAYED, "Task Switch C", - Arrays.asList(DETAILS, DELEGATE, CLEAR_DELAY, DESTROY, WORKFLOW_EVENTS, PROCESS_VIEWER, ADD_AD_HOC_TASK)); + Arrays.asList(DETAILS, DELEGATE, CLEAR_DELAY, DESTROY, WORKFLOW_EVENTS, PROCESS_VIEWER)); // Destroyed taskWidget.openFilterWidget(); @@ -144,7 +143,7 @@ public void testVisibilityTaskActionForInprogressTasks() { taskWidget.removeFilter(0); taskWidget.applyFilter(); assertTaskActionsByTaskState(IN_PROGRESS, Arrays.asList(DETAILS, RESERVE, RESET, CLEAR_EXPIRY, DESTROY, - WORKFLOW_EVENTS, PROCESS_VIEWER, ADD_AD_HOC_TASK)); + WORKFLOW_EVENTS, PROCESS_VIEWER)); login(TestAccount.DEMO_USER); createTasksForTesting(); @@ -160,7 +159,7 @@ public void testVisibilityTaskActionForInprogressTasks() { taskWidget.removeFilter(1); taskWidget.applyFilter(); assertTaskActionsByTaskState(IN_PROGRESS, - Arrays.asList(DETAILS, RESERVE, RESET, CLEAR_EXPIRY, PROCESS_VIEWER, ADD_AD_HOC_TASK)); + Arrays.asList(DETAILS, RESERVE, RESET, CLEAR_EXPIRY, PROCESS_VIEWER)); } private void filterTaskByNameAndState(String name, String state) { @@ -183,7 +182,7 @@ public void testVisibilityTaskActionForReserveTasks() { // Reserved for admin user assertTaskActionsByTaskState(OPEN, Arrays.asList(DETAILS, DELEGATE, RESET, CLEAR_EXPIRY, DESTROY, - TRIGGER_ESCALATION, WORKFLOW_EVENTS, PROCESS_VIEWER, ADD_AD_HOC_TASK)); + TRIGGER_ESCALATION, WORKFLOW_EVENTS, PROCESS_VIEWER)); login(TestAccount.DEMO_USER); createTasksForTesting(); diff --git a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/task/TaskActionTest.java b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/task/TaskActionTest.java index eda5b354a50..0cb747d718e 100644 --- a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/task/TaskActionTest.java +++ b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/task/TaskActionTest.java @@ -44,7 +44,6 @@ public class TaskActionTest extends BaseTest { private static final String CLEAR_EXPIRY = "Clear expiry"; private static final String DELEGATE = "Delegate"; private static final String RESERVE = "Reserve"; - private static final String ADD_AD_HOC_TASK = "Add Ad-hoc Task"; private static final String RESET = "Reset"; private static final String DESTROY = "Destroy"; private static final String WORKFLOW_EVENTS = "Workflow Events"; @@ -70,14 +69,14 @@ public void testVisibilityTaskActionForNormalUser() { // Suspended assertTaskActionsByTaskState(SUSPENDED, - Arrays.asList(DETAILS, DELEGATE, RESERVE, CLEAR_EXPIRY, PROCESS_VIEWER, ADD_AD_HOC_TASK)); + Arrays.asList(DETAILS, DELEGATE, RESERVE, CLEAR_EXPIRY, PROCESS_VIEWER)); taskWidgetPage = taskDetailsPage.goBackToTaskListFromTaskDetails(); // Reserved taskWidgetPage.clickOnTaskActionLink(0); taskWidgetPage.reserveTask(0); assertTaskActionsByTaskState(RESERVED, - Arrays.asList(DETAILS, DELEGATE, RESET, CLEAR_EXPIRY, PROCESS_VIEWER, ADD_AD_HOC_TASK)); + Arrays.asList(DETAILS, DELEGATE, RESET, CLEAR_EXPIRY, PROCESS_VIEWER)); // In progress TaskIFrameTemplatePage taskTemplatePage = taskDetailsPage.clickStartTask(); @@ -85,7 +84,7 @@ public void testVisibilityTaskActionForNormalUser() { taskDetailsPage = new TaskDetailsPage(); taskWidgetPage = taskDetailsPage.goBackToTaskListFromTaskDetails(); assertTaskActionsByTaskState(IN_PROGRESS, - Arrays.asList(DETAILS, RESERVE, RESET, CLEAR_EXPIRY, PROCESS_VIEWER, ADD_AD_HOC_TASK)); + Arrays.asList(DETAILS, RESERVE, RESET, CLEAR_EXPIRY, PROCESS_VIEWER)); taskWidgetPage = taskDetailsPage.goBackToTaskListFromTaskDetails(); } @@ -102,14 +101,14 @@ public void testVisibilityTaskActionForAdminUser() { // Suspended assertTaskActionsByTaskState(SUSPENDED, Arrays.asList(DETAILS, DELEGATE, RESERVE, CLEAR_EXPIRY, DESTROY, - WORKFLOW_EVENTS, TRIGGER_ESCALATION, PROCESS_VIEWER, ADD_AD_HOC_TASK)); + WORKFLOW_EVENTS, TRIGGER_ESCALATION, PROCESS_VIEWER)); taskWidgetPage = taskDetailsPage.goBackToTaskListFromTaskDetails(); // Reserved taskWidgetPage.clickOnTaskActionLink(0); taskWidgetPage.reserveTask(0); assertTaskActionsByTaskState(RESERVED, Arrays.asList(DETAILS, DELEGATE, RESET, CLEAR_EXPIRY, DESTROY, - WORKFLOW_EVENTS, TRIGGER_ESCALATION, PROCESS_VIEWER, ADD_AD_HOC_TASK)); + WORKFLOW_EVENTS, TRIGGER_ESCALATION, PROCESS_VIEWER)); // In progress TaskIFrameTemplatePage taskTemplatePage = taskDetailsPage.clickStartTask(); @@ -117,7 +116,7 @@ public void testVisibilityTaskActionForAdminUser() { taskDetailsPage = new TaskDetailsPage(); taskWidgetPage = taskDetailsPage.goBackToTaskListFromTaskDetails(); assertTaskActionsByTaskState(IN_PROGRESS, Arrays.asList(DETAILS, RESERVE, RESET, CLEAR_EXPIRY, DESTROY, - WORKFLOW_EVENTS, PROCESS_VIEWER, ADD_AD_HOC_TASK)); + WORKFLOW_EVENTS, PROCESS_VIEWER)); taskWidgetPage = taskDetailsPage.goBackToTaskListFromTaskDetails(); // Done @@ -126,7 +125,7 @@ public void testVisibilityTaskActionForAdminUser() { // Delayed assertTaskActionsByTaskState(DELAYED, - Arrays.asList(DETAILS, DELEGATE, CLEAR_DELAY, DESTROY, WORKFLOW_EVENTS, PROCESS_VIEWER, ADD_AD_HOC_TASK)); + Arrays.asList(DETAILS, DELEGATE, CLEAR_DELAY, DESTROY, WORKFLOW_EVENTS, PROCESS_VIEWER)); taskWidgetPage = taskDetailsPage.goBackToTaskListFromTaskDetails(); // Destroyed diff --git a/AxonIvyPortal/portal/cms/cms.yaml b/AxonIvyPortal/portal/cms/cms.yaml index 7eac27a47f5..5ce60eef083 100644 --- a/AxonIvyPortal/portal/cms/cms.yaml +++ b/AxonIvyPortal/portal/cms/cms.yaml @@ -1190,7 +1190,6 @@ Dialogs: switchToEditMode: Edit switchToViewMode: Save agileBPM: - TooltipForOriginalTask: Your current task will return once previous steps of the ad hoc workflow are finished. define_WF: ErrorSelectInvalidAssignee: Assignee is already selected or invalid ListOfSelectedUser: List of selected users @@ -1290,7 +1289,6 @@ Labels: TaskUser-Explain: Comma separated list of users ViewAllResults: View all results disabledUserPrefix: (disabled) - title: Self Service Ad-hoc Workflow patterns: datePattern: dd.MM.yyyy dateTimePattern: dd.MM.yyyy HH:mm @@ -1320,8 +1318,6 @@ Processes: SynchronizeServerConfigurationCaseName: Synchronize server configuration portalHome: Portal Home portalSettingSaved: Portal settings are saved -ProcessPages: - selfServiceDescription: 'Self Service Prozess: Launch an ad-hoc Workflow based on a predefined flow pattern.' Texts: Approval-Explain: |+

    diff --git a/AxonIvyPortal/portal/cms/cms_de.yaml b/AxonIvyPortal/portal/cms/cms_de.yaml index 6715ed31e6d..360f9e7a8b2 100644 --- a/AxonIvyPortal/portal/cms/cms_de.yaml +++ b/AxonIvyPortal/portal/cms/cms_de.yaml @@ -1421,7 +1421,6 @@ Dialogs: switchToEditMode: Bearbeiten switchToViewMode: Speichern agileBPM: - TooltipForOriginalTask: Ihre aktuelle Aufgabe wird wieder auftauchen sobald der Ad hoc Workflow fertiggestellt ist. define_WF: ErrorSelectInvalidAssignee: Der Beauftragte ist bereits ausgewählt oder ungültig ListOfSelectedUser: Liste ausgewählter Benutzer @@ -1647,7 +1646,6 @@ Labels: ToggleMenu: Menü umschalten ViewAllResults: Alle Ergebnisse anzeigen disabledUserPrefix: (inaktiv) - title: Self Service Ad-hoc Workflow patterns: datePattern: dd.MM.yyyy dateTimePattern: dd.MM.yyyy HH:mm @@ -1677,8 +1675,6 @@ Processes: SynchronizeServerConfigurationCaseName: Server Konfiguration synchronisieren portalHome: Portal Home portalSettingSaved: Portaleinstellungen sind gespeichert -ProcessPages: - selfServiceDescription: 'Self Service Prozess: ein ad-hoc Workflow starten' Texts: Approval-Explain: "

    \n\nTreffen Sie Ihre Entscheidung und klicken Sie auf Senden um weiterzufahren. \n\n

    \n\n" QA-Explain: |+ diff --git a/AxonIvyPortal/portal/cms/cms_en.yaml b/AxonIvyPortal/portal/cms/cms_en.yaml index be733a3398a..c581319d388 100644 --- a/AxonIvyPortal/portal/cms/cms_en.yaml +++ b/AxonIvyPortal/portal/cms/cms_en.yaml @@ -1422,7 +1422,6 @@ Dialogs: switchToEditMode: Edit switchToViewMode: Save agileBPM: - TooltipForOriginalTask: Your current task will return once previous steps of the ad hoc workflow are finished. define_WF: ErrorSelectInvalidAssignee: Assignee is already selected or invalid ListOfSelectedUser: List of selected users @@ -1651,7 +1650,6 @@ Labels: ToggleMenu: Toggle menu ViewAllResults: View all results disabledUserPrefix: (disabled) - title: Self Service Ad-hoc Workflow patterns: datePattern: dd.MM.yyyy dateTimePattern: dd.MM.yyyy HH:mm @@ -1681,8 +1679,6 @@ Processes: SynchronizeServerConfigurationCaseName: Synchronize server configuration portalHome: Portal Home portalSettingSaved: Portal settings are saved -ProcessPages: - selfServiceDescription: 'Self Service Prozess: Launch an ad-hoc Workflow based on a predefined flow pattern.' Texts: Approval-Explain: |+

    diff --git a/AxonIvyPortal/portal/cms/cms_es.yaml b/AxonIvyPortal/portal/cms/cms_es.yaml index 3027f015e13..001af6fe421 100644 --- a/AxonIvyPortal/portal/cms/cms_es.yaml +++ b/AxonIvyPortal/portal/cms/cms_es.yaml @@ -1423,7 +1423,6 @@ Dialogs: switchToEditMode: Editar switchToViewMode: Guardar agileBPM: - TooltipForOriginalTask: Su tarea actual volverá a evaluarse cuando estén completados los flujos de trabajo ad hoc previos. define_WF: ErrorSelectInvalidAssignee: El destinatario ya está seleccionado o es inválido ListOfSelectedUser: Lista de usuarios seleccionados @@ -1649,7 +1648,6 @@ Labels: ToggleMenu: Menú alternativo ViewAllResults: Ver todos los resultados disabledUserPrefix: (inactivo) - title: Flujo de trabajo Ad-hoc de auto servicio patterns: datePattern: dd.MM.yyyy dateTimePattern: dd.MM.yyyy HH:mm @@ -1679,8 +1677,6 @@ Processes: SynchronizeServerConfigurationCaseName: Sincronizar configuración del servidor portalHome: Portal Principal portalSettingSaved: Ajustes del portal guardados -ProcessPages: - selfServiceDescription: 'Proceso de auto servicio: Lanzar un flujo de trabajo ad-hoc basado en un patrón de flujo predefinido' Texts: Approval-Explain: |+

    diff --git a/AxonIvyPortal/portal/cms/cms_fr.yaml b/AxonIvyPortal/portal/cms/cms_fr.yaml index c5a978f7570..dbf70b270e2 100644 --- a/AxonIvyPortal/portal/cms/cms_fr.yaml +++ b/AxonIvyPortal/portal/cms/cms_fr.yaml @@ -1417,7 +1417,6 @@ Dialogs: switchToEditMode: Editer switchToViewMode: Enregistrer agileBPM: - TooltipForOriginalTask: 'Votre tâche actuelle réapparaîtra dès que le workflow ad hoc sera terminé. ' define_WF: ErrorSelectInvalidAssignee: Le destinataire est déjà sélectionné ou invalide ListOfSelectedUser: Liste des utilisateurs sélectionnés @@ -1635,7 +1634,6 @@ Labels: ToggleMenu: Menu à bascule ViewAllResults: Voir tous les résultats disabledUserPrefix: (désactivé) - title: Workflow ad hoc Self Service patterns: datePattern: dd.MM.yyyy dateTimePattern: dd.MM.yyyy HH:mm @@ -1665,8 +1663,6 @@ Processes: SynchronizeServerConfigurationCaseName: Synchroniser la configuration du serveur portalHome: Page d'accueil portalSettingSaved: Les paramètres du portail sont enregistrés -ProcessPages: - selfServiceDescription: 'Processus en libre service: lance un workflow ad hoc basé sur un modèle prédéfini. ' Texts: Approval-Explain: "

    \n\nVeuillez choisir et cliquez sur Envoyer pour poursuivre. \n\n

    " QA-Explain: |- diff --git a/build/gui-test-new-dashboard/Jenkinsfile b/build/gui-test-new-dashboard/Jenkinsfile index 913a6cdb320..412cf4c41c5 100644 --- a/build/gui-test-new-dashboard/Jenkinsfile +++ b/build/gui-test-new-dashboard/Jenkinsfile @@ -1,5 +1,5 @@ pipeline { - agent {label 'portal-slave'} + agent {label 'loc-pc'} options { buildDiscarder(logRotator(numToKeepStr: '60', artifactNumToKeepStr: '60')) From 80d9cb7d96e674d3d8eb2b89231642a892557af0 Mon Sep 17 00:00:00 2001 From: Loc Nguyen Date: Fri, 20 Sep 2024 13:59:19 +0700 Subject: [PATCH 11/16] feature/IVYPORTAL-17431-Remove-Express-from-Portal - Update gui test part 3 --- .../Start Processes/DataCreation.p.json | 70 ---- .../resources/js/document-screenshot.js | 8 +- .../portal/selenium/test/ChatTest.java | 386 +++++++++--------- 3 files changed, 195 insertions(+), 269 deletions(-) diff --git a/AxonIvyPortal/PortalKitTestHelper/processes/Start Processes/DataCreation.p.json b/AxonIvyPortal/PortalKitTestHelper/processes/Start Processes/DataCreation.p.json index b58ccf85c3e..a997ff5ece9 100644 --- a/AxonIvyPortal/PortalKitTestHelper/processes/Start Processes/DataCreation.p.json +++ b/AxonIvyPortal/PortalKitTestHelper/processes/Start Processes/DataCreation.p.json @@ -1351,63 +1351,6 @@ "connect" : [ { "id" : "f139", "to" : "S10" } ] - }, { - "id" : "f145", - "type" : "RequestStart", - "name" : "createSampleExpressWorkflowProcess.ivp", - "config" : { - "signature" : "createSampleExpressWorkflowProcess", - "input" : { - "params" : [ - { "name" : "filePath", "type" : "String", "desc" : "" } - ], - "map" : { - "out.expressExportFilePath" : "param.filePath" - } - }, - "request" : { - "isVisibleOnStartList" : false - } - }, - "visual" : { - "at" : { "x" : 816, "y" : 1280 }, - "labelOffset" : { "x" : 5, "y" : 49 } - }, - "connect" : [ - { "id" : "f148", "to" : "f147" } - ] - }, { - "id" : "f146", - "type" : "TaskEnd", - "visual" : { - "at" : { "x" : 1120, "y" : 1280 } - } - }, { - "id" : "f147", - "type" : "Script", - "name" : "Import Express from file", - "config" : { - "output" : { - "code" : [ - "import java.util.Map;", - "import java.io.FileInputStream;", - "import java.io.InputStream;", - "import ch.ivy.addon.portalkit.util.ExpressManagementUtils;", - "", - "Map output = ExpressManagementUtils.initOutputMessage();", - "InputStream inputstream = new FileInputStream(in.expressExportFilePath);", - "ExpressManagementUtils.installExpressWorkflows(inputstream, output);" - ] - }, - "sudo" : true - }, - "visual" : { - "at" : { "x" : 984, "y" : 1280 }, - "size" : { "width" : 144 } - }, - "connect" : [ - { "id" : "f149", "to" : "f146" } - ] }, { "id" : "f150", "type" : "RequestStart", @@ -1821,19 +1764,6 @@ "import ch.ivy.addon.portalkit.service.ExternalLinkService;", "import ch.ivyteam.ivy.security.ISecurityContext;", "import ch.ivy.addon.portalkit.configuration.ExternalLink;", - "import ch.ivy.addon.portalkit.service.ExpressProcessService;", - "import ch.ivy.addon.portalkit.bo.ExpressProcess;", - "ExpressProcess expressProcess = new ExpressProcess();", - "expressProcess.ableToEdit = true;", - "expressProcess.processName = \"A sample for Express process\";", - "expressProcess.processDescription = \"A sample for Express process\";", - "expressProcess.readyToExecute = true;", - "expressProcess.processFolder = \"test\";", - "expressProcess.processType = \"AHWF\";", - "expressProcess.processPermissions = [\"#demo\"];", - "expressProcess.processOwner = \"#demo\";", - "ExpressProcessService expressProcessService = new ExpressProcessService();", - "expressProcessService.save(expressProcess);", "", "ExternalLink externalLink = new ExternalLink();", "externalLink.name = \"A sample for External link to Google\";", diff --git a/AxonIvyPortal/portal-selenium-test/resources/js/document-screenshot.js b/AxonIvyPortal/portal-selenium-test/resources/js/document-screenshot.js index fa23c64eacb..7be242765ab 100644 --- a/AxonIvyPortal/portal-selenium-test/resources/js/document-screenshot.js +++ b/AxonIvyPortal/portal-selenium-test/resources/js/document-screenshot.js @@ -157,16 +157,12 @@ function highlightProcessItems() { createRedMediumOutline(processSearch); appendStepAnnotation(processSearch, "1", -5, processSearch.width() - 40); - var expressLogo = $('.express-workflow .image-process-icon:eq(0)'); - createRedMediumOutline(expressLogo); - appendStepAnnotation(expressLogo, "2", -15, -30); - var externalLink = $('.js-external-link-process-item .image-process-icon:eq(0)'); createRedMediumOutline(externalLink); - appendStepAnnotation(externalLink, "3", -15, -30); + appendStepAnnotation(externalLink, "2", -15, -30); createRedMediumOutline($('[id$="process-widget:process-view-mode:view-mode-selection"]')); - appendStepAnnotation($("[id$='process-widget:process-view-mode:view-mode-selection'] div[class$='ui-state-active']"), "4", -10, -40); + appendStepAnnotation($("[id$='process-widget:process-view-mode:view-mode-selection'] div[class$='ui-state-active']"), "3", -10, -40); } function highlightEditProcessIcon() { diff --git a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/ChatTest.java b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/ChatTest.java index 83d0acf2983..a3e595c37a6 100644 --- a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/ChatTest.java +++ b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/ChatTest.java @@ -1,193 +1,193 @@ -//package com.axonivy.portal.selenium.test; -// -//import java.util.Arrays; -// -//import org.junit.jupiter.api.BeforeEach; -//import org.junit.jupiter.api.Test; -//import org.openqa.selenium.WindowType; -// -//import com.axonivy.ivy.webtest.IvyWebTest; -//import com.axonivy.portal.selenium.common.BaseTest; -//import com.axonivy.portal.selenium.common.NavigationHelper; -//import com.axonivy.portal.selenium.common.TestAccount; -//import com.axonivy.portal.selenium.common.Variable; -//import com.axonivy.portal.selenium.common.WaitHelper; -//import com.axonivy.portal.selenium.page.ChatPage; -//import com.axonivy.portal.selenium.page.ExpressTaskPage; -//import com.axonivy.portal.selenium.page.NewDashboardPage; -//import com.axonivy.portal.selenium.page.TaskWidgetPage; -// -//import ch.ivyteam.ivy.project.portal.test.Responsible; -// -//@IvyWebTest -//public class ChatTest extends BaseTest { -// private static final String ENABLE_PRIVATE_CHAT_SETTING = Variable.ENABLE_PRIVATE_CHAT.getKey(); -// private static final String ENABLE_GROUP_CHAT_SETTING = Variable.ENABLE_GROUP_CHAT.getKey(); -// private static final String CHAT_MESSAGE_USER_DEMO = "Hi i'm demo user"; -// private static final String CHAT_MESSAGE_USER_ADMIN = "Hi i'm admin user"; -// -// @Override -// @BeforeEach -// public void setup() { -// super.setup(); -// } -// -// // Currently still not have any idea how to open two browser with difference session to test chat between multiple -// // user -// // Tests that still not implement -// // TODO chatGroupMultiTabs, chatGroupOnTwoInstanceOfBrowser -// -// @Test -// public void chatAddGroup() { -// Responsible chatUser1 = setResponsible(TestAccount.ADMIN_USER.getUsername(), false); -// ChatPage chatPage = enableChatGroup(); -// createChatGroup(TestAccount.DEMO_USER); -// joinChatGroupWhichAlreadyHadChatGroup(TestAccount.ADMIN_USER); -// chatMessageInGroup(TestAccount.DEMO_USER, CHAT_MESSAGE_USER_DEMO); -// -// openNewTabOrWindow(WindowType.WINDOW); -// launchBrowserAndGotoRelativeLink(NewDashboardPage.PORTAL_HOME_PAGE_URL); -// ChatPage chatPage2 = chatMessageInGroup(TestAccount.ADMIN_USER, CHAT_MESSAGE_USER_ADMIN); -// -// openNewTabOrWindow(WindowType.WINDOW); -// launchBrowserAndGotoRelativeLink(NewDashboardPage.PORTAL_HOME_PAGE_URL); -// -// Responsible chatGroupEveryBody = setResponsible("Everybody", true); -// createChatGroup(TestAccount.GUEST_USER, chatUser1, chatGroupEveryBody); -// -// login(TestAccount.ADMIN_USER); -// assertEquals(2, chatPage2.refreshAndCountGroupChat()); -// -// login(TestAccount.DEMO_USER); -// assertEquals(2, chatPage.refreshAndCountGroupChat()); -// } -// -// // @Test -// public void chatGroupOnTwoInstanceOfBrowser() { -// ChatPage chatPage = enableChatGroup(); -// createChatGroup(TestAccount.DEMO_USER); -// joinChatGroupWhichAlreadyHadChatGroup(TestAccount.ADMIN_USER); -// chatMessageInGroup(TestAccount.DEMO_USER, CHAT_MESSAGE_USER_DEMO); -// -// launchBrowserAndGotoRelativeLink(NewDashboardPage.PORTAL_HOME_PAGE_URL); -// ChatPage chatPage2 = chatMessageInGroup(TestAccount.ADMIN_USER, CHAT_MESSAGE_USER_ADMIN); -// chatPage2.closeChatMessageList(); -// -// chatPage = chatMessageInGroup(TestAccount.DEMO_USER, CHAT_MESSAGE_USER_DEMO); -// chatPage.sendMessage("from 1 to 2"); -// -// chatPage2 = getChatGroup(TestAccount.ADMIN_USER); -// assertChatNotification(chatPage2, true); -// -// chatPage2.openFirstGroupChat(); -// chatPage2.sendMessage("from 2 to 1"); -// -// chatPage = getChatGroup(TestAccount.DEMO_USER); -// assertContainMessage(chatPage, "from 2 to 1"); -// chatPage2 = getChatGroup(TestAccount.ADMIN_USER); -// assertContainMessage(chatPage2, "from 1 to 2"); -// } -// -// @Test -// public void chatDisplay() { -// enableChatGroup(); -// new NewDashboardPage().isChatDisplayed(); -// } -// -// @Test -// public void chatPrivate() { -// ChatPage chatPage = enableChatPrivate(); -// chatPage.selectChatUser("demo"); -// chatPage.sendMessage(CHAT_MESSAGE_USER_ADMIN); -// -// login(TestAccount.DEMO_USER); -// new NewDashboardPage().getChat(); -// chatPage.selectChatUser("admin"); -// chatPage.sendMessage(CHAT_MESSAGE_USER_DEMO); -// } -// -// @Test -// public void joinChatGroupAlreadyCreated() { -// ChatPage chatPage = enableChatGroup(); -// createChatGroup(TestAccount.DEMO_USER); -// joinChatGroupWhichAlreadyHadChatGroup(TestAccount.ADMIN_USER); -// chatMessageInGroup(TestAccount.DEMO_USER, CHAT_MESSAGE_USER_DEMO); -// chatMessageInGroup(TestAccount.ADMIN_USER, CHAT_MESSAGE_USER_ADMIN); -// -// assertContainMessage(chatPage, CHAT_MESSAGE_USER_DEMO); -// assertContainMessage(chatPage, CHAT_MESSAGE_USER_ADMIN); -// -// login(TestAccount.DEMO_USER); -// new NewDashboardPage().getChat().isNotificationContactChat(); -// } -// -// private ChatPage createChatGroup(TestAccount creatorChatGroup, Responsible... participants) { -// redirectToRelativeLink(createTestingCaseUrlForDefaultAdditionalCaseDetails); -// login(creatorChatGroup); -// redirectToRelativeLink(NewDashboardPage.PORTAL_HOME_PAGE_URL); -// ChatPage chatPage = new NewDashboardPage().getChat(); -// // Create chat group via task -// TaskWidgetPage taskWidgetPage = NavigationHelper.navigateToTaskList(); -// ExpressTaskPage taskTemplatePage = taskWidgetPage.startExpressTask(0); -// taskTemplatePage.clickTaskActionMenu(); -// taskTemplatePage.clickChatGroup(); -// if (participants.length != 0) { -// chatPage.addUserToChatGroup(Arrays.asList(participants)); -// } -// taskTemplatePage.clickCreateGroupChatBtn(); -// return chatPage; -// } -// -// private ChatPage enableChatGroup() { -// updatePortalSetting(ENABLE_GROUP_CHAT_SETTING, "true"); -// login(TestAccount.ADMIN_USER); -// return new ChatPage(); -// } -// -// private ChatPage enableChatPrivate() { -// updatePortalSetting(ENABLE_PRIVATE_CHAT_SETTING, "true"); -// login(TestAccount.ADMIN_USER); -// new NewDashboardPage().getChat(); -// return new ChatPage(); -// } -// -// private void joinChatGroupWhichAlreadyHadChatGroup(TestAccount userJoined) { -// login(userJoined); -// TaskWidgetPage taskWidgetPage = NavigationHelper.navigateToTaskList(); -// taskWidgetPage.filterTasksInExpandedModeBy("Sick Leave Request Default Case Details Page"); -// ExpressTaskPage taskTemplatePage = taskWidgetPage.startExpressTask(0); -// taskTemplatePage.clickTaskActionMenu(); -// taskTemplatePage.clickChatGroup(); -// taskTemplatePage.joinProcessChatAlreadyCreated(); -// } -// -// private ChatPage chatMessageInGroup(TestAccount chatUser, String chatMessage) { -// ChatPage chatPage = openChatGroup(chatUser); -// chatPage.sendMessage(chatMessage); -// return chatPage; -// } -// -// private ChatPage openChatGroup(TestAccount chatUser) { -// login(chatUser); -// redirectToRelativeLink(NewDashboardPage.PORTAL_HOME_PAGE_URL); -// ChatPage chatPage = getChatGroup(chatUser); -// chatPage.openFirstGroupChat(); -// return chatPage; -// } -// -// private ChatPage getChatGroup(TestAccount chatUser) { -// login(chatUser); -// redirectToRelativeLink(NewDashboardPage.PORTAL_HOME_PAGE_URL); -// return new NewDashboardPage().getChat(); -// } -// -// private void assertContainMessage(ChatPage chatPage, String message) { -// WaitHelper.assertTrueWithWait(() -> chatPage.getAllMessagesChatLog().contains(message)); -// } -// -// private void assertChatNotification(ChatPage chatPage, boolean hasNotification) { -// chatPage.isNotificationBadgeChat(); -// chatPage.isNotificationContactChat(); -// } -// -//} +package com.axonivy.portal.selenium.test; + +import java.util.Arrays; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.openqa.selenium.WindowType; + +import com.axonivy.ivy.webtest.IvyWebTest; +import com.axonivy.portal.selenium.common.BaseTest; +import com.axonivy.portal.selenium.common.NavigationHelper; +import com.axonivy.portal.selenium.common.TestAccount; +import com.axonivy.portal.selenium.common.Variable; +import com.axonivy.portal.selenium.common.WaitHelper; +import com.axonivy.portal.selenium.page.ChatPage; +import com.axonivy.portal.selenium.page.NewDashboardPage; +import com.axonivy.portal.selenium.page.TaskTemplatePage; +import com.axonivy.portal.selenium.page.TaskWidgetPage; + +import ch.ivyteam.ivy.project.portal.test.Responsible; + +@IvyWebTest(headless = false) +public class ChatTest extends BaseTest { + private static final String ENABLE_PRIVATE_CHAT_SETTING = Variable.ENABLE_PRIVATE_CHAT.getKey(); + private static final String ENABLE_GROUP_CHAT_SETTING = Variable.ENABLE_GROUP_CHAT.getKey(); + private static final String CHAT_MESSAGE_USER_DEMO = "Hi i'm demo user"; + private static final String CHAT_MESSAGE_USER_ADMIN = "Hi i'm admin user"; + + @Override + @BeforeEach + public void setup() { + super.setup(); + } + + // Currently still not have any idea how to open two browser with difference session to test chat between multiple + // user + // Tests that still not implement + // TODO chatGroupMultiTabs, chatGroupOnTwoInstanceOfBrowser + + @Test + public void chatAddGroup() { + Responsible chatUser1 = setResponsible(TestAccount.ADMIN_USER.getUsername(), false); + ChatPage chatPage = enableChatGroup(); + createChatGroup(TestAccount.DEMO_USER); + joinChatGroupWhichAlreadyHadChatGroup(TestAccount.ADMIN_USER); + chatMessageInGroup(TestAccount.DEMO_USER, CHAT_MESSAGE_USER_DEMO); + + openNewTabOrWindow(WindowType.WINDOW); + launchBrowserAndGotoRelativeLink(NewDashboardPage.PORTAL_HOME_PAGE_URL); + ChatPage chatPage2 = chatMessageInGroup(TestAccount.ADMIN_USER, CHAT_MESSAGE_USER_ADMIN); + + openNewTabOrWindow(WindowType.WINDOW); + launchBrowserAndGotoRelativeLink(NewDashboardPage.PORTAL_HOME_PAGE_URL); + + Responsible chatGroupEveryBody = setResponsible("Everybody", true); + createChatGroup(TestAccount.GUEST_USER, chatUser1, chatGroupEveryBody); + + login(TestAccount.ADMIN_USER); + assertEquals(2, chatPage2.refreshAndCountGroupChat()); + + login(TestAccount.DEMO_USER); + assertEquals(2, chatPage.refreshAndCountGroupChat()); + } + + // @Test + public void chatGroupOnTwoInstanceOfBrowser() { + ChatPage chatPage = enableChatGroup(); + createChatGroup(TestAccount.DEMO_USER); + joinChatGroupWhichAlreadyHadChatGroup(TestAccount.ADMIN_USER); + chatMessageInGroup(TestAccount.DEMO_USER, CHAT_MESSAGE_USER_DEMO); + + launchBrowserAndGotoRelativeLink(NewDashboardPage.PORTAL_HOME_PAGE_URL); + ChatPage chatPage2 = chatMessageInGroup(TestAccount.ADMIN_USER, CHAT_MESSAGE_USER_ADMIN); + chatPage2.closeChatMessageList(); + + chatPage = chatMessageInGroup(TestAccount.DEMO_USER, CHAT_MESSAGE_USER_DEMO); + chatPage.sendMessage("from 1 to 2"); + + chatPage2 = getChatGroup(TestAccount.ADMIN_USER); + assertChatNotification(chatPage2, true); + + chatPage2.openFirstGroupChat(); + chatPage2.sendMessage("from 2 to 1"); + + chatPage = getChatGroup(TestAccount.DEMO_USER); + assertContainMessage(chatPage, "from 2 to 1"); + chatPage2 = getChatGroup(TestAccount.ADMIN_USER); + assertContainMessage(chatPage2, "from 1 to 2"); + } + + @Test + public void chatDisplay() { + enableChatGroup(); + new NewDashboardPage().isChatDisplayed(); + } + + @Test + public void chatPrivate() { + ChatPage chatPage = enableChatPrivate(); + chatPage.selectChatUser("demo"); + chatPage.sendMessage(CHAT_MESSAGE_USER_ADMIN); + + login(TestAccount.DEMO_USER); + new NewDashboardPage().getChat(); + chatPage.selectChatUser("admin"); + chatPage.sendMessage(CHAT_MESSAGE_USER_DEMO); + } + + @Test + public void joinChatGroupAlreadyCreated() { + ChatPage chatPage = enableChatGroup(); + createChatGroup(TestAccount.DEMO_USER); + joinChatGroupWhichAlreadyHadChatGroup(TestAccount.ADMIN_USER); + chatMessageInGroup(TestAccount.DEMO_USER, CHAT_MESSAGE_USER_DEMO); + chatMessageInGroup(TestAccount.ADMIN_USER, CHAT_MESSAGE_USER_ADMIN); + + assertContainMessage(chatPage, CHAT_MESSAGE_USER_DEMO); + assertContainMessage(chatPage, CHAT_MESSAGE_USER_ADMIN); + + login(TestAccount.DEMO_USER); + new NewDashboardPage().getChat().isNotificationContactChat(); + } + + private ChatPage createChatGroup(TestAccount creatorChatGroup, Responsible... participants) { + redirectToRelativeLink(createTestingCaseUrlForDefaultAdditionalCaseDetails); + login(creatorChatGroup); + redirectToRelativeLink(NewDashboardPage.PORTAL_HOME_PAGE_URL); + ChatPage chatPage = new NewDashboardPage().getChat(); + // Create chat group via task + TaskWidgetPage taskWidgetPage = NavigationHelper.navigateToTaskList(); + TaskTemplatePage taskTemplatePage = taskWidgetPage.startTask(0); + taskTemplatePage.clickTaskActionMenu(); + taskTemplatePage.clickChatGroup(); + if (participants.length != 0) { + chatPage.addUserToChatGroup(Arrays.asList(participants)); + } + taskTemplatePage.clickCreateGroupChatBtn(); + return chatPage; + } + + private ChatPage enableChatGroup() { + updatePortalSetting(ENABLE_GROUP_CHAT_SETTING, "true"); + login(TestAccount.ADMIN_USER); + return new ChatPage(); + } + + private ChatPage enableChatPrivate() { + updatePortalSetting(ENABLE_PRIVATE_CHAT_SETTING, "true"); + login(TestAccount.ADMIN_USER); + new NewDashboardPage().getChat(); + return new ChatPage(); + } + + private void joinChatGroupWhichAlreadyHadChatGroup(TestAccount userJoined) { + login(userJoined); + TaskWidgetPage taskWidgetPage = NavigationHelper.navigateToTaskList(); + taskWidgetPage.filterTasksInExpandedModeBy("Sick Leave Request Default Case Details Page"); + TaskTemplatePage taskTemplatePage = taskWidgetPage.startTask(0); + taskTemplatePage.clickTaskActionMenu(); + taskTemplatePage.clickChatGroup(); + taskTemplatePage.joinProcessChatAlreadyCreated(); + } + + private ChatPage chatMessageInGroup(TestAccount chatUser, String chatMessage) { + ChatPage chatPage = openChatGroup(chatUser); + chatPage.sendMessage(chatMessage); + return chatPage; + } + + private ChatPage openChatGroup(TestAccount chatUser) { + login(chatUser); + redirectToRelativeLink(NewDashboardPage.PORTAL_HOME_PAGE_URL); + ChatPage chatPage = getChatGroup(chatUser); + chatPage.openFirstGroupChat(); + return chatPage; + } + + private ChatPage getChatGroup(TestAccount chatUser) { + login(chatUser); + redirectToRelativeLink(NewDashboardPage.PORTAL_HOME_PAGE_URL); + return new NewDashboardPage().getChat(); + } + + private void assertContainMessage(ChatPage chatPage, String message) { + WaitHelper.assertTrueWithWait(() -> chatPage.getAllMessagesChatLog().contains(message)); + } + + private void assertChatNotification(ChatPage chatPage, boolean hasNotification) { + chatPage.isNotificationBadgeChat(); + chatPage.isNotificationContactChat(); + } + +} From 661f98d6f1110db75553446a5946edfbb175af8e Mon Sep 17 00:00:00 2001 From: Loc Nguyen Date: Fri, 20 Sep 2024 15:46:34 +0700 Subject: [PATCH 12/16] feature/IVYPORTAL-17431-Remove-Express-from-Portal - Fix gui test part 4 --- .../resources/testFile/express-test.json | 125 ------------------ .../express-wf-with-disabled-user.json | 67 ---------- .../portal/selenium/common/Variable.java | 3 +- .../selenium/page/SearchResultPage.java | 61 --------- .../dashboard/DashboardProcessWidgetTest.java | 5 +- .../Portal/Processes/ExpressProcesses.json | 1 - 6 files changed, 4 insertions(+), 258 deletions(-) delete mode 100644 AxonIvyPortal/portal-selenium-test/resources/testFile/express-test.json delete mode 100644 AxonIvyPortal/portal-selenium-test/resources/testFile/express-wf-with-disabled-user.json delete mode 100644 AxonIvyPortal/portal/config/variables/Portal/Processes/ExpressProcesses.json diff --git a/AxonIvyPortal/portal-selenium-test/resources/testFile/express-test.json b/AxonIvyPortal/portal-selenium-test/resources/testFile/express-test.json deleted file mode 100644 index 1d7e62b5b26..00000000000 --- a/AxonIvyPortal/portal-selenium-test/resources/testFile/express-test.json +++ /dev/null @@ -1,125 +0,0 @@ -{ - "version": 1, - "expressWorkflow": [{ - "expressProcess": { - "id": "f5da82a8ed4f437d95b477e9746d9a75", - "processName": "Leave request creation", - "processDescription": "Leave request creation description", - "processType": "AHWF", - "processPermissions": ["#admin"], - "processOwner": "#admin", - "isUseDefaultUI": false, - "processFolder": "e172808e-edd2-4457-8169-f6a48c70bc43", - "readyToExecute": true, - "processCoOwners": ["#admin"], - "isAbleToEdit": true - }, - "expressTaskDefinitions": [{ - "id": "7f0cac61d68346babbebe1e703c578cb", - "processID": "f5da82a8ed4f437d95b477e9746d9a75", - "type": "USER_TASK", - "responsibles": ["#admin"], - "subject": "Express Task 1", - "description": "", - "taskPosition": 1, - "untilDays": 1 - } - ], - "expressFormElements": [{ - "id": "b9d14eba257c40b8b3e628d5defa5479", - "processID": "f5da82a8ed4f437d95b477e9746d9a75", - "elementID": "Test label2019-12-27 11:08:16", - "taskPosition": 1, - "label": "Test Label", - "required": false, - "intSetting": 0, - "elementType": "InputFieldText", - "optionStrs": [""], - "elementPosition": "HEADER", - "indexInPanel": 0, - "counter": 0 - } - ] - }, { - "expressProcess": { - "id": "c3939e7508144f94a03dc71c8054570c", - "processName": "Quality Report", - "processDescription": "Quality Report description", - "processType": "AHWF", - "processPermissions": ["#admin"], - "processOwner": "#admin", - "isUseDefaultUI": false, - "processFolder": "e172808e-edd2-4457-8169-f6a48c70bc43", - "readyToExecute": true, - "processCoOwners": ["#admin"], - "isAbleToEdit": true - }, - "expressTaskDefinitions": [{ - "id": "209f65e4e7344d2ca7d46e0cb39f70b6", - "processID": "c3939e7508144f94a03dc71c8054570c", - "type": "USER_TASK", - "responsibles": ["#admin"], - "subject": "Express Task 1", - "description": "", - "taskPosition": 1, - "untilDays": 1 - } - ], - "expressFormElements": [{ - "id": "4a23be65f8bf4dbb97f0d126a146bfb0", - "processID": "c3939e7508144f94a03dc71c8054570c", - "elementID": "Test label2019-12-27 11:08:16", - "taskPosition": 1, - "label": "Test Label", - "required": false, - "intSetting": 0, - "elementType": "InputFieldText", - "optionStrs": [""], - "elementPosition": "HEADER", - "indexInPanel": 0, - "counter": 0 - } - ] - }, { - "expressProcess": { - "id": "c8166c0a53144adc9eaa1df9c2902f04", - "processName": "Express Test 1", - "processDescription": "Express Test 1", - "processType": "AHWF", - "processPermissions": ["#admin"], - "processOwner": "#admin", - "isUseDefaultUI": false, - "processFolder": "e172808e-edd2-4457-8169-f6a48c70bc43", - "readyToExecute": true, - "processCoOwners": ["#admin"], - "isAbleToEdit": true - }, - "expressTaskDefinitions": [{ - "id": "69cd5fe6730842d394e9025b2b58b56d", - "processID": "c8166c0a53144adc9eaa1df9c2902f04", - "type": "USER_TASK", - "responsibles": ["#admin"], - "subject": "Express Task 1", - "description": "", - "taskPosition": 1, - "untilDays": 1 - } - ], - "expressFormElements": [{ - "id": "269bbeb00a7143c18753e3dc87a273b8", - "processID": "c8166c0a53144adc9eaa1df9c2902f04", - "elementID": "Test label2019-12-27 11:08:16", - "taskPosition": 1, - "label": "Test Label", - "required": false, - "intSetting": 0, - "elementType": "InputFieldText", - "optionStrs": [""], - "elementPosition": "HEADER", - "indexInPanel": 0, - "counter": 0 - } - ] - } - ] -} \ No newline at end of file diff --git a/AxonIvyPortal/portal-selenium-test/resources/testFile/express-wf-with-disabled-user.json b/AxonIvyPortal/portal-selenium-test/resources/testFile/express-wf-with-disabled-user.json deleted file mode 100644 index 837fcba4636..00000000000 --- a/AxonIvyPortal/portal-selenium-test/resources/testFile/express-wf-with-disabled-user.json +++ /dev/null @@ -1,67 +0,0 @@ -{ - "version": 1, - "expressWorkflow": [{ - "expressProcess": { - "id": "1aa339cba44148c8a7215b840b0911b4", - "processName": "Test disabled user", - "processDescription": "Test disabled user", - "processType": "AHWF", - "processPermissions": ["#visibility_test_user", "#demo"], - "processOwner": "#admin", - "isUseDefaultUI": false, - "processFolder": "e26cfb17-4fdd-405c-9aed-4dbfdd7eefe1", - "readyToExecute": true, - "processCoOwners": ["#admin", "#visibility_test_user"], - "isAbleToEdit": true - }, - "expressTaskDefinitions": [{ - "id": "3a059f99084d488a99a8992157589d1c", - "processID": "1aa339cba44148c8a7215b840b0911b4", - "type": "USER_TASK", - "responsibles": ["#visibility_test_user", "#demo"], - "subject": "Task 1 - Test disabled user", - "description": "", - "taskPosition": 1, - "untilDays": 1 - }, { - "id": "4491316e17e947be86ce02ed1e91ba9a", - "processID": "1aa339cba44148c8a7215b840b0911b4", - "type": "USER_TASK", - "responsibles": ["#visibility_test_user"], - "subject": "Task 2 - Test disabled user", - "description": "", - "taskPosition": 2, - "untilDays": 1 - } - ], - "expressFormElements": [{ - "id": "b8dba0d41b1a4290b9f125a29fa2f4f5", - "processID": "1aa339cba44148c8a7215b840b0911b4", - "elementID": "Hello2020-06-01 04:45:15", - "taskPosition": 1, - "label": "Hello", - "required": false, - "intSetting": 0, - "elementType": "InputFieldText", - "optionStrs": [""], - "elementPosition": "LEFTPANEL", - "indexInPanel": 0, - "counter": 0 - }, { - "id": "fb18bb0bf7f2400b949f244fea1bbfc0", - "processID": "1aa339cba44148c8a7215b840b0911b4", - "elementID": "Test 22020-06-01 04:45:27", - "taskPosition": 2, - "label": "Test 2", - "required": false, - "intSetting": 0, - "elementType": "InputFieldText", - "optionStrs": [""], - "elementPosition": "HEADER", - "indexInPanel": 0, - "counter": 0 - } - ] - } - ] -} diff --git a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/common/Variable.java b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/common/Variable.java index 14b8f91053e..a0823b3c476 100644 --- a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/common/Variable.java +++ b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/common/Variable.java @@ -32,8 +32,7 @@ public enum Variable { DISPLAY_USERS_OF_TASK_ACTIVATOR("Portal.DisplayUsersOfRole"), ANNOUNCEMENT("Portal.Announcement"), TASK_ANALYSIS_FILTER("Portal.TaskAnalysisFilters"), THIRD_PARTY_APP("Portal.ThirdPartyApplications"), STATISTIC_CHART("Portal.StatisticCharts"), EXTERNAL_LINK("Portal.Processes.ExternalLinks"), - EXPRESS_PROCESS("Portal.Processes.ExpressProcesses"), TASK_COLUMN("Portal.Tasks.TaskColumn"), - TASK_FILTER("Portal.Tasks.TaskFilters"), + TASK_COLUMN("Portal.Tasks.TaskColumn"), TASK_FILTER("Portal.Tasks.TaskFilters"), TASK_BEHAVIOUR_WHEN_CLICKING_ON_LINE_IN_TASK_LIST("Portal.Tasks.BehaviourWhenClickingOnLineInTaskList"), TASK_DETAIL("Portal.TaskDetails"), CASE_COLUMN("Portal.Cases.CaseColumn"), CASE_FILTER("Portal.Cases.CaseFilters"), CASE_DETAIL("Portal.CaseDetails"), SHOW_AVATAR("Portal.ShowAvatar"), diff --git a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/SearchResultPage.java b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/SearchResultPage.java index a07214807b2..16659e1eb8f 100644 --- a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/SearchResultPage.java +++ b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/SearchResultPage.java @@ -1,20 +1,13 @@ package com.axonivy.portal.selenium.page; import static com.codeborne.selenide.Selenide.$; -import static com.codeborne.selenide.Selenide.$$; import org.openqa.selenium.By; -import org.openqa.selenium.WebElement; import com.codeborne.selenide.SelenideElement; public class SearchResultPage extends TemplatePage { - private final String INFO_EXPRESS_WORKFlOW = "span[id$='info-workflow']"; - private final String EDIT_EXPRESS_WORKFlOW = "a[id$='edit-express-workflow']"; - private final String DELETE_EXPRESS_WORKFlOW = "a[id$='delete-express-workflow']"; - private final String EXPRESS_PROCESS_LOGO = "span[id$='express-process-logo']"; - @Override protected String getLoadedLocator() { return "[id$='search-results-tabview']"; @@ -84,56 +77,6 @@ private ProcessWidgetPage getProcessWidget() { return new ProcessWidgetPage("search-results-tabview:process-results"); } - public boolean isInfoWorkflowIcon() { - ProcessWidgetPage processWidget = getProcessWidget(); - if (processWidget.isImageModeActivated()) { - SelenideElement icon = $(".express-workflow").$(".process-image-view-icon"); - return icon.getAttribute("class").contains("si si si-startup-launch"); - } - - WebElement element = findElementByCssSelector(INFO_EXPRESS_WORKFlOW); - return element.getAttribute("class").contains("si-information-circle"); - } - - public boolean isEditExpressWorkflow(String processName) { - ProcessWidgetPage processWidget = getProcessWidget(); - if (processWidget.isImageModeActivated()) { - SelenideElement actionMenu = getImageProcessActionMenuPanel(processName); - SelenideElement icon = actionMenu.$("a[id$=':image-process-action-component:edit-process']"); - return icon != null; - } - SelenideElement element = findElementByCssSelector(EDIT_EXPRESS_WORKFlOW); - return element.getAttribute("class").contains("si-graphic-tablet-drawing-pen"); - } - - private SelenideElement getImageProcessActionMenuPanel(String processName) { - var selectedProcess = $$("span.process-image-view-name").asFixedIterable().stream() - .filter(process -> processName.equalsIgnoreCase(process.getText())).findFirst().orElse(null); - var processActionMenuId = selectedProcess.getAttribute(ID_PROPERTY).replace("process-item-name", ""); - processActionMenuId = processActionMenuId.concat("process-item:image-process-action-component:process-action-menu"); - return findElementByCssSelector(String.format("div[id$='%s']", processActionMenuId)); - } - - public boolean isDeleteExpressWorkflown(String processName) { - ProcessWidgetPage processWidget = getProcessWidget(); - if (processWidget.isImageModeActivated()) { - SelenideElement actionMenu = getImageProcessActionMenuPanel(processName); - SelenideElement icon = actionMenu.$("a[id$=':image-process-action-component:delete-process']"); - return icon != null; - } - SelenideElement element = findElementByCssSelector(DELETE_EXPRESS_WORKFlOW); - return element.getAttribute("class").contains("si-bin-1"); - } - - public boolean isExpressProcessLogo() { - ProcessWidgetPage processWidget = getProcessWidget(); - if (processWidget.isImageModeActivated()) { - return isInfoWorkflowIcon(); - } - SelenideElement element = findElementByCssSelector(EXPRESS_PROCESS_LOGO); - return element.getAttribute("class").contains("si-startup-launch"); - } - public boolean isTaskCategoryColumnDisplayed() { return findElementByCssSelector("span[id$=':task-category-cell']").isDisplayed(); } @@ -147,8 +90,4 @@ public void waitForFirstTabFinishedLoading() { waitForElementDisplayed(By.className("js-loading-process-list"), false); waitForElementDisplayed(By.className("js-process-start-list-container"), true); } - - public void clickOnActionButton(String processName) { - $(".express-workflow").$("button[id$=':process-action-button']").shouldBe(getClickableCondition()).click(); - } } diff --git a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/dashboard/DashboardProcessWidgetTest.java b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/dashboard/DashboardProcessWidgetTest.java index bd4f0661c52..8decec7d22d 100644 --- a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/dashboard/DashboardProcessWidgetTest.java +++ b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/dashboard/DashboardProcessWidgetTest.java @@ -28,6 +28,7 @@ public class DashboardProcessWidgetTest extends BaseTest { private static final String YOUR_PROCESSES = "Your Processes"; private static final String EXPRESS_PROCESS = "EXPRESS_PROCESS"; + private static final String EXTERNAL_LINK = "EXTERNAL_LINK"; private static final String CASE_LEAVE_REQUEST_TEST_FOR_IVYPORTAL_3369 = "Case: Leave Request Test For IVYPORTAL-3369"; private static final String TASK_SICK_LEAVE_REQUEST = "Task: Sick Leave Request"; @@ -530,7 +531,7 @@ public void testFilterCompactModeProcessFilterProcessNameWhenExpanded() { public void testFilterCompactModeProcessFilterProcessType() { newDashboardPage.checkCompactModeProcessDisplayedProcessItem(CREATE_INVESTMENT_IFRAME); - newDashboardPage.applyFilterCompactModeProcessProcessType(EXPRESS_PROCESS); + newDashboardPage.applyFilterCompactModeProcessProcessType(EXTERNAL_LINK); newDashboardPage.checkCompactModeProcessDisappearedProcessItem(CREATE_INVESTMENT_IFRAME); } @@ -540,7 +541,7 @@ public void testFilterCompactModeProcessFilterProcessTypeWhenExpanded() { newDashboardPage.checkCompactModeProcessDisplayedProcessItem(CREATE_INVESTMENT_IFRAME); newDashboardPage.expandCompactModeProcess(); - newDashboardPage.applyFilterCompactModeProcessProcessTypeWhenExpanded(EXPRESS_PROCESS); + newDashboardPage.applyFilterCompactModeProcessProcessTypeWhenExpanded(EXTERNAL_LINK); newDashboardPage.checkCompactModeProcessDisappearedProcessItem(CREATE_INVESTMENT_IFRAME); } diff --git a/AxonIvyPortal/portal/config/variables/Portal/Processes/ExpressProcesses.json b/AxonIvyPortal/portal/config/variables/Portal/Processes/ExpressProcesses.json deleted file mode 100644 index 0637a088a01..00000000000 --- a/AxonIvyPortal/portal/config/variables/Portal/Processes/ExpressProcesses.json +++ /dev/null @@ -1 +0,0 @@ -[] \ No newline at end of file From 820a9f167b284a0c7dcb9144fd877d77949b1510 Mon Sep 17 00:00:00 2001 From: Loc Nguyen Date: Mon, 23 Sep 2024 10:08:41 +0700 Subject: [PATCH 13/16] feature/IVYPORTAL-17431-Remove-Express-from-Portal - Remove css p.1 --- .../resources/css/portal-variables-dark.css | 42 ------------------ .../resources/css/portal-variables-light.css | 43 ------------------- .../webContent/resources/css/portal.css | 20 --------- 3 files changed, 105 deletions(-) diff --git a/AxonIvyPortal/portal/webContent/resources/css/portal-variables-dark.css b/AxonIvyPortal/portal/webContent/resources/css/portal-variables-dark.css index 7d86109ec13..0093902fd02 100644 --- a/AxonIvyPortal/portal/webContent/resources/css/portal-variables-dark.css +++ b/AxonIvyPortal/portal/webContent/resources/css/portal-variables-dark.css @@ -203,48 +203,6 @@ /* Error Page */ --error-container-color: #546e7a; --error-message-header-color: #e67163; - /* Express */ - --express-input-switch-selection-background-color: var(--primary-color); - --task-responsible-label-state-error-color: #e62a10; - --defined-task-button-background-color: var(--ivy-primary-color-white); - --form-elements-panel-hover-drop-section-background-color: var(--ivy-primary-color-light); - --form-elements-checkbox-fields-color: var(--ivy-primary-color-black); - --defined-task-label-background-color: var(--ivy-primary-color-grey-dark); - --defined-task-button-container-background-color: var(--ivy-primary-color-white); - --defined-task-button-actived-or-hover-background-color: var(--primary-color); - --defined-task-button-actived-border-color: var(--primary-color); - --defined-task-button-border-color: var(--primary-color); - --defined-task-button-text-color: var(--ivy-primary-color-black); - --active-defined-task-button-text-color: var(--ivy-primary-color-white); - --defined-task-label-text-color: var(--ivy-primary-color-white); - --active-defined-task-label-text-color: var(--ivy-primary-color-black); - --form-elements-panel-hover-drop-section-label-color: var(--ivy-primary-color-white); - --autocomplete-more-text-state-highlight-background-color: white; - --express-input-switch-selection-border: var(--primary-color); - --express-available-elements-action-button-background-color: transparent; - --express-available-elements-action-button-shadow: none; - --express-available-elements-action-button-icon-color: var(--ivy-primary-color-black); - --form-definition-table-border: var(--ivy-primary-color-grey-light); - --form-definition-table-selected-panel-border: var(--ivy-primary-color-grey-light); - --form-definition-table-selected-panel-background-color: transparent; - --email-file-upload-corner-top-background-color: transparent; - --express-table-no-header-border: var(--ivy-primary-color-grey-light); - --express-table-no-header-background-color: transparent; - --expand-collapse-button-color: var(--ivy-primary-color-black); - --express-workflow-active-switch-label-font-weight: 700; - --express-review-content-title-font-weight: 700; - --express-finished-task-label-font-weight: 700; - --express-active-defined-task-button-font-weight: bold; - --collapse-button-background-color: var(--ivy-primary-color-grey-pale); - --collapse-button-hover-background-color: var(--ivy-primary-color-grey-light) ; - --express-assignee-icon-color: var(--ivy-primary-color-black); - --express-review-content-title-border-color: hsla(180, 1%, 61%, 0.5); - --express-import-status-success: var(--ivy-tertinary-color-green-medium); - --express-import-status-warning: var(--ivy-tertinary-color-yellow-medium); - --express-import-status-failed: var(--ivy-tertinary-color-red-medium); - --express-import-paginator-background-color: hsla(180, 1%, 85%,0.5); - --express-import-paginator-hover-button-background-color: hsla(180, 1%, 85%,0.5); - --express-import-paginator-text-color: var(--ivy-primary-color-black); /* Chat */ --chat-panel-background-color: #303A48; --no-group-chat-color: var(--text-color, #69707A); diff --git a/AxonIvyPortal/portal/webContent/resources/css/portal-variables-light.css b/AxonIvyPortal/portal/webContent/resources/css/portal-variables-light.css index b80ed2802bb..531154da02d 100644 --- a/AxonIvyPortal/portal/webContent/resources/css/portal-variables-light.css +++ b/AxonIvyPortal/portal/webContent/resources/css/portal-variables-light.css @@ -214,49 +214,6 @@ /* Error Page */ --error-container-color: #546e7a; --error-message-header-color: #e67163; - /* Express */ - --express-input-switch-selection-background-color: var(--primary-color); - --task-responsible-label-state-error-color: #e62a10; - --defined-task-button-background-color: var(--ivy-primary-color-white); - --form-elements-panel-hover-drop-section-background-color: var(--ivy-primary-color-light); - --form-elements-checkbox-fields-color: var(--ivy-primary-color-black); - --defined-task-label-background-color: var(--ivy-primary-color-grey-dark); - --defined-task-button-container-background-color: var(--ivy-primary-color-white); - --defined-task-button-actived-or-hover-background-color: var(--primary-color); - --defined-task-button-actived-border-color: var(--primary-color); - --defined-task-button-border-color: var(--primary-color); - --defined-task-button-text-color: var(--ivy-primary-color-black); - --active-defined-task-button-text-color: var(--ivy-primary-color-white); - --defined-task-label-text-color: var(--ivy-primary-color-white); - --active-defined-task-label-text-color: var(--ivy-primary-color-black); - --form-elements-panel-hover-drop-section-label-color: var(--ivy-primary-color-white); - --autocomplete-more-text-state-highlight-background-color: white; - --express-input-switch-selection-border: var(--primary-color); - --express-available-elements-action-button-background-color: transparent; - --express-available-elements-action-button-shadow: none; - --express-available-elements-action-button-icon-color: var(--ivy-primary-color-black); - --form-definition-table-border: var(--ivy-primary-color-grey-light); - --form-definition-table-selected-panel-border: var(--ivy-primary-color-grey-light); - --form-definition-table-selected-panel-background-color: transparent; - --email-file-upload-corner-top-background-color: transparent; - --express-table-no-header-border: var(--ivy-primary-color-grey-light); - --express-table-no-header-background-color: transparent; - --expand-collapse-button-color: var(--ivy-primary-color-black); - --express-workflow-active-switch-label-font-weight: 700; - --express-review-content-title-font-weight: 700; - --express-finished-task-label-font-weight: 700; - --express-active-defined-task-button-font-weight: bold; - --collapse-button-background-color: var(--ivy-primary-color-grey-pale); - --collapse-button-hover-background-color: var(--ivy-primary-color-grey-light) ; - --express-assignee-icon-color: var(--ivy-primary-color-black); - --express-review-content-title-border-color: hsla(180, 1%, 61%, 0.5); - --express-import-status-success: var(--ivy-tertinary-color-green-medium); - --express-import-status-warning: var(--ivy-tertinary-color-yellow-medium); - --express-import-status-failed: var(--ivy-tertinary-color-red-medium); - --express-import-status-font-weight: bold; - --express-import-paginator-background-color: hsla(180, 1%, 85%,0.5); - --express-import-paginator-hover-button-background-color: hsla(180, 1%, 85%,0.5); - --express-import-paginator-text-color: var(--ivy-primary-color-black); /* Chat */ --chat-panel-background-color: #F7FAFF; --chat-panel-box-shadow: 0px 10px 40px rgb(41 50 65 / 6%); diff --git a/AxonIvyPortal/portal/webContent/resources/css/portal.css b/AxonIvyPortal/portal/webContent/resources/css/portal.css index 20d89ad62b8..696a04f3988 100644 --- a/AxonIvyPortal/portal/webContent/resources/css/portal.css +++ b/AxonIvyPortal/portal/webContent/resources/css/portal.css @@ -1061,31 +1061,11 @@ a.compact-task-start-link .task-start-list-item:hover, .task-start-list-item.ful color: var(--error-message-header-color); } /* Express */ -.ui-widget.ui-button.defined-task-button { - border: solid 2px var(--defined-task-button-border-color); - background-color: var(--defined-task-button-background-color); } - -.ui-widget.ui-button.defined-task-button span { - color: var(--defined-task-button-text-color); } - -.ui-widget.ui-button.defined-task-button.ui-state-hover span, -.ui-widget.ui-button.defined-task-button.active span { - color: var(--active-defined-task-button-text-color); } - -.express-work-flow .express-input-switch-selection, -.ui-inputswitch.ui-widget.ui-widget-content.express-input-switch-selection.ui-inputswitch-checked, -.process-widget .process-input-switch-selection, -.ui-inputswitch.ui-widget.ui-widget-content.process-input-switch-selection.ui-inputswitch-checked { - background-color: var(--express-input-switch-selection-background-color); - border-color: var(--express-input-switch-selection-border); } .ui-inputswitch.ui-widget.ui-widget-content.express-input-switch-selection.ui-inputswitch-checked .ui-inputswitch-handle { background: var(--ivy-primary-color-white); } -.available-elements-action-btn button:hover, .available-elements-action-btn button:focus, .express-add-option-panel button:hover, .express-add-option-panel button:focus { - background-color:transparent;} - .task-responsible-label.ui-state-error { color: var(--task-responsible-label-state-error-color); } From 1b61cc151c3c9f84905de475c272735e11a6ce5f Mon Sep 17 00:00:00 2001 From: Loc Nguyen Date: Mon, 23 Sep 2024 10:10:22 +0700 Subject: [PATCH 14/16] feature/IVYPORTAL-17431-Remove-Express-from-Portal - revert cms es, fr --- AxonIvyPortal/portal/cms/cms_es.yaml | 405 +++++++++++---------------- AxonIvyPortal/portal/cms/cms_fr.yaml | 394 +++++++++++--------------- 2 files changed, 338 insertions(+), 461 deletions(-) diff --git a/AxonIvyPortal/portal/cms/cms_es.yaml b/AxonIvyPortal/portal/cms/cms_es.yaml index ff26912e4bf..001af6fe421 100644 --- a/AxonIvyPortal/portal/cms/cms_es.yaml +++ b/AxonIvyPortal/portal/cms/cms_es.yaml @@ -1,26 +1,11 @@ -Categories: - AdhocExpressTasks: - name: Tareas Adhoc de Express - CreateExpressWorkflow: - name: Crear Express Workflow - ExpressWorkflow: - name: Flujo de trabajo exprés ch.ivy.addon.portal.generic: CaseDetailsTemplate: noCaseId: No hay ID de caso especificado requestTabTitle: Solicitud statusTabTitle: Información del caso OpenTaskTemplate: - adhocHistory: Historial del proceso AdHoc - adhocHistoryTooltip: Mostrar historial del proceso AdHoc browserTabClosingWarning: Puede perder su trabajo en progreso. ¿Quiere continuar? - goToAdhocWarning: Puede perder su trabajo en progreso e iniciar el proceso Ad-hoc. ¿Quiere continuar? goToSidestepWarning: Sus modificaciones actuales no se guardarán cuando se inicie un proceso de paso lateral directamente desde una tarea. ¿Quiere continuar? - noteOfResultFromAdhocProcess: 'Nota: podrá encontrar este historial también en el historial del caso.' - reCreateAdhocWarning: Ya existe un proceso AdHoc para esta tarea. ¿Desea crear un proceso nuevo? - resultFromAdhocProcess: Resultados del proceso AdHoc - startAdHoc: Comenzar Adhoc - startAdHocTooltip: Redirija este proceso usando pasos ad-hoc PortalName: PortalName: Portal ch.ivy.addon.portalkit.ui.jsf: @@ -111,7 +96,6 @@ ch.ivy.addon.portalkit.ui.jsf: BY_CUSTOM_ORDER: Pedido personalizado BY_INDEX: Índice de clasificación ProcessType: - EXPRESS_PROCESS: Flujo de trabajo exprés EXTERNAL_LINK: Link externo IVY_PROCESS: Proceso de negocio ProcessWidgetMode: @@ -253,7 +237,6 @@ ch.ivy.addon.portalkit.ui.jsf: enableProcessViewer: Defina esta propiedad como true para habilitar la opción de visor de procesos en las acciones de Tarea/Caso enableScriptCheckingForUploadedDocumentNote: 'Cambiar a "True" para activar el control de anexos permitidos. De momento se pueden controlar archivos en PDF, word y excel. ' enableVirusScannerForUploadedDocumentNote: Cambiar a "true" para habilitar el escáner de virus para el documento cargado. Actualmente esta función utiliza la API VIRUSTOTAL. - expressEndPageNote: Mostrar la página de final de flujo de trabajo express propia. hideCaseCreator: |- Establecer a true para ocultar el creador de casos en la lista de casos, widget de casos y detalles de casos. Este ajuste afecta a todas las consultas de casos, por ejemplo, para la lista de casos, la búsqueda global o la estadística. @@ -261,6 +244,7 @@ ch.ivy.addon.portalkit.ui.jsf: hideChangePasswordButtonNote: Establezca esta variable a true para ocultar la opción "Cambiar contraseña" en el menú superior y la opción "Contraseña olvidada" en la página de inicio de sesión. Si se establece en false, estas opciones se mostrarán. hideLogoutButtonNote: Cambiar a "true" para ocultar la opción de logout. hideRelatedCaseInfoFromHistory: Si es verdadero, el historial de casos no muestra la información de los casos relacionados en la tabla de historial. + hideStatisticWidget: Cambiar a "true" para ocultar la estadística de la página principal y del menu lateral hideSystemNotesFromHistory: Si esto es cierto, no se muestran notas del sistema para los usuarios en las notas de tarea/tarea. hideSystemNotesFromHistoryAdministrator: Si esto es cierto, no se muestran notas de sistema para los administradores en las notas de tarea/tarea. hideSystemTasksFromHistory: Cambiar a "true" para ocultar notas técnicas del historial de tareas del caso para usuarios @@ -279,6 +263,7 @@ ch.ivy.addon.portalkit.ui.jsf: showProcessInformation: Cambiar a falso para desactivar el enlace "Más información" en la página de Procesos (modo cuadrícula) y Detalles del caso. showQuickGlobalSearch: Para activar/desactivar la visualización de la búsqueda global rápida. showTaskDurationTime: Activar o desactivar la visibilidad de la duración de la tarea en detalles de tarea. + statisticChartScalingInterval: Intervalo en segundos para realizar peticiones periódicas de escalado de gráficos estadísticos. Si el valor del intervalo es inferior a 10, se desactiva el escalado periódico de gráficos estadísticos. uploadDocumentWhiteListExtensionNote: 'Dejar libre, sie quiere permitir todos los anexos. Si quiere reducir los formatos permitidos, cree una lista separada por coma. Por ejemplo: pdf, txt, doc, docx.' key: Llave link: Enlazar @@ -429,7 +414,6 @@ ch.ivy.addon.portalkit.ui.jsf: add: Añadir addDocument: Agregar documento addNote: Agregar nota - adhoc: Adhoc allCategories: Todas las categorias allowPng: Solo se permiten los tipos png apply: Aplicar @@ -440,7 +424,6 @@ ch.ivy.addon.portalkit.ui.jsf: backgroundColor: Color de fondo cancel: Cancelar case: Caso - caseCategory: Categoría de caso caseInformation: Informaciones del caso caseName: Nombre del caso categories: Categorias @@ -652,45 +635,6 @@ ch.ivy.addon.portalkit.ui.jsf: noUser: No hay usuarios tooltipHelper: Click para ver todos los usuarios que tienen este rol de forma directa o indirecta userOfRoleTitle: 'Usuarios del rol {0} ' - expressManagement: - deployButton: Desplegar - deployMessage: Desplegando procesos - exportExpress: Export Express - exportExpressProcessTitle: 'Exportar procesos Express ' - expressExportName: AXONIVY_Dataset_ExpressWorkflow_{0}.json - expressManagement: Gestionar Express - expressMessages: - deployErrorLog: Error durante el despliegue {0} - deploymentFinishedLog: Proceso(s) del archivo {0} han sido desplegados con éxito en {1}ms - endDeployLog: Despliegue Express finalizado - invalidVersionLog: Versión de Express {0} no apoyada - process: - duplicateProcessNameLog: Nombre de proceso duplicado {0} - installProcessFailedLog: Error al desplegar proceso {0} - installProcessFinishedLog: Instalación de proceso {0} con éxito. - installedProcessLog: Procesos instalados {0} - startDeployProcessLog: Comienzo de la instalación del proceso {0} - startDeployLog: Empezando el despliegue de los procesos del documento {0} - status: - error: Error - failed: Error - info: Info - successful: Éxito - warning: Atención - validate: - validateExpressVersion: La variable "Version Express" no ha sido encontrada. Por favor contacte a su administrador. - validateProcessCoOwnerLog: '- Validación del copropietario del proceso {0}. Usuario {1} no existe en el sistema' - validateProcessOwnerLog: '- Validación del propietario del proceso {0}. Usuario {1} no existe en el sistema. Cambie el propietario a {2}' - validateProcessPermissionLog: '- Validación del permiso para el proceso {0}. Usuario {1} no existe en el sistema' - validateTaskDefUserLog: '- Validación del responsable de tarea {0}. Usuario {1} no existe en el sistema' - versionLog: 'Versión de Express: {0}' - fileEmptyMessage: Archivo está vacío - importDialogHeaderTitle: Seleccione un archivo de procesos Express. El formato tiene que ser JSON. - importExpress: Importar Express - importExpressProcessTitle: Importar procesos Express - importHeaderTitle: 'Lista de procesos Express será exportada:' - processCount: proceso(s) - waitingMessage: Coleccionando datos… passwordValidation: criteria: Criterios enablePasswordValidation: Activar la validación de contraseñas @@ -703,6 +647,11 @@ ch.ivy.addon.portalkit.ui.jsf: titlePage: Validación de contraseñas processChain: currentStepIsNotDefined: El paso ({0}) de la cadena de proceso no está definido + statisticWidget: + chartDeletionConfirmation: ¿Seguro que quiere eliminar esta tabla de estadísticas? + contextMenuDrilldown: Drilldown + contextMenuToCaseList: Ir a la lista de casos + contextMenuToTaskList: Ir a la lista de tareas taskStart: cannotDelegateTaskMessage: Esta tarea no se puede delegar a ningún otro usuario o grupo. cannotStartMessages: @@ -773,7 +722,14 @@ ch.ivy.addon.portalkit.ui.jsf: ShareThisDashboard: Comparte este panel StandardWidgets: Widgets estándar StatisticWidget: + AvailableCharts: Gráficos estadísticos disponibles + Charts: 'Gráfico(s): {0}' + ConfigurationDescription: Puede configurar su widget en esta área de configuración. Por favor, defina el gráfico que se mostrará en su panel de control. EmptyChartDataMessage: No tenemos suficientes datos para crear un buen gráfico. + FilterChartText: Filtrar un gráfico por nombre + PlaceholderChartOption: Seleccione un gráfico + PleaseSelectChart: Seleccione un gráfico + PreviewText: Seleccione un gráfico para ver los datos del lienzo WelcomeWidgetIntroduction: Este widget muestra un texto y una imagen de bienvenida en el panel de control. WelcomeWidgetNotFoundMessage: No podemos encontrar la imagen del widget, por favor reconfigure su imagen. WidgetFilterName: Nombre del filtro del widget @@ -917,6 +873,7 @@ ch.ivy.addon.portalkit.ui.jsf: yourNotifications: Sus notificaciones yourProcessViewer: Su visor de procesos yourProcesses: Sus procesos + yourStatistics: Sus estadísticas yourTasks: Sus tareas documentFiles: deleteDocumentNote: '{0} ha eliminado {1}' @@ -958,6 +915,7 @@ ch.ivy.addon.portalkit.ui.jsf: processElementId: ID del elemento del proceso stackTrace: Conjunto de trazas forgotPassword: + EmailAddress: Dirección de E-Mail empty: Vacío forgotPassword: Olvidé mi contraseña forgotPasswordError: Ha habido un error mientras se procesaba su solicitud. Por favor inténtelo más tarde. @@ -1066,7 +1024,6 @@ ch.ivy.addon.portalkit.ui.jsf: addNewProcess: Agregar nuevo proceso addNewProcessDialogHeader: Agregar nuevo proceso de usuario backToOverview: De regreso a la visión general - deleteExpressWorkflowTooltip: Eliminar Express Workflow deleteExternalLinkTooltip: Borrar enlace externo deleteProcess: Eliminar proceso deleteProcessItemConfirmation: ¿Seguro que quiere eliminar el siguiente proceso? @@ -1077,9 +1034,7 @@ ch.ivy.addon.portalkit.ui.jsf: dialogEditInfoTitle: '{0} Información' dialogHeaderDescription: Aqui puede configurar parámetros relacionados con el proceso seleccionado. dialogHeaderTitle: Editar información para {0} - editExpressWorkflowTooltip: Editar Express Workflow editProcesses: Editar procesos - expressWorkflow: Workflow Express externalLink: Enlace externo externalLinkVisibility: Visibilidad goTo: 'Ir a:' @@ -1116,8 +1071,157 @@ ch.ivy.addon.portalkit.ui.jsf: process: Proceso searchResults: Resultados de la búsqueda searchResultsFor: '{0} resultados de búsqueda para "{1}"' - sidestep: - addAdhocTask: Añadir tarea Ad-hoc + statistic: + chart: + ExpandOrCollapseColumn: Abrir/Cerrar columnas + addChart: Agregar nueva grafica + addChartDialogHeader: Agregar grafica estadística al tablero + backToDashboard: Regresar al tablero + barchart: + Percentage: Porcentaje + daysOfWeek: + friday: Viernes + monday: Lunes + saturday: Sábado + sunday: Domingo + thursday: Jueves + tuesday: Martes + wednesday: Miércoles + expired: Vencido + in2Days: En 2 días + in3Days: En 3 días + monthsOfYear: + April: Abril + August: Agosto + December: Diciembre + February: Febrero + January: Enero + July: Julio + June: Junio + March: Marzo + May: Mayo + November: Noviembre + October: Octubre + September: Septiembre + today: Hoy + tomorrow: Mañana + weeksOfMonth: + fifthWeek: Quinta semana + firstWeek: Primera semana + fourthWeek: Cuarta semana + secondWeek: Segunda semana + sixthWeek: Sexta semana + thirdWeek: Tercera semana + caseCategory: Categoría de caso + chartCreationSuccessDetailMsg: El gráfico con el nombre {0} se creó con éxito + chartCreationSuccessTitle: El gráfico fue creado con éxito + elapsedTime: Tiempo transcurrido + elapsedTimeChart: + compareButton: Comparar + compareRole: 'Comparar el rol:' + elapsedTimeInHours: Tiempo transcurrido en horas + noEntriesFound: No se encontraron entradas con los criterios dados + taskCategory: Categoría de tarea + withRole: 'Con Rol:' + emptystate: + defaultEmptyMessages: No hay tabla de estadísticas para mostrar. + exception: + idNotFound: 'Chart Id not found with id: {0}' + noPermission: You do not have the permission to send this request! + expiryPeriod: Período de caducidad + loadingCharts: Por favor espere, los diagramas se están cargando + moveLeft: Muévete a la izquierda + moveRight: Muévete a la derecha + notAllowedToCreateChart: Ha cambiado los filtros aplicados. Por favor aplique los filtros. + other: Otros + restoreDefaultChart: Si continúa, todos los diagramas hechos por usted serán borrados. Los valores iniciales serán reestablecidos. + second: segundo + showAllCharts: Mostrar todas las estadísticas + statisticCarousel: Tiovivo de estadísticas + statistics: Estadísticas + taskByExpiry: + hour: (Hora) + thisMonth: Este mes + thisWeek: Esta semana + thisYear: Este año + taskByPriority: + addToDashboardLink: Agregar al tablero + exception: Excepción + high: Alto + low: Bajo + normal: Normal + taskExpiry: Vencimiento de tareas + chartInfo: + chartDetailsHeader: Detalles del gráfico + chartName: Nombre del gráfico + chartType: Tipo de gráfico + name: Información gráfica + chartType: + caseByFinishedTask: Caso por Tarea Terminada + caseByFinishedTaskDescription: Casos en los que al menos una tarea ha sido finalizada en el tiempo seleccionado + caseByFinishedTime: Caso por tiempo finalizado + caseByFinishedTimeDescription: Casos terminados en el periodo de tiempo seleccionado + caseByState: Caso por estado + casesByCategory: Casos por categoría + elapsedTimeByCaseCategory: Tiempo transcurrido por categoría de caso + elapsedTimeByCaseCategoryDescription: Tiempo de duración para casos terminados por categoría + taskByExpiry: Tarea por vencimiento + taskByPriority: Tarea por prioridad + defaultChart: + newChart: Diagrama nuevo + tasksByPriority: Tareas por prioridad + filter: + affectedCharts: Diagramas afectados + allSelected: Todos + caseCategoriesLabel: Categorías de casos + caseCategoryFilterDescription: Puede encontrar todos las categorias disponibles aqui. Solo las categorías seleccionadas serán consideradas en los diagramas creados + caseStateFilterDescription: Solo los estados seleccionados serán considerados en los diagramas + filter: Filtros + noRoles: No hay Roles + noSelectionCustomVarChar: Sin selección + noneSelected: Ninguno + roleFilterDescription: Puede encontra todos los roles disponibles aquí. Solo los roles seleccionados serán considerados en los diagramas + rolesLabel: Roles + selectAll: Seleccionar todo + taskPrioritiesLabel: Prioridades de tareas + taskPriorityFilterDescription: Puede filtrar tareas por prioridad. + timePeriod: Periodo de tiempo + timePeriodFilterDescription: Restringir el periodo de tiempo para casos y tareas + workflowStatesLabel: Estados de flujo de trabajo + taskAnalysis: + applyFilter: Aplicar filtros + caseCategory: Categoría de caso + caseCreator: Creador del caso + caseDescription: Descripción del caso + caseFilter: Filtros del caso + caseID: ID del caso + caseName: Nombre del caso + caseOwner: Propietario del caso + caseState: Estado del caso + downloadZipFileExplanation: |- + El número de tareas excede el Límite de Excel. Por ello se crearán varios archivos y se comprimirán en un archivo Zip. + + El número de tareas excede el Límite de Excel. Por ello se crearán varios archivos y se comprimirán en un archivo Zip. + taskAnalysis: Análisis de tareas + taskCategory: Categoría de la tarea + taskCreationTime: Tarea creada + taskDescription: Descripción de la tarea + taskExpiryTime: Fecha de expiración de la tarea + taskFilter: Filtros de tareas + taskFinishedTime: Tarea completada + taskID: ID de la tarea + taskPriority: Prioridad de tarea + taskResponsible: Resonsable de tarea + taskState: Estado de tarea + taskWorker: Editor de tareas + waitingDownloadMessage: 'Estamos creando su exporte, esto puede tardar unos minutos. ' + timePeriod: + custom: Personalizado + last6Month: Último 6 meses + lastMonth: El mes pasado + lastWeek: La semana pasada + validationErrors: + nameIsExisted: Ya existe una tabla con este nombre taskActivator: assign: Asignar cannotAssignTask: Esta tarea no puede ser asignada a otro usuario o grupo. @@ -1162,7 +1266,6 @@ ch.ivy.addon.portalkit.ui.jsf: expiry: Expiración failedDelayValidation: La marca de tiempo del retraso de la tarea no puede ser un valor vacío o un formato de fecha inválido failedExpiryValidation: La fecha de vencimiento de la tarea no puede estar en el pasado. - noAdhoc: Proceso AdHoc no disponible noDescription: Sin descripción noNotes: Sin notas processingTime: Tiempo de procesado @@ -1314,60 +1417,13 @@ Dialogs: CaseDescription: Editar un flujo de trabajo existente CaseName: Editar flujo de trabajo Tasks: - CreateWorkflow: - TaskDescription: Flujo de trabajo ha sido creado - TaskName: Flujo de trabajo ha sido creado - EditWorkflow: - TaskDescription: Un flujo de trabajo ha sido editado - TaskName: Flujo de trabajo editado - FinalReview: - TaskName: Control final - FinalWorkflowTask: - taskDescription: ¡El flujo de trabajo {0} ha sido {1}! - FormDefinition: - TaskDescription: ¡Por favor define el formulario! - TaskName: ¡Creación de formulario! - ProcessLoaded: - TaskName: Tarea para configurar el proceso Adhoc - SaveWorkflow: - TaskName: El flujo de trabajo express en tramitación TaskDetail: DataDescription: Datos y Descripción restoreToDefaultSettings: 'Restablecer la configuración por defecto ' switchToEditMode: Editar switchToViewMode: Guardar - WorkflowProperties: - TaskDescription: ¡Por favor configure las propiedades del flujo de trabajo! - TaskName: Propiedades del flujo de trabajo - WorkflowExecution: - ApprovalForm: - Approve: Aprobar - ApproveComment: Aprobar - CommentLabel: Comentario del aprobador - FieldSetApplicant: Solicitante - FieldSetForm: Formulario - FinishedTasks: Tareas terminadas - Fullname: Nombre completo - Reject: Rechazar - RejectComment: Rechazar - FinalReviewForm: - approvalStatus: Estado del aprobado - approver: Aprovador - noticed: Verificado - FinishedTasksForm: - Applicant: Solicitante - ApprovalResult: Estado del aprobado - FinishedTasks: Tareas terminadas - FormDetails: Detalles del formulario - UserTaskForm: - ApprovalResult: - Approved: Aprobado - Rejected: Rechazado - Formular: Formulario agileBPM: - TooltipForOriginalTask: Su tarea actual volverá a evaluarse cuando estén completados los flujos de trabajo ad hoc previos. define_WF: - AdhocWorkflowTasks: Tareas del flujo de trabajo ErrorSelectInvalidAssignee: El destinatario ya está seleccionado o es inválido ListOfSelectedUser: Lista de usuarios seleccionados ResponsibleDialogHeader: Usuarios responsables @@ -1384,14 +1440,6 @@ Dialogs: ch: ivy: addon: - express: - generic: - endpage: - subtitle: La última tarea se completó con éxito. - title: ¡Tarea completada con éxito! - expressNoItem: Aún no se ha completado ninguna Tarea Express - expressNoItemDescription: Aquí se mostrarán los resultados de las tareas completadas - expressWorkflowName: 'Detalles de negocio del caso #{0}' portal: generic: GlobalSearch: @@ -1422,7 +1470,7 @@ Dialogs: CaseOwner: Responsable del proceso Finished: Terminado GlobalSearchText: Los casos contienen la palabra clave "{0}" en ID del caso{1}. - ShowBusinessDetails: Detalles del negocio + ShowBusinessDetails: detalles del negocio caseNameNotAvailable: '[Nombre del caso no disponible]' defaultEmptyMessage: No hay casos CustomIFrameWidget: @@ -1443,13 +1491,12 @@ Dialogs: component: ShareLinkDialog: CopyLink: Copiar enlace - LinkCopied: ¡Enlace copiado + LinkCopied: Enlace copiado dashboard: component: CaseWidgetConfiguration: AddFilter: Añadir filtro ClientStatisticWidget: - IdNotFound: 'Chart Id not found with id: {0}' NoPermissionChartMessage: No tiene permiso para ver este gráfico. DashboardImportDetails: FileInfomation: Informacion del archivo @@ -1502,104 +1549,7 @@ Dialogs: invalidFileMessage: Tipo de archivo no permitido invalidSizeMessage: ¡El archivo es muy grande! maximumFileUploadElement: Ya existe un elemento de subir documentos - workflowCreation: - AdhocProcessName: Proceso adHoc para la tarea {0} - {1} - FormDefinition: - AddCheckboxField: Agregar nuevo campo - AddOptionboxField: Anexar nueva opción - AllowedFiletypes: Tipos de Archivo permitidos - BroadFooterArea: Pie de pagina amplio - BroadHeaderArea: Encabezado amplio - CheckboxFields: Campos de casillas de verificación - CreateField: Crear - DataProvider: Proveedor de datos - DragAndDropTooltip: Arrastre y suelte los elementos disponibles al encabezado, columna de la izquierda o de la derecha o al pie de página - ElementLabel: Etiqueta - ElementName: Nombre del elemento - Email: - Attachment: Anexo - EmailAddress: Dirección de E-Mail - EmailText: Texto de E-Mail - ResponseTo: Respuesta a - Subject: Asunto - ExecuteWorkflow: Ejecutar flujo de trabajo directamente - ExecuteWorkflowWarning: Tiene que procesar todas las tareas antes de poder ejecutar este processo - FieldSetAvailableFormelements: Elementos del formulario - FieldSetFormelements: Crear elementos de formulario - FieldSetFormelementsPlacing: Ubicación de elementos de formulario - FieldSetPreviewArea: Vista previa del formulario definido - FinishWorkflow: Fin del flujo de trabajo - InputArea: Área de entrada - InputCheckbox: Casilla de verificación - InputField: Campo de entrada - InputFileUpload: Carga de archivo - InputOptions: Botón Radial - InputType: Tipo de Entrada - InputTypes: - DateSelection: Seleccionador de Fecha - NumberField: Campo de numero - TextBox: Campo de texto - LeftColumn: Columna izquierda - NoCheckboxFieldYet: No hay campos de verificación definidos todavía - NoDataProvider: Proveedor de datos - NoFormelementsAvailable: ¡No hay elementos de formulario disponibles! - NoOptionboxFieldsYet: No hay tipos de casillas de verificación definidos todavía - NumberOfFiles: Numero de archivos - NumberOfRows: Numero de filas - OptionboxFields: Botones Radiales - OptionboxPlaceholder: Opción - Preview: Vista previa - RightColumn: Columna derecha - SaveWorkflow: Guardar Flujo de trabajo - UploadFileFormat: - Excel: Excel (xls/xlsx) - OtherFormats: Otros formatos de archivo - PDF: PDF (pdf) - Word: Word (doc/docx) - cancelCreateForm: 'Seguro que quiere cancelar? Perderá todos los datos. ' - otherFiletype: Otros tipos de archivos - ProcessName: Crear Flujo de Trabajo Express - TaskType: - Approval: Aprobado - Email: E-Mail de información - Review: Comprobación - UserTask: Tarea - UserTaskWithEmail: 'Tarea con E-Mail ' - WorkflowDefinition: - AbleToStart: Permiso de ejecución - AddProcessStep: Agregar paso de proceso - ChooseAssignee: - AddUserOrRole: 'Selecione un grupo o usuario porfavor:' - SelectedAssigneesFieldSet: Usuarios seleccionados - UserTooltip: Usuario - DefaultTemplateDescription: Abajo verá el patrón estandard - DeleteProcessStep: Retirar paso del proceso - Description: Describa su proceso - DueTimeInDays: Expiración en días - EndStep: Terminar - FormDefinitionStep: Definición de formulario - ProcessNameExists: Este nombre para el flujo de trabajo ya ha sido seleccionado - ProcessOwner: Responsable del proceso - Processdescription: Descripción de proceso - Processdetails: Propiedades del proceso - Processflow: Flujo de proceso - Processstep: Paso del proceso - Processtype: Tipo de proceso - ProcesstypeAdHoc: Una vez - ProcesstypeRepeating: Recurrente - TaskType: Tipo de tarea - UntilDaysTooltip: Después de la fecha de caducidad, esta tarea será asignada al grupo "todos" y su prioridad será alta - UserInterface: - ChangeSettingWarning: Todas las tareas definidas serán borradas, desea proceder? - CreateOwn: Crear propia - UseDefault: Usar patrón estandard - UserInterface: Interfaz de usuario - WorkflowPropertiesStep: Propiedades del flujo de trabajo - requiredMsgs: - ReqMsgGeneric: ¡Es un campo requerido! - processStep: Paso del proceso Labels: - AdhocWorkflow: Describe tu Flujo de Trabajo AppendTask-Explain: La tarea es añadida a la secuencia después de mi tarea. AppendTheTask: Anexar la tarea CreateNewDashboard: Crear un nuevo cuadro de mandos @@ -1642,13 +1592,13 @@ Labels: END_WITH: Termina con EQUAL: Igualdad GREATER: Greater - GREATER_OR_EQUAL: Mayor o igual + GREATER_OR_EQUAL: Greater or equal IN: En IS: Es IS_NOT: No es LAST: En los últimos LESS: Less - LESS_OR_EQUAL: Menor o igual + LESS_OR_EQUAL: Less or equal NEXT: En los próximos NOT_BETWEEN: No entre NOT_CONTAINS: No contiene @@ -1697,9 +1647,7 @@ Labels: TaskUser-Explain: Lista de usuario separados por coma ToggleMenu: Menú alternativo ViewAllResults: Ver todos los resultados - adhocTaskRequired: Deberá agregar al menos una tarea. disabledUserPrefix: (inactivo) - title: Flujo de trabajo Ad-hoc de auto servicio patterns: datePattern: dd.MM.yyyy dateTimePattern: dd.MM.yyyy HH:mm @@ -1729,18 +1677,7 @@ Processes: SynchronizeServerConfigurationCaseName: Sincronizar configuración del servidor portalHome: Portal Principal portalSettingSaved: Ajustes del portal guardados -ProcessPages: - selfServiceAdhocProcess: Auto servicio Axon Ivy - selfServiceDescription: 'Proceso de auto servicio: Lanzar un flujo de trabajo ad-hoc basado en un patrón de flujo predefinido' Texts: - Adhoc-Explain: |+ -

    - - Introduzca sus comentarios y presione Enviar para proceder al flujo de trabajo. - -

    - - AdhocWF-Explain: "

    \n\nDefinir y lanzar un flujo de trabajo es muy sencillo: seleccione un patrón de flujo, agregue algunas tareas y empieze el flujo de trabajo. \n\n

    \n\n

    \n\n\n\n

    \n\n" Approval-Explain: |+

    diff --git a/AxonIvyPortal/portal/cms/cms_fr.yaml b/AxonIvyPortal/portal/cms/cms_fr.yaml index 4fe4a3ffa1b..dbf70b270e2 100644 --- a/AxonIvyPortal/portal/cms/cms_fr.yaml +++ b/AxonIvyPortal/portal/cms/cms_fr.yaml @@ -1,26 +1,11 @@ -Categories: - AdhocExpressTasks: - name: Tâches Adhoc Express - CreateExpressWorkflow: - name: Créer un workflow express - ExpressWorkflow: - name: Flux de travail express ch.ivy.addon.portal.generic: CaseDetailsTemplate: noCaseId: Aucun numéro de dossier n'a été indiqué requestTabTitle: Demande statusTabTitle: Informations sur le dossier OpenTaskTemplate: - adhocHistory: l'historique adhoc - adhocHistoryTooltip: Afficher l'historique adhoc browserTabClosingWarning: Votre travail risque d'être perdu. Souhaitez-vous continuer ? - goToAdhocWarning: En démarrant un processus ad hoc, vos données non sauvegardées seront perdues. Voulez-vous continuer? goToSidestepWarning: En démarrant un processus sidestep, vos données non sauvegardées seront perdues. Voulez-vous continuer? - noteOfResultFromAdhocProcess: 'Remarque : Vous trouverez également toutes ces entrées dans l''historique du processus.' - reCreateAdhocWarning: Il existe déjà un processus ad hoc pour cette tâche, voulez-vous en créer un autre ? - resultFromAdhocProcess: Résultats du processus ad hoc - startAdHoc: Démarrer ad-hoc - startAdHocTooltip: Rediriger ce processus en ajoutant une étape ad hoc. PortalName: PortalName: Portal ch.ivy.addon.portalkit.ui.jsf: @@ -111,7 +96,6 @@ ch.ivy.addon.portalkit.ui.jsf: BY_CUSTOM_ORDER: Commande personnalisée BY_INDEX: Index de tri ProcessType: - EXPRESS_PROCESS: Flux de travail express EXTERNAL_LINK: Lien externe IVY_PROCESS: Processus d'entreprise ProcessWidgetMode: @@ -250,7 +234,6 @@ ch.ivy.addon.portalkit.ui.jsf: enableProcessViewer: Définissez cette propriété à true pour activer l'option de visualisation de processus dans les actions de Task/Case. enableScriptCheckingForUploadedDocumentNote: Défini sur true pour activer la vérification de script pour le document téléchargé. Actuellement, cette fonction prend en charge la vérification de PDF, Excel, Word. enableVirusScannerForUploadedDocumentNote: Définie sur true pour activer le scanner de virus pour le document téléchargé. Actuellement, cette fonction utilise l'API VIRUSTOTAL. - expressEndPageNote: Affiche la page de fin personnalisée à la fin de chaque processus Express. hideCaseCreator: |- La valeur "true" permet de masquer le créateur du dossier dans la liste des dossiers, le widget du dossier et les détails du dossier. Ce paramètre affecte toutes les requêtes de cas, par exemple pour la liste des cas, la recherche globale, les statistiques. @@ -258,6 +241,7 @@ ch.ivy.addon.portalkit.ui.jsf: hideChangePasswordButtonNote: Attribuez la valeur true à cette variable pour masquer l'option "Changer de mot de passe" dans le menu supérieur et l'option "Mot de passe oublié" sur la page de connexion. Si elle vaut false, ces options seront affichées. hideLogoutButtonNote: Si true, le bouton de déconnexion du menu supérieur sera masqué, sinon il sera affiché. hideRelatedCaseInfoFromHistory: Si la valeur est vraie, l'historique des cas n'affiche pas les informations relatives aux cas dans le tableau de l'historique. + hideStatisticWidget: Définissez la valeur sur "true" pour masquer le widget de statistiques de la page d'accueil et du menu de l'application. hideSystemNotesFromHistory: Si vrai, la remarque sur le cas/la tâche n'affiche aucune note de système pour les utilisateurs non administrateurs. hideSystemNotesFromHistoryAdministrator: Si vrai, la remarque sur le cas/la tâche n'affiche aucune note de système pour l'administrateur. hideSystemTasksFromHistory: Si vrai, la remarque sure le cas / de la tâche n'affiche aucune tâche du système pour les utilisateurs non administrateurs. @@ -276,6 +260,7 @@ ch.ivy.addon.portalkit.ui.jsf: showProcessInformation: Définissez la valeur false pour désactiver le lien vers l'option Afficher les informations du processus sur la page processus (mode grille) et détails du cas. showQuickGlobalSearch: Pour activer/désactiver l'affichage de la recherche globale rapide. showTaskDurationTime: Pour activer/désactiver l'affichage de la durée dans la page des détails de la tâche. + statisticChartScalingInterval: Intervalle en secondes pour effectuer les demandes de mise à l'échelle périodique des graphiques statistiques. Si la valeur de l'intervalle est inférieure à 10, la mise à l'échelle périodique des graphiques statistiques est désactivée. uploadDocumentWhiteListExtensionNote: 'Laissez la valeur vide si vous autorisez toutes les extensions. Si juste autoriser quelques extensions, listez les extensions ici, séparées par des virgules. Exemple: pdf, txt, doc, docx.' key: Clé link: Lien @@ -426,7 +411,6 @@ ch.ivy.addon.portalkit.ui.jsf: add: Ajouter addDocument: Ajouter un document addNote: Ajouter une note - adhoc: Adhoc allCategories: Toutes les catégories allowPng: Seulement les types .png autorisés apply: Utiliser @@ -437,7 +421,6 @@ ch.ivy.addon.portalkit.ui.jsf: backgroundColor: Couleur de fond cancel: Annuler case: Dossier - caseCategory: Catégorie des cas caseInformation: Information sur le cas caseName: Nom de cas categories: Catégories @@ -649,45 +632,6 @@ ch.ivy.addon.portalkit.ui.jsf: noUser: Il n'y a pas d'utilisateurs. tooltipHelper: Cliquez pour afficher tous les utilisateurs qui possèdent ce rôle directement ou indirectement userOfRoleTitle: Utilisateur du groupe {0} - expressManagement: - deployButton: Déployer - deployMessage: 'Déploiement des processus en cours ... ' - exportExpress: Export Express - exportExpressProcessTitle: Exporter des processus express - expressExportName: AXONIVY_Dataset_ExpressWorkflow_{0}.json - expressManagement: Gestion de l'express - expressMessages: - deployErrorLog: Erreur lors du déploiement {0} - deploymentFinishedLog: Processus du fichier {0} déployé avec succès dans Portal en {1}ms - endDeployLog: Déploiement Express terminé - invalidVersionLog: Version non supportée {0} d'Express - process: - duplicateProcessNameLog: '- Nom du processus dupliqué {0}' - installProcessFailedLog: '- Le déploiement du processus {0} a échoué' - installProcessFinishedLog: Installation du processus {0} réussie - installedProcessLog: Processus installé {0} - startDeployProcessLog: Commencer à déployer le processus {0} - startDeployLog: Commencez à déployer le(s) processus Express du fichier {0} vers Portal - status: - error: Erreur - failed: Echoué - info: Info - successful: Succès - warning: Attention - validate: - validateExpressVersion: Impossible de trouver la variable Express Version dans le système. Veuillez contacter votre administrateur. - validateProcessCoOwnerLog: '- Valider le processus Copropriétaire de {0}, l''utilisateur {1} n''est pas disponible dans le système' - validateProcessOwnerLog: '- Valider le propriétaire du processus de {0}, l''utilisateur {1} n''est pas disponible dans le système, changer le propriétaire du processus pour {2}.' - validateProcessPermissionLog: '- Valider la permission de processus de {0}, l''utilisateur {1} n''est pas disponible dans le système' - validateTaskDefUserLog: '- Valider les responsabilités de la définition de tâche de {0}, l''utilisateur {1} n''est pas disponible dans le système' - versionLog: 'Version de l''Express : {0}' - fileEmptyMessage: Le fichier est vide - importDialogHeaderTitle: Choisissez un Dataset de workflow Express, il doit s'agir d'un fichier JSON. - importExpress: Importation Express - importExpressProcessTitle: Importation de processus express - importHeaderTitle: 'La liste des processus Express sera exportée :' - processCount: processus(s) - waitingMessage: Les données sont recueillies … passwordValidation: criteria: Critères enablePasswordValidation: Activer la validation du mot de passe @@ -700,6 +644,11 @@ ch.ivy.addon.portalkit.ui.jsf: titlePage: Validation du mot de passe processChain: currentStepIsNotDefined: L'étape actuelle ({0}) de la chaîne de processus n'est pas définie + statisticWidget: + chartDeletionConfirmation: Êtes-vous sûr de vouloir supprimer cette statistique? + contextMenuDrilldown: Drilldown + contextMenuToCaseList: Aller à la liste des affaires + contextMenuToTaskList: Aller à la liste des tâches taskStart: cannotDelegateTaskMessage: Cette tâche ne peut pas être déléguée ä un autre utilisateur ou une autre groupe. cannotStartMessages: @@ -770,7 +719,14 @@ ch.ivy.addon.portalkit.ui.jsf: ShareThisDashboard: Partager ce tableau de bord StandardWidgets: Widgets standard StatisticWidget: + AvailableCharts: Graphiques de statistiques disponibles + Charts: 'Graphique(s) : {0}' + ConfigurationDescription: Vous pouvez configurer votre widget dans cette zone de configuration. Veuillez définir le graphique qui sera affiché sur votre tableau de bord. EmptyChartDataMessage: Nous n'avons pas assez de données pour créer un beau graphique ! + FilterChartText: Filtrer un graphique par nom + PlaceholderChartOption: Sélectionnez un graphique + PleaseSelectChart: Veuillez sélectionner un graphique + PreviewText: Veuillez sélectionner un graphique pour voir les données du canevas WelcomeWidgetIntroduction: Ce widget affiche un texte et une image de bienvenue sur le tableau de bord. WelcomeWidgetNotFoundMessage: Nous ne pouvons pas trouver l'image du widget, veuillez reconfigurer votre image ! WidgetFilterName: Nom du filtre du widget @@ -914,6 +870,7 @@ ch.ivy.addon.portalkit.ui.jsf: yourNotifications: Vos notifications yourProcessViewer: Votre visualisateur de processus yourProcesses: Vos processus + yourStatistics: Vos statistiques yourTasks: Vos tâches documentFiles: deleteDocumentNote: '{0} a supprimé(e) {1}' @@ -955,6 +912,7 @@ ch.ivy.addon.portalkit.ui.jsf: processElementId: Id de l'élément de processus stackTrace: StackTrace forgotPassword: + EmailAddress: Adresse e-mail empty: Vide forgotPassword: J'ai oublié mon mot de pas forgotPasswordError: Une erreur s'est produite lors du traitement de votre demande. Veuillez réessayer plus tard. @@ -1063,7 +1021,6 @@ ch.ivy.addon.portalkit.ui.jsf: addNewProcess: Ajouter un processus addNewProcessDialogHeader: Ajouter un nouveau processus utilisateur backToOverview: Retour à l'aperçu - deleteExpressWorkflowTooltip: Supprimer le Workflow Express deleteExternalLinkTooltip: Supprimer le lien externe deleteProcess: Supprimer processus deleteProcessItemConfirmation: Êtes-vous sûr de vouloir détruire le processus suivant ? @@ -1074,9 +1031,7 @@ ch.ivy.addon.portalkit.ui.jsf: dialogEditInfoTitle: '{0} Informations' dialogHeaderDescription: Dans cette zone, vous pouvez modifier certaines informations relatives au processus sélectionné. dialogHeaderTitle: Modifier les informations pour {0} - editExpressWorkflowTooltip: Modifier le Workflow Express editProcesses: Modifier des processus - expressWorkflow: Workflow Express externalLink: lien externe externalLinkVisibility: Visibilité goTo: 'Aller à:' @@ -1113,8 +1068,154 @@ ch.ivy.addon.portalkit.ui.jsf: process: Processus searchResults: Résultats de la recherche searchResultsFor: '{0} résultats pour "{1}"' - sidestep: - addAdhocTask: Ajouter une Ad-hoc tâche + statistic: + chart: + ExpandOrCollapseColumn: Agrandir/réduire les colonnes + addChart: Ajouter un nouveau diagramme + addChartDialogHeader: Ajouter un diagramme au tableau de bord + backToDashboard: Retour au tableau de bord + barchart: + Percentage: Pourcentage + daysOfWeek: + friday: Vendredi + monday: Lundi + saturday: samedi + sunday: dimanche + thursday: Jeudi + tuesday: Mardi + wednesday: Mercredi + expired: Expiré + in2Days: Dans 2 jours + in3Days: Dans 3 jours + monthsOfYear: + April: avril + August: août + December: décembre + February: février + January: janvier + July: juillet + June: juin + March: Mars + May: Mai + November: novembre + October: octobre + September: septembre + today: Aujourd'hui + tomorrow: Demain + weeksOfMonth: + fifthWeek: Cinquième semaine + firstWeek: Première semaine + fourthWeek: Quatrième semaine + secondWeek: Deuxième semaine + sixthWeek: Sixième semaine + thirdWeek: Troisième semaine + caseCategory: Catégorie des cas + chartCreationSuccessDetailMsg: Diagramme avec le nom {0} a été créé avec succès + chartCreationSuccessTitle: Diagramme a été créé avec succès + elapsedTime: Temps écoulé + elapsedTimeChart: + compareButton: Comparer + compareRole: Comparer les rôles + elapsedTimeInHours: Temps écoulé en heures + noEntriesFound: Aucun critère correspondant trouvé + taskCategory: Catégorie de tâche + withRole: 'Avec rôle:' + emptystate: + defaultEmptyMessages: Pas de diagrammes à afficher + exception: + idNotFound: 'Chart Id not found with id: {0}' + noPermission: You do not have the permission to send this request! + expiryPeriod: Période d'expiration + loadingCharts: Veuillez patienter, les graphiques sont en cours de chargement … + moveLeft: Déplacer vers la gauche + moveRight: Déplacer vers la droite + notAllowedToCreateChart: Vous n'êtes pas autorisé à créer un diagramme avant de cliquer sur le bouton Appliquer les filtres + other: Outres + restoreDefaultChart: Si vous continuez, vous perdrez tous les graphiques créés par vous-même. Les paramètres standard seront appliqués. + second: sec + showAllCharts: Voir tous les diagrammes + statisticCarousel: Carrousel de statistiques + statistics: Statistiques + taskByExpiry: + hour: (Heure) + thisMonth: Ce mois + thisWeek: Cette semaine + thisYear: Cette année + taskByPriority: + addToDashboardLink: Ajouter au tableau de bord + exception: Exception + high: Haute + low: Basse + normal: Normale + taskExpiry: Expiration de la tâche + chartInfo: + chartDetailsHeader: Détails du diagramme + chartName: Nom du diagramme + chartType: Type du diagramme + name: Infos graphiques + chartType: + caseByFinishedTask: Cas traités en période de temps + caseByFinishedTaskDescription: Cas où une tâche s'est terminée dans la période sélectionnée + caseByFinishedTime: Cas traités dans le temps + caseByFinishedTimeDescription: Cas qui se font dans la période sélectionnée + caseByState: Cas par état + casesByCategory: Affaires par catégorie + elapsedTimeByCaseCategory: Temps écoulé des cas accomplis + elapsedTimeByCaseCategoryDescription: Temps écoulé des cas finis par catégorie + taskByExpiry: Tâche par échéance + taskByPriority: Tâche par priorité + defaultChart: + newChart: Nouveau diagramme + tasksByPriority: Tãches par priorité + filter: + affectedCharts: Diagrammes concernés + allSelected: Tous + caseCategoriesLabel: Catégories de cas + caseCategoryFilterDescription: Vous pouvez trouver toutes les catégories de cas disponibles ici. Seules les catégories de cas sélectionnées sont prises en compte dans les diagrammes concernés. + caseStateFilterDescription: Seuls les états sélectionnés sont pris en compte dans les diagrammes concernés. + filter: Filtres + noRoles: Aucun rôle disponible + noSelectionCustomVarChar: Pas de choix. + noneSelected: Aucun + roleFilterDescription: Vous pouvez trouver tous les rôles de processus disponibles ici. Seuls les rôles sélectionnés sont pris en compte dans le diagramme concerné + rolesLabel: Rôle + selectAll: Tout sélectionner + taskPrioritiesLabel: Priorités de tâches + taskPriorityFilterDescription: Les tâches peuvent être sélectionnées en fonction de leur priorité. + timePeriod: Période de temps + timePeriodFilterDescription: Limite la période de temps pour les cas et les tâches. + workflowStatesLabel: État de flux de travail + taskAnalysis: + applyFilter: Appliquer les filtres + caseCategory: Catégorie de cas + caseCreator: Créateur de cas + caseDescription: Description du cas + caseFilter: Filtres de cas + caseID: ID de cas + caseName: Nom de cas + caseOwner: Propriétaire du cas + caseState: État du cas + downloadZipFileExplanation: Le nombre de tâches à exporter dépasse la limite des lignes Excel. Par conséquent, les données seront divisées en plusieurs fichiers Excel, puis compressées dans un fichier ZIP à télécharger. + taskAnalysis: Analyse des tâches + taskCategory: Catégorie de tâche + taskCreationTime: Tâche créée + taskDescription: Description de la tâche + taskExpiryTime: Expiration de la tâche + taskFilter: Filtres de la tâche + taskFinishedTime: Tâche terminée le + taskID: Id de tâche + taskPriority: Priorité de la tâche + taskResponsible: Tâche responsable + taskState: État de la tâche + taskWorker: Éditeur de tâche + waitingDownloadMessage: Nous créons l'export, cela peut prendre quelques minutes + timePeriod: + custom: Coutume + last6Month: Six derniers mois + lastMonth: Dernier Mois + lastWeek: Dernière semaine + validationErrors: + nameIsExisted: Un diagramme avec ce nom existe déjà taskActivator: assign: Assigner cannotAssignTask: Cette tâche ne peut être assignée à aucun autre utilisateur ou groupe. @@ -1159,7 +1260,6 @@ ch.ivy.addon.portalkit.ui.jsf: expiry: Expiration failedDelayValidation: L'horodatage du délai des tâches ne peut pas être une valeur vide ou un format de date non valide failedExpiryValidation: L'horodatage de l'expiration des tâches ne peut pas être dans le passé. - noAdhoc: Pas d'Adhoc disponible noDescription: Aucune description noNotes: Aucune note processingTime: Durée de traitement @@ -1311,60 +1411,13 @@ Dialogs: CaseDescription: Modifier un workflow existant CaseName: Modifier workflow Tasks: - CreateWorkflow: - TaskDescription: Le workflow a été créé - TaskName: Le workflow a été créé - EditWorkflow: - TaskDescription: Un processus a été modifié. - TaskName: Processus modifié - FinalReview: - TaskName: Finales chèques - FinalWorkflowTask: - taskDescription: Le workflow {0} a été terminé! - FormDefinition: - TaskDescription: Veuillez définir le formulaire ! - TaskName: Création du formulaire! - ProcessLoaded: - TaskName: Tâche pour la configuration Adhoc - SaveWorkflow: - TaskName: Création de workflow express en cours TaskDetail: DataDescription: Données et description restoreToDefaultSettings: Rétablir les paramètres par défaut switchToEditMode: Editer switchToViewMode: Enregistrer - WorkflowProperties: - TaskDescription: Veuillez configurer les propriétés du workflow ! - TaskName: Propriétés de workflow - WorkflowExecution: - ApprovalForm: - Approve: Approuver ! - ApproveComment: Approuver - CommentLabel: Commentaire de l'approbateur - FieldSetApplicant: Demandeur - FieldSetForm: Formulaire - FinishedTasks: Tâches finies - Fullname: Nom complet - Reject: Refuser ! - RejectComment: Refuser - FinalReviewForm: - approvalStatus: Statut d'approbation - approver: Approbateur - noticed: Prendre acte! - FinishedTasksForm: - Applicant: Demandeur - ApprovalResult: Résultat d'approbation - FinishedTasks: Tãches finies - FormDetails: Détails du formulaire - UserTaskForm: - ApprovalResult: - Approved: Approuvé - Rejected: Refusé - Formular: Formulaire agileBPM: - TooltipForOriginalTask: 'Votre tâche actuelle réapparaîtra dès que le workflow ad hoc sera terminé. ' define_WF: - AdhocWorkflowTasks: Tâches du workflow ErrorSelectInvalidAssignee: Le destinataire est déjà sélectionné ou invalide ListOfSelectedUser: Liste des utilisateurs sélectionnés ResponsibleDialogHeader: Utilisateurs responsables @@ -1381,14 +1434,6 @@ Dialogs: ch: ivy: addon: - express: - generic: - endpage: - subtitle: La dernière tâche a été accomplie avec succès - title: Tâche terminée avec succès! - expressNoItem: Pas de tâche Express terminée - expressNoItemDescription: Les résultats des tâches terminées sont affichés ici - expressWorkflowName: 'Détails de cas #{0}' portal: generic: GlobalSearch: @@ -1419,7 +1464,7 @@ Dialogs: CaseOwner: Responsable de processus Finished: Terminé GlobalSearchText: Les cas contiennent le mot-clé "{0}" dans Id du dossier{1}. - ShowBusinessDetails: Détails de l'entreprise + ShowBusinessDetails: Détails de la demande caseNameNotAvailable: '[Nom de cas pas disponible]' defaultEmptyMessage: Il n'y a pas de dossiers CustomIFrameWidget: @@ -1446,7 +1491,6 @@ Dialogs: CaseWidgetConfiguration: AddFilter: Ajouter un filtre ClientStatisticWidget: - IdNotFound: 'Chart Id not found with id: {0}' NoPermissionChartMessage: Vous n'avez pas l'autorisation requise pour consulter ce graphique. DashboardImportDetails: FileInfomation: Informations sur le fichier @@ -1499,104 +1543,7 @@ Dialogs: invalidFileMessage: Ce type de fichier n'est pas accepté! invalidSizeMessage: Le fichier est trop volumineux ! maximumFileUploadElement: Il existe déjà un élément de téléchargement de fichiers - workflowCreation: - AdhocProcessName: AdHoc processues pour tâche {0} - {1} - FormDefinition: - AddCheckboxField: Ajouter un nouveau champs - AddOptionboxField: Ajouter une nouvelle option - AllowedFiletypes: Types de fichier autorisés - BroadFooterArea: Zone de bas de page large - BroadHeaderArea: En-tête large - CheckboxFields: Champs de cases à cocher - CreateField: Créer - DataProvider: Fournisseur de données - DragAndDropTooltip: Veuillez placer les éléments disponibles par glisser/déposer dans l’en-tête, dans la colonne de droite ou en pied de page. - ElementLabel: Label - ElementName: Nom de l’élément - Email: - Attachment: Pièce jointe - EmailAddress: Adresse e-mail - EmailText: Texte d'email - ResponseTo: Réponse à - Subject: Sujet - ExecuteWorkflow: Lancer le workflow directement - ExecuteWorkflowWarning: Vous devez effectuer toutes les tâches avant de pouvoir exécuter ce workflow - FieldSetAvailableFormelements: Éléments de formulaire - FieldSetFormelements: Créer un élément de formulaire - FieldSetFormelementsPlacing: Placer les éléments de formulaire - FieldSetPreviewArea: Pré-visualiser le formulaire - FinishWorkflow: Fin de workflow - InputArea: Zone de texte - InputCheckbox: Case d’option à cocher - InputField: Champ de texte - InputFileUpload: Téléchargement de fichier - InputOptions: Bouton radio - InputType: Type d’entrée - InputTypes: - DateSelection: Calendrier - NumberField: Champ numérique - TextBox: Champ de texte - LeftColumn: Colonne de gauche - NoCheckboxFieldYet: Aucun type de champ de case d’option à cocher n’est pour l’instant défini - NoDataProvider: Fournisseur de données statiques spéciales - NoFormelementsAvailable: Aucun élément de formulaire n’est disponible ! - NoOptionboxFieldsYet: Aucun type de case d’’option à cocher n’est pour l’instant défini - NumberOfFiles: Nombre de fichiers - NumberOfRows: Nombre de lignes - OptionboxFields: Boutons radio - OptionboxPlaceholder: Option - Preview: Aperçu - RightColumn: Colonne de droite - SaveWorkflow: Sauvegarder le workflow - UploadFileFormat: - Excel: Excel (xls/xlsx) - OtherFormats: Autres formats de fichier - PDF: PDF (pdf) - Word: Word (doc/docx) - cancelCreateForm: Voulez-vous vraiment annuler? Toutes vos données seront perdues! - otherFiletype: Autres types de fichier - ProcessName: Créer un flux de travail Express - TaskType: - Approval: Approbation - Email: email d'information - Review: Revue - UserTask: Tâche - UserTaskWithEmail: Tâche avec email - WorkflowDefinition: - AbleToStart: Capable de commencer - AddProcessStep: Ajouter une étape de processus - ChooseAssignee: - AddUserOrRole: 'Veuillez sélectionner un groupe ou un utilisateur :' - SelectedAssigneesFieldSet: Cessionnaires sélectionnés - UserTooltip: Utilisateur - DefaultTemplateDescription: Voici le modèle par défaut - DeleteProcessStep: Supprimer l’étape de processus - Description: Décrivez votre processus - DueTimeInDays: Expiration en jours - EndStep: Fin - FormDefinitionStep: Définition du formulaire - ProcessNameExists: Ce nom de processus a été utilisé avant - ProcessOwner: Propriétaire du processus - Processdescription: Description du processus - Processdetails: Propriétés du processus - Processflow: Flux du processus - Processstep: Étape de processus - Processtype: Type de processus - ProcesstypeAdHoc: Une fois - ProcesstypeRepeating: Rrépétitif - TaskType: Type de tâche - UntilDaysTooltip: Après expiration, la tâche sera assignée au role “Everybody” et sa priorité sera passée en “haute”. - UserInterface: - ChangeSettingWarning: Toutes les tâches définies seront supprimées. Êtes-vous sûr? - CreateOwn: Créer propre - UseDefault: Coutume - UserInterface: Iinterface utilisateur - WorkflowPropertiesStep: Propriétés du workflow ! - requiredMsgs: - ReqMsgGeneric: est un champ obligatoire ! - processStep: Étape du processus Labels: - AdhocWorkflow: Décrivez votre workflow AppendTask-Explain: La tâche est ajoutée à la séquence après ma tâche. AppendTheTask: Ajouter la tâche CreateNewDashboard: Créer un nouveau tableau de bord @@ -1638,13 +1585,13 @@ Labels: EMPTY: Est vide END_WITH: Se termine par EQUAL: Égalité - GREATER_OR_EQUAL: Supérieur ou égal + GREATER_OR_EQUAL: Greater or equal IN: En IS: Est IS_NOT: N'est pas LAST: Au cours des dernières LESS: Less - LESS_OR_EQUAL: Inférieur ou égal + LESS_OR_EQUAL: Less or equal NEXT: Dans les prochains NOT_BETWEEN: Pas entre NOT_CONTAINS: Ne contient pas @@ -1686,9 +1633,7 @@ Labels: TaskUser-Explain: Liste d’utilisateurs séparés par des virgules ToggleMenu: Menu à bascule ViewAllResults: Voir tous les résultats - adhocTaskRequired: Vous devez ajouter au moins une tâche. disabledUserPrefix: (désactivé) - title: Workflow ad hoc Self Service patterns: datePattern: dd.MM.yyyy dateTimePattern: dd.MM.yyyy HH:mm @@ -1718,12 +1663,7 @@ Processes: SynchronizeServerConfigurationCaseName: Synchroniser la configuration du serveur portalHome: Page d'accueil portalSettingSaved: Les paramètres du portail sont enregistrés -ProcessPages: - selfServiceAdhocProcess: Axon Ivy Self Service - selfServiceDescription: 'Processus en libre service: lance un workflow ad hoc basé sur un modèle prédéfini. ' Texts: - Adhoc-Explain: '

    Rentrez votre commentaire et cliquez sur Envoyer afin de poursuivre.

    ' - AdhocWF-Explain: "

    \n\nDéfinir et démarrer un workflow en un clic. \n\n

    " Approval-Explain: "

    \n\nVeuillez choisir et cliquez sur Envoyer pour poursuivre. \n\n

    " QA-Explain: |-

    From 26b662f91c119ed3a369bd333d38bae17767abd9 Mon Sep 17 00:00:00 2001 From: Loc Nguyen Date: Mon, 23 Sep 2024 10:16:05 +0700 Subject: [PATCH 15/16] Revert "feature/IVYPORTAL-17431-Remove-Express-from-Portal - revert cms es, fr" This reverts commit 1b61cc151c3c9f84905de475c272735e11a6ce5f. --- AxonIvyPortal/portal/cms/cms_es.yaml | 405 ++++++++++++++++----------- AxonIvyPortal/portal/cms/cms_fr.yaml | 394 +++++++++++++++----------- 2 files changed, 461 insertions(+), 338 deletions(-) diff --git a/AxonIvyPortal/portal/cms/cms_es.yaml b/AxonIvyPortal/portal/cms/cms_es.yaml index 001af6fe421..ff26912e4bf 100644 --- a/AxonIvyPortal/portal/cms/cms_es.yaml +++ b/AxonIvyPortal/portal/cms/cms_es.yaml @@ -1,11 +1,26 @@ +Categories: + AdhocExpressTasks: + name: Tareas Adhoc de Express + CreateExpressWorkflow: + name: Crear Express Workflow + ExpressWorkflow: + name: Flujo de trabajo exprés ch.ivy.addon.portal.generic: CaseDetailsTemplate: noCaseId: No hay ID de caso especificado requestTabTitle: Solicitud statusTabTitle: Información del caso OpenTaskTemplate: + adhocHistory: Historial del proceso AdHoc + adhocHistoryTooltip: Mostrar historial del proceso AdHoc browserTabClosingWarning: Puede perder su trabajo en progreso. ¿Quiere continuar? + goToAdhocWarning: Puede perder su trabajo en progreso e iniciar el proceso Ad-hoc. ¿Quiere continuar? goToSidestepWarning: Sus modificaciones actuales no se guardarán cuando se inicie un proceso de paso lateral directamente desde una tarea. ¿Quiere continuar? + noteOfResultFromAdhocProcess: 'Nota: podrá encontrar este historial también en el historial del caso.' + reCreateAdhocWarning: Ya existe un proceso AdHoc para esta tarea. ¿Desea crear un proceso nuevo? + resultFromAdhocProcess: Resultados del proceso AdHoc + startAdHoc: Comenzar Adhoc + startAdHocTooltip: Redirija este proceso usando pasos ad-hoc PortalName: PortalName: Portal ch.ivy.addon.portalkit.ui.jsf: @@ -96,6 +111,7 @@ ch.ivy.addon.portalkit.ui.jsf: BY_CUSTOM_ORDER: Pedido personalizado BY_INDEX: Índice de clasificación ProcessType: + EXPRESS_PROCESS: Flujo de trabajo exprés EXTERNAL_LINK: Link externo IVY_PROCESS: Proceso de negocio ProcessWidgetMode: @@ -237,6 +253,7 @@ ch.ivy.addon.portalkit.ui.jsf: enableProcessViewer: Defina esta propiedad como true para habilitar la opción de visor de procesos en las acciones de Tarea/Caso enableScriptCheckingForUploadedDocumentNote: 'Cambiar a "True" para activar el control de anexos permitidos. De momento se pueden controlar archivos en PDF, word y excel. ' enableVirusScannerForUploadedDocumentNote: Cambiar a "true" para habilitar el escáner de virus para el documento cargado. Actualmente esta función utiliza la API VIRUSTOTAL. + expressEndPageNote: Mostrar la página de final de flujo de trabajo express propia. hideCaseCreator: |- Establecer a true para ocultar el creador de casos en la lista de casos, widget de casos y detalles de casos. Este ajuste afecta a todas las consultas de casos, por ejemplo, para la lista de casos, la búsqueda global o la estadística. @@ -244,7 +261,6 @@ ch.ivy.addon.portalkit.ui.jsf: hideChangePasswordButtonNote: Establezca esta variable a true para ocultar la opción "Cambiar contraseña" en el menú superior y la opción "Contraseña olvidada" en la página de inicio de sesión. Si se establece en false, estas opciones se mostrarán. hideLogoutButtonNote: Cambiar a "true" para ocultar la opción de logout. hideRelatedCaseInfoFromHistory: Si es verdadero, el historial de casos no muestra la información de los casos relacionados en la tabla de historial. - hideStatisticWidget: Cambiar a "true" para ocultar la estadística de la página principal y del menu lateral hideSystemNotesFromHistory: Si esto es cierto, no se muestran notas del sistema para los usuarios en las notas de tarea/tarea. hideSystemNotesFromHistoryAdministrator: Si esto es cierto, no se muestran notas de sistema para los administradores en las notas de tarea/tarea. hideSystemTasksFromHistory: Cambiar a "true" para ocultar notas técnicas del historial de tareas del caso para usuarios @@ -263,7 +279,6 @@ ch.ivy.addon.portalkit.ui.jsf: showProcessInformation: Cambiar a falso para desactivar el enlace "Más información" en la página de Procesos (modo cuadrícula) y Detalles del caso. showQuickGlobalSearch: Para activar/desactivar la visualización de la búsqueda global rápida. showTaskDurationTime: Activar o desactivar la visibilidad de la duración de la tarea en detalles de tarea. - statisticChartScalingInterval: Intervalo en segundos para realizar peticiones periódicas de escalado de gráficos estadísticos. Si el valor del intervalo es inferior a 10, se desactiva el escalado periódico de gráficos estadísticos. uploadDocumentWhiteListExtensionNote: 'Dejar libre, sie quiere permitir todos los anexos. Si quiere reducir los formatos permitidos, cree una lista separada por coma. Por ejemplo: pdf, txt, doc, docx.' key: Llave link: Enlazar @@ -414,6 +429,7 @@ ch.ivy.addon.portalkit.ui.jsf: add: Añadir addDocument: Agregar documento addNote: Agregar nota + adhoc: Adhoc allCategories: Todas las categorias allowPng: Solo se permiten los tipos png apply: Aplicar @@ -424,6 +440,7 @@ ch.ivy.addon.portalkit.ui.jsf: backgroundColor: Color de fondo cancel: Cancelar case: Caso + caseCategory: Categoría de caso caseInformation: Informaciones del caso caseName: Nombre del caso categories: Categorias @@ -635,6 +652,45 @@ ch.ivy.addon.portalkit.ui.jsf: noUser: No hay usuarios tooltipHelper: Click para ver todos los usuarios que tienen este rol de forma directa o indirecta userOfRoleTitle: 'Usuarios del rol {0} ' + expressManagement: + deployButton: Desplegar + deployMessage: Desplegando procesos + exportExpress: Export Express + exportExpressProcessTitle: 'Exportar procesos Express ' + expressExportName: AXONIVY_Dataset_ExpressWorkflow_{0}.json + expressManagement: Gestionar Express + expressMessages: + deployErrorLog: Error durante el despliegue {0} + deploymentFinishedLog: Proceso(s) del archivo {0} han sido desplegados con éxito en {1}ms + endDeployLog: Despliegue Express finalizado + invalidVersionLog: Versión de Express {0} no apoyada + process: + duplicateProcessNameLog: Nombre de proceso duplicado {0} + installProcessFailedLog: Error al desplegar proceso {0} + installProcessFinishedLog: Instalación de proceso {0} con éxito. + installedProcessLog: Procesos instalados {0} + startDeployProcessLog: Comienzo de la instalación del proceso {0} + startDeployLog: Empezando el despliegue de los procesos del documento {0} + status: + error: Error + failed: Error + info: Info + successful: Éxito + warning: Atención + validate: + validateExpressVersion: La variable "Version Express" no ha sido encontrada. Por favor contacte a su administrador. + validateProcessCoOwnerLog: '- Validación del copropietario del proceso {0}. Usuario {1} no existe en el sistema' + validateProcessOwnerLog: '- Validación del propietario del proceso {0}. Usuario {1} no existe en el sistema. Cambie el propietario a {2}' + validateProcessPermissionLog: '- Validación del permiso para el proceso {0}. Usuario {1} no existe en el sistema' + validateTaskDefUserLog: '- Validación del responsable de tarea {0}. Usuario {1} no existe en el sistema' + versionLog: 'Versión de Express: {0}' + fileEmptyMessage: Archivo está vacío + importDialogHeaderTitle: Seleccione un archivo de procesos Express. El formato tiene que ser JSON. + importExpress: Importar Express + importExpressProcessTitle: Importar procesos Express + importHeaderTitle: 'Lista de procesos Express será exportada:' + processCount: proceso(s) + waitingMessage: Coleccionando datos… passwordValidation: criteria: Criterios enablePasswordValidation: Activar la validación de contraseñas @@ -647,11 +703,6 @@ ch.ivy.addon.portalkit.ui.jsf: titlePage: Validación de contraseñas processChain: currentStepIsNotDefined: El paso ({0}) de la cadena de proceso no está definido - statisticWidget: - chartDeletionConfirmation: ¿Seguro que quiere eliminar esta tabla de estadísticas? - contextMenuDrilldown: Drilldown - contextMenuToCaseList: Ir a la lista de casos - contextMenuToTaskList: Ir a la lista de tareas taskStart: cannotDelegateTaskMessage: Esta tarea no se puede delegar a ningún otro usuario o grupo. cannotStartMessages: @@ -722,14 +773,7 @@ ch.ivy.addon.portalkit.ui.jsf: ShareThisDashboard: Comparte este panel StandardWidgets: Widgets estándar StatisticWidget: - AvailableCharts: Gráficos estadísticos disponibles - Charts: 'Gráfico(s): {0}' - ConfigurationDescription: Puede configurar su widget en esta área de configuración. Por favor, defina el gráfico que se mostrará en su panel de control. EmptyChartDataMessage: No tenemos suficientes datos para crear un buen gráfico. - FilterChartText: Filtrar un gráfico por nombre - PlaceholderChartOption: Seleccione un gráfico - PleaseSelectChart: Seleccione un gráfico - PreviewText: Seleccione un gráfico para ver los datos del lienzo WelcomeWidgetIntroduction: Este widget muestra un texto y una imagen de bienvenida en el panel de control. WelcomeWidgetNotFoundMessage: No podemos encontrar la imagen del widget, por favor reconfigure su imagen. WidgetFilterName: Nombre del filtro del widget @@ -873,7 +917,6 @@ ch.ivy.addon.portalkit.ui.jsf: yourNotifications: Sus notificaciones yourProcessViewer: Su visor de procesos yourProcesses: Sus procesos - yourStatistics: Sus estadísticas yourTasks: Sus tareas documentFiles: deleteDocumentNote: '{0} ha eliminado {1}' @@ -915,7 +958,6 @@ ch.ivy.addon.portalkit.ui.jsf: processElementId: ID del elemento del proceso stackTrace: Conjunto de trazas forgotPassword: - EmailAddress: Dirección de E-Mail empty: Vacío forgotPassword: Olvidé mi contraseña forgotPasswordError: Ha habido un error mientras se procesaba su solicitud. Por favor inténtelo más tarde. @@ -1024,6 +1066,7 @@ ch.ivy.addon.portalkit.ui.jsf: addNewProcess: Agregar nuevo proceso addNewProcessDialogHeader: Agregar nuevo proceso de usuario backToOverview: De regreso a la visión general + deleteExpressWorkflowTooltip: Eliminar Express Workflow deleteExternalLinkTooltip: Borrar enlace externo deleteProcess: Eliminar proceso deleteProcessItemConfirmation: ¿Seguro que quiere eliminar el siguiente proceso? @@ -1034,7 +1077,9 @@ ch.ivy.addon.portalkit.ui.jsf: dialogEditInfoTitle: '{0} Información' dialogHeaderDescription: Aqui puede configurar parámetros relacionados con el proceso seleccionado. dialogHeaderTitle: Editar información para {0} + editExpressWorkflowTooltip: Editar Express Workflow editProcesses: Editar procesos + expressWorkflow: Workflow Express externalLink: Enlace externo externalLinkVisibility: Visibilidad goTo: 'Ir a:' @@ -1071,157 +1116,8 @@ ch.ivy.addon.portalkit.ui.jsf: process: Proceso searchResults: Resultados de la búsqueda searchResultsFor: '{0} resultados de búsqueda para "{1}"' - statistic: - chart: - ExpandOrCollapseColumn: Abrir/Cerrar columnas - addChart: Agregar nueva grafica - addChartDialogHeader: Agregar grafica estadística al tablero - backToDashboard: Regresar al tablero - barchart: - Percentage: Porcentaje - daysOfWeek: - friday: Viernes - monday: Lunes - saturday: Sábado - sunday: Domingo - thursday: Jueves - tuesday: Martes - wednesday: Miércoles - expired: Vencido - in2Days: En 2 días - in3Days: En 3 días - monthsOfYear: - April: Abril - August: Agosto - December: Diciembre - February: Febrero - January: Enero - July: Julio - June: Junio - March: Marzo - May: Mayo - November: Noviembre - October: Octubre - September: Septiembre - today: Hoy - tomorrow: Mañana - weeksOfMonth: - fifthWeek: Quinta semana - firstWeek: Primera semana - fourthWeek: Cuarta semana - secondWeek: Segunda semana - sixthWeek: Sexta semana - thirdWeek: Tercera semana - caseCategory: Categoría de caso - chartCreationSuccessDetailMsg: El gráfico con el nombre {0} se creó con éxito - chartCreationSuccessTitle: El gráfico fue creado con éxito - elapsedTime: Tiempo transcurrido - elapsedTimeChart: - compareButton: Comparar - compareRole: 'Comparar el rol:' - elapsedTimeInHours: Tiempo transcurrido en horas - noEntriesFound: No se encontraron entradas con los criterios dados - taskCategory: Categoría de tarea - withRole: 'Con Rol:' - emptystate: - defaultEmptyMessages: No hay tabla de estadísticas para mostrar. - exception: - idNotFound: 'Chart Id not found with id: {0}' - noPermission: You do not have the permission to send this request! - expiryPeriod: Período de caducidad - loadingCharts: Por favor espere, los diagramas se están cargando - moveLeft: Muévete a la izquierda - moveRight: Muévete a la derecha - notAllowedToCreateChart: Ha cambiado los filtros aplicados. Por favor aplique los filtros. - other: Otros - restoreDefaultChart: Si continúa, todos los diagramas hechos por usted serán borrados. Los valores iniciales serán reestablecidos. - second: segundo - showAllCharts: Mostrar todas las estadísticas - statisticCarousel: Tiovivo de estadísticas - statistics: Estadísticas - taskByExpiry: - hour: (Hora) - thisMonth: Este mes - thisWeek: Esta semana - thisYear: Este año - taskByPriority: - addToDashboardLink: Agregar al tablero - exception: Excepción - high: Alto - low: Bajo - normal: Normal - taskExpiry: Vencimiento de tareas - chartInfo: - chartDetailsHeader: Detalles del gráfico - chartName: Nombre del gráfico - chartType: Tipo de gráfico - name: Información gráfica - chartType: - caseByFinishedTask: Caso por Tarea Terminada - caseByFinishedTaskDescription: Casos en los que al menos una tarea ha sido finalizada en el tiempo seleccionado - caseByFinishedTime: Caso por tiempo finalizado - caseByFinishedTimeDescription: Casos terminados en el periodo de tiempo seleccionado - caseByState: Caso por estado - casesByCategory: Casos por categoría - elapsedTimeByCaseCategory: Tiempo transcurrido por categoría de caso - elapsedTimeByCaseCategoryDescription: Tiempo de duración para casos terminados por categoría - taskByExpiry: Tarea por vencimiento - taskByPriority: Tarea por prioridad - defaultChart: - newChart: Diagrama nuevo - tasksByPriority: Tareas por prioridad - filter: - affectedCharts: Diagramas afectados - allSelected: Todos - caseCategoriesLabel: Categorías de casos - caseCategoryFilterDescription: Puede encontrar todos las categorias disponibles aqui. Solo las categorías seleccionadas serán consideradas en los diagramas creados - caseStateFilterDescription: Solo los estados seleccionados serán considerados en los diagramas - filter: Filtros - noRoles: No hay Roles - noSelectionCustomVarChar: Sin selección - noneSelected: Ninguno - roleFilterDescription: Puede encontra todos los roles disponibles aquí. Solo los roles seleccionados serán considerados en los diagramas - rolesLabel: Roles - selectAll: Seleccionar todo - taskPrioritiesLabel: Prioridades de tareas - taskPriorityFilterDescription: Puede filtrar tareas por prioridad. - timePeriod: Periodo de tiempo - timePeriodFilterDescription: Restringir el periodo de tiempo para casos y tareas - workflowStatesLabel: Estados de flujo de trabajo - taskAnalysis: - applyFilter: Aplicar filtros - caseCategory: Categoría de caso - caseCreator: Creador del caso - caseDescription: Descripción del caso - caseFilter: Filtros del caso - caseID: ID del caso - caseName: Nombre del caso - caseOwner: Propietario del caso - caseState: Estado del caso - downloadZipFileExplanation: |- - El número de tareas excede el Límite de Excel. Por ello se crearán varios archivos y se comprimirán en un archivo Zip. - - El número de tareas excede el Límite de Excel. Por ello se crearán varios archivos y se comprimirán en un archivo Zip. - taskAnalysis: Análisis de tareas - taskCategory: Categoría de la tarea - taskCreationTime: Tarea creada - taskDescription: Descripción de la tarea - taskExpiryTime: Fecha de expiración de la tarea - taskFilter: Filtros de tareas - taskFinishedTime: Tarea completada - taskID: ID de la tarea - taskPriority: Prioridad de tarea - taskResponsible: Resonsable de tarea - taskState: Estado de tarea - taskWorker: Editor de tareas - waitingDownloadMessage: 'Estamos creando su exporte, esto puede tardar unos minutos. ' - timePeriod: - custom: Personalizado - last6Month: Último 6 meses - lastMonth: El mes pasado - lastWeek: La semana pasada - validationErrors: - nameIsExisted: Ya existe una tabla con este nombre + sidestep: + addAdhocTask: Añadir tarea Ad-hoc taskActivator: assign: Asignar cannotAssignTask: Esta tarea no puede ser asignada a otro usuario o grupo. @@ -1266,6 +1162,7 @@ ch.ivy.addon.portalkit.ui.jsf: expiry: Expiración failedDelayValidation: La marca de tiempo del retraso de la tarea no puede ser un valor vacío o un formato de fecha inválido failedExpiryValidation: La fecha de vencimiento de la tarea no puede estar en el pasado. + noAdhoc: Proceso AdHoc no disponible noDescription: Sin descripción noNotes: Sin notas processingTime: Tiempo de procesado @@ -1417,13 +1314,60 @@ Dialogs: CaseDescription: Editar un flujo de trabajo existente CaseName: Editar flujo de trabajo Tasks: + CreateWorkflow: + TaskDescription: Flujo de trabajo ha sido creado + TaskName: Flujo de trabajo ha sido creado + EditWorkflow: + TaskDescription: Un flujo de trabajo ha sido editado + TaskName: Flujo de trabajo editado + FinalReview: + TaskName: Control final + FinalWorkflowTask: + taskDescription: ¡El flujo de trabajo {0} ha sido {1}! + FormDefinition: + TaskDescription: ¡Por favor define el formulario! + TaskName: ¡Creación de formulario! + ProcessLoaded: + TaskName: Tarea para configurar el proceso Adhoc + SaveWorkflow: + TaskName: El flujo de trabajo express en tramitación TaskDetail: DataDescription: Datos y Descripción restoreToDefaultSettings: 'Restablecer la configuración por defecto ' switchToEditMode: Editar switchToViewMode: Guardar + WorkflowProperties: + TaskDescription: ¡Por favor configure las propiedades del flujo de trabajo! + TaskName: Propiedades del flujo de trabajo + WorkflowExecution: + ApprovalForm: + Approve: Aprobar + ApproveComment: Aprobar + CommentLabel: Comentario del aprobador + FieldSetApplicant: Solicitante + FieldSetForm: Formulario + FinishedTasks: Tareas terminadas + Fullname: Nombre completo + Reject: Rechazar + RejectComment: Rechazar + FinalReviewForm: + approvalStatus: Estado del aprobado + approver: Aprovador + noticed: Verificado + FinishedTasksForm: + Applicant: Solicitante + ApprovalResult: Estado del aprobado + FinishedTasks: Tareas terminadas + FormDetails: Detalles del formulario + UserTaskForm: + ApprovalResult: + Approved: Aprobado + Rejected: Rechazado + Formular: Formulario agileBPM: + TooltipForOriginalTask: Su tarea actual volverá a evaluarse cuando estén completados los flujos de trabajo ad hoc previos. define_WF: + AdhocWorkflowTasks: Tareas del flujo de trabajo ErrorSelectInvalidAssignee: El destinatario ya está seleccionado o es inválido ListOfSelectedUser: Lista de usuarios seleccionados ResponsibleDialogHeader: Usuarios responsables @@ -1440,6 +1384,14 @@ Dialogs: ch: ivy: addon: + express: + generic: + endpage: + subtitle: La última tarea se completó con éxito. + title: ¡Tarea completada con éxito! + expressNoItem: Aún no se ha completado ninguna Tarea Express + expressNoItemDescription: Aquí se mostrarán los resultados de las tareas completadas + expressWorkflowName: 'Detalles de negocio del caso #{0}' portal: generic: GlobalSearch: @@ -1470,7 +1422,7 @@ Dialogs: CaseOwner: Responsable del proceso Finished: Terminado GlobalSearchText: Los casos contienen la palabra clave "{0}" en ID del caso{1}. - ShowBusinessDetails: detalles del negocio + ShowBusinessDetails: Detalles del negocio caseNameNotAvailable: '[Nombre del caso no disponible]' defaultEmptyMessage: No hay casos CustomIFrameWidget: @@ -1491,12 +1443,13 @@ Dialogs: component: ShareLinkDialog: CopyLink: Copiar enlace - LinkCopied: Enlace copiado + LinkCopied: ¡Enlace copiado dashboard: component: CaseWidgetConfiguration: AddFilter: Añadir filtro ClientStatisticWidget: + IdNotFound: 'Chart Id not found with id: {0}' NoPermissionChartMessage: No tiene permiso para ver este gráfico. DashboardImportDetails: FileInfomation: Informacion del archivo @@ -1549,7 +1502,104 @@ Dialogs: invalidFileMessage: Tipo de archivo no permitido invalidSizeMessage: ¡El archivo es muy grande! maximumFileUploadElement: Ya existe un elemento de subir documentos + workflowCreation: + AdhocProcessName: Proceso adHoc para la tarea {0} - {1} + FormDefinition: + AddCheckboxField: Agregar nuevo campo + AddOptionboxField: Anexar nueva opción + AllowedFiletypes: Tipos de Archivo permitidos + BroadFooterArea: Pie de pagina amplio + BroadHeaderArea: Encabezado amplio + CheckboxFields: Campos de casillas de verificación + CreateField: Crear + DataProvider: Proveedor de datos + DragAndDropTooltip: Arrastre y suelte los elementos disponibles al encabezado, columna de la izquierda o de la derecha o al pie de página + ElementLabel: Etiqueta + ElementName: Nombre del elemento + Email: + Attachment: Anexo + EmailAddress: Dirección de E-Mail + EmailText: Texto de E-Mail + ResponseTo: Respuesta a + Subject: Asunto + ExecuteWorkflow: Ejecutar flujo de trabajo directamente + ExecuteWorkflowWarning: Tiene que procesar todas las tareas antes de poder ejecutar este processo + FieldSetAvailableFormelements: Elementos del formulario + FieldSetFormelements: Crear elementos de formulario + FieldSetFormelementsPlacing: Ubicación de elementos de formulario + FieldSetPreviewArea: Vista previa del formulario definido + FinishWorkflow: Fin del flujo de trabajo + InputArea: Área de entrada + InputCheckbox: Casilla de verificación + InputField: Campo de entrada + InputFileUpload: Carga de archivo + InputOptions: Botón Radial + InputType: Tipo de Entrada + InputTypes: + DateSelection: Seleccionador de Fecha + NumberField: Campo de numero + TextBox: Campo de texto + LeftColumn: Columna izquierda + NoCheckboxFieldYet: No hay campos de verificación definidos todavía + NoDataProvider: Proveedor de datos + NoFormelementsAvailable: ¡No hay elementos de formulario disponibles! + NoOptionboxFieldsYet: No hay tipos de casillas de verificación definidos todavía + NumberOfFiles: Numero de archivos + NumberOfRows: Numero de filas + OptionboxFields: Botones Radiales + OptionboxPlaceholder: Opción + Preview: Vista previa + RightColumn: Columna derecha + SaveWorkflow: Guardar Flujo de trabajo + UploadFileFormat: + Excel: Excel (xls/xlsx) + OtherFormats: Otros formatos de archivo + PDF: PDF (pdf) + Word: Word (doc/docx) + cancelCreateForm: 'Seguro que quiere cancelar? Perderá todos los datos. ' + otherFiletype: Otros tipos de archivos + ProcessName: Crear Flujo de Trabajo Express + TaskType: + Approval: Aprobado + Email: E-Mail de información + Review: Comprobación + UserTask: Tarea + UserTaskWithEmail: 'Tarea con E-Mail ' + WorkflowDefinition: + AbleToStart: Permiso de ejecución + AddProcessStep: Agregar paso de proceso + ChooseAssignee: + AddUserOrRole: 'Selecione un grupo o usuario porfavor:' + SelectedAssigneesFieldSet: Usuarios seleccionados + UserTooltip: Usuario + DefaultTemplateDescription: Abajo verá el patrón estandard + DeleteProcessStep: Retirar paso del proceso + Description: Describa su proceso + DueTimeInDays: Expiración en días + EndStep: Terminar + FormDefinitionStep: Definición de formulario + ProcessNameExists: Este nombre para el flujo de trabajo ya ha sido seleccionado + ProcessOwner: Responsable del proceso + Processdescription: Descripción de proceso + Processdetails: Propiedades del proceso + Processflow: Flujo de proceso + Processstep: Paso del proceso + Processtype: Tipo de proceso + ProcesstypeAdHoc: Una vez + ProcesstypeRepeating: Recurrente + TaskType: Tipo de tarea + UntilDaysTooltip: Después de la fecha de caducidad, esta tarea será asignada al grupo "todos" y su prioridad será alta + UserInterface: + ChangeSettingWarning: Todas las tareas definidas serán borradas, desea proceder? + CreateOwn: Crear propia + UseDefault: Usar patrón estandard + UserInterface: Interfaz de usuario + WorkflowPropertiesStep: Propiedades del flujo de trabajo + requiredMsgs: + ReqMsgGeneric: ¡Es un campo requerido! + processStep: Paso del proceso Labels: + AdhocWorkflow: Describe tu Flujo de Trabajo AppendTask-Explain: La tarea es añadida a la secuencia después de mi tarea. AppendTheTask: Anexar la tarea CreateNewDashboard: Crear un nuevo cuadro de mandos @@ -1592,13 +1642,13 @@ Labels: END_WITH: Termina con EQUAL: Igualdad GREATER: Greater - GREATER_OR_EQUAL: Greater or equal + GREATER_OR_EQUAL: Mayor o igual IN: En IS: Es IS_NOT: No es LAST: En los últimos LESS: Less - LESS_OR_EQUAL: Less or equal + LESS_OR_EQUAL: Menor o igual NEXT: En los próximos NOT_BETWEEN: No entre NOT_CONTAINS: No contiene @@ -1647,7 +1697,9 @@ Labels: TaskUser-Explain: Lista de usuario separados por coma ToggleMenu: Menú alternativo ViewAllResults: Ver todos los resultados + adhocTaskRequired: Deberá agregar al menos una tarea. disabledUserPrefix: (inactivo) + title: Flujo de trabajo Ad-hoc de auto servicio patterns: datePattern: dd.MM.yyyy dateTimePattern: dd.MM.yyyy HH:mm @@ -1677,7 +1729,18 @@ Processes: SynchronizeServerConfigurationCaseName: Sincronizar configuración del servidor portalHome: Portal Principal portalSettingSaved: Ajustes del portal guardados +ProcessPages: + selfServiceAdhocProcess: Auto servicio Axon Ivy + selfServiceDescription: 'Proceso de auto servicio: Lanzar un flujo de trabajo ad-hoc basado en un patrón de flujo predefinido' Texts: + Adhoc-Explain: |+ +

    + + Introduzca sus comentarios y presione Enviar para proceder al flujo de trabajo. + +

    + + AdhocWF-Explain: "

    \n\nDefinir y lanzar un flujo de trabajo es muy sencillo: seleccione un patrón de flujo, agregue algunas tareas y empieze el flujo de trabajo. \n\n

    \n\n

    \n\n\n\n

    \n\n" Approval-Explain: |+

    diff --git a/AxonIvyPortal/portal/cms/cms_fr.yaml b/AxonIvyPortal/portal/cms/cms_fr.yaml index dbf70b270e2..4fe4a3ffa1b 100644 --- a/AxonIvyPortal/portal/cms/cms_fr.yaml +++ b/AxonIvyPortal/portal/cms/cms_fr.yaml @@ -1,11 +1,26 @@ +Categories: + AdhocExpressTasks: + name: Tâches Adhoc Express + CreateExpressWorkflow: + name: Créer un workflow express + ExpressWorkflow: + name: Flux de travail express ch.ivy.addon.portal.generic: CaseDetailsTemplate: noCaseId: Aucun numéro de dossier n'a été indiqué requestTabTitle: Demande statusTabTitle: Informations sur le dossier OpenTaskTemplate: + adhocHistory: l'historique adhoc + adhocHistoryTooltip: Afficher l'historique adhoc browserTabClosingWarning: Votre travail risque d'être perdu. Souhaitez-vous continuer ? + goToAdhocWarning: En démarrant un processus ad hoc, vos données non sauvegardées seront perdues. Voulez-vous continuer? goToSidestepWarning: En démarrant un processus sidestep, vos données non sauvegardées seront perdues. Voulez-vous continuer? + noteOfResultFromAdhocProcess: 'Remarque : Vous trouverez également toutes ces entrées dans l''historique du processus.' + reCreateAdhocWarning: Il existe déjà un processus ad hoc pour cette tâche, voulez-vous en créer un autre ? + resultFromAdhocProcess: Résultats du processus ad hoc + startAdHoc: Démarrer ad-hoc + startAdHocTooltip: Rediriger ce processus en ajoutant une étape ad hoc. PortalName: PortalName: Portal ch.ivy.addon.portalkit.ui.jsf: @@ -96,6 +111,7 @@ ch.ivy.addon.portalkit.ui.jsf: BY_CUSTOM_ORDER: Commande personnalisée BY_INDEX: Index de tri ProcessType: + EXPRESS_PROCESS: Flux de travail express EXTERNAL_LINK: Lien externe IVY_PROCESS: Processus d'entreprise ProcessWidgetMode: @@ -234,6 +250,7 @@ ch.ivy.addon.portalkit.ui.jsf: enableProcessViewer: Définissez cette propriété à true pour activer l'option de visualisation de processus dans les actions de Task/Case. enableScriptCheckingForUploadedDocumentNote: Défini sur true pour activer la vérification de script pour le document téléchargé. Actuellement, cette fonction prend en charge la vérification de PDF, Excel, Word. enableVirusScannerForUploadedDocumentNote: Définie sur true pour activer le scanner de virus pour le document téléchargé. Actuellement, cette fonction utilise l'API VIRUSTOTAL. + expressEndPageNote: Affiche la page de fin personnalisée à la fin de chaque processus Express. hideCaseCreator: |- La valeur "true" permet de masquer le créateur du dossier dans la liste des dossiers, le widget du dossier et les détails du dossier. Ce paramètre affecte toutes les requêtes de cas, par exemple pour la liste des cas, la recherche globale, les statistiques. @@ -241,7 +258,6 @@ ch.ivy.addon.portalkit.ui.jsf: hideChangePasswordButtonNote: Attribuez la valeur true à cette variable pour masquer l'option "Changer de mot de passe" dans le menu supérieur et l'option "Mot de passe oublié" sur la page de connexion. Si elle vaut false, ces options seront affichées. hideLogoutButtonNote: Si true, le bouton de déconnexion du menu supérieur sera masqué, sinon il sera affiché. hideRelatedCaseInfoFromHistory: Si la valeur est vraie, l'historique des cas n'affiche pas les informations relatives aux cas dans le tableau de l'historique. - hideStatisticWidget: Définissez la valeur sur "true" pour masquer le widget de statistiques de la page d'accueil et du menu de l'application. hideSystemNotesFromHistory: Si vrai, la remarque sur le cas/la tâche n'affiche aucune note de système pour les utilisateurs non administrateurs. hideSystemNotesFromHistoryAdministrator: Si vrai, la remarque sur le cas/la tâche n'affiche aucune note de système pour l'administrateur. hideSystemTasksFromHistory: Si vrai, la remarque sure le cas / de la tâche n'affiche aucune tâche du système pour les utilisateurs non administrateurs. @@ -260,7 +276,6 @@ ch.ivy.addon.portalkit.ui.jsf: showProcessInformation: Définissez la valeur false pour désactiver le lien vers l'option Afficher les informations du processus sur la page processus (mode grille) et détails du cas. showQuickGlobalSearch: Pour activer/désactiver l'affichage de la recherche globale rapide. showTaskDurationTime: Pour activer/désactiver l'affichage de la durée dans la page des détails de la tâche. - statisticChartScalingInterval: Intervalle en secondes pour effectuer les demandes de mise à l'échelle périodique des graphiques statistiques. Si la valeur de l'intervalle est inférieure à 10, la mise à l'échelle périodique des graphiques statistiques est désactivée. uploadDocumentWhiteListExtensionNote: 'Laissez la valeur vide si vous autorisez toutes les extensions. Si juste autoriser quelques extensions, listez les extensions ici, séparées par des virgules. Exemple: pdf, txt, doc, docx.' key: Clé link: Lien @@ -411,6 +426,7 @@ ch.ivy.addon.portalkit.ui.jsf: add: Ajouter addDocument: Ajouter un document addNote: Ajouter une note + adhoc: Adhoc allCategories: Toutes les catégories allowPng: Seulement les types .png autorisés apply: Utiliser @@ -421,6 +437,7 @@ ch.ivy.addon.portalkit.ui.jsf: backgroundColor: Couleur de fond cancel: Annuler case: Dossier + caseCategory: Catégorie des cas caseInformation: Information sur le cas caseName: Nom de cas categories: Catégories @@ -632,6 +649,45 @@ ch.ivy.addon.portalkit.ui.jsf: noUser: Il n'y a pas d'utilisateurs. tooltipHelper: Cliquez pour afficher tous les utilisateurs qui possèdent ce rôle directement ou indirectement userOfRoleTitle: Utilisateur du groupe {0} + expressManagement: + deployButton: Déployer + deployMessage: 'Déploiement des processus en cours ... ' + exportExpress: Export Express + exportExpressProcessTitle: Exporter des processus express + expressExportName: AXONIVY_Dataset_ExpressWorkflow_{0}.json + expressManagement: Gestion de l'express + expressMessages: + deployErrorLog: Erreur lors du déploiement {0} + deploymentFinishedLog: Processus du fichier {0} déployé avec succès dans Portal en {1}ms + endDeployLog: Déploiement Express terminé + invalidVersionLog: Version non supportée {0} d'Express + process: + duplicateProcessNameLog: '- Nom du processus dupliqué {0}' + installProcessFailedLog: '- Le déploiement du processus {0} a échoué' + installProcessFinishedLog: Installation du processus {0} réussie + installedProcessLog: Processus installé {0} + startDeployProcessLog: Commencer à déployer le processus {0} + startDeployLog: Commencez à déployer le(s) processus Express du fichier {0} vers Portal + status: + error: Erreur + failed: Echoué + info: Info + successful: Succès + warning: Attention + validate: + validateExpressVersion: Impossible de trouver la variable Express Version dans le système. Veuillez contacter votre administrateur. + validateProcessCoOwnerLog: '- Valider le processus Copropriétaire de {0}, l''utilisateur {1} n''est pas disponible dans le système' + validateProcessOwnerLog: '- Valider le propriétaire du processus de {0}, l''utilisateur {1} n''est pas disponible dans le système, changer le propriétaire du processus pour {2}.' + validateProcessPermissionLog: '- Valider la permission de processus de {0}, l''utilisateur {1} n''est pas disponible dans le système' + validateTaskDefUserLog: '- Valider les responsabilités de la définition de tâche de {0}, l''utilisateur {1} n''est pas disponible dans le système' + versionLog: 'Version de l''Express : {0}' + fileEmptyMessage: Le fichier est vide + importDialogHeaderTitle: Choisissez un Dataset de workflow Express, il doit s'agir d'un fichier JSON. + importExpress: Importation Express + importExpressProcessTitle: Importation de processus express + importHeaderTitle: 'La liste des processus Express sera exportée :' + processCount: processus(s) + waitingMessage: Les données sont recueillies … passwordValidation: criteria: Critères enablePasswordValidation: Activer la validation du mot de passe @@ -644,11 +700,6 @@ ch.ivy.addon.portalkit.ui.jsf: titlePage: Validation du mot de passe processChain: currentStepIsNotDefined: L'étape actuelle ({0}) de la chaîne de processus n'est pas définie - statisticWidget: - chartDeletionConfirmation: Êtes-vous sûr de vouloir supprimer cette statistique? - contextMenuDrilldown: Drilldown - contextMenuToCaseList: Aller à la liste des affaires - contextMenuToTaskList: Aller à la liste des tâches taskStart: cannotDelegateTaskMessage: Cette tâche ne peut pas être déléguée ä un autre utilisateur ou une autre groupe. cannotStartMessages: @@ -719,14 +770,7 @@ ch.ivy.addon.portalkit.ui.jsf: ShareThisDashboard: Partager ce tableau de bord StandardWidgets: Widgets standard StatisticWidget: - AvailableCharts: Graphiques de statistiques disponibles - Charts: 'Graphique(s) : {0}' - ConfigurationDescription: Vous pouvez configurer votre widget dans cette zone de configuration. Veuillez définir le graphique qui sera affiché sur votre tableau de bord. EmptyChartDataMessage: Nous n'avons pas assez de données pour créer un beau graphique ! - FilterChartText: Filtrer un graphique par nom - PlaceholderChartOption: Sélectionnez un graphique - PleaseSelectChart: Veuillez sélectionner un graphique - PreviewText: Veuillez sélectionner un graphique pour voir les données du canevas WelcomeWidgetIntroduction: Ce widget affiche un texte et une image de bienvenue sur le tableau de bord. WelcomeWidgetNotFoundMessage: Nous ne pouvons pas trouver l'image du widget, veuillez reconfigurer votre image ! WidgetFilterName: Nom du filtre du widget @@ -870,7 +914,6 @@ ch.ivy.addon.portalkit.ui.jsf: yourNotifications: Vos notifications yourProcessViewer: Votre visualisateur de processus yourProcesses: Vos processus - yourStatistics: Vos statistiques yourTasks: Vos tâches documentFiles: deleteDocumentNote: '{0} a supprimé(e) {1}' @@ -912,7 +955,6 @@ ch.ivy.addon.portalkit.ui.jsf: processElementId: Id de l'élément de processus stackTrace: StackTrace forgotPassword: - EmailAddress: Adresse e-mail empty: Vide forgotPassword: J'ai oublié mon mot de pas forgotPasswordError: Une erreur s'est produite lors du traitement de votre demande. Veuillez réessayer plus tard. @@ -1021,6 +1063,7 @@ ch.ivy.addon.portalkit.ui.jsf: addNewProcess: Ajouter un processus addNewProcessDialogHeader: Ajouter un nouveau processus utilisateur backToOverview: Retour à l'aperçu + deleteExpressWorkflowTooltip: Supprimer le Workflow Express deleteExternalLinkTooltip: Supprimer le lien externe deleteProcess: Supprimer processus deleteProcessItemConfirmation: Êtes-vous sûr de vouloir détruire le processus suivant ? @@ -1031,7 +1074,9 @@ ch.ivy.addon.portalkit.ui.jsf: dialogEditInfoTitle: '{0} Informations' dialogHeaderDescription: Dans cette zone, vous pouvez modifier certaines informations relatives au processus sélectionné. dialogHeaderTitle: Modifier les informations pour {0} + editExpressWorkflowTooltip: Modifier le Workflow Express editProcesses: Modifier des processus + expressWorkflow: Workflow Express externalLink: lien externe externalLinkVisibility: Visibilité goTo: 'Aller à:' @@ -1068,154 +1113,8 @@ ch.ivy.addon.portalkit.ui.jsf: process: Processus searchResults: Résultats de la recherche searchResultsFor: '{0} résultats pour "{1}"' - statistic: - chart: - ExpandOrCollapseColumn: Agrandir/réduire les colonnes - addChart: Ajouter un nouveau diagramme - addChartDialogHeader: Ajouter un diagramme au tableau de bord - backToDashboard: Retour au tableau de bord - barchart: - Percentage: Pourcentage - daysOfWeek: - friday: Vendredi - monday: Lundi - saturday: samedi - sunday: dimanche - thursday: Jeudi - tuesday: Mardi - wednesday: Mercredi - expired: Expiré - in2Days: Dans 2 jours - in3Days: Dans 3 jours - monthsOfYear: - April: avril - August: août - December: décembre - February: février - January: janvier - July: juillet - June: juin - March: Mars - May: Mai - November: novembre - October: octobre - September: septembre - today: Aujourd'hui - tomorrow: Demain - weeksOfMonth: - fifthWeek: Cinquième semaine - firstWeek: Première semaine - fourthWeek: Quatrième semaine - secondWeek: Deuxième semaine - sixthWeek: Sixième semaine - thirdWeek: Troisième semaine - caseCategory: Catégorie des cas - chartCreationSuccessDetailMsg: Diagramme avec le nom {0} a été créé avec succès - chartCreationSuccessTitle: Diagramme a été créé avec succès - elapsedTime: Temps écoulé - elapsedTimeChart: - compareButton: Comparer - compareRole: Comparer les rôles - elapsedTimeInHours: Temps écoulé en heures - noEntriesFound: Aucun critère correspondant trouvé - taskCategory: Catégorie de tâche - withRole: 'Avec rôle:' - emptystate: - defaultEmptyMessages: Pas de diagrammes à afficher - exception: - idNotFound: 'Chart Id not found with id: {0}' - noPermission: You do not have the permission to send this request! - expiryPeriod: Période d'expiration - loadingCharts: Veuillez patienter, les graphiques sont en cours de chargement … - moveLeft: Déplacer vers la gauche - moveRight: Déplacer vers la droite - notAllowedToCreateChart: Vous n'êtes pas autorisé à créer un diagramme avant de cliquer sur le bouton Appliquer les filtres - other: Outres - restoreDefaultChart: Si vous continuez, vous perdrez tous les graphiques créés par vous-même. Les paramètres standard seront appliqués. - second: sec - showAllCharts: Voir tous les diagrammes - statisticCarousel: Carrousel de statistiques - statistics: Statistiques - taskByExpiry: - hour: (Heure) - thisMonth: Ce mois - thisWeek: Cette semaine - thisYear: Cette année - taskByPriority: - addToDashboardLink: Ajouter au tableau de bord - exception: Exception - high: Haute - low: Basse - normal: Normale - taskExpiry: Expiration de la tâche - chartInfo: - chartDetailsHeader: Détails du diagramme - chartName: Nom du diagramme - chartType: Type du diagramme - name: Infos graphiques - chartType: - caseByFinishedTask: Cas traités en période de temps - caseByFinishedTaskDescription: Cas où une tâche s'est terminée dans la période sélectionnée - caseByFinishedTime: Cas traités dans le temps - caseByFinishedTimeDescription: Cas qui se font dans la période sélectionnée - caseByState: Cas par état - casesByCategory: Affaires par catégorie - elapsedTimeByCaseCategory: Temps écoulé des cas accomplis - elapsedTimeByCaseCategoryDescription: Temps écoulé des cas finis par catégorie - taskByExpiry: Tâche par échéance - taskByPriority: Tâche par priorité - defaultChart: - newChart: Nouveau diagramme - tasksByPriority: Tãches par priorité - filter: - affectedCharts: Diagrammes concernés - allSelected: Tous - caseCategoriesLabel: Catégories de cas - caseCategoryFilterDescription: Vous pouvez trouver toutes les catégories de cas disponibles ici. Seules les catégories de cas sélectionnées sont prises en compte dans les diagrammes concernés. - caseStateFilterDescription: Seuls les états sélectionnés sont pris en compte dans les diagrammes concernés. - filter: Filtres - noRoles: Aucun rôle disponible - noSelectionCustomVarChar: Pas de choix. - noneSelected: Aucun - roleFilterDescription: Vous pouvez trouver tous les rôles de processus disponibles ici. Seuls les rôles sélectionnés sont pris en compte dans le diagramme concerné - rolesLabel: Rôle - selectAll: Tout sélectionner - taskPrioritiesLabel: Priorités de tâches - taskPriorityFilterDescription: Les tâches peuvent être sélectionnées en fonction de leur priorité. - timePeriod: Période de temps - timePeriodFilterDescription: Limite la période de temps pour les cas et les tâches. - workflowStatesLabel: État de flux de travail - taskAnalysis: - applyFilter: Appliquer les filtres - caseCategory: Catégorie de cas - caseCreator: Créateur de cas - caseDescription: Description du cas - caseFilter: Filtres de cas - caseID: ID de cas - caseName: Nom de cas - caseOwner: Propriétaire du cas - caseState: État du cas - downloadZipFileExplanation: Le nombre de tâches à exporter dépasse la limite des lignes Excel. Par conséquent, les données seront divisées en plusieurs fichiers Excel, puis compressées dans un fichier ZIP à télécharger. - taskAnalysis: Analyse des tâches - taskCategory: Catégorie de tâche - taskCreationTime: Tâche créée - taskDescription: Description de la tâche - taskExpiryTime: Expiration de la tâche - taskFilter: Filtres de la tâche - taskFinishedTime: Tâche terminée le - taskID: Id de tâche - taskPriority: Priorité de la tâche - taskResponsible: Tâche responsable - taskState: État de la tâche - taskWorker: Éditeur de tâche - waitingDownloadMessage: Nous créons l'export, cela peut prendre quelques minutes - timePeriod: - custom: Coutume - last6Month: Six derniers mois - lastMonth: Dernier Mois - lastWeek: Dernière semaine - validationErrors: - nameIsExisted: Un diagramme avec ce nom existe déjà + sidestep: + addAdhocTask: Ajouter une Ad-hoc tâche taskActivator: assign: Assigner cannotAssignTask: Cette tâche ne peut être assignée à aucun autre utilisateur ou groupe. @@ -1260,6 +1159,7 @@ ch.ivy.addon.portalkit.ui.jsf: expiry: Expiration failedDelayValidation: L'horodatage du délai des tâches ne peut pas être une valeur vide ou un format de date non valide failedExpiryValidation: L'horodatage de l'expiration des tâches ne peut pas être dans le passé. + noAdhoc: Pas d'Adhoc disponible noDescription: Aucune description noNotes: Aucune note processingTime: Durée de traitement @@ -1411,13 +1311,60 @@ Dialogs: CaseDescription: Modifier un workflow existant CaseName: Modifier workflow Tasks: + CreateWorkflow: + TaskDescription: Le workflow a été créé + TaskName: Le workflow a été créé + EditWorkflow: + TaskDescription: Un processus a été modifié. + TaskName: Processus modifié + FinalReview: + TaskName: Finales chèques + FinalWorkflowTask: + taskDescription: Le workflow {0} a été terminé! + FormDefinition: + TaskDescription: Veuillez définir le formulaire ! + TaskName: Création du formulaire! + ProcessLoaded: + TaskName: Tâche pour la configuration Adhoc + SaveWorkflow: + TaskName: Création de workflow express en cours TaskDetail: DataDescription: Données et description restoreToDefaultSettings: Rétablir les paramètres par défaut switchToEditMode: Editer switchToViewMode: Enregistrer + WorkflowProperties: + TaskDescription: Veuillez configurer les propriétés du workflow ! + TaskName: Propriétés de workflow + WorkflowExecution: + ApprovalForm: + Approve: Approuver ! + ApproveComment: Approuver + CommentLabel: Commentaire de l'approbateur + FieldSetApplicant: Demandeur + FieldSetForm: Formulaire + FinishedTasks: Tâches finies + Fullname: Nom complet + Reject: Refuser ! + RejectComment: Refuser + FinalReviewForm: + approvalStatus: Statut d'approbation + approver: Approbateur + noticed: Prendre acte! + FinishedTasksForm: + Applicant: Demandeur + ApprovalResult: Résultat d'approbation + FinishedTasks: Tãches finies + FormDetails: Détails du formulaire + UserTaskForm: + ApprovalResult: + Approved: Approuvé + Rejected: Refusé + Formular: Formulaire agileBPM: + TooltipForOriginalTask: 'Votre tâche actuelle réapparaîtra dès que le workflow ad hoc sera terminé. ' define_WF: + AdhocWorkflowTasks: Tâches du workflow ErrorSelectInvalidAssignee: Le destinataire est déjà sélectionné ou invalide ListOfSelectedUser: Liste des utilisateurs sélectionnés ResponsibleDialogHeader: Utilisateurs responsables @@ -1434,6 +1381,14 @@ Dialogs: ch: ivy: addon: + express: + generic: + endpage: + subtitle: La dernière tâche a été accomplie avec succès + title: Tâche terminée avec succès! + expressNoItem: Pas de tâche Express terminée + expressNoItemDescription: Les résultats des tâches terminées sont affichés ici + expressWorkflowName: 'Détails de cas #{0}' portal: generic: GlobalSearch: @@ -1464,7 +1419,7 @@ Dialogs: CaseOwner: Responsable de processus Finished: Terminé GlobalSearchText: Les cas contiennent le mot-clé "{0}" dans Id du dossier{1}. - ShowBusinessDetails: Détails de la demande + ShowBusinessDetails: Détails de l'entreprise caseNameNotAvailable: '[Nom de cas pas disponible]' defaultEmptyMessage: Il n'y a pas de dossiers CustomIFrameWidget: @@ -1491,6 +1446,7 @@ Dialogs: CaseWidgetConfiguration: AddFilter: Ajouter un filtre ClientStatisticWidget: + IdNotFound: 'Chart Id not found with id: {0}' NoPermissionChartMessage: Vous n'avez pas l'autorisation requise pour consulter ce graphique. DashboardImportDetails: FileInfomation: Informations sur le fichier @@ -1543,7 +1499,104 @@ Dialogs: invalidFileMessage: Ce type de fichier n'est pas accepté! invalidSizeMessage: Le fichier est trop volumineux ! maximumFileUploadElement: Il existe déjà un élément de téléchargement de fichiers + workflowCreation: + AdhocProcessName: AdHoc processues pour tâche {0} - {1} + FormDefinition: + AddCheckboxField: Ajouter un nouveau champs + AddOptionboxField: Ajouter une nouvelle option + AllowedFiletypes: Types de fichier autorisés + BroadFooterArea: Zone de bas de page large + BroadHeaderArea: En-tête large + CheckboxFields: Champs de cases à cocher + CreateField: Créer + DataProvider: Fournisseur de données + DragAndDropTooltip: Veuillez placer les éléments disponibles par glisser/déposer dans l’en-tête, dans la colonne de droite ou en pied de page. + ElementLabel: Label + ElementName: Nom de l’élément + Email: + Attachment: Pièce jointe + EmailAddress: Adresse e-mail + EmailText: Texte d'email + ResponseTo: Réponse à + Subject: Sujet + ExecuteWorkflow: Lancer le workflow directement + ExecuteWorkflowWarning: Vous devez effectuer toutes les tâches avant de pouvoir exécuter ce workflow + FieldSetAvailableFormelements: Éléments de formulaire + FieldSetFormelements: Créer un élément de formulaire + FieldSetFormelementsPlacing: Placer les éléments de formulaire + FieldSetPreviewArea: Pré-visualiser le formulaire + FinishWorkflow: Fin de workflow + InputArea: Zone de texte + InputCheckbox: Case d’option à cocher + InputField: Champ de texte + InputFileUpload: Téléchargement de fichier + InputOptions: Bouton radio + InputType: Type d’entrée + InputTypes: + DateSelection: Calendrier + NumberField: Champ numérique + TextBox: Champ de texte + LeftColumn: Colonne de gauche + NoCheckboxFieldYet: Aucun type de champ de case d’option à cocher n’est pour l’instant défini + NoDataProvider: Fournisseur de données statiques spéciales + NoFormelementsAvailable: Aucun élément de formulaire n’est disponible ! + NoOptionboxFieldsYet: Aucun type de case d’’option à cocher n’est pour l’instant défini + NumberOfFiles: Nombre de fichiers + NumberOfRows: Nombre de lignes + OptionboxFields: Boutons radio + OptionboxPlaceholder: Option + Preview: Aperçu + RightColumn: Colonne de droite + SaveWorkflow: Sauvegarder le workflow + UploadFileFormat: + Excel: Excel (xls/xlsx) + OtherFormats: Autres formats de fichier + PDF: PDF (pdf) + Word: Word (doc/docx) + cancelCreateForm: Voulez-vous vraiment annuler? Toutes vos données seront perdues! + otherFiletype: Autres types de fichier + ProcessName: Créer un flux de travail Express + TaskType: + Approval: Approbation + Email: email d'information + Review: Revue + UserTask: Tâche + UserTaskWithEmail: Tâche avec email + WorkflowDefinition: + AbleToStart: Capable de commencer + AddProcessStep: Ajouter une étape de processus + ChooseAssignee: + AddUserOrRole: 'Veuillez sélectionner un groupe ou un utilisateur :' + SelectedAssigneesFieldSet: Cessionnaires sélectionnés + UserTooltip: Utilisateur + DefaultTemplateDescription: Voici le modèle par défaut + DeleteProcessStep: Supprimer l’étape de processus + Description: Décrivez votre processus + DueTimeInDays: Expiration en jours + EndStep: Fin + FormDefinitionStep: Définition du formulaire + ProcessNameExists: Ce nom de processus a été utilisé avant + ProcessOwner: Propriétaire du processus + Processdescription: Description du processus + Processdetails: Propriétés du processus + Processflow: Flux du processus + Processstep: Étape de processus + Processtype: Type de processus + ProcesstypeAdHoc: Une fois + ProcesstypeRepeating: Rrépétitif + TaskType: Type de tâche + UntilDaysTooltip: Après expiration, la tâche sera assignée au role “Everybody” et sa priorité sera passée en “haute”. + UserInterface: + ChangeSettingWarning: Toutes les tâches définies seront supprimées. Êtes-vous sûr? + CreateOwn: Créer propre + UseDefault: Coutume + UserInterface: Iinterface utilisateur + WorkflowPropertiesStep: Propriétés du workflow ! + requiredMsgs: + ReqMsgGeneric: est un champ obligatoire ! + processStep: Étape du processus Labels: + AdhocWorkflow: Décrivez votre workflow AppendTask-Explain: La tâche est ajoutée à la séquence après ma tâche. AppendTheTask: Ajouter la tâche CreateNewDashboard: Créer un nouveau tableau de bord @@ -1585,13 +1638,13 @@ Labels: EMPTY: Est vide END_WITH: Se termine par EQUAL: Égalité - GREATER_OR_EQUAL: Greater or equal + GREATER_OR_EQUAL: Supérieur ou égal IN: En IS: Est IS_NOT: N'est pas LAST: Au cours des dernières LESS: Less - LESS_OR_EQUAL: Less or equal + LESS_OR_EQUAL: Inférieur ou égal NEXT: Dans les prochains NOT_BETWEEN: Pas entre NOT_CONTAINS: Ne contient pas @@ -1633,7 +1686,9 @@ Labels: TaskUser-Explain: Liste d’utilisateurs séparés par des virgules ToggleMenu: Menu à bascule ViewAllResults: Voir tous les résultats + adhocTaskRequired: Vous devez ajouter au moins une tâche. disabledUserPrefix: (désactivé) + title: Workflow ad hoc Self Service patterns: datePattern: dd.MM.yyyy dateTimePattern: dd.MM.yyyy HH:mm @@ -1663,7 +1718,12 @@ Processes: SynchronizeServerConfigurationCaseName: Synchroniser la configuration du serveur portalHome: Page d'accueil portalSettingSaved: Les paramètres du portail sont enregistrés +ProcessPages: + selfServiceAdhocProcess: Axon Ivy Self Service + selfServiceDescription: 'Processus en libre service: lance un workflow ad hoc basé sur un modèle prédéfini. ' Texts: + Adhoc-Explain: '

    Rentrez votre commentaire et cliquez sur Envoyer afin de poursuivre.

    ' + AdhocWF-Explain: "

    \n\nDéfinir et démarrer un workflow en un clic. \n\n

    " Approval-Explain: "

    \n\nVeuillez choisir et cliquez sur Envoyer pour poursuivre. \n\n

    " QA-Explain: |-

    From 8627c1ce55d317c2e55dbda6b4192a9df60c2c75 Mon Sep 17 00:00:00 2001 From: Loc Nguyen Date: Mon, 23 Sep 2024 10:16:24 +0700 Subject: [PATCH 16/16] Revert "Merge branch 'master' into feature/IVYPORTAL-17431-Remove-Express-from-Portal" This reverts commit fdea56bf10e7ff8e48372667162b934f73b9f3aa, reversing changes made to 661f98d6f1110db75553446a5946edfbb175af8e. --- .../Start Processes/GrantPermissions.p.json | 33 +- .../jmeter/portal_walkthrough_testplan.jmx | 4343 +++++++++++++++++ .../components/enums/PortalVariable.java | 1 + .../resources/js/process-history-component.js | 8 +- .../resources/js/document-screenshot.js | 32 + .../testFile/Dashboard_Dashboard_Export.json | 59 + ...dashboard-has-chart-cases-by-category.json | 67 + .../dashboard-has-one-chart-example.json | 71 + .../selenium/common/NavigationHelper.java | 6 + .../selenium/common/ScreenshotUtils.java | 1 + .../portal/selenium/common/Variable.java | 5 +- .../AdditionalComponentsScreenshotTest.java | 16 + .../screenshot/StatisticScreenshotTest.java | 51 + .../TaskAnalysisScreenshotTest.java | 62 + .../portal/selenium/page/MainMenuPage.java | 15 + .../page/NewDashboardDetailsEditPage.java | 5 + .../selenium/page/NewDashboardPage.java | 16 + .../page/StatisticWidgetDashboardPage.java | 58 + .../selenium/page/StatisticWidgetPage.java | 270 + .../selenium/page/TaskAnalysisWidgetPage.java | 362 ++ .../selenium/test/DefaultChartTest.java | 75 + .../portal/selenium/test/MenuTest.java | 9 +- .../selenium/test/PortalPermissionTest.java | 6 + .../test/StatisticDashboardWidgetTest.java | 92 + .../selenium/test/StatisticWidgetTest.java | 155 + .../DashboardRestoreConfigurationTest.java | 2 +- .../selenium/test/task/TaskActionTest.java | 2 +- .../test/task/TaskAnalysisWidgetTest.java | 348 ++ AxonIvyPortal/portal/cms/cms.yaml | 158 +- AxonIvyPortal/portal/cms/cms_de.yaml | 175 +- AxonIvyPortal/portal/cms/cms_en.yaml | 167 +- AxonIvyPortal/portal/cms/cms_es.yaml | 405 +- AxonIvyPortal/portal/cms/cms_fr.yaml | 394 +- AxonIvyPortal/portal/config/variables.yaml | 12 + .../variables/Portal/StatisticCharts.json | 25 + .../variables/Portal/TaskAnalysisFilters.json | 1 + .../Start Processes/PortalStart.p.json | 381 +- .../CleanUpObsoletedUserData.p.json | 58 + .../addon/portal/generic/menu/MenuView.java | 17 +- .../portal/generic/menu/PortalMenuItem.java | 1 + .../generic/menu/PortalMenuNavigator.java | 11 + .../generic/menu/StatisticSubMenuItem.java | 17 + .../userprofile/homepage/HomepageMapper.java | 2 + .../userprofile/homepage/HomepageType.java | 2 +- .../userprofile/homepage/HomepageUtils.java | 1 + .../bean/DashboardDetailModificationBean.java | 30 + .../portal/generic/bean/NavigatorBean.java | 5 +- .../portal/generic/bean/StatisticBean.java | 31 + .../portal/generic/bean/UserMenuBean.java | 4 + .../generic/navigation/PortalNavigator.java | 7 + .../portal/generic/view/TaskAnalysisView.java | 162 + .../bean/DashboardStatisticChartBean.java | 196 + .../bean/ElapsedTimeDetailsBean.java | 60 + .../bean/StatisticChartCreationBean.java | 403 ++ .../bean/StatisticDashboardBean.java | 268 + .../bean/TaskAnalysisWidgetBean.java | 113 + .../casefilter/impl/CaseCategoryFilter.java | 2 +- .../impl/TaskAnalysisCaseFilterContainer.java | 14 + .../converter/StatisticConverter.java | 30 + .../internal/ElapsedTimeLazyDataModel.java | 172 + .../internal/TaskAnalysisLazyDataModel.java | 455 ++ .../dto/dashboard/DashboardWidget.java | 1 + .../dashboard/StatisticDashboardWidget.java | 128 + .../addon/portalkit/enums/BreadCrumbKind.java | 2 +- .../portalkit/enums/DashboardWidgetType.java | 2 +- .../addon/portalkit/enums/GlobalVariable.java | 2 + .../ivy/addon/portalkit/enums/MenuKind.java | 2 +- .../portalkit/enums/PortalPermission.java | 4 +- .../addon/portalkit/enums/PortalVariable.java | 1 + .../portalkit/enums/StatisticChartType.java | 34 + .../enums/StatisticTimePeriodSelection.java | 20 + .../enums/TaskAndCaseAnalysisColumn.java | 41 + .../portalkit/exporter/CaseExporter.java | 2 +- .../internal/TaskAnalysisExporter.java | 168 + .../ivydata/service/impl/CaseService.java | 5 +- .../portalkit/security/PortalSecurity.java | 4 +- .../portalkit/service/StatisticService.java | 1435 ++++++ .../service/TaskAnalysisFilterService.java | 57 + .../StatisticCaseCategoryFilter.java | 83 + .../portalkit/statistics/StatisticChart.java | 114 + .../statistics/StatisticChartConstants.java | 100 + .../StatisticChartDrilldownUtils.java | 102 + .../statistics/StatisticChartQueryUtils.java | 666 +++ .../statistics/StatisticChartTimeUtils.java | 150 + .../portalkit/statistics/StatisticFilter.java | 357 ++ .../impl/TaskAnalysisFilterData.java | 53 + .../impl/TaskAnalysisTaskFilterContainer.java | 31 + .../addon/portalkit/util/CategoryUtils.java | 2 - ...ByGlobalVariableTriggerStartEventBean.java | 65 + .../portalkit/util/DashboardWidgetUtils.java | 11 +- .../addon/portalkit/util/PermissionUtils.java | 9 + .../service/ClientStatisticService.java | 2 +- .../generic/TaskAnalysis/TaskAnalysis.xhtml | 24 + .../TaskAnalysis/TaskAnalysisData.d.json | 11 + .../TaskAnalysis/TaskAnalysisProcess.p.json | 77 + .../PortalDashBoard/PortalDashBoard.xhtml | 20 + .../PortalDashBoardData.d.json | 16 + .../PortalDashBoardProcess.p.json | 56 + .../PortalDashboardAddNewWidgets.xhtml | 5 + .../StatisticChartWidget.xhtml | 129 + .../StatisticChartWidgetData.d.json | 55 + .../StatisticChartWidgetProcess.p.json | 290 ++ .../StatisticChartWidgetConfiguration.xhtml | 92 + ...atisticChartWidgetConfigurationData.d.json | 6 + ...sticChartWidgetConfigurationProcess.p.json | 48 + .../AdminSettings/AdminSettingsProcess.p.json | 1 + .../StatisticWidget/StatisticWidget.xhtml | 124 + .../StatisticWidgetData.d.json | 67 + .../StatisticWidgetProcess.p.json | 477 ++ .../TaskAnalysisWidget/StatisticResult.xhtml | 185 + .../TaskAnalysisWidget.xhtml | 321 ++ .../TaskAnalysisWidgetData.d.json | 80 + .../TaskAnalysisWidgetProcess.p.json | 706 +++ .../ChartCreationWidget.xhtml | 250 + .../ChartCreationWidgetData.d.json | 47 + .../ChartCreationWidgetProcess.p.json | 615 +++ .../ChartInformationDialog.xhtml | 138 + .../ChartInformationDialogData.d.json | 6 + .../ChartInformationDialogProcess.p.json | 49 + .../statistic/CustomField/CustomField.xhtml | 54 + .../CustomField/CustomFieldData.d.json | 19 + .../CustomField/CustomFieldProcess.p.json | 114 + .../CustomVarField/CustomVarField.xhtml | 53 + .../CustomVarField/CustomVarFieldData.d.json | 15 + .../CustomVarFieldProcess.p.json | 88 + .../ElapsedTimeChartDetails.xhtml | 109 + .../ElapsedTimeChartDetailsData.d.json | 39 + .../ElapsedTimeChartDetailsProcess.p.json | 230 + .../StatisticCarousel.xhtml | 61 + .../StatisticDashboardWidget.xhtml | 199 + .../StatisticDashboardWidgetData.d.json | 107 + .../StatisticDashboardWidgetProcess.p.json | 1121 +++++ .../StatisticFilters/StatisticFilters.xhtml | 196 + .../StatisticFiltersData.d.json | 6 + .../StatisticFiltersProcess.p.json | 49 + .../ClientStatisticWidget.xhtml | 1 + .../webContent/layouts/includes/topbar.xhtml | 2 +- .../restricted/DashboardTemplate.xhtml | 9 + .../webContent/resources/css/dashboard.css | 4 + .../webContent/resources/css/module.css | 560 +++ .../resources/css/portal-variables-dark.css | 208 + .../resources/css/portal-variables-light.css | 208 + .../webContent/resources/css/portal.css | 46 + .../webContent/resources/js/chart-carousel.js | 77 + .../portal/webContent/resources/js/portal.js | 41 + .../resources/js/statistic-widget.js | 672 +++ .../components/additional-components.rst | 47 + .../customization/default-chart-colors.rst | 134 + .../customization/default-chart.rst | 21 + .../customization/index.rst | 2 + .../customization/menu.rst | 4 +- ...stomization-logos-colors-date-patterns.rst | 4 + .../installation/index.rst | 9 +- .../permissions/index.rst | 18 + .../portal-developer-guide/settings/index.rst | 12 + .../accessibility/documents/shortcuts.csv | 5 +- .../documents/available_settings.csv | 8 +- .../admin-settings/index.rst | 8 - .../full-statistic-list/index.rst | 287 ++ .../source/portal-user-guide/index.rst | 1 + .../portal-user-guide/new-dashboard/index.rst | 4 + .../portal-user-guide/portal-header/index.rst | 2 +- .../testProcesses/TestTaskFlow.p.json | 44 +- .../ui/SaleDepartment/SaleDepartment.xhtml | 5 +- 164 files changed, 21772 insertions(+), 628 deletions(-) create mode 100644 AxonIvyPortal/portal-selenium-test/resources/testFile/dashboard-has-chart-cases-by-category.json create mode 100644 AxonIvyPortal/portal-selenium-test/resources/testFile/dashboard-has-one-chart-example.json create mode 100644 AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/document/screenshot/TaskAnalysisScreenshotTest.java create mode 100644 AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/StatisticWidgetDashboardPage.java create mode 100644 AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/StatisticWidgetPage.java create mode 100644 AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/TaskAnalysisWidgetPage.java create mode 100644 AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/DefaultChartTest.java create mode 100644 AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/StatisticDashboardWidgetTest.java create mode 100644 AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/StatisticWidgetTest.java create mode 100644 AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/task/TaskAnalysisWidgetTest.java create mode 100644 AxonIvyPortal/portal/config/variables/Portal/StatisticCharts.json create mode 100644 AxonIvyPortal/portal/config/variables/Portal/TaskAnalysisFilters.json create mode 100644 AxonIvyPortal/portal/processes/SynchronizeDataProcesses/CleanUpObsoletedUserData.p.json create mode 100644 AxonIvyPortal/portal/src/ch/addon/portal/generic/menu/StatisticSubMenuItem.java create mode 100644 AxonIvyPortal/portal/src/ch/ivy/addon/portal/generic/bean/StatisticBean.java create mode 100644 AxonIvyPortal/portal/src/ch/ivy/addon/portal/generic/view/TaskAnalysisView.java create mode 100644 AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bean/DashboardStatisticChartBean.java create mode 100644 AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bean/ElapsedTimeDetailsBean.java create mode 100644 AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bean/StatisticChartCreationBean.java create mode 100644 AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bean/StatisticDashboardBean.java create mode 100644 AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bean/TaskAnalysisWidgetBean.java create mode 100644 AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/casefilter/impl/TaskAnalysisCaseFilterContainer.java create mode 100644 AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/converter/StatisticConverter.java create mode 100644 AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/datamodel/internal/ElapsedTimeLazyDataModel.java create mode 100644 AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/datamodel/internal/TaskAnalysisLazyDataModel.java create mode 100644 AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/dto/dashboard/StatisticDashboardWidget.java create mode 100644 AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/enums/StatisticChartType.java create mode 100644 AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/enums/StatisticTimePeriodSelection.java create mode 100644 AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/enums/TaskAndCaseAnalysisColumn.java create mode 100644 AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/exporter/internal/TaskAnalysisExporter.java create mode 100644 AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/service/StatisticService.java create mode 100644 AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/service/TaskAnalysisFilterService.java create mode 100644 AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/statistics/StatisticCaseCategoryFilter.java create mode 100644 AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/statistics/StatisticChart.java create mode 100644 AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/statistics/StatisticChartConstants.java create mode 100644 AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/statistics/StatisticChartDrilldownUtils.java create mode 100644 AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/statistics/StatisticChartQueryUtils.java create mode 100644 AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/statistics/StatisticChartTimeUtils.java create mode 100644 AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/statistics/StatisticFilter.java create mode 100644 AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/taskfilter/impl/TaskAnalysisFilterData.java create mode 100644 AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/taskfilter/impl/TaskAnalysisTaskFilterContainer.java create mode 100644 AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/util/CronByGlobalVariableTriggerStartEventBean.java create mode 100644 AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/TaskAnalysis/TaskAnalysis.xhtml create mode 100644 AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/TaskAnalysis/TaskAnalysisData.d.json create mode 100644 AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/TaskAnalysis/TaskAnalysisProcess.p.json create mode 100644 AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/admin/PortalDashBoard/PortalDashBoard.xhtml create mode 100644 AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/admin/PortalDashBoard/PortalDashBoardData.d.json create mode 100644 AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/admin/PortalDashBoard/PortalDashBoardProcess.p.json create mode 100644 AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/dashboard/component/StatisticChartWidget/StatisticChartWidget.xhtml create mode 100644 AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/dashboard/component/StatisticChartWidget/StatisticChartWidgetData.d.json create mode 100644 AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/dashboard/component/StatisticChartWidget/StatisticChartWidgetProcess.p.json create mode 100644 AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/dashboard/component/StatisticChartWidgetConfiguration/StatisticChartWidgetConfiguration.xhtml create mode 100644 AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/dashboard/component/StatisticChartWidgetConfiguration/StatisticChartWidgetConfigurationData.d.json create mode 100644 AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/dashboard/component/StatisticChartWidgetConfiguration/StatisticChartWidgetConfigurationProcess.p.json create mode 100644 AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/StatisticWidget/StatisticWidget.xhtml create mode 100644 AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/StatisticWidget/StatisticWidgetData.d.json create mode 100644 AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/StatisticWidget/StatisticWidgetProcess.p.json create mode 100644 AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/TaskAnalysisWidget/StatisticResult.xhtml create mode 100644 AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/TaskAnalysisWidget/TaskAnalysisWidget.xhtml create mode 100644 AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/TaskAnalysisWidget/TaskAnalysisWidgetData.d.json create mode 100644 AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/TaskAnalysisWidget/TaskAnalysisWidgetProcess.p.json create mode 100644 AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/statistic/ChartCreationWidget/ChartCreationWidget.xhtml create mode 100644 AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/statistic/ChartCreationWidget/ChartCreationWidgetData.d.json create mode 100644 AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/statistic/ChartCreationWidget/ChartCreationWidgetProcess.p.json create mode 100644 AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/statistic/ChartInformationDialog/ChartInformationDialog.xhtml create mode 100644 AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/statistic/ChartInformationDialog/ChartInformationDialogData.d.json create mode 100644 AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/statistic/ChartInformationDialog/ChartInformationDialogProcess.p.json create mode 100644 AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/statistic/CustomField/CustomField.xhtml create mode 100644 AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/statistic/CustomField/CustomFieldData.d.json create mode 100644 AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/statistic/CustomField/CustomFieldProcess.p.json create mode 100644 AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/statistic/CustomVarField/CustomVarField.xhtml create mode 100644 AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/statistic/CustomVarField/CustomVarFieldData.d.json create mode 100644 AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/statistic/CustomVarField/CustomVarFieldProcess.p.json create mode 100644 AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/statistic/ElapsedTimeChartDetails/ElapsedTimeChartDetails.xhtml create mode 100644 AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/statistic/ElapsedTimeChartDetails/ElapsedTimeChartDetailsData.d.json create mode 100644 AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/statistic/ElapsedTimeChartDetails/ElapsedTimeChartDetailsProcess.p.json create mode 100644 AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/statistic/StatisticDashboardWidget/StatisticCarousel.xhtml create mode 100644 AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/statistic/StatisticDashboardWidget/StatisticDashboardWidget.xhtml create mode 100644 AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/statistic/StatisticDashboardWidget/StatisticDashboardWidgetData.d.json create mode 100644 AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/statistic/StatisticDashboardWidget/StatisticDashboardWidgetProcess.p.json create mode 100644 AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/statistic/StatisticFilters/StatisticFilters.xhtml create mode 100644 AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/statistic/StatisticFilters/StatisticFiltersData.d.json create mode 100644 AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/statistic/StatisticFilters/StatisticFiltersProcess.p.json create mode 100644 AxonIvyPortal/portal/webContent/resources/js/chart-carousel.js create mode 100644 AxonIvyPortal/portal/webContent/resources/js/statistic-widget.js create mode 100644 Documentation/portal-guide/source/portal-developer-guide/customization/default-chart-colors.rst create mode 100644 Documentation/portal-guide/source/portal-developer-guide/customization/default-chart.rst create mode 100644 Documentation/portal-guide/source/portal-user-guide/full-statistic-list/index.rst diff --git a/AxonIvyPortal/PortalKitTestHelper/processes/Start Processes/GrantPermissions.p.json b/AxonIvyPortal/PortalKitTestHelper/processes/Start Processes/GrantPermissions.p.json index 63cd31fd2c9..6f110eedaa6 100644 --- a/AxonIvyPortal/PortalKitTestHelper/processes/Start Processes/GrantPermissions.p.json +++ b/AxonIvyPortal/PortalKitTestHelper/processes/Start Processes/GrantPermissions.p.json @@ -446,7 +446,17 @@ "import ch.ivyteam.ivy.security.restricted.permission.IPermissionRepository;", "import ch.ivyteam.ivy.security.IPermission;", "", - " IPermission iPermission = IPermissionRepository.instance().findByName(PortalPermission.SHOW_CASE_DETAILS.getValue());", + "IPermission iPermission = IPermissionRepository.instance().findByName(PortalPermission.STATISTIC_ADD_DASHBOARD_CHART.getValue());", + " if (Objects.nonNull(iPermission)){", + " ISecurityContext.current().securityDescriptor().grantPermission(iPermission, ivy.session.getSessionUser());", + " }", + " ", + "iPermission = IPermissionRepository.instance().findByName(PortalPermission.STATISTIC_ANALYZE_TASK.getValue());", + " if (Objects.nonNull(iPermission)){", + " ISecurityContext.current().securityDescriptor().grantPermission(iPermission, ivy.session.getSessionUser());", + " }", + "", + " iPermission = IPermissionRepository.instance().findByName(PortalPermission.SHOW_CASE_DETAILS.getValue());", " if (Objects.nonNull(iPermission)){", " ISecurityContext.current().securityDescriptor().grantPermission(iPermission, ivy.session.getSessionUser());", " }", @@ -589,7 +599,16 @@ "import ch.ivyteam.ivy.security.restricted.permission.IPermissionRepository;", "import ch.ivyteam.ivy.security.IPermission;", "", - " IPermission iPermission = IPermissionRepository.instance().findByName(PortalPermission.SHOW_CASE_DETAILS.getValue());", + "IPermission iPermission = IPermissionRepository.instance().findByName(PortalPermission.STATISTIC_ADD_DASHBOARD_CHART.getValue());", + " if (Objects.nonNull(iPermission)){", + " ISecurityContext.current().securityDescriptor().denyPermission(iPermission, ivy.session.getSessionUser());", + " }", + " iPermission = IPermissionRepository.instance().findByName(PortalPermission.STATISTIC_ANALYZE_TASK.getValue());", + " if (Objects.nonNull(iPermission)){", + " ISecurityContext.current().securityDescriptor().denyPermission(iPermission, ivy.session.getSessionUser());", + " }", + "", + " iPermission = IPermissionRepository.instance().findByName(PortalPermission.SHOW_CASE_DETAILS.getValue());", " if (Objects.nonNull(iPermission)){", " ISecurityContext.current().securityDescriptor().denyPermission(iPermission, ivy.session.getSessionUser());", " }", @@ -717,6 +736,11 @@ "iPermission = IPermissionRepository.instance().findByName(PortalPermission.ACCESS_FULL_CASE_LIST.getValue());", "if (Objects.nonNull(iPermission)){", " ISecurityContext.current().securityDescriptor().denyPermission(iPermission, ivy.session.getSessionUser());", + "}", + "", + "iPermission = IPermissionRepository.instance().findByName(PortalPermission.ACCESS_FULL_STATISTICS_LIST.getValue());", + "if (Objects.nonNull(iPermission)){", + " ISecurityContext.current().securityDescriptor().denyPermission(iPermission, ivy.session.getSessionUser());", "}" ] }, @@ -755,6 +779,11 @@ "iPermission = IPermissionRepository.instance().findByName(PortalPermission.ACCESS_FULL_CASE_LIST.getValue());", "if (Objects.nonNull(iPermission)){", " ISecurityContext.current().securityDescriptor().grantPermission(iPermission, ivy.session.getSessionUser());", + "}", + " ", + "iPermission = IPermissionRepository.instance().findByName(PortalPermission.ACCESS_FULL_STATISTICS_LIST.getValue());", + "if (Objects.nonNull(iPermission)){", + " ISecurityContext.current().securityDescriptor().grantPermission(iPermission, ivy.session.getSessionUser());", "}" ] }, diff --git a/AxonIvyPortal/PortalTest/jmeter/portal_walkthrough_testplan.jmx b/AxonIvyPortal/PortalTest/jmeter/portal_walkthrough_testplan.jmx index 3a4150f5bf5..60fe6265f0b 100644 --- a/AxonIvyPortal/PortalTest/jmeter/portal_walkthrough_testplan.jmx +++ b/AxonIvyPortal/PortalTest/jmeter/portal_walkthrough_testplan.jmx @@ -2105,6 +2105,4349 @@ + + + + + true + true + = + true + javax.faces.partial.ajax + + + true + user-menu-required-login:main-navigator:main-menu + = + true + javax.faces.source + + + true + user-menu-required-login:main-navigator:main-menu + = + true + javax.faces.partial.execute + + + true + user-menu-required-login:main-navigator:main-menu + = + true + javax.faces.partial.render + + + true + user-menu-required-login:main-navigator:main-menu + = + true + user-menu-required-login:main-navigator:main-menu + + + true + + = + true + taskId + + + true + false + = + true + isWorkingOnATask + + + true + statistics + = + true + menuKind + + + true + + = + true + menuUrl + + + true + statistics_4 + = + true + user-menu-required-login:main-navigator:main-menu_menuid + + + true + ${viewState} + = + true + javax.faces.ViewState + + + + + + + + ${url} + POST + true + false + true + false + + + + + + + false + redirectURL + <redirect url="([^"]+)"> + $1$ + emptyRedirectURL + 1 + + + + ${__P(portal.duration.ajax)} + + + + + 200 + + + Assertion.response_code + false + 8 + + + + + + + + + + + + ${redirectURL} + GET + false + true + true + false + + + + + + + false + viewState + id="j_id__v_0:javax.faces.ViewState:1" value=("[\S]+") + $1$ + + 1 + + + + URL + url + (http[\S]+) + $1$ + + 1 + + + + ${__P(portal.duration.normal)} + + + + + 200 + + + Assertion.response_code + false + 8 + + + + + + + + true + true + = + true + javax.faces.partial.ajax + + + true + statistics-widget:statistic-dashboard-widget:statistic-form:init-chart-command + = + true + javax.faces.source + + + true + statistics-widget:statistic-dashboard-widget:statistic-form:init-chart-command + = + true + javax.faces.partial.execute + + + true + statistics-widget:statistic-dashboard-widget:statistic-chart-repeater-container + = + true + javax.faces.partial.render + + + true + statistics-widget:statistic-dashboard-widget:statistic-form:init-chart-command + = + true + statistics-widget:statistic-dashboard-widget:statistic-form:init-chart-command + + + true + ${viewState} + = + true + javax.faces.ViewState + + + + + + + + ${url} + POST + true + false + true + false + + + + + + + false + viewState + id="j_id__v_0:javax.faces.ViewState:1" value=("[\S]+") + $1$ + + 1 + + + + URL + url + (http[\S]+) + $1$ + + 1 + + + + ${__P(portal.duration.normal)} + + + + + 200 + + + Assertion.response_code + false + 8 + + + + + + + + true + true + = + true + javax.faces.partial.ajax + + + true + statistics-widget:create-chart-link + = + true + javax.faces.source + + + true + @all + = + true + javax.faces.partial.execute + + + true + statistics-widget:widget-container statistics-widget:create-chart-header + = + true + javax.faces.partial.render + + + true + statistics-widget:create-chart-link + = + true + statistics-widget:create-chart-link + + + true + + = + true + user-menu-required-login:global-search-component-mobile:global-search-data + + + true + 1 + = + true + user-menu-required-login:global-search-component-mobile-form_SUBMIT + + + true + ${viewState} + = + true + javax.faces.ViewState + + + + + + + + ${url} + POST + true + false + true + false + + + + + + + false + viewState + id="j_id__v_0:javax.faces.ViewState:1" value=("[\S]+") + $1$ + + 1 + + + + ${__P(portal.duration.normal)} + + + + + 200 + + + Assertion.response_code + false + 8 + + + + + true + + + + + + + true + true + = + true + javax.faces.partial.ajax + + + true + statistics-widget:chart-creation-widget:chart-management-form:init-filter-command + = + true + javax.faces.source + + + true + @all + = + true + javax.faces.partial.execute + + + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter + = + true + javax.faces.partial.render + + + true + statistics-widget:chart-creation-widget:chart-management-form:init-filter-command + = + true + statistics-widget:chart-creation-widget:chart-management-form:init-filter-command + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:period-time-selection_focus + + + true + CUSTOM + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:period-time-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:filter-from_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:filter-to_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:task-category-filter-tree_filter + + + true + 0,0_0,0_1 + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:task-category-filter-tree_selection + + + true + 0,0 + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:task-category-filter-tree_scrollState + + + true + on + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:roles-select-all_input + + + true + on + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:case-states-select-all_input + + + true + on + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:task-priorities-select-all_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField1:custom-string-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField1:custom-string-selection_hinput + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField2:custom-string-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField2:custom-string-selection_hinput + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField3:custom-string-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField3:custom-string-selection_hinput + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField4:custom-string-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField4:custom-string-selection_hinput + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField5:custom-string-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField5:custom-string-selection_hinput + + + true + 0,1,2,3 + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel_active + + + true + 1 + = + true + statistics-widget:chart-creation-widget:chart-management-form_SUBMIT + + + true + ${viewState} + = + true + javax.faces.ViewState + + + + + + + + ${url} + POST + true + false + true + false + + + + + + + ${__P(portal.duration.normal)} + + + + + 200 + + + Assertion.response_code + false + 8 + + + + + + + + true + true + = + true + javax.faces.partial.ajax + + + true + statistics-widget:chart-creation-widget:chart-management-form:update-chart-models-command + = + true + javax.faces.source + + + true + statistics-widget:chart-creation-widget:chart-management-form:update-chart-models-command + = + true + javax.faces.partial.execute + + + true + statistics-widget:chart-creation-widget:chart-management-form:update-chart-models-command + = + true + statistics-widget:chart-creation-widget:chart-management-form:update-chart-models-command + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:period-time-selection_focus + + + true + CUSTOM + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:period-time-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:filter-from_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:filter-to_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:task-category-filter-tree_filter + + + true + 0,0_0,0_1 + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:task-category-filter-tree_selection + + + true + 0,0 + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:task-category-filter-tree_scrollState + + + true + on + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:roles-select-all_input + + + true + on + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:case-states-select-all_input + + + true + on + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:task-priorities-select-all_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField1:custom-string-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField1:custom-string-selection_hinput + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField2:custom-string-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField2:custom-string-selection_hinput + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField3:custom-string-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField3:custom-string-selection_hinput + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField4:custom-string-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField4:custom-string-selection_hinput + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField5:custom-string-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField5:custom-string-selection_hinput + + + true + 0,1,2,3 + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel_active + + + true + 1 + = + true + statistics-widget:chart-creation-widget:chart-management-form_SUBMIT + + + true + ${viewState} + = + true + javax.faces.ViewState + + + + + + + + ${url} + POST + true + false + true + false + + + + + + + ${__P(portal.duration.normal)} + + + + + 200 + + + Assertion.response_code + false + 8 + + + + + + + + true + true + = + true + javax.faces.partial.ajax + + + true + statistics-widget:chart-creation-widget:chart-management-form:update-task-by-priority-model-command + = + true + javax.faces.source + + + true + statistics-widget:chart-creation-widget:chart-management-form:update-task-by-priority-model-command + = + true + javax.faces.partial.execute + + + true + statistics-widget:chart-creation-widget:chart-management-form:task-by-priority-chart + = + true + javax.faces.partial.render + + + true + statistics-widget:chart-creation-widget:chart-management-form:update-task-by-priority-model-command + = + true + statistics-widget:chart-creation-widget:chart-management-form:update-task-by-priority-model-command + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:period-time-selection_focus + + + true + CUSTOM + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:period-time-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:filter-from_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:filter-to_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:task-category-filter-tree_filter + + + true + 0,0_0,0_1 + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:task-category-filter-tree_selection + + + true + 0,0 + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:task-category-filter-tree_scrollState + + + true + on + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:roles-select-all_input + + + true + on + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:case-states-select-all_input + + + true + on + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:task-priorities-select-all_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField1:custom-string-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField1:custom-string-selection_hinput + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField2:custom-string-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField2:custom-string-selection_hinput + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField3:custom-string-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField3:custom-string-selection_hinput + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField4:custom-string-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField4:custom-string-selection_hinput + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField5:custom-string-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField5:custom-string-selection_hinput + + + true + 0,1,2,3 + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel_active + + + true + 1 + = + true + statistics-widget:chart-creation-widget:chart-management-form_SUBMIT + + + true + ${viewState} + = + true + javax.faces.ViewState + + + + + + + + ${url} + POST + true + false + true + false + + + + + + + ${__P(portal.duration.normal)} + + + + + 200 + + + Assertion.response_code + false + 8 + + + + + + + + true + true + = + true + javax.faces.partial.ajax + + + true + statistics-widget:chart-creation-widget:chart-management-form:update-case-by-state-model-command + = + true + javax.faces.source + + + true + statistics-widget:chart-creation-widget:chart-management-form:update-case-by-state-model-command + = + true + javax.faces.partial.execute + + + true + statistics-widget:chart-creation-widget:chart-management-form:case-by-state-chart + = + true + javax.faces.partial.render + + + true + statistics-widget:chart-creation-widget:chart-management-form:update-case-by-state-model-command + = + true + statistics-widget:chart-creation-widget:chart-management-form:update-case-by-state-model-command + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:period-time-selection_focus + + + true + CUSTOM + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:period-time-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:filter-from_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:filter-to_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:task-category-filter-tree_filter + + + true + 0,0_0,0_1 + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:task-category-filter-tree_selection + + + true + 0,0 + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:task-category-filter-tree_scrollState + + + true + on + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:roles-select-all_input + + + true + on + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:case-states-select-all_input + + + true + on + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:task-priorities-select-all_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField1:custom-string-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField1:custom-string-selection_hinput + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField2:custom-string-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField2:custom-string-selection_hinput + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField3:custom-string-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField3:custom-string-selection_hinput + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField4:custom-string-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField4:custom-string-selection_hinput + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField5:custom-string-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField5:custom-string-selection_hinput + + + true + 0,1,2,3 + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel_active + + + true + 1 + = + true + statistics-widget:chart-creation-widget:chart-management-form_SUBMIT + + + true + ${viewState} + = + true + javax.faces.ViewState + + + + + + + + ${url} + POST + true + false + true + false + + + + + + + ${__P(portal.duration.normal)} + + + + + 200 + + + Assertion.response_code + false + 8 + + + + + + + + true + true + = + true + javax.faces.partial.ajax + + + true + statistics-widget:chart-creation-widget:chart-management-form:update-task-by-expiry-model-command + = + true + javax.faces.source + + + true + statistics-widget:chart-creation-widget:chart-management-form:update-task-by-expiry-model-command + = + true + javax.faces.partial.execute + + + true + statistics-widget:chart-creation-widget:chart-management-form:task-by-expiry-chart + = + true + javax.faces.partial.render + + + true + statistics-widget:chart-creation-widget:chart-management-form:update-task-by-expiry-model-command + = + true + statistics-widget:chart-creation-widget:chart-management-form:update-task-by-expiry-model-command + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:period-time-selection_focus + + + true + CUSTOM + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:period-time-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:filter-from_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:filter-to_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:task-category-filter-tree_filter + + + true + 0,0_0,0_1 + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:task-category-filter-tree_selection + + + true + 0,0 + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:task-category-filter-tree_scrollState + + + true + on + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:roles-select-all_input + + + true + on + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:case-states-select-all_input + + + true + on + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:task-priorities-select-all_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField1:custom-string-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField1:custom-string-selection_hinput + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField2:custom-string-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField2:custom-string-selection_hinput + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField3:custom-string-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField3:custom-string-selection_hinput + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField4:custom-string-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField4:custom-string-selection_hinput + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField5:custom-string-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField5:custom-string-selection_hinput + + + true + 0,1,2,3 + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel_active + + + true + 1 + = + true + statistics-widget:chart-creation-widget:chart-management-form_SUBMIT + + + true + ${viewState} + = + true + javax.faces.ViewState + + + + + + + + ${url} + POST + true + false + true + false + + + + + + + ${__P(portal.duration.normal)} + + + + + 200 + + + Assertion.response_code + false + 8 + + + + + + + + true + true + = + true + javax.faces.partial.ajax + + + true + statistics-widget:chart-creation-widget:chart-management-form:update-elapsed-time-by-case-category-command + = + true + javax.faces.source + + + true + statistics-widget:chart-creation-widget:chart-management-form:update-elapsed-time-by-case-category-command + = + true + javax.faces.partial.execute + + + true + statistics-widget:chart-creation-widget:chart-management-form:elapsed-time-by-case-category + = + true + javax.faces.partial.render + + + true + statistics-widget:chart-creation-widget:chart-management-form:update-elapsed-time-by-case-category-command + = + true + statistics-widget:chart-creation-widget:chart-management-form:update-elapsed-time-by-case-category-command + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:period-time-selection_focus + + + true + CUSTOM + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:period-time-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:filter-from_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:filter-to_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:task-category-filter-tree_filter + + + true + 0,0_0,0_1 + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:task-category-filter-tree_selection + + + true + 0,0 + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:task-category-filter-tree_scrollState + + + true + on + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:roles-select-all_input + + + true + on + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:case-states-select-all_input + + + true + on + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:task-priorities-select-all_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField1:custom-string-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField1:custom-string-selection_hinput + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField2:custom-string-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField2:custom-string-selection_hinput + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField3:custom-string-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField3:custom-string-selection_hinput + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField4:custom-string-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField4:custom-string-selection_hinput + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField5:custom-string-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField5:custom-string-selection_hinput + + + true + 0,1,2,3 + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel_active + + + true + 1 + = + true + statistics-widget:chart-creation-widget:chart-management-form_SUBMIT + + + true + ${viewState} + = + true + javax.faces.ViewState + + + + + + + + ${url} + POST + true + false + true + false + + + + + + + ${__P(portal.duration.normal)} + + + + + 200 + + + Assertion.response_code + false + 8 + + + + + + + + true + true + = + true + javax.faces.partial.ajax + + + true + statistics-widget:chart-creation-widget:chart-management-form:update-case-by-finished-task-model-command + = + true + javax.faces.source + + + true + statistics-widget:chart-creation-widget:chart-management-form:update-case-by-finished-task-model-command + = + true + javax.faces.partial.execute + + + true + statistics-widget:chart-creation-widget:chart-management-form:case-by-finished-task-chart + = + true + javax.faces.partial.render + + + true + statistics-widget:chart-creation-widget:chart-management-form:update-case-by-finished-task-model-command + = + true + statistics-widget:chart-creation-widget:chart-management-form:update-case-by-finished-task-model-command + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:period-time-selection_focus + + + true + CUSTOM + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:period-time-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:filter-from_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:filter-to_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:task-category-filter-tree_filter + + + true + 0,0_0,0_1 + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:task-category-filter-tree_selection + + + true + 0,0 + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:task-category-filter-tree_scrollState + + + true + on + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:roles-select-all_input + + + true + on + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:case-states-select-all_input + + + true + on + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:task-priorities-select-all_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField1:custom-string-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField1:custom-string-selection_hinput + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField2:custom-string-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField2:custom-string-selection_hinput + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField3:custom-string-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField3:custom-string-selection_hinput + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField4:custom-string-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField4:custom-string-selection_hinput + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField5:custom-string-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField5:custom-string-selection_hinput + + + true + 0,1,2,3 + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel_active + + + true + 1 + = + true + statistics-widget:chart-creation-widget:chart-management-form_SUBMIT + + + true + ${viewState} + = + true + javax.faces.ViewState + + + + + + + + ${url} + POST + true + false + true + false + + + + + + + ${__P(portal.duration.normal)} + + + + + 200 + + + Assertion.response_code + false + 8 + + + + + + + + true + true + = + true + javax.faces.partial.ajax + + + true + statistics-widget:chart-creation-widget:chart-management-form:update-case-by-finished-time-model-command + = + true + javax.faces.source + + + true + statistics-widget:chart-creation-widget:chart-management-form:update-case-by-finished-time-model-command + = + true + javax.faces.partial.execute + + + true + statistics-widget:chart-creation-widget:chart-management-form:case-by-finished-time-chart + = + true + javax.faces.partial.render + + + true + statistics-widget:chart-creation-widget:chart-management-form:update-case-by-finished-time-model-command + = + true + statistics-widget:chart-creation-widget:chart-management-form:update-case-by-finished-time-model-command + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:period-time-selection_focus + + + true + CUSTOM + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:period-time-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:filter-from_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:filter-to_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:task-category-filter-tree_filter + + + true + 0,0_0,0_1 + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:task-category-filter-tree_selection + + + true + 0,0 + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:task-category-filter-tree_scrollState + + + true + on + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:roles-select-all_input + + + true + on + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:case-states-select-all_input + + + true + on + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:task-priorities-select-all_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField1:custom-string-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField1:custom-string-selection_hinput + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField2:custom-string-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField2:custom-string-selection_hinput + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField3:custom-string-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField3:custom-string-selection_hinput + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField4:custom-string-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField4:custom-string-selection_hinput + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField5:custom-string-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField5:custom-string-selection_hinput + + + true + 0,1,2,3 + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel_active + + + true + 1 + = + true + statistics-widget:chart-creation-widget:chart-management-form_SUBMIT + + + true + ${viewState} + = + true + javax.faces.ViewState + + + + + + + + ${url} + POST + true + false + true + false + + + + + + + ${__P(portal.duration.normal)} + + + + + 200 + + + Assertion.response_code + false + 8 + + + + + + true + + + + + + + true + true + = + true + javax.faces.partial.ajax + + + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:apply-filter-button + = + true + javax.faces.source + + + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel + = + true + javax.faces.partial.execute + + + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:apply-filter-button + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:apply-filter-button + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:period-time-selection_focus + + + true + CUSTOM + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:period-time-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:filter-from_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:filter-to_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:task-category-filter-tree_filter + + + true + 0,0_0,0_1 + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:task-category-filter-tree_selection + + + true + 0,0 + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:task-category-filter-tree_scrollState + + + true + on + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:roles-select-all_input + + + true + on + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:case-states-select-all_input + + + true + on + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:task-priorities-select-all_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField1:custom-string-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField1:custom-string-selection_hinput + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField2:custom-string-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField2:custom-string-selection_hinput + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField3:custom-string-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField3:custom-string-selection_hinput + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField4:custom-string-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField4:custom-string-selection_hinput + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField5:custom-string-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField5:custom-string-selection_hinput + + + true + 0,1,2,3 + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel_active + + + true + 1 + = + true + statistics-widget:chart-creation-widget:chart-management-form_SUBMIT + + + true + ${viewState} + = + true + javax.faces.ViewState + + + + + + + + ${url} + POST + false + true + true + false + + + + + + + ${__P(portal.duration.normal)} + + + + + 200 + + + Assertion.response_code + false + 8 + + + + + + + + true + true + = + true + javax.faces.partial.ajax + + + true + statistics-widget:chart-creation-widget:chart-management-form:clear-chart-models-command + = + true + javax.faces.source + + + true + statistics-widget:chart-creation-widget:chart-management-form:clear-chart-models-command + = + true + javax.faces.partial.execute + + + true + statistics-widget:chart-creation-widget:chart-management-form:chart-list + = + true + javax.faces.partial.render + + + true + statistics-widget:chart-creation-widget:chart-management-form:clear-chart-models-command + = + true + statistics-widget:chart-creation-widget:chart-management-form:clear-chart-models-command + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:period-time-selection_focus + + + true + CUSTOM + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:period-time-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:filter-from_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:filter-to_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:task-category-filter-tree_filter + + + true + 0,0_0,0_1 + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:task-category-filter-tree_selection + + + true + 0,0 + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:task-category-filter-tree_scrollState + + + true + on + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:roles-select-all_input + + + true + on + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:case-states-select-all_input + + + true + on + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:task-priorities-select-all_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField1:custom-string-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField1:custom-string-selection_hinput + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField2:custom-string-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField2:custom-string-selection_hinput + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField3:custom-string-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField3:custom-string-selection_hinput + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField4:custom-string-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField4:custom-string-selection_hinput + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField5:custom-string-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField5:custom-string-selection_hinput + + + true + 0,1,2,3 + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel_active + + + true + 1 + = + true + statistics-widget:chart-creation-widget:chart-management-form_SUBMIT + + + true + ${viewState} + = + true + javax.faces.ViewState + + + + + + + + ${url} + POST + false + true + true + false + + + + + + + ${__P(portal.duration.normal)} + + + + + 200 + + + Assertion.response_code + false + 8 + + + + + + + + true + true + = + true + javax.faces.partial.ajax + + + true + statistics-widget:chart-creation-widget:chart-management-form:update-chart-models-command + = + true + javax.faces.source + + + true + statistics-widget:chart-creation-widget:chart-management-form:update-chart-models-command + = + true + javax.faces.partial.execute + + + true + statistics-widget:chart-creation-widget:chart-management-form:update-chart-models-command + = + true + statistics-widget:chart-creation-widget:chart-management-form:update-chart-models-command + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:period-time-selection_focus + + + true + CUSTOM + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:period-time-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:filter-from_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:filter-to_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:task-category-filter-tree_filter + + + true + 0,0_0,0_1 + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:task-category-filter-tree_selection + + + true + 0,0 + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:task-category-filter-tree_scrollState + + + true + on + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:roles-select-all_input + + + true + on + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:case-states-select-all_input + + + true + on + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:task-priorities-select-all_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField1:custom-string-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField1:custom-string-selection_hinput + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField2:custom-string-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField2:custom-string-selection_hinput + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField3:custom-string-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField3:custom-string-selection_hinput + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField4:custom-string-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField4:custom-string-selection_hinput + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField5:custom-string-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField5:custom-string-selection_hinput + + + true + 0,1,2,3 + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel_active + + + true + 1 + = + true + statistics-widget:chart-creation-widget:chart-management-form_SUBMIT + + + true + ${viewState} + = + true + javax.faces.ViewState + + + + + + + + ${url} + POST + false + true + true + false + + + + + + + ${__P(portal.duration.normal)} + + + + + 200 + + + Assertion.response_code + false + 8 + + + + + + + + true + true + = + true + javax.faces.partial.ajax + + + true + statistics-widget:chart-creation-widget:chart-management-form:update-task-by-priority-model-command + = + true + javax.faces.source + + + true + statistics-widget:chart-creation-widget:chart-management-form:update-task-by-priority-model-command + = + true + javax.faces.partial.execute + + + true + statistics-widget:chart-creation-widget:chart-management-form:task-by-priority-chart + = + true + javax.faces.partial.render + + + true + statistics-widget:chart-creation-widget:chart-management-form:update-task-by-priority-model-command + = + true + statistics-widget:chart-creation-widget:chart-management-form:update-task-by-priority-model-command + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:period-time-selection_focus + + + true + CUSTOM + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:period-time-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:filter-from_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:filter-to_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:task-category-filter-tree_filter + + + true + 0,0_0,0_1 + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:task-category-filter-tree_selection + + + true + 0,0 + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:task-category-filter-tree_scrollState + + + true + on + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:roles-select-all_input + + + true + on + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:case-states-select-all_input + + + true + on + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:task-priorities-select-all_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField1:custom-string-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField1:custom-string-selection_hinput + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField2:custom-string-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField2:custom-string-selection_hinput + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField3:custom-string-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField3:custom-string-selection_hinput + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField4:custom-string-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField4:custom-string-selection_hinput + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField5:custom-string-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField5:custom-string-selection_hinput + + + true + 0,1,2,3 + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel_active + + + true + 1 + = + true + statistics-widget:chart-creation-widget:chart-management-form_SUBMIT + + + true + ${viewState} + = + true + javax.faces.ViewState + + + + + + + + ${url} + POST + false + true + true + false + + + + + + + ${__P(portal.duration.normal)} + + + + + 200 + + + Assertion.response_code + false + 8 + + + + + + + + true + true + = + true + javax.faces.partial.ajax + + + true + statistics-widget:chart-creation-widget:chart-management-form:update-task-by-expiry-model-command + = + true + javax.faces.source + + + true + statistics-widget:chart-creation-widget:chart-management-form:update-task-by-expiry-model-command + = + true + javax.faces.partial.execute + + + true + statistics-widget:chart-creation-widget:chart-management-form:task-by-expiry-chart + = + true + javax.faces.partial.render + + + true + statistics-widget:chart-creation-widget:chart-management-form:update-task-by-expiry-model-command + = + true + statistics-widget:chart-creation-widget:chart-management-form:update-task-by-expiry-model-command + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:period-time-selection_focus + + + true + CUSTOM + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:period-time-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:filter-from_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:filter-to_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:task-category-filter-tree_filter + + + true + 0,0_0,0_1 + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:task-category-filter-tree_selection + + + true + 0,0 + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:task-category-filter-tree_scrollState + + + true + on + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:roles-select-all_input + + + true + on + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:case-states-select-all_input + + + true + on + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:task-priorities-select-all_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField1:custom-string-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField1:custom-string-selection_hinput + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField2:custom-string-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField2:custom-string-selection_hinput + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField3:custom-string-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField3:custom-string-selection_hinput + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField4:custom-string-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField4:custom-string-selection_hinput + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField5:custom-string-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField5:custom-string-selection_hinput + + + true + 0,1,2,3 + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel_active + + + true + 1 + = + true + statistics-widget:chart-creation-widget:chart-management-form_SUBMIT + + + true + ${viewState} + = + true + javax.faces.ViewState + + + + + + + + ${url} + POST + false + true + true + false + + + + + + + ${__P(portal.duration.normal)} + + + + + 200 + + + Assertion.response_code + false + 8 + + + + + + + + true + true + = + true + javax.faces.partial.ajax + + + true + statistics-widget:chart-creation-widget:chart-management-form:update-case-by-state-model-command + = + true + javax.faces.source + + + true + statistics-widget:chart-creation-widget:chart-management-form:update-case-by-state-model-command + = + true + javax.faces.partial.execute + + + true + statistics-widget:chart-creation-widget:chart-management-form:case-by-state-chart + = + true + javax.faces.partial.render + + + true + statistics-widget:chart-creation-widget:chart-management-form:update-case-by-state-model-command + = + true + statistics-widget:chart-creation-widget:chart-management-form:update-case-by-state-model-command + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:period-time-selection_focus + + + true + CUSTOM + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:period-time-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:filter-from_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:filter-to_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:task-category-filter-tree_filter + + + true + 0,0_0,0_1 + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:task-category-filter-tree_selection + + + true + 0,0 + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:task-category-filter-tree_scrollState + + + true + on + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:roles-select-all_input + + + true + on + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:case-states-select-all_input + + + true + on + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:task-priorities-select-all_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField1:custom-string-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField1:custom-string-selection_hinput + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField2:custom-string-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField2:custom-string-selection_hinput + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField3:custom-string-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField3:custom-string-selection_hinput + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField4:custom-string-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField4:custom-string-selection_hinput + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField5:custom-string-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField5:custom-string-selection_hinput + + + true + 0,1,2,3 + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel_active + + + true + 1 + = + true + statistics-widget:chart-creation-widget:chart-management-form_SUBMIT + + + true + ${viewState} + = + true + javax.faces.ViewState + + + + + + + + ${url} + POST + false + true + true + false + + + + + + + ${__P(portal.duration.normal)} + + + + + 200 + + + Assertion.response_code + false + 8 + + + + + + + + true + true + = + true + javax.faces.partial.ajax + + + true + statistics-widget:chart-creation-widget:chart-management-form:update-elapsed-time-by-case-category-command + = + true + javax.faces.source + + + true + statistics-widget:chart-creation-widget:chart-management-form:update-elapsed-time-by-case-category-command + = + true + javax.faces.partial.execute + + + true + statistics-widget:chart-creation-widget:chart-management-form:elapsed-time-by-case-category + = + true + javax.faces.partial.render + + + true + statistics-widget:chart-creation-widget:chart-management-form:update-elapsed-time-by-case-category-command + = + true + statistics-widget:chart-creation-widget:chart-management-form:update-elapsed-time-by-case-category-command + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:period-time-selection_focus + + + true + CUSTOM + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:period-time-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:filter-from_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:filter-to_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:task-category-filter-tree_filter + + + true + 0,0_0,0_1 + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:task-category-filter-tree_selection + + + true + 0,0 + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:task-category-filter-tree_scrollState + + + true + on + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:roles-select-all_input + + + true + on + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:case-states-select-all_input + + + true + on + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:task-priorities-select-all_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField1:custom-string-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField1:custom-string-selection_hinput + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField2:custom-string-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField2:custom-string-selection_hinput + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField3:custom-string-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField3:custom-string-selection_hinput + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField4:custom-string-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField4:custom-string-selection_hinput + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField5:custom-string-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField5:custom-string-selection_hinput + + + true + 0,1,2,3 + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel_active + + + true + 1 + = + true + statistics-widget:chart-creation-widget:chart-management-form_SUBMIT + + + true + ${viewState} + = + true + javax.faces.ViewState + + + + + + + + ${url} + POST + false + true + true + false + + + + + + + ${__P(portal.duration.normal)} + + + + + 200 + + + Assertion.response_code + false + 8 + + + + + + + + true + true + = + true + javax.faces.partial.ajax + + + true + statistics-widget:chart-creation-widget:chart-management-form:update-case-by-finished-task-model-command + = + true + javax.faces.source + + + true + statistics-widget:chart-creation-widget:chart-management-form:update-case-by-finished-task-model-command + = + true + javax.faces.partial.execute + + + true + statistics-widget:chart-creation-widget:chart-management-form:case-by-finished-task-chart + = + true + javax.faces.partial.render + + + true + statistics-widget:chart-creation-widget:chart-management-form:update-case-by-finished-task-model-command + = + true + statistics-widget:chart-creation-widget:chart-management-form:update-case-by-finished-task-model-command + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:period-time-selection_focus + + + true + CUSTOM + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:period-time-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:filter-from_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:filter-to_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:task-category-filter-tree_filter + + + true + 0,0_0,0_1 + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:task-category-filter-tree_selection + + + true + 0,0 + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:task-category-filter-tree_scrollState + + + true + on + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:roles-select-all_input + + + true + on + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:case-states-select-all_input + + + true + on + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:task-priorities-select-all_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField1:custom-string-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField1:custom-string-selection_hinput + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField2:custom-string-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField2:custom-string-selection_hinput + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField3:custom-string-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField3:custom-string-selection_hinput + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField4:custom-string-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField4:custom-string-selection_hinput + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField5:custom-string-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField5:custom-string-selection_hinput + + + true + 0,1,2,3 + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel_active + + + true + 1 + = + true + statistics-widget:chart-creation-widget:chart-management-form_SUBMIT + + + true + ${viewState} + = + true + javax.faces.ViewState + + + + + + + + ${url} + POST + false + true + true + false + + + + + + + ${__P(portal.duration.normal)} + + + + + 200 + + + Assertion.response_code + false + 8 + + + + + + + + true + true + = + true + javax.faces.partial.ajax + + + true + statistics-widget:chart-creation-widget:chart-management-form:update-case-by-finished-time-model-command + = + true + javax.faces.source + + + true + statistics-widget:chart-creation-widget:chart-management-form:update-case-by-finished-time-model-command + = + true + javax.faces.partial.execute + + + true + statistics-widget:chart-creation-widget:chart-management-form:case-by-finished-time-chart + = + true + javax.faces.partial.render + + + true + statistics-widget:chart-creation-widget:chart-management-form:update-case-by-finished-time-model-command + = + true + statistics-widget:chart-creation-widget:chart-management-form:update-case-by-finished-time-model-command + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:period-time-selection_focus + + + true + CUSTOM + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:period-time-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:filter-from_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:filter-to_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:task-category-filter-tree_filter + + + true + 0,0_0,0_1 + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:task-category-filter-tree_selection + + + true + 0,0 + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:task-category-filter-tree_scrollState + + + true + on + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:roles-select-all_input + + + true + on + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:case-states-select-all_input + + + true + on + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:task-priorities-select-all_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField1:custom-string-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField1:custom-string-selection_hinput + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField2:custom-string-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField2:custom-string-selection_hinput + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField3:custom-string-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField3:custom-string-selection_hinput + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField4:custom-string-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField4:custom-string-selection_hinput + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField5:custom-string-selection_input + + + true + + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel:CustomVarCharField5:custom-string-selection_hinput + + + true + 0,1,2,3 + = + true + statistics-widget:chart-creation-widget:chart-management-form:statistic-filter:statistic-filter-accordion-panel_active + + + true + 1 + = + true + statistics-widget:chart-creation-widget:chart-management-form_SUBMIT + + + true + ${viewState} + = + true + javax.faces.ViewState + + + + + + + + ${url} + POST + false + true + true + false + + + + + + + ${__P(portal.duration.normal)} + + + + + 200 + + + Assertion.response_code + false + 8 + + + + + + ${__groovy("${username}" == "admin" || "${username}" == "portaladmin")} + false + true + + + + + + + + + + + /${__P(security.system.name)}/${__P(portal.application.name)}/pro/${__P(portal.portal)}/1549F58C18A6C562/showTaskAnalysis.ivp + GET + false + true + true + false + + + + + + + false + viewState + id="j_id__v_0:javax.faces.ViewState:1" value=("[\S]+") + $1$ + + 1 + + + + URL + url + (http[\S]+) + $1$ + + 1 + + + + ${__P(portal.duration.normal)} + + + + + 200 + + + Assertion.response_code + false + 8 + + + + diff --git a/AxonIvyPortal/portal-components/src/com/axonivy/portal/components/enums/PortalVariable.java b/AxonIvyPortal/portal-components/src/com/axonivy/portal/components/enums/PortalVariable.java index 0f1ada532ab..da1bfa9ce3b 100644 --- a/AxonIvyPortal/portal-components/src/com/axonivy/portal/components/enums/PortalVariable.java +++ b/AxonIvyPortal/portal-components/src/com/axonivy/portal/components/enums/PortalVariable.java @@ -4,6 +4,7 @@ public enum PortalVariable { PASSWORD_VALIDATION("Portal.PasswordValidation"), ANNOUNCEMENT("Portal.Announcement"), THIRD_PARTY_APP("Portal.ThirdPartyApplications"), + STATISTIC_CHART("Portal.StatisticCharts"), WIDGET_FILTER("Portal.Dashboard.WidgetFilters"), EXTERNAL_LINK("Portal.Processes.ExternalLinks"), TASK_DETAIL("Portal.TaskDetails"), diff --git a/AxonIvyPortal/portal-components/webContent/resources/js/process-history-component.js b/AxonIvyPortal/portal-components/webContent/resources/js/process-history-component.js index 665d499a373..54a42de600a 100644 --- a/AxonIvyPortal/portal-components/webContent/resources/js/process-history-component.js +++ b/AxonIvyPortal/portal-components/webContent/resources/js/process-history-component.js @@ -205,7 +205,8 @@ var MainMenu = { ["CaseWidget.xhtml", "CASE"], ["PortalCaseDetails.xhtml", "CASE"], ["CaseItemDetails.xhtml", "CASE"], - ["PortalDashBoard.xhtml", "DASHBOARD"]], + ["PortalDashBoard.xhtml", "DASHBOARD"], + ["TaskAnalysis.xhtml", "DASHBOARD"]], init : function(responsiveToolkit) { this.highlightMenuItem(); @@ -218,6 +219,11 @@ var MainMenu = { var $this = this; this.$mainMenuToggle.on('click', function(e) { $this.responsiveToolkit.updateLayoutWithAnimation(); + + var statisticContainer = $('.js-statistic-widget-container.compact-mode'); + if (statisticContainer.length > 0) { + updateStatisticCarousel(); + } }); }, diff --git a/AxonIvyPortal/portal-selenium-test/resources/js/document-screenshot.js b/AxonIvyPortal/portal-selenium-test/resources/js/document-screenshot.js index 006317d3419..7be242765ab 100644 --- a/AxonIvyPortal/portal-selenium-test/resources/js/document-screenshot.js +++ b/AxonIvyPortal/portal-selenium-test/resources/js/document-screenshot.js @@ -36,6 +36,7 @@ function createRedThickOutlineWithOffset($element) { /***IMPLEMENTATION TO DECORATE PAGES - WHICH ARE CALLED IN SELENIUM****/ function highlightDashboardWidget() { createRedMediumOutline($("#task-widget")); + createRedMediumOutline($("#statistic-widget-container")); createRedMediumOutline($("#process-widget")); } @@ -46,6 +47,9 @@ function highlightAndNumberingDashboardSections() { var taskWidget = $("#task-widget"); createRedMediumOutline(taskWidget); appendStepAnnotation(taskWidget, "2", 0, taskWidget.width()/2); + var statisticWidget = $("#statistic-widget-container"); + createRedMediumOutline(statisticWidget); + appendStepAnnotation(statisticWidget, "3", 0, statisticWidget.width()/2); } function numberingTaskFilter() { @@ -182,6 +186,14 @@ function highlightProcessMoreMenuButton() { appendStepAnnotation(processMoreMenuButton, "1", -10, -40); } +function numberingStatisticWidget() { + var chartInfo = $('.chart-info:eq(0)'); + appendStepAnnotation(chartInfo, "1", -10, 25); + var chartCanvas = $('.ui-carousel-items-content'); + appendStepAnnotation(chartCanvas, "2", chartCanvas.width()/4, chartCanvas.height()/2 + 10); + appendStepAnnotation(chartCanvas, "3", 15, chartCanvas.width()*0.75); +} + function highlightAdminSettings() { createRedMediumOutline($("#adminui-menu-item")); } @@ -199,6 +211,26 @@ function highlightShowMoreNoteLink() { createRedMediumOutline($('a.js-note-show-more-link')); } +function highlightStatisticNavigation() { + createRedThickOutlineWithOffset($('.layout-menu .STATISTICS')); +} + +function highlightTaskAnalysisNavigationLink() { + createRedMediumOutline($("a[id$=':task-analysis-page-navigation-link']")); +} + +function numberingChartPanel() { + var chartName = $('.chart-name:eq(1)'); + appendStepAnnotation(chartName, "1", -30, -25); + var chartInfo = $('.chart-info:eq(1)'); + appendStepAnnotation(chartInfo, "2", -20, 25); + var chartActions = $('.chart-actions-container:eq(0)'); + appendStepAnnotation(chartActions, "3", -20, 0); + var chartCanvas = $('.statistic-chart:eq(1)'); + appendStepAnnotation(chartCanvas, "4", chartCanvas.width()/4, chartCanvas.height()/2 + 10); + appendStepAnnotation(chartCanvas, "5", 15, chartCanvas.width()*0.8); +} + function highlightCustomCaseList() { var caseHeader = $("[id$='case-widget:widget-column-header']"); createRedMediumOutline(caseHeader); diff --git a/AxonIvyPortal/portal-selenium-test/resources/testFile/Dashboard_Dashboard_Export.json b/AxonIvyPortal/portal-selenium-test/resources/testFile/Dashboard_Dashboard_Export.json index fafb183dda2..c69ee7024d2 100644 --- a/AxonIvyPortal/portal-selenium-test/resources/testFile/Dashboard_Dashboard_Export.json +++ b/AxonIvyPortal/portal-selenium-test/resources/testFile/Dashboard_Dashboard_Export.json @@ -532,6 +532,65 @@ "url": "https://www.google.com/search?q=danang&sca_esv=566561006&sxsrf=AM9HkKlUBz__VtVTES7NouybfOXwwRRccA%3A1695119592162&source=hp&ei=6HgJZZXzBpfj2roPnry2wAo&iflsig=AO6bgOgAAAAAZQmG-HMK6OQuwxM5-TaUgojXdqYC8KL4&oq=da&gs_lp=Egdnd3Mtd2l6IgJkYSoCCAAyBxAjGIoFGCcyBxAjGIoFGCcyBBAjGCcyBxAuGIoFGEMyCxAAGIAEGLEDGIMBMgsQABiABBixAxiDATILEAAYgAQYsQMYgwEyBBAAGAMyBBAAGAMyCxAAGIAEGLEDGIMBSNEKUABYZHAAeACQAQCYAZQBoAGlAqoBAzAuMrgBA8gBAPgBAcICDBAjGIoFGBMYgAQYJw&sclient=gws-wiz" } }, + { + "type": "statistic", + "id": "statistic_ff821a63a24d49c6a310fb83ce818a46", + "names": [ + { + "locale": "en", + "value": "Tasks by Priority" + }, + { + "locale": "fr", + "value": "Tasks by Priority" + }, + { + "locale": "de", + "value": "Tasks by Priority" + }, + { + "locale": "es", + "value": "Tasks by Priority" + } + ], + "layout": { + "w": 4, + "h": 8, + "x": 5, + "y": 15 + }, + "chart": { + "id": "0", + "names": [ + { + "locale": "de", + "value": "Aufgaben nach Priorität" + }, + { + "locale": "en", + "value": "Tasks by Priority" + }, + { + "locale": "fr", + "value": "Tãches par priorité" + }, + { + "locale": "es", + "value": "Tareas por prioridad" + } + ], + "type": "TASK_BY_PRIORITY", + "filter": { + "timePeriodSelection": "CUSTOM", + "isAllCategoriesSelected": false, + "isAllRolesSelected": true, + "isAllCaseStatesSelected": true, + "isAllTaskPrioritiesSelected": true + }, + "position": 0 + }, + "chartEmpty": true + }, { "type": "news", "id": "news_bc977a31c02a446fb2f2cb68a6118344", diff --git a/AxonIvyPortal/portal-selenium-test/resources/testFile/dashboard-has-chart-cases-by-category.json b/AxonIvyPortal/portal-selenium-test/resources/testFile/dashboard-has-chart-cases-by-category.json new file mode 100644 index 00000000000..808ab31f2d4 --- /dev/null +++ b/AxonIvyPortal/portal-selenium-test/resources/testFile/dashboard-has-chart-cases-by-category.json @@ -0,0 +1,67 @@ +[ + { + "id": "1", + "title": "Dashboard", + "widgets": [ + { + "type": "statistic", + "id": "statistic_1", + "names": [ + { + "locale": "en", + "value": "Cases by Category" + } + ], + "layout": { + "id": null, + "styleClass": "new-widget", + "style": null, + "w": 5, + "h": 5, + "x": 0, + "y": 0 + }, + "chart": { + "id": "0", + "names": [ + { + "locale": "de", + "value": "Vorgänge nach Kategorie" + }, + { + "locale": "en", + "value": "Cases by category" + }, + { + "locale": "fr", + "value": "Affaires par catégorie" + }, + { + "locale": "es", + "value": "Casos por categoría" + } + ], + "type": "CASES_BY_CATEGORY", + "filter": { + "timePeriodSelection": "CUSTOM", + "createdDateFrom": null, + "createdDateTo": null, + "selectedCaseCategories": [], + "isAllCategoriesSelected": false, + "selectedRoles": [], + "isAllRolesSelected": true, + "selectedCaseStates": [], + "isAllCaseStatesSelected": true, + "selectedTaskPriorities": [], + "isAllTaskPrioritiesSelected": true, + "customFieldFilters": null + }, + "position": 0 + } + } + ], + "permissions": [ + "Everybody" + ] + } +] \ No newline at end of file diff --git a/AxonIvyPortal/portal-selenium-test/resources/testFile/dashboard-has-one-chart-example.json b/AxonIvyPortal/portal-selenium-test/resources/testFile/dashboard-has-one-chart-example.json new file mode 100644 index 00000000000..8ba27392dc2 --- /dev/null +++ b/AxonIvyPortal/portal-selenium-test/resources/testFile/dashboard-has-one-chart-example.json @@ -0,0 +1,71 @@ +[ + { + "id": "1", + "title": "Dashboard", + "widgets": [ + { + "type": "statistic", + "id": "statistic_1", + "names": [ + { + "locale": "en", + "value": "Tasks by Priority" + } + ], + "layout": { + "id": null, + "styleClass": "new-widget", + "style": null, + "w": 5, + "h": 5, + "x": 0, + "y": 0 + }, + "chart": { + "id": "0", + "names": [ + { + "locale": "de", + "value": "Aufgaben nach Priorit�t" + }, + { + "locale": "en", + "value": "Tasks by Priority" + }, + { + "locale": "fr", + "value": "T�ches par priorit�" + }, + { + "locale": "es", + "value": "Tareas por prioridad" + } + ], + "type": "TASK_BY_PRIORITY", + "filter": { + "timePeriodSelection": "CUSTOM", + "createdDateFrom": null, + "createdDateTo": null, + "selectedCaseCategories": [ + ], + "isAllCategoriesSelected": false, + "selectedRoles": [ + ], + "isAllRolesSelected": true, + "selectedCaseStates": [ + ], + "isAllCaseStatesSelected": true, + "selectedTaskPriorities": [ + ], + "isAllTaskPrioritiesSelected": true, + "customFieldFilters": null + }, + "position": 0 + } + } + ], + "permissions": [ + "Everybody" + ] + } +] diff --git a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/common/NavigationHelper.java b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/common/NavigationHelper.java index 37851aa5ec0..e057fbf9f42 100644 --- a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/common/NavigationHelper.java +++ b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/common/NavigationHelper.java @@ -4,12 +4,14 @@ import com.axonivy.portal.selenium.page.CaseWidgetPage; import com.axonivy.portal.selenium.page.ProcessWidgetPage; +import com.axonivy.portal.selenium.page.StatisticWidgetPage; import com.axonivy.portal.selenium.page.TaskWidgetPage; public class NavigationHelper { private static final String TASK_LIST_PAGE_URL = "portal/1549F58C18A6C562/DefaultTaskListPage.ivp"; private static final String CASE_LIST_PAGE_URL = "portal/1549F58C18A6C562/CaseListPage.ivp"; private static final String PROCESS_LIST_PAGE_URL = "portal/1549F58C18A6C562/DefaultProcessStartListPage.ivp"; + private static final String STATISTIC_PAGE_URL = "portal/1549F58C18A6C562/StatisticPage.ivp"; public static void navigateToRelativeLink(String relativeProcessStartUrl) { try { @@ -34,4 +36,8 @@ public static ProcessWidgetPage navigateToProcessList() { return new ProcessWidgetPage(); } + public static StatisticWidgetPage navigateToStatisticPage() { + navigateToRelativeLink(STATISTIC_PAGE_URL); + return new StatisticWidgetPage(); + } } diff --git a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/common/ScreenshotUtils.java b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/common/ScreenshotUtils.java index 9f52b6ed515..91fd5c32fd3 100644 --- a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/common/ScreenshotUtils.java +++ b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/common/ScreenshotUtils.java @@ -38,6 +38,7 @@ public class ScreenshotUtils { public static final String CASE_DETAIL_FOLDER = "/case-detail/"; public static final String CASE_DETAIL_CUSTOMIZATION_FOLDER = "/case-detail/customization/"; public static final String STATISTIC_WIDGET_FOLDER = "/statistic/"; + public static final String TASK_ANALYSIS_FOLDER = "/statistic/task-analysis/"; public static final String SEARCH_FOLDER = "/search/"; public static final String SETTINGS_FOLDER = "/settings/"; public static final String MY_PROFILE_FOLDER = "/my-profile/"; diff --git a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/common/Variable.java b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/common/Variable.java index de1af870d2d..a0823b3c476 100644 --- a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/common/Variable.java +++ b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/common/Variable.java @@ -12,7 +12,7 @@ public enum Variable { HIDE_SYSTEM_TASKS_FROM_HISTORY_ADMINISTRATOR("Portal.Histories.HideSystemTasksForAdministrator"), HIDE_SYSTEM_NOTES_FROM_HISTORY("Portal.Histories.HideSystemNotes"), HIDE_SYSTEM_NOTES_FROM_HISTORY_ADMINISTRATOR("Portal.Histories.HideSystemNotesForAdministrator"), - ENABLE_GROUP_CHAT("Portal.Chat.EnableGroup"), + HIDE_STATISTIC_WIDGET("Portal.Dashboard.HideStatisticWidget"), ENABLE_GROUP_CHAT("Portal.Chat.EnableGroup"), ENABLE_PRIVATE_CHAT("Portal.Chat.EnablePrivate"), CHAT_RESPONSE_TIMEOUT("Portal.Chat.ResponseTimeout"), CHAT_MAX_CONNECTION("Portal.Chat.MaxConnection"), ENABLE_CASE_OWNER("Portal.Cases.EnableOwner"), DISABLE_CASE_COUNT("Portal.Cases.DisableCount"), DEFAULT_SORT_FIELD_OF_CASE_LIST("Portal.Cases.SortField"), @@ -30,7 +30,8 @@ public enum Variable { SHOW_BUTTON_ICON("Portal.ShowButtonIcon"), DEFAULT_HOMEPAGE("Portal.Homepage"), HIDE_RELATED_CASE_INFO_FROM_HISTORY("Portal.Histories.HideRelatedCaseInfo"), DISPLAY_USERS_OF_TASK_ACTIVATOR("Portal.DisplayUsersOfRole"), ANNOUNCEMENT("Portal.Announcement"), - THIRD_PARTY_APP("Portal.ThirdPartyApplications"), EXTERNAL_LINK("Portal.Processes.ExternalLinks"), + TASK_ANALYSIS_FILTER("Portal.TaskAnalysisFilters"), THIRD_PARTY_APP("Portal.ThirdPartyApplications"), + STATISTIC_CHART("Portal.StatisticCharts"), EXTERNAL_LINK("Portal.Processes.ExternalLinks"), TASK_COLUMN("Portal.Tasks.TaskColumn"), TASK_FILTER("Portal.Tasks.TaskFilters"), TASK_BEHAVIOUR_WHEN_CLICKING_ON_LINE_IN_TASK_LIST("Portal.Tasks.BehaviourWhenClickingOnLineInTaskList"), TASK_DETAIL("Portal.TaskDetails"), CASE_COLUMN("Portal.Cases.CaseColumn"), CASE_FILTER("Portal.Cases.CaseFilters"), diff --git a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/document/screenshot/AdditionalComponentsScreenshotTest.java b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/document/screenshot/AdditionalComponentsScreenshotTest.java index 02b81c32cbd..3d770f38673 100644 --- a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/document/screenshot/AdditionalComponentsScreenshotTest.java +++ b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/document/screenshot/AdditionalComponentsScreenshotTest.java @@ -17,6 +17,7 @@ import com.axonivy.portal.selenium.page.NewDashboardPage; import com.axonivy.portal.selenium.page.ProcessHistoryPage; import com.axonivy.portal.selenium.page.ProcessViewerPage; +import com.axonivy.portal.selenium.page.StatisticWidgetPage; import com.axonivy.portal.selenium.page.TaskTemplatePage; import com.axonivy.portal.selenium.page.component.DocumentTableComponentPage; import com.axonivy.portal.selenium.page.component.ProcessViewerComponentPage; @@ -93,6 +94,21 @@ public void captureScreenshotDocumentTableComponent() throws IOException { ScreenshotUtils.capturePageScreenshot(ScreenshotUtils.COMPONENTS_FOLDER + "document-table"); } + @Test + public void captureScreenshotTaskAnalysisComponent() throws IOException { + redirectToRelativeLink(create12CasesWithCategoryUrl); + redirectToRelativeLink(createTestingTasksUrl); + login(TestAccount.ADMIN_USER); + showNewDashboard(); + NewDashboardPage homepage = new NewDashboardPage(); + homepage.waitForCaseWidgetLoaded(); + MainMenuPage mainMenuPage = new MainMenuPage(); + StatisticWidgetPage statisticWidgetDashboardPage = mainMenuPage.openStatisticPage(); + statisticWidgetDashboardPage.navigateToTaskAnalysisPage(); + ScreenshotUtils.resizeBrowser(new Dimension(1500, 1000)); + ScreenshotUtils.capturePageScreenshot(ScreenshotUtils.COMPONENTS_FOLDER + "task-analysis"); + } + @Test public void captureScreenshotUserSelectionComponent() throws IOException { redirectToRelativeLink(userSelectionComponentShowcaseUrl); diff --git a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/document/screenshot/StatisticScreenshotTest.java b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/document/screenshot/StatisticScreenshotTest.java index 65896b7c228..766009f13bd 100644 --- a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/document/screenshot/StatisticScreenshotTest.java +++ b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/document/screenshot/StatisticScreenshotTest.java @@ -13,8 +13,12 @@ import com.axonivy.portal.selenium.common.ScreenshotUtils; import com.axonivy.portal.selenium.common.TestAccount; import com.axonivy.portal.selenium.common.Variable; +import com.axonivy.portal.selenium.common.WaitHelper; import com.axonivy.portal.selenium.page.ClientStatisticWidgetNewDashboardPage; +import com.axonivy.portal.selenium.page.MainMenuPage; import com.axonivy.portal.selenium.page.NewDashboardPage; +import com.axonivy.portal.selenium.page.StatisticWidgetPage; +import com.axonivy.portal.selenium.page.TaskWidgetPage; import ch.ivy.addon.portalkit.enums.PortalVariable; @@ -30,6 +34,53 @@ public void setup() { login(TestAccount.ADMIN_USER); } + @Test + public void screenshotForStatistic() throws IOException { + showNewDashboard(); + NewDashboardPage homePage = new NewDashboardPage(); + homePage.waitForCaseWidgetLoaded(); + MainMenuPage mainMenu = new MainMenuPage(); + + TaskWidgetPage taskWidgetPage = mainMenu.openTaskList(); + taskWidgetPage.openTask("SupportTicket"); + + ScreenshotUtils.resizeBrowser(new Dimension(1460, 800)); + WaitHelper.waitForNavigation(() -> redirectToRelativeLink(createTestingTasksUrl)); + homePage = new NewDashboardPage(); + homePage.waitForCaseWidgetLoaded(); + homePage.waitForGrowlMessageDisappear(); + mainMenu.expandMainMenu(); + + ScreenshotUtils.executeDecorateJs("highlightStatisticNavigation()"); + ScreenshotUtils.capturePageScreenshot(ScreenshotUtils.STATISTIC_WIDGET_FOLDER + "navigate-to-full-statistics-page"); + ScreenshotUtils.resizeBrowser(new Dimension(1386, 2210)); + + StatisticWidgetPage statisticWidgetPage = mainMenu.openStatisticPage(); + statisticWidgetPage.switchCreateMode(); + mainMenu.closeMainMenu(); + + statisticWidgetPage.createTaskByPriorityChart(); + statisticWidgetPage.createTaskByExpiryChart(); + ScreenshotUtils.captureElementScreenshot(statisticWidgetPage.waitAndGetChartCreationContainer(), + ScreenshotUtils.STATISTIC_WIDGET_FOLDER + "available-charts"); + + WebElement chartCreationDialog = statisticWidgetPage.getCaseByFinishedTaskCreationDialog(); + ScreenshotUtils.captureElementWithMarginOptionScreenshot(chartCreationDialog, + ScreenshotUtils.STATISTIC_WIDGET_FOLDER + "chart-creation-dialog", new ScreenshotMargin(10, 10)); + + refreshPage(); + statisticWidgetPage.waitForChartCreationPageRendered(); + statisticWidgetPage.backToDashboard(); + statisticWidgetPage.waitForAllChartLoaded(); + ScreenshotUtils.executeDecorateJs("numberingChartPanel()"); + ScreenshotUtils.captureElementWithMarginOptionScreenshot(statisticWidgetPage.waitAndGetChartPanelByIndex(1), + ScreenshotUtils.STATISTIC_WIDGET_FOLDER + "chart-detail-with-annotation", new ScreenshotMargin(20, 10)); + refreshPage(); + statisticWidgetPage.waitForAllChartLoaded(); + ScreenshotUtils.captureElementWithMarginOptionScreenshot(statisticWidgetPage.getChartInfoDialogOfChart(1), + ScreenshotUtils.STATISTIC_WIDGET_FOLDER + "chart-info-dialog", new ScreenshotMargin(20, 10)); + } + @Test public void screenshotStatisticWidgetList() throws IOException { showNewDashboard(); diff --git a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/document/screenshot/TaskAnalysisScreenshotTest.java b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/document/screenshot/TaskAnalysisScreenshotTest.java new file mode 100644 index 00000000000..90cf6f7274e --- /dev/null +++ b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/document/screenshot/TaskAnalysisScreenshotTest.java @@ -0,0 +1,62 @@ +package com.axonivy.portal.selenium.document.screenshot; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.openqa.selenium.Dimension; + +import com.axonivy.ivy.webtest.IvyWebTest; +import com.axonivy.portal.selenium.common.ScreenshotBaseTest; +import com.axonivy.portal.selenium.common.ScreenshotMargin; +import com.axonivy.portal.selenium.common.ScreenshotUtils; +import com.axonivy.portal.selenium.common.TestAccount; +import com.axonivy.portal.selenium.common.Variable; +import com.axonivy.portal.selenium.page.MainMenuPage; +import com.axonivy.portal.selenium.page.NewDashboardPage; +import com.axonivy.portal.selenium.page.StatisticWidgetPage; +import com.axonivy.portal.selenium.page.TaskAnalysisWidgetPage; + +@IvyWebTest +public class TaskAnalysisScreenshotTest extends ScreenshotBaseTest { + + @Override + @BeforeEach + public void setup() { + super.setup(); + updatePortalSetting(Variable.ENABLE_GROUP_CHAT.getKey(), "true"); + login(TestAccount.ADMIN_USER); + redirectToRelativeLink(createTestingTasksUrl); + } + + @Test + public void screenshotTaskAnalysisPage() throws IOException { + showNewDashboard(); + NewDashboardPage homePage = new NewDashboardPage(); + homePage.waitForCaseWidgetLoaded(); + MainMenuPage mainMenu = new MainMenuPage(); + StatisticWidgetPage statisticWidgetPage = mainMenu.openStatisticPage(); + + ScreenshotUtils.executeDecorateJs("highlightTaskAnalysisNavigationLink()"); + ScreenshotUtils.resizeBrowser(new Dimension(1200, 800)); + ScreenshotUtils + .captureHalfTopRightPageScreenShot(ScreenshotUtils.TASK_ANALYSIS_FOLDER + "navigate-to-task-analysis"); + TaskAnalysisWidgetPage taskAnalysisWidgetPage = statisticWidgetPage.navigateToTaskAnalysisPage(); + + ScreenshotUtils.resizeBrowser(new Dimension(1400, 900)); + ScreenshotUtils.capturePageScreenshot(ScreenshotUtils.TASK_ANALYSIS_FOLDER + "task-analysis"); + + taskAnalysisWidgetPage.openAdvancedTaskFilter("Priority", "priority"); + List selectedPriorities = new ArrayList<>(); + selectedPriorities.add("NORMAL"); + taskAnalysisWidgetPage.filterByTaskPriority(selectedPriorities); + taskAnalysisWidgetPage.clickApplyFilter(); + ScreenshotUtils.resizeBrowser(new Dimension(1400, 800)); + ScreenshotUtils.capturePageScreenshot(ScreenshotUtils.TASK_ANALYSIS_FOLDER + "filtered-tasks"); + taskAnalysisWidgetPage.enterDataToSaveFilterSet("Normal Priority Task", true); + ScreenshotUtils.captureElementWithMarginOptionScreenshot(taskAnalysisWidgetPage.waitAndGetSavingFilterDialog(), + ScreenshotUtils.TASK_ANALYSIS_FOLDER + "saved-filter", new ScreenshotMargin(20)); + } +} diff --git a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/MainMenuPage.java b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/MainMenuPage.java index faf3fce9ea9..1ff015374d7 100644 --- a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/MainMenuPage.java +++ b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/MainMenuPage.java @@ -1,6 +1,7 @@ package com.axonivy.portal.selenium.page; import static com.codeborne.selenide.Condition.appear; + import static com.codeborne.selenide.Condition.disappear; import static com.codeborne.selenide.Selenide.$; import static com.codeborne.selenide.Selenide.$$; @@ -40,6 +41,10 @@ public ProcessWidgetPage openProcessList() { return NavigationHelper.navigateToProcessList(); } + public StatisticWidgetPage openStatisticPage() { + return NavigationHelper.navigateToStatisticPage(); + } + public void openUserSettingMenu() { $("#top-menu").shouldBe(appear, DEFAULT_TIMEOUT); $("a[id='user-settings-menu']").shouldBe(clickable(), DEFAULT_TIMEOUT).click(); @@ -87,6 +92,12 @@ public CaseWidgetPage selectCaseMenu() { return new CaseWidgetPage(); } + public StatisticWidgetPage selectStatisticDashboard() { + WaitHelper + .waitForNavigation(() -> waitForElementClickableThenClick($(".layout-menu li[role='menuitem'] a.STATISTICS"))); + return new StatisticWidgetPage(); + } + private void waitForProcessesPageAfterSelectProcessesCategory() { waitForElementDisplayed(By.id("process-widget:process-search:non-ajax-keyword-filter"), true); } @@ -135,6 +146,10 @@ public boolean isCasesDisplayed() { return isMenuItemDisplayed("Cases"); } + public boolean isStatisticsDisplayed() { + return isMenuItemDisplayed("Statistics"); + } + public WorkingTaskDialogPageOfApplicationMenu selectDashboardMenu() { waitForElementClickableThenClick(".layout-menu li[role='menuitem'] a.DASHBOARD"); return new WorkingTaskDialogPageOfApplicationMenu(); diff --git a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/NewDashboardDetailsEditPage.java b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/NewDashboardDetailsEditPage.java index a7ed76f4dc6..c81eaa66fb7 100644 --- a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/NewDashboardDetailsEditPage.java +++ b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/NewDashboardDetailsEditPage.java @@ -17,6 +17,7 @@ public class NewDashboardDetailsEditPage extends TemplatePage { public static final String PROCESS_WIDGET = "Process List"; public static final String PROCESS_VIEWER_WIDGET = "Process Viewer"; public static final String CUSTOM_WIDGET = "Custom Widget"; + public static final String STATISTIC_WIDGET = "Statistic chart"; public static final String WELCOME_WIDGET = "Welcome widget"; public static final String NEWS_WIDGET = "News feed widget"; public static final String TASK_BY_PRIORITY = "Tasks by Priority"; @@ -160,6 +161,10 @@ public StatisticEditWidgetNewDashboardPage addNewStatisticWidget() { return new StatisticEditWidgetNewDashboardPage(); } + public StatisticWidgetDashboardPage selectStatisticWidget() { + return new StatisticWidgetDashboardPage(); + } + public SelenideElement getTitleByIndex(int index) { return $("a[id='dashboard-title-" + index + "']"); } diff --git a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/NewDashboardPage.java b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/NewDashboardPage.java index 054fbd48fd2..f9b9702d7f8 100644 --- a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/NewDashboardPage.java +++ b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/NewDashboardPage.java @@ -15,6 +15,7 @@ import org.openqa.selenium.WebElement; import com.axonivy.portal.selenium.common.LinkNavigator; +import com.axonivy.portal.selenium.common.Sleeper; import com.axonivy.portal.selenium.common.WaitHelper; import com.codeborne.selenide.CollectionCondition; import com.codeborne.selenide.Condition; @@ -131,6 +132,17 @@ public MainMenuPage openMainMenu() { return new MainMenuPage(); } + public WebElement waitAndGetStatisticChart(int index) { + var widget = $$(".statistic-chart-widget").shouldBe(CollectionCondition.sizeGreaterThan(index), DEFAULT_TIMEOUT) + .get(index).shouldBe(appear, DEFAULT_TIMEOUT); + widget.$("[id$='loading']").shouldBe(disappear, DEFAULT_TIMEOUT); + waitForWidgetLoadedByExpandThenCollapse(widget); + // We use Sleeper here to wait for chart render completely, because the + // statistic dialog was render with an animation by canvas. + Sleeper.sleep(1000); + return widget.ancestor(".grid-stack-item"); + } + public SelenideElement waitAndGetClientStatisticChart(int index) { var widget = $$("[id^='client-statistic-client_statistic']").shouldBe(CollectionCondition.sizeGreaterThan(index), DEFAULT_TIMEOUT) .get(index) @@ -767,6 +779,10 @@ public void selectDashboard(int index) { selectDashboard.parent().shouldBe(Condition.cssClass("active-menuitem"), DEFAULT_TIMEOUT); } + public StatisticWidgetDashboardPage selectStatisticWidget() { + return new StatisticWidgetDashboardPage(); + } + public void checkDisplayedCaseWidgetContainer() { getCaseWidgetContainer().shouldBe(Condition.appear, DEFAULT_TIMEOUT); } diff --git a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/StatisticWidgetDashboardPage.java b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/StatisticWidgetDashboardPage.java new file mode 100644 index 00000000000..c806b5f284f --- /dev/null +++ b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/StatisticWidgetDashboardPage.java @@ -0,0 +1,58 @@ +package com.axonivy.portal.selenium.page; + +import static com.codeborne.selenide.Condition.appear; +import static com.codeborne.selenide.Condition.disappear; +import static com.codeborne.selenide.Selenide.$; +import static com.codeborne.selenide.Selenide.$$; + +import com.codeborne.selenide.ElementsCollection; +import com.codeborne.selenide.SelenideElement; + +public class StatisticWidgetDashboardPage extends TemplatePage { + + @Override + protected String getLoadedLocator() { + return ".statistic-chart-widget__content"; + } + + public ElementsCollection countStatisticCharts() { + return $$(".statistic-chart-widget .widget__header-title"); + } + + public SelenideElement getStatisticInfoIconOfChart(String chartId) { + return $(String.format("[id$='chart-%s:info-sidebar-link-0']", chartId)).shouldBe(appear, DEFAULT_TIMEOUT) + .should(getClickableCondition()); + } + + public void openStatisticInfoPanel(String chartId) { + getStatisticInfoIconOfChart(chartId).click(); + $(String.format("[id$='chart-%s:info-overlay-panel-0']", chartId)).shouldBe(appear, DEFAULT_TIMEOUT); + } + + public ElementsCollection countFilterOfStatistic(String chartId) { + return $(String.format("[id$='chart-%s:info-overlay-panel-0']", chartId)).shouldBe(appear, DEFAULT_TIMEOUT) + .$("table[id$=':chart-filter-container']").shouldBe(appear, DEFAULT_TIMEOUT).$$("tr"); + } + + public String getChartName(String chartId) { + return $(String.format("span[id$='chart-%s:widget__header']", chartId)).shouldBe(appear, DEFAULT_TIMEOUT).getText(); + } + + public SelenideElement getEditIconOfChart(String chartId) { + return $(String.format("[id$='chart-%s:widget-header-actions']", chartId)).shouldBe(appear, DEFAULT_TIMEOUT) + .$(String.format("[id$='chart-%s:edit-widget-0']", chartId)).shouldBe(appear, DEFAULT_TIMEOUT); + } + + public String openEditStatisticWidgetDialog(String chartId) { + getEditIconOfChart(chartId).should(getClickableCondition()).click(); + return $("[id$='new-widget-configuration-dialog']").shouldBe(appear, DEFAULT_TIMEOUT) + .$("span[id$='new-widget-configuration-dialog_title']").shouldBe(appear, DEFAULT_TIMEOUT).getText(); + } + + public void clickOnCancelConfiguration() { + $("[id$='new-widget-configuration-dialog']").shouldBe(appear, DEFAULT_TIMEOUT) + .$("a[id$='task-configuration-cancel-link']").shouldBe(appear, DEFAULT_TIMEOUT) + .shouldBe(getClickableCondition()).click(); + $("[id$='new-widget-configuration-dialog']").shouldBe(disappear, DEFAULT_TIMEOUT); + } +} diff --git a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/StatisticWidgetPage.java b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/StatisticWidgetPage.java new file mode 100644 index 00000000000..e84f360483d --- /dev/null +++ b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/StatisticWidgetPage.java @@ -0,0 +1,270 @@ +package com.axonivy.portal.selenium.page; + +import static com.codeborne.selenide.CollectionCondition.size; +import static com.codeborne.selenide.Condition.appear; +import static com.codeborne.selenide.Selenide.$; +import static com.codeborne.selenide.Selenide.$$; + +import java.util.Set; +import java.util.stream.Collectors; + +import org.openqa.selenium.By; +import org.openqa.selenium.WebDriverException; +import org.openqa.selenium.WebElement; +import org.openqa.selenium.support.ui.WebDriverWait; + +import com.axonivy.portal.selenium.common.WaitHelper; +import com.codeborne.selenide.Condition; +import com.codeborne.selenide.SelenideElement; +import com.codeborne.selenide.WebDriverRunner; + +public class StatisticWidgetPage extends TemplatePage { + public static final String TASK_BY_PRIORITY_CHART_NAME = "Task by priority chart"; + public static final String CASE_BY_STATE_CHART_NAME = "Case by state chart"; + public static final String TASK_BY_EXPIRY_CHART_NAME = "Task by expiry chart"; + public static final String ELAPSED_TIME_CHART_NAME = "Elapsed time chart"; + public static final String CASE_BY_FINISHED_TASK_CHART_NAME = "Case by finished task chart"; + public static final String CASE_BY_FINISHED_TIME_CHART_NAME = "Case by finished time chart"; + public static final String CASES_BY_CATEGORY_CHART_NAME = "Cases by category chart"; + + @Override + protected String getLoadedLocator() { + return "[id='statistics-widget']"; + } + + public TaskAnalysisWidgetPage navigateToTaskAnalysisPage() { + waitForPageLoad(); + var taskAnalysLink = $("a[id='statistics-widget:task-analysis-page-navigation-link']") + .shouldBe(Condition.appear, DEFAULT_TIMEOUT).shouldBe(getClickableCondition(), DEFAULT_TIMEOUT); + WaitHelper.waitForNavigation(() -> waitForElementClickableThenClick(taskAnalysLink)); + $("[id='task-widget']").shouldBe(Condition.appear, DEFAULT_TIMEOUT); + return new TaskAnalysisWidgetPage(); + } + + public Set getAllChartNames() { + $(By.id("chart-name-0")).shouldBe(Condition.appear, DEFAULT_TIMEOUT); + return $$("div[id$=':chart-name-container'] .chart-name").shouldHave(size(1), DEFAULT_TIMEOUT).asFixedIterable() + .stream().map(e -> e.getText()).collect(Collectors.toSet()); + } + + public String getRestoreDefaultButtonName() { + return findElementByCssSelector("span[id$='restore-default-chart-link-label']").getText(); + } + + public boolean hasCreateChartsLink() { + return isElementPresent(By.id("statistics-widget:create-chart-link-label")); + } + + private boolean isCompactMode() { + waitPageLoaded(); + waitForElementDisplayed(By.id("statistics-widget:widget-container"), true); + WebElement statisticContainer = findElementById("statistics-widget:widget-container"); + return statisticContainer.getAttribute(CLASS_PROPERTY).contains("compact-mode"); + } + + public boolean isFullMode() { + return !isCompactMode(); + } + + public void createCaseByStateChart() { + waitForElementDisplayed( + By.id("statistics-widget:chart-creation-widget:chart-management-form:create-case-by-state-link"), true, 30); + SelenideElement createCaseByStateLink = + findElementById("statistics-widget:chart-creation-widget:chart-management-form:create-case-by-state-link"); + waitForElementClickableThenClick(createCaseByStateLink); + + waitForElementDisplayed(By.cssSelector("div[id$='add-chart-dialog']"), true); + + inputNameForSupportedLanguages(CASE_BY_STATE_CHART_NAME); + waitForElementClickableThenClick("button[id$='chart-save-command']"); + + waitForElementExisted(By.cssSelector("span[class='ui-growl-title']"), true); + } + + public void createCaseByFinishTime() { + waitForElementDisplayed( + By.id("statistics-widget:chart-creation-widget:chart-management-form:create-case-by-finished-time-link"), true, + 30); + SelenideElement createCaseByFinishedTaskLink = findElementById( + "statistics-widget:chart-creation-widget:chart-management-form:create-case-by-finished-time-link"); + waitForElementClickableThenClick(createCaseByFinishedTaskLink); + + waitForElementDisplayed(By.cssSelector("div[id$='add-chart-dialog']"), true); + inputNameForSupportedLanguages(CASE_BY_FINISHED_TIME_CHART_NAME); + waitForElementClickableThenClick("button[id$='chart-save-command']"); + + waitForElementExisted(By.cssSelector("span[class='ui-growl-title']"), true); + } + + public void createTaskByPriorityChartMultiLanguage() { + waitForElementDisplayed( + By.id("statistics-widget:chart-creation-widget:chart-management-form:create-task-by-priority-link"), true, 30); + waitForElementClickableThenClick( + $(By.id("statistics-widget:chart-creation-widget:chart-management-form:create-task-by-priority-link"))); + + waitForElementDisplayed(By.cssSelector("div[id$='add-chart-dialog']"), true); + + findElementByCssSelector("input[id$='0:chart-name-input']") + .sendKeys(TASK_BY_PRIORITY_CHART_NAME.concat(" English")); + findElementByCssSelector("input[id$='1:chart-name-input']").sendKeys(TASK_BY_PRIORITY_CHART_NAME.concat(" French")); + findElementByCssSelector("input[id$='2:chart-name-input']").sendKeys(TASK_BY_PRIORITY_CHART_NAME.concat(" German")); + findElementByCssSelector("input[id$='3:chart-name-input']") + .sendKeys(TASK_BY_PRIORITY_CHART_NAME.concat(" Spanish")); + + waitForElementClickableThenClick("button[id$='chart-save-command']"); + waitForElementExisted(By.cssSelector("span[class='ui-growl-title']"), true); + } + + public void createCasesByCategory() { + waitForElementDisplayed( + By.id("statistics-widget:chart-creation-widget:chart-management-form:create-cases-by-category-link"), true, 30); + SelenideElement createCaseByFinishedTaskLink = + findElementById("statistics-widget:chart-creation-widget:chart-management-form:create-cases-by-category-link"); + waitForElementClickableThenClick(createCaseByFinishedTaskLink); + + waitForElementDisplayed(By.cssSelector("div[id$='add-chart-dialog']"), true); + inputNameForSupportedLanguages(CASES_BY_CATEGORY_CHART_NAME); + waitForElementClickableThenClick("button[id$='chart-save-command']"); + + waitForElementExisted(By.cssSelector("span[class='ui-growl-title']"), true); + } + + public void createElapsedTimeChart() { + waitForElementDisplayed( + By.id("statistics-widget:chart-creation-widget:chart-management-form:create-elapsed-time-link"), true, 30); + SelenideElement createElapsedTimeLink = + findElementById("statistics-widget:chart-creation-widget:chart-management-form:create-elapsed-time-link"); + waitForElementClickableThenClick(createElapsedTimeLink); + + waitForElementDisplayed(By.cssSelector("div[id$='add-chart-dialog']"), true); + inputNameForSupportedLanguages(ELAPSED_TIME_CHART_NAME); + waitForElementClickableThenClick("button[id$='chart-save-command']"); + + waitForElementExisted(By.cssSelector("span[class='ui-growl-title']"), true); + } + + public void createCaseByFinishedTask() { + var caseByFinishedTaskSelector = "button[id$=':chart-management-form:create-case-by-finished-task-link']"; + waitForElementClickableThenClick($(caseByFinishedTaskSelector)); + waitForElementDisplayed(By.cssSelector("div[id$='add-chart-dialog']"), true); + + inputNameForSupportedLanguages(CASE_BY_FINISHED_TASK_CHART_NAME); + waitForElementClickableThenClick($(By.cssSelector("button[id$='chart-save-command']"))); + waitForElementDisplayed(By.cssSelector("div[id$='add-chart-dialog']"), false); + waitForElementExisted(By.cssSelector("span[class='ui-growl-title']"), true); + } + + public void restoreDefaultCharts() { + new WebDriverWait(WebDriverRunner.getWebDriver(), DEFAULT_TIMEOUT).until((webDriver) -> { + WebElement restoreDefault = findElementByCssSelector("span[id$='restore-default-chart-link-label']"); + try { + return restoreDefault.getText().contains("Restore default"); + } catch (WebDriverException e) { + System.out.println("Exception when waiting for element existed, try again."); + } + return false; + }); + waitForElementClickableThenClick($("span[id$='restore-default-chart-link-label']")); + waitForElementDisplayed(By.id("statistics-widget:restore-confirmation-dialog"), true, 30); + waitForElementClickableThenClick($(By.id("statistics-widget:confirm-restore"))); + } + + public String getChartName(int chartIndex) { + new WebDriverWait(WebDriverRunner.getWebDriver(), DEFAULT_TIMEOUT).until((webDriver) -> { + try { + return findElementByCssSelector(String.format("div[id$='%d:chart-name-container'] .chart-name", chartIndex)) + .getText().length() > 1; + } catch (WebDriverException e) { + System.out.println("Exception when waiting for element existed, try again."); + } + return false; + }); + WebElement chartName = + findElementByCssSelector(String.format("div[id$='%d:chart-name-container'] .chart-name", chartIndex)); + return chartName.getText(); + } + + public void switchCreateMode() { + $("a[id$='create-chart-link']").shouldBe(getClickableCondition(), DEFAULT_TIMEOUT).click(); + $("a[id$='statistics-widget:back-from-chart-creation']").shouldBe(appear, DEFAULT_TIMEOUT); + } + + public void waitForAllChartLoaded() { + SelenideElement element = + $("[id$='statistics-widget:statistic-dashboard-widget:statistic-chart-repeater:0:chart-name-container'] a"); + element.shouldBe(clickable(), DEFAULT_TIMEOUT).click(); + $("[id$='statistics-widget:statistic-dashboard-widget:chart-details-dialog']").shouldBe(appear, DEFAULT_TIMEOUT) + .$("button.ui-button-text-icon-left").shouldBe(appear, DEFAULT_TIMEOUT).click(); + } + + public void createTaskByPriorityChart() { + $("[id='statistics-widget:chart-creation-widget:chart-management-form:create-task-by-priority-link']") + .shouldBe(getClickableCondition(), DEFAULT_TIMEOUT).click(); + $("div[id$='add-chart-dialog']").shouldBe(appear, DEFAULT_TIMEOUT); + + inputNameForSupportedLanguages(TASK_BY_PRIORITY_CHART_NAME); + $("button[id$='chart-save-command']").shouldBe(getClickableCondition(), DEFAULT_TIMEOUT).click(); + $("span[class='ui-growl-title']").shouldBe(appear, DEFAULT_TIMEOUT); + } + + private void inputNameForSupportedLanguages(String value) { + for (int i = 0; i < 4; i++) { + $("input[id$='" + i + ":chart-name-input']").shouldBe(getClickableCondition(), DEFAULT_TIMEOUT).sendKeys(value); + } + } + + public void createTaskByExpiryChart() { + $("[id='statistics-widget:chart-creation-widget:chart-management-form:create-task-by-expiry-link']") + .shouldBe(getClickableCondition(), DEFAULT_TIMEOUT).click(); + + $("div[id$='add-chart-dialog']").shouldBe(appear, DEFAULT_TIMEOUT); + inputNameForSupportedLanguages(TASK_BY_EXPIRY_CHART_NAME); + $("button[id$='chart-save-command']").shouldBe(getClickableCondition(), DEFAULT_TIMEOUT).click(); + + $("span[class='ui-growl-title']").shouldBe(appear, DEFAULT_TIMEOUT); + } + + public SelenideElement getChartCreationContainer() { + return $("[id='statistics-widget:chart-creation-widget:chart-management-form:chart-list']"); + } + + public WebElement waitAndGetChartCreationContainer() { + return getChartCreationContainer().shouldBe(appear, DEFAULT_TIMEOUT); + } + + public WebElement getCaseByFinishedTaskCreationDialog() { + $("[id='statistics-widget:chart-creation-widget:chart-management-form:create-case-by-finished-task-link']") + .shouldBe(getClickableCondition(), DEFAULT_TIMEOUT).click(); + $("div[id$='add-chart-dialog']").shouldBe(appear, DEFAULT_TIMEOUT); + + inputNameForSupportedLanguages(CASE_BY_FINISHED_TASK_CHART_NAME); + return $("div[id$='add-chart-dialog']").shouldBe(appear, DEFAULT_TIMEOUT); + } + + public void waitForChartCreationPageRendered() { + $("[id='statistics-widget:back-from-chart-creation']").shouldBe(appear, DEFAULT_TIMEOUT); + } + + public void backToDashboard() { + $("a[id$='back-from-chart-creation']").shouldBe(getClickableCondition(), DEFAULT_TIMEOUT).click(); + $("a[id$='create-chart-link']").shouldBe(appear, DEFAULT_TIMEOUT); + } + + public SelenideElement getChartPanelByIndex(int index) { + return $(String.format("span[id$='%d:chart-panel']", index)); + } + + public WebElement waitAndGetChartPanelByIndex(int index) { + return getChartPanelByIndex(index).shouldBe(appear, DEFAULT_TIMEOUT); + } + + public WebElement getChartInfoDialogOfChart(int chartIndex) { + $("[id='" + + String.format("statistics-widget:statistic-dashboard-widget:statistic-chart-repeater:%d:chart-name-container", + chartIndex) + + "']").shouldBe(appear, DEFAULT_TIMEOUT).$("a.chart-info").shouldBe(getClickableCondition(), DEFAULT_TIMEOUT) + .click(); + return $("[id='statistics-widget:statistic-dashboard-widget:chart-details-dialog']").shouldBe(appear, + DEFAULT_TIMEOUT); + } +} diff --git a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/TaskAnalysisWidgetPage.java b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/TaskAnalysisWidgetPage.java new file mode 100644 index 00000000000..9b690d99d2e --- /dev/null +++ b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/TaskAnalysisWidgetPage.java @@ -0,0 +1,362 @@ +package com.axonivy.portal.selenium.page; + +import static com.codeborne.selenide.Condition.appear; +import static com.codeborne.selenide.Selenide.$; +import static com.codeborne.selenide.Selenide.$$; + +import java.util.List; + +import org.openqa.selenium.By; +import org.openqa.selenium.NoSuchElementException; +import org.openqa.selenium.WebElement; +import org.openqa.selenium.support.ui.WebDriverWait; + +import com.codeborne.selenide.CollectionCondition; +import com.codeborne.selenide.Condition; +import com.codeborne.selenide.ElementsCollection; +import com.codeborne.selenide.SelenideElement; +import com.codeborne.selenide.WebDriverRunner; + +public class TaskAnalysisWidgetPage extends TemplatePage { + + private static final String TASK_FILTER_SELECTION = "task-widget:task-filter-add-form:task-filter-selection"; + + @Override + protected String getLoadedLocator() { + return "div[id='task-widget']"; + } + + public void openAdvancedTaskFilter(String filterName, String filterIdName) { + findTaskFilterButton().shouldBe(getClickableCondition(), DEFAULT_TIMEOUT).click(); + $("[id='" + TASK_FILTER_SELECTION + "']").shouldBe(appear, DEFAULT_TIMEOUT).$$("label").asFixedIterable().stream() + .filter(filter -> filter.getText().contentEquals(filterName)).findFirst().get() + .shouldBe(getClickableCondition(), DEFAULT_TIMEOUT).click(); + $("[id='task-widget:task-filter-add-form:update-task-filter-selected-command']") + .shouldBe(getClickableCondition(), DEFAULT_TIMEOUT).click(); + $("span[id$='" + filterIdName + "-filter:filter-open-form:advanced-filter-item-container']").shouldBe(appear, + DEFAULT_TIMEOUT); + } + + public void filterByTaskPriority(List selectedPriorities) { + $("[id$='priority-filter:filter-open-form:advanced-filter-command']") + .shouldBe(getClickableCondition(), DEFAULT_TIMEOUT).click(); + $("[id$='priority-filter:filter-input-form:advanced-filter-panel-content']").shouldBe(appear, DEFAULT_TIMEOUT) + .$$("label").asFixedIterable().stream().filter(filter -> !selectedPriorities.contains(filter.getText())) + .forEach(filter -> filter.shouldBe(getClickableCondition(), DEFAULT_TIMEOUT).click()); + + $("[id$='priority-filter:filter-input-form:update-command']").shouldBe(getClickableCondition(), DEFAULT_TIMEOUT) + .click(); + } + + public void clickApplyFilter() { + $("button[id$='task-widget:apply-filter']").shouldBe(getClickableCondition(), DEFAULT_TIMEOUT).click(); + } + + private SelenideElement findTaskFilterButton() { + return $("[id='task-widget:task-filter-add-action']"); + } + + public void enterDataToSaveFilterSet(String filterSetName, boolean isPersonalFilter) { + $("[id='task-widget:filter-save-action']").shouldBe(getClickableCondition(), DEFAULT_TIMEOUT).click(); + $("[id='task-widget:filter-save-form:save-filter-set-name-input']").shouldBe(appear, DEFAULT_TIMEOUT) + .sendKeys(filterSetName); + + SelenideElement filterVisibilityContainer = findElementById("task-widget:filter-save-form:save-filter-type-radio"); + if (isPersonalFilter) { + filterVisibilityContainer.$$(By.tagName("LABEL")).get(0).shouldBe(clickable(), DEFAULT_TIMEOUT).click(); + } else { + filterVisibilityContainer.$$(By.tagName("LABEL")).get(1).shouldBe(clickable(), DEFAULT_TIMEOUT).click(); + } + } + + public WebElement waitAndGetSavingFilterDialog() { + return $("div[id$='save-filter-set-dialog']").shouldBe(appear, DEFAULT_TIMEOUT); + } + + public StatisticWidgetPage navigateToStatisticPage() { + String backButtonId = "task-widget:back-button"; + waitForElementDisplayed(By.id(backButtonId), true); + SelenideElement backButton = findElementById(backButtonId); + + clickByJavaScript(backButton); + waitForElementDisplayed(By.id("statistics-widget"), true); + return new StatisticWidgetPage(); + } + + public void clickOnColumnToggler() { + String togglerId = "task-widget:statistic-result-form:toggler"; + waitForElementDisplayed(By.id(togglerId), true); + clickByJavaScript(findElementById(togglerId)); + } + + public void filterByTaskName(String text) { + waitForElementClickableThenClick($("[id$='task-name-filter:filter-open-form:advanced-filter-command']")); + $("input[id$='task-name-filter:filter-input-form:name']").shouldBe(appear, DEFAULT_TIMEOUT).sendKeys(text); + waitForElementClickableThenClick($("[id$='task-name-filter:filter-input-form:update-command']")); + } + + public ElementsCollection getRowsInTaskTable() { + return findElementById("task-widget:statistic-result-form:task-table_data") + .$$(By.cssSelector("tr.ui-widget-content")); + } + + private SelenideElement findCaseFilterButton() { + String caseFilterButtonId = "task-widget:case-filter-add-action"; + waitForElementDisplayed(By.id(caseFilterButtonId), true); + return findElementById(caseFilterButtonId); + } + + public void openAdvancedCaseFilter(String filterName, String filterIdName) { + waitForElementClickableThenClick(findCaseFilterButton()); + waitForElementDisplayed(findElementById("task-widget:case-filter-add-form:case-filter-selection"), true); + SelenideElement filterSelectionElement = findElementById("task-widget:case-filter-add-form:case-filter-selection"); + for (SelenideElement filterElement : filterSelectionElement.$$(By.tagName("LABEL"))) { + if (filterName.equals(filterElement.getText())) { + waitForElementClickableThenClick(filterElement); + waitForElementClickableThenClick( + $("button[id$='task-widget:case-filter-add-form:update-task-filter-selected-command']")); + break; + } + } + waitForElementDisplayed( + By.cssSelector("span[id$='" + filterIdName + "-filter:filter-open-form:advanced-filter-item-container']"), + true); + } + + public void filterByCaseName(String text) { + waitForElementClickableThenClick($("[id$='case-name-filter:filter-open-form:advanced-filter-command']")); + findElementByCssSelector("input[id$='case-name-filter:filter-input-form:name']").shouldBe(appear, DEFAULT_TIMEOUT) + .sendKeys(text); + waitForElementClickableThenClick($("[id$='case-name-filter:filter-input-form:update-command']")); + } + + public void filterByCaseState(List selectedPriorities) { + waitForElementClickableThenClick($( + "div[id$='task-widget:case-filters-container'] button[id$='state-filter:filter-open-form:advanced-filter-command']")); + SelenideElement selectionElement = findElementByCssSelector( + "div[id$='task-widget:case-filters-container'] div[id$='state-filter:filter-input-form:advanced-filter-panel-content']"); + for (SelenideElement labelElement : selectionElement.$$(By.tagName("LABEL"))) { + if (!selectedPriorities.contains(labelElement.getText())) { + waitForElementClickableThenClick(labelElement); + } + } + waitForElementClickableThenClick( + $("div[id$='task-widget:case-filters-container'] button[id$='state-filter:filter-input-form:update-command']")); + } + + public void filterByTaskCategory(String selectedCategory) { + waitForElementClickableThenClick($("[id$='task-category-filter:filter-open-form:advanced-filter-command']")); + waitForElementDisplayed($("div[id$=':task-category-filter-tree']"), true); + SelenideElement selectionElement = + findElementByCssSelector("[id$='task-category-filter:filter-input-form:advanced-filter-panel-content']"); + List categoryTreeLabels = selectionElement.$$(By.className("ui-treenode-label")); + // Find parent node of tree first and uncheck it + SelenideElement parentNodeOfTree = categoryTreeLabels.stream().findFirst().get(); + waitForElementDisplayed(parentNodeOfTree, true); + waitForElementClickableThenClick(parentNodeOfTree); + for (SelenideElement labelElement : categoryTreeLabels) { + if (selectedCategory.contains(labelElement.getText())) { + waitForElementClickableThenClick(labelElement); + break; + } + } + waitForElementClickableThenClick($("[id$='task-category-filter:filter-input-form:update-command']")); + } + + public void filterByCaseCategory(String selectedCategory) { + waitForElementClickableThenClick($("[id$='case-category-filter:filter-open-form:advanced-filter-command']")); + waitForElementDisplayed($("div[id$=':case-category-filter-tree']"), true); + SelenideElement selectionElement = + findElementByCssSelector("[id$='case-category-filter:filter-input-form:advanced-filter-panel-content']"); + List categoryTreeLabels = selectionElement.$$(By.className("ui-treenode-label")); + // Find parent node of tree first and uncheck it + SelenideElement parentNodeOfTree = categoryTreeLabels.stream().findFirst().get(); + waitForElementDisplayed(parentNodeOfTree, true); + waitForElementClickableThenClick(parentNodeOfTree); + for (SelenideElement labelElement : categoryTreeLabels) { + if (selectedCategory.contains(labelElement.getText())) { + waitForElementClickableThenClick(labelElement); + break; + } + } + waitForElementClickableThenClick($("button[id$='case-category-filter:filter-input-form:update-command']")); + } + + public void filterByOwner(String user) { + openAdvancedCaseFilter("Owner", "owner"); + waitForElementClickableThenClick($("button[id$='owner-filter:filter-open-form:advanced-filter-command']")); + findElementByCssSelector("input[id$='owner-filter:filter-input-form:owner_input']").sendKeys(user); + waitForElementDisplayed($("span[id$='owner-filter:filter-input-form:owner_panel']"), true); + waitForElementDisplayed($("div[id*='owner-filter'] .ui-avatar-text"), true); + waitForElementClickableThenClick($("[id$=':owner-filter:filter-input-form:owner_panel']")); + waitForElementClickableThenClick($("button[id$='owner-filter:filter-input-form:update-command']")); + } + + public void saveFilterSet(String filterSetName, boolean isPersonalFilter) { + enterDataToSaveFilterSet(filterSetName, isPersonalFilter); + SelenideElement saveButton = + $("button[id$='task-widget:filter-save-form:filter-save-command']").shouldBe(appear, DEFAULT_TIMEOUT); + waitForElementClickableThenClick(saveButton); + $("[id='task-widget:save-filter-set-dialog']").shouldBe(Condition.disappear, DEFAULT_TIMEOUT); + saveButton.shouldBe(Condition.disappear, DEFAULT_TIMEOUT); + } + + public void waitForTaskDataChangeToSpecificSize(int size) { + new WebDriverWait(WebDriverRunner.getWebDriver(), DEFAULT_TIMEOUT).until((driver) -> { + return getRowsInTaskTable().size() == size; + }); + } + + public boolean loadFilterSet(String filterSetName, boolean isPersonalFilter) { + waitPageLoaded(); + waitForElementDisplayed( + $("a[id$='task-widget:filter-selection-form:filter-name']"), true); + waitForElementClickableThenClick( + "a[id$='task-widget:filter-selection-form:filter-name']"); + waitForElementDisplayed( + findElementById( + "task-widget:filter-selection-form:filter-name-overlay-panel"), + true); + SelenideElement filterContainer = null; + if (isPersonalFilter) { + try { + filterContainer = findElementById( + "task-widget:filter-selection-form:private-filters"); + } catch (NoSuchElementException e) { + return false; + } + } else { + try { + filterContainer = findElementById( + "task-widget:filter-selection-form:public-filters"); + } catch (NoSuchElementException e) { + return false; + } + } + + if (!filterContainer.$(By.linkText(filterSetName)).isDisplayed()) { + return false; + } + clickByJavaScript(filterContainer.$(By.linkText(filterSetName)) + .shouldBe(appear, DEFAULT_TIMEOUT)); + return true; + } + + public String getFilterName() { + new WebDriverWait(WebDriverRunner.getWebDriver(), DEFAULT_TIMEOUT).until((driver) -> + + $("a[id$='task-widget:filter-selection-form:filter-name'] > span:nth-child(2)").getText().length() > 1); + WebElement filterName = + findElementByCssSelector("a[id$='task-widget:filter-selection-form:filter-name'] > span:nth-child(2)"); + return filterName.getText(); + } + + private void filterByUserName(String user, String filterIdName) { + waitForElementClickableThenClick( + $("button[id$='" + filterIdName + "-filter:filter-open-form:advanced-filter-command']")); + $("input[id*='" + filterIdName + "-filter:filter-input-form:']").sendKeys(user); + waitForElementExisted(By.cssSelector("div[id*='" + filterIdName + "-filter'] .ui-avatar-text"), true); + waitForElementClickableThenClick($("tr[class$='ui-state-highlight']")); + waitForElementClickableThenClick($("button[id$='" + filterIdName + "-filter:filter-input-form:update-command']")); + } + + public void filterByResponsible(String user, String filterName, String filterIdName) { + openAdvancedTaskFilter(filterName, filterIdName); + waitForElementClickableThenClick($("button[id$='responsible-filter:filter-open-form:advanced-filter-command']")); + $("input[id$='responsible-filter:filter-input-form:responsible_input']").sendKeys(user); + waitForElementDisplayed($("span[id$='responsible-filter:filter-input-form:responsible_panel']"), true); + waitForElementDisplayed($("div[id*='responsible-filter'] .ui-avatar-text"), true); + waitForElementClickableThenClick($("[id$=':responsible-filter:filter-input-form:responsible_panel']")); + waitForElementClickableThenClick($("button[id$='responsible-filter:filter-input-form:update-command']")); + } + + public void removeUserInFilter() { + waitForElementDisplayed(By.cssSelector("button[id$='creator-filter:filter-open-form:advanced-filter-command']"), + true); + waitForElementClickableThenClick($("button[id$='creator-filter:filter-open-form:advanced-filter-command']")); + waitForElementDisplayed( + By.cssSelector("input[id$='creator-filter:filter-input-form:creator-component:creator-select_input']"), true); + findElementByCssSelector("input[id$='creator-filter:filter-input-form:creator-component:creator-select_input']") + .click(); + findElementByCssSelector("input[id$='creator-filter:filter-input-form:creator-component:creator-select_input']") + .clear(); + waitForElementClickableThenClick($("button[id$='creator-filter:filter-input-form:update-command']")); + } + + public void filterUserInCase(String user, String filterName, String filterIdName) { + openAdvancedCaseFilter(filterName, filterIdName); + filterByUserName(user, filterIdName); + } + + public void removeResponsible() { + waitForElementDisplayed(By.cssSelector("button[id$='responsible-filter:filter-open-form:advanced-filter-command']"), + true); + waitForElementClickableThenClick($("button[id$='responsible-filter:filter-open-form:advanced-filter-command']")); + waitForElementDisplayed(By.cssSelector("input[id$='responsible-filter:filter-input-form:responsible_input']"), + true); + findElementByCssSelector("input[id$='responsible-filter:filter-input-form:responsible_input']").click(); + findElementByCssSelector("input[id$='responsible-filter:filter-input-form:responsible_input']").clear(); + waitForElementClickableThenClick($("button[id$='responsible-filter:filter-input-form:update-command']")); + } + + public void openNoActivatorFilter(String filterName) { + findTaskFilterButton().click(); + SelenideElement filterSelectionElement = findElementById(TASK_FILTER_SELECTION); + for (SelenideElement filterElement : filterSelectionElement.$$(By.tagName("LABEL"))) { + if (filterName.equals(filterElement.getText())) { + filterElement.click(); + waitForElementClickableThenClick( + $("button[id$='task-widget:task-filter-add-form:update-task-filter-selected-command']")); + break; + } + } + } + + public void filterByUnavailableActivator() { + waitForElementDisplayed( + By.cssSelector("button[id$='available-activator-filter:filter-open-form:advanced-filter-command']"), true); + waitForElementClickableThenClick( + $("button[id$='available-activator-filter:filter-open-form:advanced-filter-command']")); + + waitForElementDisplayed(By.cssSelector("[id$='available-activator-filter:filter-input-form:available-activator']"), + true); + WebElement displayOnlyUnavailableTaskCheckbox = + findElementByCssSelector("[id$='available-activator-filter:filter-input-form:available-activator']"); + displayOnlyUnavailableTaskCheckbox.click(); + waitForElementClickableThenClick($("button[id$='available-activator-filter:filter-input-form:update-command']")); + } + + public boolean isResetButtonShown() { + waitForElementDisplayed(By.cssSelector("[id$='task-widget:filter-reset-action']"), true); + return isElementDisplayed(By.cssSelector("[id$='task-widget:filter-reset-action']")); + } + + public String getUser(String filterName) { + waitForElementDisplayed($("button[id$='" + filterName + "-filter:filter-open-form:advanced-filter-command']"), + true); + new WebDriverWait(WebDriverRunner.getWebDriver(), DEFAULT_TIMEOUT).until((driver) -> findElementByCssSelector( + "button[id$='" + filterName + "-filter:filter-open-form:advanced-filter-command'] > span").getText() + .length() > 1); + return findElementByCssSelector( + "button[id$='" + filterName + "-filter:filter-open-form:advanced-filter-command'] > span").getText(); + } + + public void resetFilter() { + waitForElementClickableThenClick($("[id$='task-widget:filter-reset-action']")); + waitForElementDisplayed($("[id$='task-widget:filter-reset-command']"), true); + waitForElementClickableThenClick($("[id$='task-widget:filter-reset-command']")); + new WebDriverWait(WebDriverRunner.getWebDriver(), DEFAULT_TIMEOUT) + .until((driver) -> $("a[id$='task-widget:filter-selection-form:filter-name'] > span:nth-child(2)").getText() + .contains("Default")); + } + + public SelenideElement findColumnContainer() { + return $(By.tagName("body")).$(By.cssSelector(".ui-columntoggler")); + } + + public void countSavedFilter(int size) { + waitForElementDisplayed($("a[id$='task-widget:filter-selection-form:filter-name']"), true); + waitForElementClickableThenClick("a[id$='task-widget:filter-selection-form:filter-name']"); + $$(".user-defined-filter-container").shouldBe(CollectionCondition.sizeGreaterThanOrEqual(size), DEFAULT_TIMEOUT); + } +} diff --git a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/DefaultChartTest.java b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/DefaultChartTest.java new file mode 100644 index 00000000000..1d5570ff092 --- /dev/null +++ b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/DefaultChartTest.java @@ -0,0 +1,75 @@ +package com.axonivy.portal.selenium.test; + +import static com.codeborne.selenide.Selenide.$; + +import java.util.Set; + +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.openqa.selenium.By; +import org.openqa.selenium.WebElement; + +import com.axonivy.ivy.webtest.IvyWebTest; +import com.axonivy.portal.selenium.common.BaseTest; +import com.axonivy.portal.selenium.common.TestAccount; +import com.axonivy.portal.selenium.page.MainMenuPage; +import com.axonivy.portal.selenium.page.NewDashboardPage; +import com.axonivy.portal.selenium.page.StatisticWidgetPage; + +@IvyWebTest +public class DefaultChartTest extends BaseTest { + + private static final String DEFAULT_CHART = "Tasks by Priority"; + private static final String RESTORE_DEFAULT = "Restore default"; + + @Override + @BeforeEach + public void setup() { + super.setup(); + login(TestAccount.ADMIN_USER); + grantPermissionToCreateChart(); + } + + @AfterEach + public void clear() { + resetLanguageOfCurrentUser(); + } + + @Test + public void testCreateDefaultChart() { + new NewDashboardPage(); + MainMenuPage mainMenuPage = new MainMenuPage(); + StatisticWidgetPage statisticWidgetPage = mainMenuPage.selectStatisticDashboard(); + statisticWidgetPage.waitForElementDisplayed(By.id("statistics-widget:widget-container"), true); + Set chartNames = statisticWidgetPage.getAllChartNames(); + assertTrue(chartNames.contains(DEFAULT_CHART)); + assertEquals(RESTORE_DEFAULT, statisticWidgetPage.getRestoreDefaultButtonName()); + } + + @Test + public void testRestoreDefaultChart() { + MainMenuPage mainMenuPage = new MainMenuPage(); + StatisticWidgetPage statisticWidgetPage = mainMenuPage.selectStatisticDashboard(); + resizeBrowserTo2kResolution(); + statisticWidgetPage.waitForElementDisplayed(By.id("statistics-widget:widget-container"), true); + statisticWidgetPage.switchCreateMode(); + statisticWidgetPage.createCaseByFinishedTask(); + statisticWidgetPage.backToDashboard(); + statisticWidgetPage.restoreDefaultCharts(); + + WebElement taskByExpiryChartName3 = null; + try { + taskByExpiryChartName3 = + $("[id='statistics-widget:statistic-dashboard-widget:statistic-chart-repeater:2:chart-name']"); + } catch (Exception ex) { + } + + assertEquals(DEFAULT_CHART, statisticWidgetPage.getChartName(0)); + assertEquals(false, taskByExpiryChartName3.isDisplayed()); + } + + private void grantPermissionToCreateChart() { + redirectToRelativeLink(grantPortalPermission); + } +} diff --git a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/MenuTest.java b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/MenuTest.java index 7d61c6bf1f2..74280e0f9f9 100644 --- a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/MenuTest.java +++ b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/MenuTest.java @@ -1,18 +1,19 @@ package com.axonivy.portal.selenium.test; import org.junit.jupiter.api.Assertions; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import com.axonivy.ivy.webtest.IvyWebTest; import com.axonivy.portal.selenium.common.BaseTest; import com.axonivy.portal.selenium.common.TestAccount; -import com.axonivy.portal.selenium.common.Variable; -import com.axonivy.portal.selenium.page.CaseWidgetPage; import com.axonivy.portal.selenium.page.MainMenuPage; import com.axonivy.portal.selenium.page.NewDashboardPage; +import com.axonivy.portal.selenium.page.StatisticWidgetPage; import com.axonivy.portal.selenium.page.TaskWidgetPage; import com.axonivy.portal.selenium.page.UserProfilePage; +import com.axonivy.portal.selenium.common.Variable; import ch.ivy.addon.portalkit.enums.PortalVariable; @@ -46,7 +47,7 @@ public void testLoadCustomMenuItems() { MainMenuPage mainMenuPage = new MainMenuPage(); String expected = - "Dashboard,Processes,Tasks,Cases,User example guide,Google,Testing link google,Testing example,A link,B link"; + "Dashboard,Processes,Tasks,Cases,Statistics,User example guide,Google,Testing link google,Testing example,A link,B link"; assertEquals(expected, mainMenuPage.getMenuItemsAsString()); } @@ -68,7 +69,7 @@ public void testKeepClosedStateWhenNavigateToAnotherPage() { NewDashboardPage newDashboardPage = new NewDashboardPage(); newDashboardPage.waitPageLoaded(); MainMenuPage mainMenuPage = newDashboardPage.openMainMenu(); - CaseWidgetPage dashboardPage = mainMenuPage.openCaseList(); + StatisticWidgetPage dashboardPage = mainMenuPage.selectStatisticDashboard(); dashboardPage.waitForPageLoad(); dashboardPage.closeMainMenu(); diff --git a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/PortalPermissionTest.java b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/PortalPermissionTest.java index 1fae8251d9e..65072343886 100644 --- a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/PortalPermissionTest.java +++ b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/PortalPermissionTest.java @@ -54,12 +54,14 @@ public void testShowHideSubMenuItems() { assertFalse(mainMenuPage.isProcessesDisplayed()); assertFalse(mainMenuPage.isTasksDisplayed()); assertFalse(mainMenuPage.isCasesDisplayed()); + assertFalse(mainMenuPage.isStatisticsDisplayed()); grantAccessFullListPermissions(); newDashboardPage = new NewDashboardPage(); WaitHelper.assertTrueWithWait(() -> mainMenuPage.isProcessesDisplayed()); assertTrue(mainMenuPage.isTasksDisplayed()); assertTrue(mainMenuPage.isCasesDisplayed()); + assertTrue(mainMenuPage.isStatisticsDisplayed()); } @Test @@ -198,6 +200,8 @@ private void grantAccessFullListPermissions() { String.format(grantSpecificPortalPermissionLink, PortalPermission.ACCESS_FULL_CASE_LIST.getValue())); redirectToRelativeLink( String.format(grantSpecificPortalPermissionLink, PortalPermission.ACCESS_FULL_TASK_LIST.getValue())); + redirectToRelativeLink( + String.format(grantSpecificPortalPermissionLink, PortalPermission.ACCESS_FULL_STATISTICS_LIST.getValue())); } private void denyAccessFullListPermissions() { @@ -207,6 +211,8 @@ private void denyAccessFullListPermissions() { String.format(denySpecificPortalPermissionLink, PortalPermission.ACCESS_FULL_CASE_LIST.getValue())); redirectToRelativeLink( String.format(denySpecificPortalPermissionLink, PortalPermission.ACCESS_FULL_TASK_LIST.getValue())); + redirectToRelativeLink( + String.format(denySpecificPortalPermissionLink, PortalPermission.ACCESS_FULL_STATISTICS_LIST.getValue())); } private void grantTaskActionsPermissions() { diff --git a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/StatisticDashboardWidgetTest.java b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/StatisticDashboardWidgetTest.java new file mode 100644 index 00000000000..9982f833da4 --- /dev/null +++ b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/StatisticDashboardWidgetTest.java @@ -0,0 +1,92 @@ +package com.axonivy.portal.selenium.test; + +import org.apache.commons.lang3.StringUtils; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import com.axonivy.ivy.webtest.IvyWebTest; +import com.axonivy.portal.selenium.common.BaseTest; +import com.axonivy.portal.selenium.common.TestAccount; +import com.axonivy.portal.selenium.page.DashboardModificationPage; +import com.axonivy.portal.selenium.page.NewDashboardDetailsEditPage; +import com.axonivy.portal.selenium.page.NewDashboardPage; +import com.codeborne.selenide.CollectionCondition; +import com.codeborne.selenide.Condition; + +import ch.ivy.addon.portalkit.enums.PortalVariable; + +@IvyWebTest +public class StatisticDashboardWidgetTest extends BaseTest { + + private static final String CHART_ID = "statistic_1"; + private NewDashboardPage newDashboardPage; + + @Override + @BeforeEach + public void setup() { + super.setup(); + newDashboardPage = new NewDashboardPage(); + } + + @Test + public void testShowChartInfo() { + login(TestAccount.ADMIN_USER); + createJSonFile("dashboard-has-one-chart-example.json", PortalVariable.DASHBOARD.key); + redirectToRelativeLink(createTestingTasksUrl); + var chartWidget = newDashboardPage.selectStatisticWidget(); + var chartName = chartWidget.getChartName(CHART_ID); + assertTrue(StringUtils.equalsIgnoreCase("Tasks by Priority", chartName)); + var infoIcon = chartWidget.getStatisticInfoIconOfChart(CHART_ID); + infoIcon.should(Condition.appear); + chartWidget.openStatisticInfoPanel(CHART_ID); + var chartFilter = chartWidget.countFilterOfStatistic(CHART_ID); + chartFilter.shouldHave(CollectionCondition.sizeGreaterThanOrEqual(4)); + } + + @Test + public void testEditStatisticChart() { + login(TestAccount.ADMIN_USER); + createJSonFile("dashboard-has-one-chart-example.json", PortalVariable.DASHBOARD.key); + NewDashboardDetailsEditPage newDashboardDetailsEditPage = gotoEditPublicDashboardPage(); + var chartWidget = newDashboardDetailsEditPage.selectStatisticWidget(); + chartWidget.getEditIconOfChart(CHART_ID).shouldBe(Condition.visible, Condition.enabled); + var editChartDialog = chartWidget.openEditStatisticWidgetDialog(CHART_ID); + assertTrue(StringUtils.equalsIgnoreCase(editChartDialog, "Edit Widget Configuration")); + chartWidget.clickOnCancelConfiguration(); + } + + private NewDashboardDetailsEditPage gotoEditPublicDashboardPage() { + newDashboardPage.waitForAbsencesGrowlMessageDisplay(); + var configurationPage = newDashboardPage.openDashboardConfigurationPage(); + DashboardModificationPage modificationPage = configurationPage.openEditPublicDashboardsPage(); + return modificationPage.navigateToEditDashboardDetailsByName("Dashboard"); + } + + @Test + public void testShowChartCasesByCategoryInfo() { + login(TestAccount.ADMIN_USER); + createJSonFile("dashboard-has-chart-cases-by-category.json", PortalVariable.DASHBOARD.key); + redirectToRelativeLink(createTestingTasksUrl); + var chartWidget = newDashboardPage.selectStatisticWidget(); + var chartName = chartWidget.getChartName(CHART_ID); + assertTrue(StringUtils.equalsIgnoreCase("Cases by Category", chartName)); + var infoIcon = chartWidget.getStatisticInfoIconOfChart(CHART_ID); + infoIcon.should(Condition.appear); + chartWidget.openStatisticInfoPanel(CHART_ID); + var chartFilter = chartWidget.countFilterOfStatistic(CHART_ID); + chartFilter.shouldHave(CollectionCondition.sizeGreaterThanOrEqual(4)); + } + + @Test + public void testEditCasesByCategoryChart() { + login(TestAccount.ADMIN_USER); + createJSonFile("dashboard-has-chart-cases-by-category.json", PortalVariable.DASHBOARD.key); + redirectToRelativeLink(createTestingTasksUrl); + NewDashboardDetailsEditPage newDashboardDetailsEditPage = gotoEditPublicDashboardPage(); + var chartWidget = newDashboardDetailsEditPage.selectStatisticWidget(); + chartWidget.getEditIconOfChart(CHART_ID).shouldBe(Condition.visible, Condition.enabled); + var editChartDialog = chartWidget.openEditStatisticWidgetDialog(CHART_ID); + assertTrue(StringUtils.equalsIgnoreCase(editChartDialog, "Edit Widget Configuration")); + chartWidget.clickOnCancelConfiguration(); + } +} diff --git a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/StatisticWidgetTest.java b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/StatisticWidgetTest.java new file mode 100644 index 00000000000..07aa7602b15 --- /dev/null +++ b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/StatisticWidgetTest.java @@ -0,0 +1,155 @@ +package com.axonivy.portal.selenium.test; + +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.openqa.selenium.By; + +import com.axonivy.ivy.webtest.IvyWebTest; +import com.axonivy.portal.selenium.common.BaseTest; +import com.axonivy.portal.selenium.common.TestAccount; +import com.axonivy.portal.selenium.common.WaitHelper; +import com.axonivy.portal.selenium.page.MainMenuPage; +import com.axonivy.portal.selenium.page.NewDashboardPage; +import com.axonivy.portal.selenium.page.StatisticWidgetPage; +import com.axonivy.portal.selenium.page.UserProfilePage; + +@IvyWebTest +public class StatisticWidgetTest extends BaseTest { + private static final String TASK_BY_PRIORITY_DEFAULT_CHART_NAME = "Tasks by Priority"; + public static final String TASK_BY_PRIORITY_CHART_NAME = "Task by priority chart"; + public static final String CASE_BY_STATE_CHART_NAME = "Case by state chart"; + public static final String TASK_BY_EXPIRY_CHART_NAME = "Task by expiry chart"; + public static final String ELAPSED_TIME_CHART_NAME = "Elapsed time chart"; + public static final String CASE_BY_FINISHED_TASK_CHART_NAME = "Case by finished task chart"; + public static final String CASE_BY_FINISHED_TIME_CHART_NAME = "Case by finished time chart"; + public static final String CASES_BY_CATEGORY_CHART_NAME = "Cases by category chart"; + + private NewDashboardPage newDashboardPage; + private StatisticWidgetPage statisticWidgetPage; + private MainMenuPage mainMenuPage; + + @Override + @BeforeEach + public void setup() { + super.setup(); + redirectToRelativeLink(createTestingTasksUrl); + login(TestAccount.ADMIN_USER); + newDashboardPage = new NewDashboardPage(); + } + + @AfterEach + public void clear() { + resetLanguageOfCurrentUser(); + } + + @Test + public void testNavigateToChartFromMenu() { + grantPermissionToCreateChart(); + mainMenuPage = newDashboardPage.openMainMenu(); + statisticWidgetPage = mainMenuPage.selectStatisticDashboard(); + statisticWidgetPage.waitForElementDisplayed(By.id("statistics-widget:widget-container"), true); + assertTrue(statisticWidgetPage.isFullMode()); + } + + @Test + public void testNavigateToChartWithoutPermissionFromMenu() { + String denyPortalPermissionsURL = "portalKitTestHelper/14DE09882B540AD5/denyPortalPermission.ivp"; + redirectToRelativeLink(denyPortalPermissionsURL); + mainMenuPage = newDashboardPage.openMainMenu(); + statisticWidgetPage = mainMenuPage.selectStatisticDashboard(); + assertEquals(false, statisticWidgetPage.hasCreateChartsLink()); + redirectToRelativeLink(grantPortalPermission); + } + + @Test + public void testCreateCharts() { + grantPermissionToCreateChart(); + mainMenuPage = newDashboardPage.openMainMenu(); + statisticWidgetPage = mainMenuPage.selectStatisticDashboard(); + statisticWidgetPage.waitForElementDisplayed(By.id("statistics-widget:widget-container"), true); + statisticWidgetPage.switchCreateMode(); + + statisticWidgetPage.createTaskByPriorityChart(); + statisticWidgetPage.createTaskByExpiryChart(); + statisticWidgetPage.createCaseByStateChart(); + statisticWidgetPage.createElapsedTimeChart(); + statisticWidgetPage.createCaseByFinishedTask(); + statisticWidgetPage.createCaseByFinishTime(); + statisticWidgetPage.createCasesByCategory(); + + statisticWidgetPage.backToDashboard(); + WaitHelper.assertTrueWithWait( + () -> statisticWidgetPage.findElementByCssSelector("div[id$='0:chart-name-container'] .chart-name").getText() + .equals(TASK_BY_PRIORITY_DEFAULT_CHART_NAME)); + WaitHelper.assertTrueWithWait( + () -> statisticWidgetPage.findElementByCssSelector("div[id$='1:chart-name-container'] .chart-name").getText() + .equals(TASK_BY_PRIORITY_CHART_NAME)); + WaitHelper.assertTrueWithWait( + () -> statisticWidgetPage.findElementByCssSelector("div[id$='2:chart-name-container'] .chart-name").getText() + .equals(TASK_BY_EXPIRY_CHART_NAME)); + WaitHelper.assertTrueWithWait( + () -> statisticWidgetPage.findElementByCssSelector("div[id$='3:chart-name-container'] .chart-name").getText() + .equals(CASE_BY_STATE_CHART_NAME)); + WaitHelper.assertTrueWithWait( + () -> statisticWidgetPage.findElementByCssSelector("div[id$='4:chart-name-container'] .chart-name").getText() + .equals(ELAPSED_TIME_CHART_NAME)); + WaitHelper.assertTrueWithWait( + () -> statisticWidgetPage.findElementByCssSelector("div[id$='5:chart-name-container'] .chart-name").getText() + .equals(CASE_BY_FINISHED_TASK_CHART_NAME)); + WaitHelper.assertTrueWithWait( + () -> statisticWidgetPage.findElementByCssSelector("div[id$='6:chart-name-container'] .chart-name").getText() + .equals(CASE_BY_FINISHED_TIME_CHART_NAME)); + WaitHelper.assertTrueWithWait( + () -> statisticWidgetPage.findElementByCssSelector("div[id$='7:chart-name-container'] .chart-name").getText() + .equals(CASES_BY_CATEGORY_CHART_NAME)); + } + + @Test + public void testBreadCrumb() { + grantPermissionToCreateChart(); + mainMenuPage = newDashboardPage.openMainMenu(); + statisticWidgetPage = mainMenuPage.selectStatisticDashboard(); + statisticWidgetPage.waitForElementDisplayed(By.id("statistics-widget:widget-container"), true); + assertEquals("Statistics", statisticWidgetPage.getTextOfCurrentBreadcrumb()); + + statisticWidgetPage.switchCreateMode(); + assertEquals("Statistics", statisticWidgetPage.getTextOfCurrentBreadcrumb()); + + statisticWidgetPage.goToHomeFromBreadcrumb(); + newDashboardPage = new NewDashboardPage(); + assertEquals(true, newDashboardPage.isDisplayed()); + } + + private void grantPermissionToCreateChart() { + redirectToRelativeLink(grantPortalPermission); + } + + @Test + public void testChartNameMultiLanguage() { + resetLanguageOfCurrentUser(); + grantPermissionToCreateChart(); + mainMenuPage = newDashboardPage.openMainMenu(); + statisticWidgetPage = mainMenuPage.selectStatisticDashboard(); + statisticWidgetPage.waitForElementDisplayed(By.id("statistics-widget:widget-container"), true); + + statisticWidgetPage.switchCreateMode(); + statisticWidgetPage.createTaskByPriorityChartMultiLanguage(); + + statisticWidgetPage.backToDashboard(); + WaitHelper.assertTrueWithWait( + () -> statisticWidgetPage.findElementByCssSelector("div[id$='1:chart-name-container'] .chart-name").getText() + .equals("Task by priority chart English")); + + UserProfilePage userProfilePage = statisticWidgetPage.openMyProfilePage(); + userProfilePage.selectLanguage(3); + newDashboardPage = userProfilePage.save(); + + mainMenuPage = newDashboardPage.openMainMenu(); + statisticWidgetPage = mainMenuPage.selectStatisticDashboard(); + WaitHelper.assertTrueWithWait( + () -> statisticWidgetPage.findElementByCssSelector("div[id$='1:chart-name-container'] .chart-name").getText() + .equals("Task by priority chart German")); + } + +} diff --git a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/dashboard/DashboardRestoreConfigurationTest.java b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/dashboard/DashboardRestoreConfigurationTest.java index 4da38cdb138..20b854694fa 100644 --- a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/dashboard/DashboardRestoreConfigurationTest.java +++ b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/dashboard/DashboardRestoreConfigurationTest.java @@ -73,7 +73,7 @@ public void testRestorePublicDashboardToDefaultTemplate() { @Test public void testCannotRestoreDashboardWhenTemplateNotFound() { var dashboardName = "Dashboard"; - createJSonFile("dashboard-has-newsfeed.json", PortalVariable.DASHBOARD.key); + createJSonFile("dashboard-has-one-chart-example.json", PortalVariable.DASHBOARD.key); newDashboardPage.waitForAbsencesGrowlMessageDisplay(); var configurationPage = newDashboardPage.openDashboardConfigurationPage(); var modificationPage = configurationPage.openEditPublicDashboardsPage(); diff --git a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/task/TaskActionTest.java b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/task/TaskActionTest.java index e459a9b8e66..0cb747d718e 100644 --- a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/task/TaskActionTest.java +++ b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/task/TaskActionTest.java @@ -31,7 +31,7 @@ public class TaskActionTest extends BaseTest { private static final String DONE = "Done"; private static final String SUSPENDED = "Suspended"; private static final String IN_PROGRESS = "In progress"; - private static final String READY_FOR_JOINING = "Ready for join"; + private static final String READY_FOR_JOINING = "Ready for joining"; private static final String RESERVED = "Reserved"; private static final String DELAYED = "Delayed"; private static final String DESTROYED = "Destroyed"; diff --git a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/task/TaskAnalysisWidgetTest.java b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/task/TaskAnalysisWidgetTest.java new file mode 100644 index 00000000000..5129b83d9bc --- /dev/null +++ b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/task/TaskAnalysisWidgetTest.java @@ -0,0 +1,348 @@ +package com.axonivy.portal.selenium.test.task; + +import static com.codeborne.selenide.Condition.exist; +import static com.codeborne.selenide.Condition.visible; + +import java.util.ArrayList; +import java.util.List; + +import org.apache.commons.lang3.StringUtils; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.openqa.selenium.By; +import org.openqa.selenium.WebElement; + +import com.axonivy.ivy.webtest.IvyWebTest; +import com.axonivy.portal.selenium.common.BaseTest; +import com.axonivy.portal.selenium.common.TestAccount; +import com.axonivy.portal.selenium.common.Variable; +import com.axonivy.portal.selenium.page.MainMenuPage; +import com.axonivy.portal.selenium.page.NewDashboardPage; +import com.axonivy.portal.selenium.page.StatisticWidgetPage; +import com.axonivy.portal.selenium.page.TaskAnalysisWidgetPage; +import com.codeborne.selenide.CollectionCondition; +import com.codeborne.selenide.Condition; +import com.codeborne.selenide.ElementsCollection; +import com.codeborne.selenide.SelenideElement; + +@IvyWebTest +public class TaskAnalysisWidgetTest extends BaseTest { + + private static final String ENABLE_CASE_OWNER_SETTING = Variable.ENABLE_CASE_OWNER.getKey(); + private NewDashboardPage newDashboardPage; + private StatisticWidgetPage statisticWidgetPage; + private MainMenuPage mainMenuPage; + + @Override + @BeforeEach + public void setup() { + super.setup(); + createTestingTasks(); + createTestData(); + login(TestAccount.ADMIN_USER); + grantPermissionOfPortal(); + newDashboardPage = new NewDashboardPage(); + mainMenuPage = newDashboardPage.openMainMenu(); + statisticWidgetPage = mainMenuPage.selectStatisticDashboard(); + } + + private void grantPermissionOfPortal() { + redirectToRelativeLink(grantPortalPermission); + } + + @Test + public void testBackToStatisticPage() { + TaskAnalysisWidgetPage taskAnalysisWidgetPage = statisticWidgetPage.navigateToTaskAnalysisPage(); + assertTrue(taskAnalysisWidgetPage.isDisplayed()); + statisticWidgetPage = taskAnalysisWidgetPage.navigateToStatisticPage(); + assertTrue(statisticWidgetPage.isDisplayed()); + } + + @Test + public void testAddAndRemoveColumns() { + TaskAnalysisWidgetPage taskAnalysisWidgetPage = statisticWidgetPage.navigateToTaskAnalysisPage(); + + taskAnalysisWidgetPage.clickOnColumnToggler(); + + SelenideElement columnContainer = taskAnalysisWidgetPage.findColumnContainer(); + int numberOfCheckboxes = columnContainer.findElements(By.cssSelector(".ui-chkbox-box")).size(); + List unselectedColumnCheckboxes = + columnContainer.$$(By.cssSelector(".ui-chkbox-box:not(.ui-state-active)")); + + unselectedColumnCheckboxes.forEach(elem -> elem.click()); + taskAnalysisWidgetPage.waitPageLoaded(); + + int numberOfColumns = taskAnalysisWidgetPage.findElementById("task-widget:statistic-result-form:task-table_head") + .findElements(By.cssSelector("th[scope='col']:not(.ui-helper-hidden)")).size(); + assertEquals(numberOfColumns, numberOfCheckboxes); + + refreshPage(); + taskAnalysisWidgetPage.waitPageLoaded(); + taskAnalysisWidgetPage.clickOnColumnToggler(); + List selectedColumnCheckboxes = columnContainer + .$$(By.cssSelector(".ui-chkbox-box.ui-state-active")); + + selectedColumnCheckboxes.get(0) + .shouldBe(Condition.and("should be clickable", visible, exist), + DEFAULT_TIMEOUT) + .click(); + selectedColumnCheckboxes.get(1) + .shouldBe(Condition.and("should be clickable", visible, exist), + DEFAULT_TIMEOUT) + .click(); + + taskAnalysisWidgetPage.waitPageLoaded(); + + numberOfColumns = taskAnalysisWidgetPage + .findElementById("task-widget:statistic-result-form:task-table_head") + .$$(By.cssSelector("th[scope='col']:not(.ui-helper-hidden)")) + .shouldBe(CollectionCondition.sizeGreaterThanOrEqual(0)).size(); + + assertEquals(numberOfColumns, selectedColumnCheckboxes.size()); + } + + @Test + public void testApplyTaskFilters() { + String nameKeyword = "request"; + String prioritySeletion = "NORMAL"; + + TaskAnalysisWidgetPage taskAnalysisWidgetPage = statisticWidgetPage.navigateToTaskAnalysisPage(); + taskAnalysisWidgetPage.openAdvancedTaskFilter("Name", "name"); + taskAnalysisWidgetPage.filterByTaskName(nameKeyword); + + taskAnalysisWidgetPage.openAdvancedTaskFilter("Priority", "priority"); + List selectedPriorities = new ArrayList<>(); + selectedPriorities.add(prioritySeletion); + taskAnalysisWidgetPage.filterByTaskPriority(selectedPriorities); + taskAnalysisWidgetPage.clickApplyFilter(); + + ElementsCollection results = taskAnalysisWidgetPage.getRowsInTaskTable(); + results.shouldHave(CollectionCondition.size(2), DEFAULT_TIMEOUT); + + for (WebElement resultRow : results) { + List resultCells = resultRow.findElements(By.cssSelector("td:not([class='ui-helper-hidden'])")); + assertTrue(resultCells.get(2).getText().toLowerCase().contains(nameKeyword)); + assertTrue(resultCells.get(3).getText().equals(prioritySeletion)); + } + } + + @Test + public void testApplyCaseFilters() { + String keyword = "request"; + String stateSeletion = "In progress"; + + TaskAnalysisWidgetPage taskAnalysisWidgetPage = statisticWidgetPage.navigateToTaskAnalysisPage(); + taskAnalysisWidgetPage.openAdvancedCaseFilter("State", "state"); + taskAnalysisWidgetPage.openAdvancedCaseFilter("Name", "case-name"); + taskAnalysisWidgetPage.filterByCaseName(keyword); + + List selectedStates = new ArrayList<>(); + selectedStates.add(stateSeletion); + taskAnalysisWidgetPage.filterByCaseState(selectedStates); + taskAnalysisWidgetPage.clickApplyFilter(); + + ElementsCollection results = taskAnalysisWidgetPage.getRowsInTaskTable(); + results.shouldHave(CollectionCondition.size(4), DEFAULT_TIMEOUT); + + for (WebElement resultRow : results) { + List resultCells = resultRow.findElements(By.cssSelector("td:not([class='ui-helper-hidden'])")); + assertTrue(resultCells.get(0).getText().toLowerCase().contains(keyword)); + assertTrue("RUNNING".equals(resultCells.get(1).getText())); + } + } + + @Test + public void testApplyCategoryFilters() { + resizeBrowserTo2kResolution(); + TaskAnalysisWidgetPage taskAnalysisWidgetPage = statisticWidgetPage.navigateToTaskAnalysisPage(); + + // Task category filter + taskAnalysisWidgetPage.openAdvancedTaskFilter("Category", "task-category"); + taskAnalysisWidgetPage.filterByTaskCategory("Other Leave"); + taskAnalysisWidgetPage.clickApplyFilter(); + ElementsCollection results = taskAnalysisWidgetPage.getRowsInTaskTable(); + results.shouldHave(CollectionCondition.size(2), DEFAULT_TIMEOUT); + + // Case category filter + taskAnalysisWidgetPage.resetFilter(); + taskAnalysisWidgetPage.openAdvancedCaseFilter("Case category", + "case-category"); + taskAnalysisWidgetPage.filterByCaseCategory("Leave Request"); + taskAnalysisWidgetPage.clickApplyFilter(); + + results = taskAnalysisWidgetPage.getRowsInTaskTable(); + results.shouldHave(CollectionCondition.size(4), DEFAULT_TIMEOUT); + } + + @Test + public void testApplyCaseOwnerFilter() { + updatePortalSetting(ENABLE_CASE_OWNER_SETTING, "true"); + redirectToRelativeLink(userIsOwnerUrl); + newDashboardPage = new NewDashboardPage(); + mainMenuPage = newDashboardPage.openMainMenu(); + statisticWidgetPage = mainMenuPage.selectStatisticDashboard(); + TaskAnalysisWidgetPage taskAnalysisWidgetPage = statisticWidgetPage.navigateToTaskAnalysisPage(); + taskAnalysisWidgetPage.filterByOwner("Demo"); + taskAnalysisWidgetPage.clickApplyFilter(); + + ElementsCollection results = taskAnalysisWidgetPage.getRowsInTaskTable(); + results.shouldHave(CollectionCondition.size(2), DEFAULT_TIMEOUT); + updatePortalSetting(ENABLE_CASE_OWNER_SETTING, "false"); + } + + @Test + public void testAddCaseOwnerColumn() { + updatePortalSetting(ENABLE_CASE_OWNER_SETTING, "true"); + newDashboardPage = new NewDashboardPage(); + mainMenuPage = newDashboardPage.openMainMenu(); + statisticWidgetPage = mainMenuPage.selectStatisticDashboard(); + TaskAnalysisWidgetPage taskAnalysisWidgetPage = statisticWidgetPage.navigateToTaskAnalysisPage(); + + taskAnalysisWidgetPage.clickOnColumnToggler(); + + WebElement columnContainer = taskAnalysisWidgetPage.getDriver().findElement(By.tagName("body")) + .findElement(By.cssSelector(".ui-columntoggler")); + List checkboxes = columnContainer.findElements(By.cssSelector("li.ui-columntoggler-item")); + + checkboxes.forEach(elem -> { + if (StringUtils.equals(elem.getText(), "Case Owner")) { + elem.findElement(By.className("ui-chkbox")).click(); + } + }); + updatePortalSetting(ENABLE_CASE_OWNER_SETTING, "false"); + } + + @Test + public void testSavePublicFilterSet() { + String filterSetName = "Filters for annual"; + + TaskAnalysisWidgetPage taskAnalysisWidgetPage = statisticWidgetPage.navigateToTaskAnalysisPage(); + resizeBrowserTo2kResolution(); + addFilters(taskAnalysisWidgetPage); + taskAnalysisWidgetPage.saveFilterSet(filterSetName, false); + taskAnalysisWidgetPage.countSavedFilter(2); + statisticWidgetPage = taskAnalysisWidgetPage.navigateToStatisticPage(); + TaskAnalysisWidgetPage secondTaskAnalysisWidgetPage = statisticWidgetPage.navigateToTaskAnalysisPage(); + boolean isFilterSetloaded = secondTaskAnalysisWidgetPage.loadFilterSet(filterSetName, false); + + // Sometimes ES take longer time to save data... + if (!isFilterSetloaded) { + refreshPage(); + secondTaskAnalysisWidgetPage.loadFilterSet(filterSetName, false); + } + + secondTaskAnalysisWidgetPage.waitForTaskDataChangeToSpecificSize(1); + List resultCells = secondTaskAnalysisWidgetPage.getRowsInTaskTable().get(0) + .findElements(By.cssSelector("td:not([class='ui-helper-hidden'])")); + assertTrue(resultCells.get(0).getText().toLowerCase().contains("request")); + assertTrue("RUNNING".equals(resultCells.get(1).getText())); + assertTrue(resultCells.get(2).getText().toLowerCase().contains("annual")); + } + + @Test + public void testSavePrivateFilterSet() { + String filterSetName = "Filters for annual"; + TaskAnalysisWidgetPage taskAnalysisWidgetPage = statisticWidgetPage.navigateToTaskAnalysisPage(); + resizeBrowserTo2kResolution(); + addFilters(taskAnalysisWidgetPage); + taskAnalysisWidgetPage.saveFilterSet(filterSetName, true); + taskAnalysisWidgetPage.countSavedFilter(2); + statisticWidgetPage = taskAnalysisWidgetPage.navigateToStatisticPage(); + TaskAnalysisWidgetPage secondTaskAnalysisWidgetPage = statisticWidgetPage.navigateToTaskAnalysisPage(); + boolean isFilterSetloaded = secondTaskAnalysisWidgetPage.loadFilterSet(filterSetName, true); + + // Sometimes ES take longer time to save data... + if (!isFilterSetloaded) { + refreshPage(); + secondTaskAnalysisWidgetPage.loadFilterSet(filterSetName, true); + } + + secondTaskAnalysisWidgetPage.waitForTaskDataChangeToSpecificSize(1); + + List resultCells = secondTaskAnalysisWidgetPage.getRowsInTaskTable().get(0) + .findElements(By.cssSelector("td:not([class='ui-helper-hidden'])")); + assertTrue(resultCells.get(0).getText().toLowerCase().contains("request")); + assertTrue("RUNNING".equals(resultCells.get(1).getText())); + assertTrue(resultCells.get(2).getText().toLowerCase().contains("annual")); + } + + private void createTestData() { + redirectToRelativeLink(create12CasesWithCategoryUrl); + } + + private void addFilters(TaskAnalysisWidgetPage taskAnalysisWidgetPage) { + String taskNameKeyword = "annual"; + String taskCategory = "Annual Leave"; + String caseNameKeyword = "request"; + String caseCategory = "Leave Request"; + String caseState = "In progress"; + + taskAnalysisWidgetPage.openAdvancedCaseFilter("State", "state"); + taskAnalysisWidgetPage.openAdvancedTaskFilter("Name", "name"); + taskAnalysisWidgetPage.filterByTaskName(taskNameKeyword); + + taskAnalysisWidgetPage.openAdvancedTaskFilter("Category", "task-category"); + taskAnalysisWidgetPage.filterByTaskCategory(taskCategory); + + taskAnalysisWidgetPage.openAdvancedCaseFilter("Name", "case-name"); + taskAnalysisWidgetPage.filterByCaseName(caseNameKeyword); + + taskAnalysisWidgetPage.openAdvancedCaseFilter("Case category", "case-category"); + taskAnalysisWidgetPage.filterByCaseCategory(caseCategory); + + List selectedStates = new ArrayList<>(); + selectedStates.add(caseState); + taskAnalysisWidgetPage.filterByCaseState(selectedStates); + } + + @Test + public void testDefaultAndResetFilter() { + TaskAnalysisWidgetPage taskAnalysisWidgetPage = statisticWidgetPage.navigateToTaskAnalysisPage(); + assertTrue(taskAnalysisWidgetPage.getFilterName().contains("Default filter")); + + taskAnalysisWidgetPage.openAdvancedTaskFilter("Name", "name"); + taskAnalysisWidgetPage.filterByTaskName("request"); + assertTrue(taskAnalysisWidgetPage.isResetButtonShown()); + + taskAnalysisWidgetPage.resetFilter(); + assertTrue(taskAnalysisWidgetPage.getFilterName().contains("Default filter")); + } + + @Test + public void testRemoveAndReloadFilter() { + // Task Responsible, Case Creator + String filterSetName = "saveUserFilter"; + + TaskAnalysisWidgetPage taskAnalysisWidgetPage = statisticWidgetPage.navigateToTaskAnalysisPage(); + taskAnalysisWidgetPage.filterByResponsible("Demo", "Responsible", "responsible"); + taskAnalysisWidgetPage.filterUserInCase("Demo", "Creator", "creator"); + resizeBrowserTo2kResolution(); + taskAnalysisWidgetPage.saveFilterSet(filterSetName, false); + taskAnalysisWidgetPage.countSavedFilter(2); + + MainMenuPage mainMenuPage = new MainMenuPage(); + statisticWidgetPage = mainMenuPage.selectStatisticDashboard(); + statisticWidgetPage.navigateToTaskAnalysisPage(); + taskAnalysisWidgetPage.loadFilterSet(filterSetName, false); + + taskAnalysisWidgetPage.removeResponsible(); + taskAnalysisWidgetPage.removeUserInFilter(); + + statisticWidgetPage = mainMenuPage.selectStatisticDashboard(); + statisticWidgetPage.navigateToTaskAnalysisPage(); + taskAnalysisWidgetPage.loadFilterSet(filterSetName, false); + + assertTrue(taskAnalysisWidgetPage.getUser("responsible").contains("Demo")); + assertTrue(taskAnalysisWidgetPage.getUser("creator").contains("Demo")); + } + + @Test + public void testTaskFilterForUnavailableActivator() { + TaskAnalysisWidgetPage taskAnalysisWidgetPage = statisticWidgetPage.navigateToTaskAnalysisPage(); + taskAnalysisWidgetPage.openNoActivatorFilter("Missing activator"); + taskAnalysisWidgetPage.filterByUnavailableActivator(); + taskAnalysisWidgetPage.clickApplyFilter(); + ElementsCollection results = taskAnalysisWidgetPage.getRowsInTaskTable(); + results.shouldHave(CollectionCondition.size(2), DEFAULT_TIMEOUT); + } +} diff --git a/AxonIvyPortal/portal/cms/cms.yaml b/AxonIvyPortal/portal/cms/cms.yaml index 097383bfc3a..5ce60eef083 100644 --- a/AxonIvyPortal/portal/cms/cms.yaml +++ b/AxonIvyPortal/portal/cms/cms.yaml @@ -192,6 +192,7 @@ ch.ivy.addon.portalkit.ui.jsf: hideChangePasswordButtonNote: Set this variable to true to hide the "Change Password" option in the top menu and the "Forgotten Password" option on the login page. If set to false, these options will be shown. hideLogoutButtonNote: If true, the logout button on top menu will be hidden, otherwise it will be shown. hideRelatedCaseInfoFromHistory: If true, case history does not display the related case information in the history table. + hideStatisticWidget: Set to true to hide Statistic widget from homepage and application menu. hideSystemNotesFromHistory: If true, case/task note does not display any system notes for non-administrator users. hideSystemNotesFromHistoryAdministrator: If true, case/task note does not display any system notes for administrator. hideSystemTasksFromHistory: If true, case note does not display any system tasks for non-administrator users. @@ -209,6 +210,7 @@ ch.ivy.addon.portalkit.ui.jsf: showProcessInformation: Set to false to disable link to Show Information of process on Processes page (grid mode) and Case Details. showQuickGlobalSearch: For switch on/off the display of the quick global search. showTaskDurationTime: For switch on/off the display of the duration time in task details page. + statisticChartScalingInterval: Interval in seconds to do periodic statistic chart scaling requests. If the interval value is less than 10, periodic statistic chart scaling is disabled. uploadDocumentWhiteListExtensionNote: 'Leave value empty if you allow all extensions. If just allow some extensions, list out extensions here, separated by comma. Example: pdf, txt, doc, docx.' key: Key link: Link @@ -358,7 +360,6 @@ ch.ivy.addon.portalkit.ui.jsf: backgroundColor: Background color cancel: Cancel case: Case - caseCategory: Case category caseInformation: Case Information caseName: Case name categories: Categories @@ -532,6 +533,10 @@ ch.ivy.addon.portalkit.ui.jsf: userOfRoleTitle: User of {0} group processChain: currentStepIsNotDefined: Current step ({0}) of process chain is not defined + statisticWidget: + chartDeletionConfirmation: Are you sure you want to delete this statistic chart? + contextMenuDrilldown: Drilldown + contextMenuToTaskList: Go to task list taskStart: cannotDelegateTaskMessage: This task cannot be delegated to any other user or group. cannotStartMessages: @@ -583,7 +588,14 @@ ch.ivy.addon.portalkit.ui.jsf: SavedFilterHeader: Saved filters SearchForFilter: Search for filter StatisticWidget: + AvailableCharts: Available statistics charts + Charts: 'Chart(s): {0}' + ConfigurationDescription: You can configure your widget in this configuration area. Please define the chart which will be shown on your dashboard. EmptyChartDataMessage: We do not have enough data to create a nice chart! + FilterChartText: Filter a chart by name + PlaceholderChartOption: Select a chart + PleaseSelectChart: Please select a chart + PreviewText: Please select a chart to see the canvas data WidgetFilterName: Widget filter name WidgetFilters: Widget filters actionSelection: Action selection @@ -687,6 +699,7 @@ ch.ivy.addon.portalkit.ui.jsf: yourCustomWidget: Your Custom Widget yourProcessViewer: Your Process Viewer yourProcesses: Your Processes + yourStatistics: Your Statistics yourTasks: Your Tasks documentFiles: deleteDocumentNote: '{0} has deleted {1}' @@ -839,8 +852,147 @@ ch.ivy.addon.portalkit.ui.jsf: process: Process searchResults: Search Results searchResultsFor: '{0} search results for "{1}"' - sidestep: - addAdhocTask: Add Ad-hoc Task + statistic: + chart: + ExpandOrCollapseColumn: Expand/Collapse Columns + addChart: Add new chart + addChartDialogHeader: Add statistic chart to dashboard + backToDashboard: Back to dashboard + barchart: + Percentage: Percentage + daysOfWeek: + friday: Friday + monday: Monday + saturday: Saturday + sunday: Sunday + thursday: Thursday + tuesday: Tuesday + wednesday: Wednesday + expired: Expired + in2Days: In 2 days + in3Days: In 3 days + monthsOfYear: + April: April + August: August + December: December + February: February + January: January + July: July + June: June + March: March + May: May + November: November + October: October + September: September + today: Today + tomorrow: Tomorrow + weeksOfMonth: + fifthWeek: Fifth week + firstWeek: First week + fourthWeek: Fourth week + secondWeek: Second week + sixthWeek: Sixth week + thirdWeek: Third week + caseCategory: Case category + chartCreationSuccessDetailMsg: Chart with name {0} was created successfully + chartCreationSuccessTitle: Chart was created successfully + elapsedTime: Elapsed Time + elapsedTimeChart: + compareButton: Compare + compareRole: 'Compare Role:' + elapsedTimeInHours: Elapsed time in hours + noEntriesFound: No entries found with given criteria + taskCategory: Task category + withRole: 'With Role:' + emptystate: + defaultEmptyMessages: No statistic chart to display. + expiryPeriod: Expiry period + loadingCharts: Please wait, charts are loading... + notAllowedToCreateChart: You are not allowed to create a chart before clicking Apply Filters button + other: Others + restoreDefaultChart: If you proceed, you will loose all charts created by yourself. The standard settings will be applied. + second: sec + showAllCharts: Show all charts + statisticCarousel: Statistics Carousel + statistics: Statistics + taskByExpiry: + hour: (Hour) + thisMonth: This Month + thisWeek: This Week + thisYear: This Year + taskByPriority: + addToDashboardLink: Add to dashboard + exception: Exception + high: High + low: Low + normal: Normal + taskExpiry: Task expiry + chartInfo: + chartDetailsHeader: Chart Details + chartName: Chart Name + chartType: Chart Type + chartType: + caseByFinishedTask: Processed cases in time period + caseByFinishedTaskDescription: Cases where a task was finished in the selected time period + caseByFinishedTime: Done cases in time period + caseByFinishedTimeDescription: Cases which are done in the selected time period + caseByState: Case by state + elapsedTimeByCaseCategory: Elapsed time of done cases + elapsedTimeByCaseCategoryDescription: Elapsed time of finished cases by category + taskByExpiry: Task by expiry + taskByPriority: Task by priority + defaultChart: + newChart: New chart + tasksByPriority: Tasks by Priority + filter: + affectedCharts: Affected charts + allSelected: All + caseCategoriesLabel: Case Categories + caseCategoryFilterDescription: You can find all available case categories here. Only selected Case Categories are considered in the affected charts. + caseStateFilterDescription: Only selected States are considered in the affected charts. + filter: Filters + noRoles: There are no roles + noSelectionCustomVarChar: No selection. + noneSelected: None + roleFilterDescription: You can find all available process roles here. Only selected roles are considered in the affected charts + rolesLabel: Roles + selectAll: Select All + taskPrioritiesLabel: Task Priorities + taskPriorityFilterDescription: Tasks can be selected depending on their priority. + timePeriod: Time period + timePeriodFilterDescription: Restricts the time period for cases and tasks. + workflowStatesLabel: Workflow States + taskAnalysis: + applyFilter: Apply filters + caseCategory: Case category + caseCreator: Case creator + caseDescription: Case description + caseFilter: Case filters + caseID: Case ID + caseName: Case name + caseOwner: Case owner + caseState: Case state + downloadZipFileExplanation: The number of tasks to export exceeds the limit of Excel rows. Therefore, data will be split to multiple Excel files, then compressed in a Zip file to download. + taskAnalysis: Task Analysis + taskCategory: Task category + taskCreationTime: Task created + taskDescription: Task description + taskExpiryTime: Task expiry + taskFilter: Task filters + taskFinishedTime: Task completed on + taskID: Task ID + taskPriority: Task priority + taskResponsible: Task responsible + taskState: Task state + taskWorker: Task editor + waitingDownloadMessage: We are creating the Export, this can take a few minutes + timePeriod: + custom: Custom + last6Month: Last 6 month + lastMonth: Last month + lastWeek: Last week + validationErrors: + nameIsExisted: A chart with this name already exists taskActivator: assign: Assign cannotAssignTask: This task cannot be assigned to any other user or group. diff --git a/AxonIvyPortal/portal/cms/cms_de.yaml b/AxonIvyPortal/portal/cms/cms_de.yaml index 39d3abda1e5..360f9e7a8b2 100644 --- a/AxonIvyPortal/portal/cms/cms_de.yaml +++ b/AxonIvyPortal/portal/cms/cms_de.yaml @@ -243,6 +243,7 @@ ch.ivy.addon.portalkit.ui.jsf: hideChangePasswordButtonNote: Setzen Sie diese Variable auf true, um die Option "Passwort ändern" im oberen Menü und die Option "Passwort vergessen" auf der Anmeldeseite auszublenden. Wenn sie auf false gesetzt ist, werden diese Optionen angezeigt. hideLogoutButtonNote: 'Auf "true" setzen, um die Logout Funktion im Top Menu zu deaktivieren. ' hideRelatedCaseInfoFromHistory: Wenn diese Option auf "true" gesetzt ist, werden die zugehörigen Fallinformationen nicht in der Tabelle "Historie" angezeigt. + hideStatisticWidget: Setzen Sie den Wert auf "true", um das Statistik-Widget auf der Startseite und im Anwendungsmenü auszublenden. hideSystemNotesFromHistory: Wenn diese Option aktiviert ist, werden in den Vorgangs-/Aufgabennotizen keine Systemnotizen für Benutzer ohne Administratorrechte angezeigt. hideSystemNotesFromHistoryAdministrator: Wenn diese Option aktiviert ist, werden in den Vorgangs-/Aufgabennotizen keine Systemnotizen für Administratoren angezeigt. hideSystemTasksFromHistory: Wenn diese Option aktiviert ist, zeigt die Vorgangs- / Aufgabennotiz keine technischen Verlaufseinträge für Benutzer ohne Administratorrechte an. @@ -261,6 +262,7 @@ ch.ivy.addon.portalkit.ui.jsf: showProcessInformation: Auf "false" setzen, um die Verknüpfung zu Informationen des Prozesses auf der Seite Prozesse (Gittermodus) und Falldetails anzeigen zu deaktivieren. showQuickGlobalSearch: Zum Ein-/Ausschalten der Anzeige der globalen Schnellsuche. showTaskDurationTime: Zum Ein-/Ausschalten der Anzeige der Bearbeitungszeit auf der Aufgabendetailseite. + statisticChartScalingInterval: Intervall in Sekunden, in dem die Skalierung des statistischen Diagramms regelmäßig angefordert wird. Ist der Intervallwert kleiner als 10, wird die periodische Skalierung des statistischen Diagramms deaktiviert. uploadDocumentWhiteListExtensionNote: 'Leer lassen, falls Sie alle Formate erlauben. Falls Sie nur eine geringe Anzahl an Formate erlauben möchten (White list), können Sie diese hier, mit Komma getrennt, aufführen. Z.B.: pdf, txt, doc, docx.' key: Schlüssel link: Link @@ -421,7 +423,6 @@ ch.ivy.addon.portalkit.ui.jsf: backgroundColor: Hintergrundfarbe cancel: Abbrechen case: Vorgang - caseCategory: Vorgangskategorie caseInformation: Vorgangsinformationen caseName: Vorgangsname categories: Kategorien @@ -645,6 +646,11 @@ ch.ivy.addon.portalkit.ui.jsf: titlePage: Passwort-Überprüfung processChain: currentStepIsNotDefined: Aktueller Schritt ({0}) der Prozesskette ist nicht definiert + statisticWidget: + chartDeletionConfirmation: Wollen Sie dieses Diagramm wirklich löschen? + contextMenuDrilldown: Drilldown + contextMenuToCaseList: Zur Fallliste gehen + contextMenuToTaskList: Zur Aufgabenliste taskStart: cannotDelegateTaskMessage: Diese Aufgabe kann an keinen anderen Benutzer oder keine andere Gruppe delegiert werden. cannotStartMessages: @@ -717,7 +723,14 @@ ch.ivy.addon.portalkit.ui.jsf: ShareThisDashboard: Teilen Sie dieses Dashboard StandardWidgets: Standard-Widgets StatisticWidget: + AvailableCharts: Verfügbare Statistikdiagramme + Charts: 'Diagramm(e): {0}' + ConfigurationDescription: Sie können Ihr Widget in diesem Konfigurationsbereich konfigurieren. Bitte definieren Sie die Grafik, die auf Ihrem Dashboard angezeigt werden soll. EmptyChartDataMessage: Wir haben nicht genug Daten, um ein schönes Diagramm zu erstellen! + FilterChartText: Filtern eines Diagramms nach Name + PlaceholderChartOption: Wählen Sie ein Diagramm + PleaseSelectChart: Bitte wählen Sie ein Diagramm aus + PreviewText: Bitte wählen Sie ein Diagramm aus, um die Canvas-Daten zu sehen WelcomeWidgetIntroduction: Dieses Widget zeigt einen Willkommenstext und ein Bild auf dem Dashboard an. WelcomeWidgetNotFoundMessage: Wir können das Bild des Widgets nicht finden, bitte konfigurieren Sie Ihr Bild neu! WidgetFilterName: Name des Widget-Filters @@ -861,6 +874,7 @@ ch.ivy.addon.portalkit.ui.jsf: yourNotifications: Ihre Benachrichtigungen yourProcessViewer: Ihr Prozessbetrachter yourProcesses: Ihre Prozesse + yourStatistics: Ihre Statistiken yourTasks: Ihre Aufgaben documentFiles: deleteDocumentNote: '{0} hat folgendes gelöscht: {1}' @@ -1058,8 +1072,154 @@ ch.ivy.addon.portalkit.ui.jsf: process: Prozess searchResults: Suchresultate searchResultsFor: '{0} Suchresultate für "{1}"' - sidestep: - addAdhocTask: Ad-hoc Aufgabe hinzufügen + statistic: + chart: + ExpandOrCollapseColumn: Spalten auf-/zuklappen + addChart: Neues Diagramm hinzufügen + addChartDialogHeader: Diagramm zum Dashboard hinzufügen + backToDashboard: Zurück zum Dashboard + barchart: + Percentage: Prozent + daysOfWeek: + friday: Freitag + monday: Montag + saturday: Samstag + sunday: Sonntag + thursday: Donnerstag + tuesday: Dienstag + wednesday: Mittwoch + expired: Abgelaufen + in2Days: In 2 Tagen + in3Days: In 3 Tagen + monthsOfYear: + April: April + August: August + December: Dezember + February: Februar + January: Januar + July: Juli + June: Juni + March: März + May: Mai + November: November + October: Oktober + September: September + today: Heute + tomorrow: Morgen + weeksOfMonth: + fifthWeek: Fünfte Woche + firstWeek: Erste Woche + fourthWeek: Vierte Woche + secondWeek: Zweite Woche + sixthWeek: Sechste Woche + thirdWeek: Dritte Woche + caseCategory: Vorgangskategorie + chartCreationSuccessDetailMsg: Diagramm mit Name {0} wurde erfolgreich erstellt + chartCreationSuccessTitle: Diagramm wurde erfolgreich erstellt + elapsedTime: Verstrichene Zeit + elapsedTimeChart: + compareButton: Vergleichen + compareRole: Rollen vergleichen + elapsedTimeInHours: Laufzeit in Std. + noEntriesFound: Keine übereinstimmende Kriterien gefunden + taskCategory: Aufgabenkategorie + withRole: 'Mit Rolle:' + emptystate: + defaultEmptyMessages: Es sind keine Auswertungen vorhanden. + exception: + idNotFound: 'Chart Id not found with id: {0}' + noPermission: You do not have the permission to send this request! + expiryPeriod: Fristende + loadingCharts: Bitte warten während die Diagramme geladen werden… + moveLeft: Nach links bewegen + moveRight: Nach rechts bewegen + notAllowedToCreateChart: Sie haben die Filtereinstellungen geändert. Bitte aktualisieren Sie gesetzten Filter mit "Filter anwenden", um das Diagramm anschließend erstellen zu können + other: Andere + restoreDefaultChart: Wenn Sie fortfahren, werden alle selbsterstellten Diagramme gelöscht. Die Standardeinstellung wird angewendet. + second: sek + showAllCharts: Alle Diagramme anzeigen + statisticCarousel: Statistik-Karussell + statistics: Statistiken + taskByExpiry: + hour: (Stunde) + thisMonth: Diesen Monat + thisWeek: Diese Woche + thisYear: Dieses Jahr + taskByPriority: + addToDashboardLink: Zum Dashboard hinzufügen + exception: Ausnahme + high: Hoch + low: Niedrig + normal: Normal + taskExpiry: Aufgabenfristen + chartInfo: + chartDetailsHeader: Diagrammdetails + chartName: Diagrammname + chartType: Diagrammtyp + name: Diagramm-Informationen + chartType: + caseByFinishedTask: Bearbeitete Vorgänge im Zeitraum + caseByFinishedTaskDescription: Vorgänge, in denen eine Aufgabe in der ausgewählten Zeitspanne abgeschlossen wurde + caseByFinishedTime: Abgeschlossene Vorgänge im Zeitraum + caseByFinishedTimeDescription: Vorgänge die in der ausgewählten Zeitspanne abgeschlossen wurden + caseByState: Vorgänge nach Status + casesByCategory: Vorgänge nach Kategorie + elapsedTimeByCaseCategory: Durchlaufzeit abgeschlossener Vorgänge + elapsedTimeByCaseCategoryDescription: Durchlaufszeit (Start bis Ende des Vorgangs) abgeschlossener Vorgänge nach Kategorie + taskByExpiry: Aufgaben nach Ablaufdatum + taskByPriority: Aufgaben nach Priorität + defaultChart: + newChart: Neues Diagramm + tasksByPriority: Aufgaben nach Priorität + filter: + affectedCharts: Betroffene Diagramme + allSelected: Alle + caseCategoriesLabel: Vorgangskategorien + caseCategoryFilterDescription: Hier sehen Sie alle verfügbaren Vorgangskategorien. Nur ausgewählte Vorgangskategorien werden in den betroffenen Diagrammen berücksichtigt. + caseStateFilterDescription: Nur ausgewählte Status werden in den betroffenen Diagrammen berücksichtigt. + filter: Filter + noRoles: Keine Rollen vorhanden + noSelectionCustomVarChar: Keine Auswahl + noneSelected: Keine + roleFilterDescription: Hier sehen Sie alle verfügbaren Prozessrollen. Nur ausgewählte Rollen werden in den betroffenen Diagrammen berücksichtigt. + rolesLabel: Rollen + selectAll: Alle selektieren + taskPrioritiesLabel: Aufgabenprioritäten + taskPriorityFilterDescription: Aufgaben können nach Ihrer Priorität gefiltert werden. + timePeriod: Zeitspanne + timePeriodFilterDescription: 'Schränkt den Zeitraum der Vorgänge und Aufgaben ein. ' + workflowStatesLabel: Workflowstatus + taskAnalysis: + applyFilter: Filter anwenden + caseCategory: Vorgangskategorie + caseCreator: Ersteller + caseDescription: Vorgangsbeschreibung + caseFilter: Vorgangsfilter + caseID: Vorgangs Id + caseName: Vorgangsname + caseOwner: Vorgangs Owner + caseState: Vorgangsstatus + downloadZipFileExplanation: Die Anzahl der zu exportierenden Aufgaben überschreitet die Grenze der Excel-Zeilen. Daher werden die Daten in mehrere Excel-Dateien aufgeteilt und dann in einer ZIP-Datei zum Herunterladen komprimiert. + taskAnalysis: Aufgabenanalyse + taskCategory: Aufgabenkategorie + taskCreationTime: Aufgabe erstellt + taskDescription: Aufgabenbeschreibung + taskExpiryTime: Aufgabenfälligkeit + taskFilter: Aufgabenfilter + taskFinishedTime: Aufgabe abgeschlossen am + taskID: Aufgabe Id + taskPriority: Aufgabenpriorität + taskResponsible: Aufgabenverantwortlicher + taskState: Aufgabenstatus + taskWorker: Aufgabenbearbeiter + waitingDownloadMessage: Bitte um Geduld. Wir erstellen gerade den Export. Das kann einige Minuten dauern. + timePeriod: + custom: Benutzerdefiniert + last6Month: Letzte 6 Monate + lastMonth: Letzter Monat + lastWeek: Letzte Woche + validationErrors: + nameIsExisted: Ein Diagramm mit dem selben Namen existiert bereits taskActivator: assign: Zuweisen cannotAssignTask: Diese Aufgabe kann keinem anderen Benutzer oder keiner anderen Gruppe zugewiesen werden. @@ -1308,7 +1468,7 @@ Dialogs: CaseOwner: Prozessverantwortlicher Finished: Erledigt GlobalSearchText: Die Vorgänge enthalten das Schlüsselwort "{0}" in Vorgangs Id{1}. - ShowBusinessDetails: Geschäftsinformationen anzeigen + ShowBusinessDetails: Business Details caseNameNotAvailable: '[Kein Vorgangsname verfügbar]' defaultEmptyMessage: Keine Vorgänge verfügbar CustomIFrameWidget: @@ -1335,7 +1495,6 @@ Dialogs: CaseWidgetConfiguration: AddFilter: Filter hinzufügen ClientStatisticWidget: - IdNotFound: 'Chart Id not found with id: {0}' NoPermissionChartMessage: Sie haben nicht die erforderliche Berechtigung, um diese Karte zu sehen. DashboardImportDetails: FileInfomation: Dateiinformationen @@ -1431,13 +1590,13 @@ Labels: END_WITH: Endet mit EQUAL: Gleichberechtigt GREATER: Greater - GREATER_OR_EQUAL: Größer oder gleich + GREATER_OR_EQUAL: Greater or equal IN: Unter IS: Ist IS_NOT: Ist nicht LAST: In den letzten LESS: Less - LESS_OR_EQUAL: Kleiner oder gleich + LESS_OR_EQUAL: Less or equal NEXT: Innerhalb der nächsten NOT_BETWEEN: Nicht zwischen NOT_CONTAINS: Enthält nicht @@ -1449,7 +1608,7 @@ Labels: NO_CATEGORY: Keine Kategorie START_WITH: Beginnt mit TODAY: Heute - YESTERDAY: Gestern + YESTERDAY: Yesterday FilterPeriodType: DAY: Tag MONTH: Monat diff --git a/AxonIvyPortal/portal/cms/cms_en.yaml b/AxonIvyPortal/portal/cms/cms_en.yaml index 8e36b33b757..c581319d388 100644 --- a/AxonIvyPortal/portal/cms/cms_en.yaml +++ b/AxonIvyPortal/portal/cms/cms_en.yaml @@ -242,6 +242,7 @@ ch.ivy.addon.portalkit.ui.jsf: hideChangePasswordButtonNote: Set this variable to true to hide the "Change Password" option in the top menu and the "Forgotten Password" option on the login page. If set to false, these options will be shown. hideLogoutButtonNote: If true, the logout button on top menu will be hidden, otherwise it will be shown. hideRelatedCaseInfoFromHistory: If true, case history does not display the related case information in the history table. + hideStatisticWidget: Set to true to hide Statistic widget from homepage and application menu. hideSystemNotesFromHistory: If true, case/task note does not display any system notes for non-administrator users. hideSystemNotesFromHistoryAdministrator: If true, case/task note does not display any system notes for administrator. hideSystemTasksFromHistory: If true, case note does not display any system tasks for non-administrator users. @@ -260,6 +261,7 @@ ch.ivy.addon.portalkit.ui.jsf: showProcessInformation: Set to false to disable link to Show Information of process on Processes page (grid mode) and Case Details. showQuickGlobalSearch: For switch on/off the display of the quick global search. showTaskDurationTime: For switch on/off the display of the duration time in task details page. + statisticChartScalingInterval: Interval in seconds to do periodic statistic chart scaling requests. If the interval value is less than 10, periodic statistic chart scaling is disabled. uploadDocumentWhiteListExtensionNote: 'Leave value empty if you allow all extensions. If just allow some extensions, list out extensions here, separated by comma. Example: pdf, txt, doc, docx.' key: Key link: Link @@ -420,7 +422,6 @@ ch.ivy.addon.portalkit.ui.jsf: backgroundColor: Background color cancel: Cancel case: Case - caseCategory: Case category caseInformation: Case Information caseName: Case name categories: Categories @@ -649,6 +650,11 @@ ch.ivy.addon.portalkit.ui.jsf: titlePage: Password Validation processChain: currentStepIsNotDefined: Current step ({0}) of process chain is not defined + statisticWidget: + chartDeletionConfirmation: Are you sure you want to delete this statistic chart? + contextMenuDrilldown: Drilldown + contextMenuToCaseList: Go to case list + contextMenuToTaskList: Go to task list taskStart: cannotDelegateTaskMessage: This task cannot be delegated to any other user or group. cannotStartMessages: @@ -719,7 +725,14 @@ ch.ivy.addon.portalkit.ui.jsf: ShareThisDashboard: Share this dashboard StandardWidgets: Standard Widgets StatisticWidget: + AvailableCharts: Available statistics charts + Charts: 'Chart(s): {0}' + ConfigurationDescription: You can configure your widget in this configuration area. Please define the chart which will be shown on your dashboard. EmptyChartDataMessage: We do not have enough data to create a nice chart! + FilterChartText: Filter a chart by name + PlaceholderChartOption: Select a chart + PleaseSelectChart: Please select a chart + PreviewText: Please select a chart to see the canvas data WelcomeWidgetIntroduction: This widget displays a welcome text and image on dashboard. WelcomeWidgetNotFoundMessage: We cannot find the image of widget, please reconfigure your image! WidgetFilterName: Widget filter name @@ -863,6 +876,7 @@ ch.ivy.addon.portalkit.ui.jsf: yourNotifications: Your Notifications yourProcessViewer: Your Process Viewer yourProcesses: Your Processes + yourStatistics: Your Statistics yourTasks: Your Tasks documentFiles: deleteDocumentNote: '{0} has deleted {1}' @@ -1060,8 +1074,154 @@ ch.ivy.addon.portalkit.ui.jsf: process: Process searchResults: Search Results searchResultsFor: '{0} search results for "{1}"' - sidestep: - addAdhocTask: Add Ad-hoc Task + statistic: + chart: + ExpandOrCollapseColumn: Expand/Collapse Columns + addChart: Add new chart + addChartDialogHeader: Add statistic chart to dashboard + backToDashboard: Back to dashboard + barchart: + Percentage: Percentage + daysOfWeek: + friday: Friday + monday: Monday + saturday: Saturday + sunday: Sunday + thursday: Thursday + tuesday: Tuesday + wednesday: Wednesday + expired: Expired + in2Days: In 2 days + in3Days: In 3 days + monthsOfYear: + April: April + August: August + December: December + February: February + January: January + July: July + June: June + March: March + May: May + November: November + October: October + September: September + today: Today + tomorrow: Tomorrow + weeksOfMonth: + fifthWeek: Fifth week + firstWeek: First week + fourthWeek: Fourth week + secondWeek: Second week + sixthWeek: Sixth week + thirdWeek: Third week + caseCategory: Case category + chartCreationSuccessDetailMsg: Chart with name {0} was created successfully + chartCreationSuccessTitle: Chart was created successfully + elapsedTime: Elapsed Time + elapsedTimeChart: + compareButton: Compare + compareRole: 'Compare Role:' + elapsedTimeInHours: Elapsed time in hours + noEntriesFound: No entries found with given criteria + taskCategory: Task category + withRole: 'With Role:' + emptystate: + defaultEmptyMessages: No statistic chart to display. + exception: + idNotFound: 'Chart Id not found with id: {0}' + noPermission: You do not have the permission to send this request! + expiryPeriod: Expiry period + loadingCharts: Please wait, charts are loading... + moveLeft: Move left + moveRight: Move right + notAllowedToCreateChart: You are not allowed to create a chart before clicking Apply Filters button + other: Others + restoreDefaultChart: If you proceed, you will loose all charts created by yourself. The standard settings will be applied. + second: sec + showAllCharts: Show all charts + statisticCarousel: Statistics Carousel + statistics: Statistics + taskByExpiry: + hour: (Hour) + thisMonth: This Month + thisWeek: This Week + thisYear: This Year + taskByPriority: + addToDashboardLink: Add to dashboard + exception: Exception + high: High + low: Low + normal: Normal + taskExpiry: Task expiry + chartInfo: + chartDetailsHeader: Chart Details + chartName: Chart Name + chartType: Chart Type + name: Chart info + chartType: + caseByFinishedTask: Processed cases in time period + caseByFinishedTaskDescription: Cases where a task was finished in the selected time period + caseByFinishedTime: Done cases in time period + caseByFinishedTimeDescription: Cases which are done in the selected time period + caseByState: Case by state + casesByCategory: Cases by category + elapsedTimeByCaseCategory: Elapsed time of done cases + elapsedTimeByCaseCategoryDescription: Elapsed time of finished cases by category + taskByExpiry: Task by expiry + taskByPriority: Task by priority + defaultChart: + newChart: New chart + tasksByPriority: Tasks by Priority + filter: + affectedCharts: Affected charts + allSelected: All + caseCategoriesLabel: Case Categories + caseCategoryFilterDescription: You can find all available case categories here. Only selected Case Categories are considered in the affected charts. + caseStateFilterDescription: Only selected States are considered in the affected charts. + filter: Filters + noRoles: There are no roles + noSelectionCustomVarChar: No selection. + noneSelected: None + roleFilterDescription: You can find all available process roles here. Only selected roles are considered in the affected charts + rolesLabel: Roles + selectAll: Select All + taskPrioritiesLabel: Task Priorities + taskPriorityFilterDescription: Tasks can be selected depending on their priority. + timePeriod: Time period + timePeriodFilterDescription: Restricts the time period for cases and tasks. + workflowStatesLabel: Workflow States + taskAnalysis: + applyFilter: Apply filters + caseCategory: Case category + caseCreator: Case creator + caseDescription: Case description + caseFilter: Case filters + caseID: Case ID + caseName: Case name + caseOwner: Case owner + caseState: Case state + downloadZipFileExplanation: The number of tasks to export exceeds the limit of Excel rows. Therefore, data will be split to multiple Excel files, then compressed in a Zip file to download. + taskAnalysis: Task Analysis + taskCategory: Task category + taskCreationTime: Task created + taskDescription: Task description + taskExpiryTime: Task expiry + taskFilter: Task filters + taskFinishedTime: Task completed on + taskID: Task ID + taskPriority: Task priority + taskResponsible: Task responsible + taskState: Task state + taskWorker: Task editor + waitingDownloadMessage: We are creating the Export, this can take a few minutes + timePeriod: + custom: Custom + last6Month: Last 6 month + lastMonth: Last month + lastWeek: Last week + validationErrors: + nameIsExisted: A chart with this name already exists taskActivator: assign: Assign cannotAssignTask: This task cannot be assigned to any other user or group. @@ -1336,7 +1496,6 @@ Dialogs: CaseWidgetConfiguration: AddFilter: Add filter ClientStatisticWidget: - IdNotFound: 'Chart Id not found with id: {0}' NoPermissionChartMessage: You do not have the required permission to see this chart. DashboardImportDetails: FileInfomation: File Infomation diff --git a/AxonIvyPortal/portal/cms/cms_es.yaml b/AxonIvyPortal/portal/cms/cms_es.yaml index ff26912e4bf..001af6fe421 100644 --- a/AxonIvyPortal/portal/cms/cms_es.yaml +++ b/AxonIvyPortal/portal/cms/cms_es.yaml @@ -1,26 +1,11 @@ -Categories: - AdhocExpressTasks: - name: Tareas Adhoc de Express - CreateExpressWorkflow: - name: Crear Express Workflow - ExpressWorkflow: - name: Flujo de trabajo exprés ch.ivy.addon.portal.generic: CaseDetailsTemplate: noCaseId: No hay ID de caso especificado requestTabTitle: Solicitud statusTabTitle: Información del caso OpenTaskTemplate: - adhocHistory: Historial del proceso AdHoc - adhocHistoryTooltip: Mostrar historial del proceso AdHoc browserTabClosingWarning: Puede perder su trabajo en progreso. ¿Quiere continuar? - goToAdhocWarning: Puede perder su trabajo en progreso e iniciar el proceso Ad-hoc. ¿Quiere continuar? goToSidestepWarning: Sus modificaciones actuales no se guardarán cuando se inicie un proceso de paso lateral directamente desde una tarea. ¿Quiere continuar? - noteOfResultFromAdhocProcess: 'Nota: podrá encontrar este historial también en el historial del caso.' - reCreateAdhocWarning: Ya existe un proceso AdHoc para esta tarea. ¿Desea crear un proceso nuevo? - resultFromAdhocProcess: Resultados del proceso AdHoc - startAdHoc: Comenzar Adhoc - startAdHocTooltip: Redirija este proceso usando pasos ad-hoc PortalName: PortalName: Portal ch.ivy.addon.portalkit.ui.jsf: @@ -111,7 +96,6 @@ ch.ivy.addon.portalkit.ui.jsf: BY_CUSTOM_ORDER: Pedido personalizado BY_INDEX: Índice de clasificación ProcessType: - EXPRESS_PROCESS: Flujo de trabajo exprés EXTERNAL_LINK: Link externo IVY_PROCESS: Proceso de negocio ProcessWidgetMode: @@ -253,7 +237,6 @@ ch.ivy.addon.portalkit.ui.jsf: enableProcessViewer: Defina esta propiedad como true para habilitar la opción de visor de procesos en las acciones de Tarea/Caso enableScriptCheckingForUploadedDocumentNote: 'Cambiar a "True" para activar el control de anexos permitidos. De momento se pueden controlar archivos en PDF, word y excel. ' enableVirusScannerForUploadedDocumentNote: Cambiar a "true" para habilitar el escáner de virus para el documento cargado. Actualmente esta función utiliza la API VIRUSTOTAL. - expressEndPageNote: Mostrar la página de final de flujo de trabajo express propia. hideCaseCreator: |- Establecer a true para ocultar el creador de casos en la lista de casos, widget de casos y detalles de casos. Este ajuste afecta a todas las consultas de casos, por ejemplo, para la lista de casos, la búsqueda global o la estadística. @@ -261,6 +244,7 @@ ch.ivy.addon.portalkit.ui.jsf: hideChangePasswordButtonNote: Establezca esta variable a true para ocultar la opción "Cambiar contraseña" en el menú superior y la opción "Contraseña olvidada" en la página de inicio de sesión. Si se establece en false, estas opciones se mostrarán. hideLogoutButtonNote: Cambiar a "true" para ocultar la opción de logout. hideRelatedCaseInfoFromHistory: Si es verdadero, el historial de casos no muestra la información de los casos relacionados en la tabla de historial. + hideStatisticWidget: Cambiar a "true" para ocultar la estadística de la página principal y del menu lateral hideSystemNotesFromHistory: Si esto es cierto, no se muestran notas del sistema para los usuarios en las notas de tarea/tarea. hideSystemNotesFromHistoryAdministrator: Si esto es cierto, no se muestran notas de sistema para los administradores en las notas de tarea/tarea. hideSystemTasksFromHistory: Cambiar a "true" para ocultar notas técnicas del historial de tareas del caso para usuarios @@ -279,6 +263,7 @@ ch.ivy.addon.portalkit.ui.jsf: showProcessInformation: Cambiar a falso para desactivar el enlace "Más información" en la página de Procesos (modo cuadrícula) y Detalles del caso. showQuickGlobalSearch: Para activar/desactivar la visualización de la búsqueda global rápida. showTaskDurationTime: Activar o desactivar la visibilidad de la duración de la tarea en detalles de tarea. + statisticChartScalingInterval: Intervalo en segundos para realizar peticiones periódicas de escalado de gráficos estadísticos. Si el valor del intervalo es inferior a 10, se desactiva el escalado periódico de gráficos estadísticos. uploadDocumentWhiteListExtensionNote: 'Dejar libre, sie quiere permitir todos los anexos. Si quiere reducir los formatos permitidos, cree una lista separada por coma. Por ejemplo: pdf, txt, doc, docx.' key: Llave link: Enlazar @@ -429,7 +414,6 @@ ch.ivy.addon.portalkit.ui.jsf: add: Añadir addDocument: Agregar documento addNote: Agregar nota - adhoc: Adhoc allCategories: Todas las categorias allowPng: Solo se permiten los tipos png apply: Aplicar @@ -440,7 +424,6 @@ ch.ivy.addon.portalkit.ui.jsf: backgroundColor: Color de fondo cancel: Cancelar case: Caso - caseCategory: Categoría de caso caseInformation: Informaciones del caso caseName: Nombre del caso categories: Categorias @@ -652,45 +635,6 @@ ch.ivy.addon.portalkit.ui.jsf: noUser: No hay usuarios tooltipHelper: Click para ver todos los usuarios que tienen este rol de forma directa o indirecta userOfRoleTitle: 'Usuarios del rol {0} ' - expressManagement: - deployButton: Desplegar - deployMessage: Desplegando procesos - exportExpress: Export Express - exportExpressProcessTitle: 'Exportar procesos Express ' - expressExportName: AXONIVY_Dataset_ExpressWorkflow_{0}.json - expressManagement: Gestionar Express - expressMessages: - deployErrorLog: Error durante el despliegue {0} - deploymentFinishedLog: Proceso(s) del archivo {0} han sido desplegados con éxito en {1}ms - endDeployLog: Despliegue Express finalizado - invalidVersionLog: Versión de Express {0} no apoyada - process: - duplicateProcessNameLog: Nombre de proceso duplicado {0} - installProcessFailedLog: Error al desplegar proceso {0} - installProcessFinishedLog: Instalación de proceso {0} con éxito. - installedProcessLog: Procesos instalados {0} - startDeployProcessLog: Comienzo de la instalación del proceso {0} - startDeployLog: Empezando el despliegue de los procesos del documento {0} - status: - error: Error - failed: Error - info: Info - successful: Éxito - warning: Atención - validate: - validateExpressVersion: La variable "Version Express" no ha sido encontrada. Por favor contacte a su administrador. - validateProcessCoOwnerLog: '- Validación del copropietario del proceso {0}. Usuario {1} no existe en el sistema' - validateProcessOwnerLog: '- Validación del propietario del proceso {0}. Usuario {1} no existe en el sistema. Cambie el propietario a {2}' - validateProcessPermissionLog: '- Validación del permiso para el proceso {0}. Usuario {1} no existe en el sistema' - validateTaskDefUserLog: '- Validación del responsable de tarea {0}. Usuario {1} no existe en el sistema' - versionLog: 'Versión de Express: {0}' - fileEmptyMessage: Archivo está vacío - importDialogHeaderTitle: Seleccione un archivo de procesos Express. El formato tiene que ser JSON. - importExpress: Importar Express - importExpressProcessTitle: Importar procesos Express - importHeaderTitle: 'Lista de procesos Express será exportada:' - processCount: proceso(s) - waitingMessage: Coleccionando datos… passwordValidation: criteria: Criterios enablePasswordValidation: Activar la validación de contraseñas @@ -703,6 +647,11 @@ ch.ivy.addon.portalkit.ui.jsf: titlePage: Validación de contraseñas processChain: currentStepIsNotDefined: El paso ({0}) de la cadena de proceso no está definido + statisticWidget: + chartDeletionConfirmation: ¿Seguro que quiere eliminar esta tabla de estadísticas? + contextMenuDrilldown: Drilldown + contextMenuToCaseList: Ir a la lista de casos + contextMenuToTaskList: Ir a la lista de tareas taskStart: cannotDelegateTaskMessage: Esta tarea no se puede delegar a ningún otro usuario o grupo. cannotStartMessages: @@ -773,7 +722,14 @@ ch.ivy.addon.portalkit.ui.jsf: ShareThisDashboard: Comparte este panel StandardWidgets: Widgets estándar StatisticWidget: + AvailableCharts: Gráficos estadísticos disponibles + Charts: 'Gráfico(s): {0}' + ConfigurationDescription: Puede configurar su widget en esta área de configuración. Por favor, defina el gráfico que se mostrará en su panel de control. EmptyChartDataMessage: No tenemos suficientes datos para crear un buen gráfico. + FilterChartText: Filtrar un gráfico por nombre + PlaceholderChartOption: Seleccione un gráfico + PleaseSelectChart: Seleccione un gráfico + PreviewText: Seleccione un gráfico para ver los datos del lienzo WelcomeWidgetIntroduction: Este widget muestra un texto y una imagen de bienvenida en el panel de control. WelcomeWidgetNotFoundMessage: No podemos encontrar la imagen del widget, por favor reconfigure su imagen. WidgetFilterName: Nombre del filtro del widget @@ -917,6 +873,7 @@ ch.ivy.addon.portalkit.ui.jsf: yourNotifications: Sus notificaciones yourProcessViewer: Su visor de procesos yourProcesses: Sus procesos + yourStatistics: Sus estadísticas yourTasks: Sus tareas documentFiles: deleteDocumentNote: '{0} ha eliminado {1}' @@ -958,6 +915,7 @@ ch.ivy.addon.portalkit.ui.jsf: processElementId: ID del elemento del proceso stackTrace: Conjunto de trazas forgotPassword: + EmailAddress: Dirección de E-Mail empty: Vacío forgotPassword: Olvidé mi contraseña forgotPasswordError: Ha habido un error mientras se procesaba su solicitud. Por favor inténtelo más tarde. @@ -1066,7 +1024,6 @@ ch.ivy.addon.portalkit.ui.jsf: addNewProcess: Agregar nuevo proceso addNewProcessDialogHeader: Agregar nuevo proceso de usuario backToOverview: De regreso a la visión general - deleteExpressWorkflowTooltip: Eliminar Express Workflow deleteExternalLinkTooltip: Borrar enlace externo deleteProcess: Eliminar proceso deleteProcessItemConfirmation: ¿Seguro que quiere eliminar el siguiente proceso? @@ -1077,9 +1034,7 @@ ch.ivy.addon.portalkit.ui.jsf: dialogEditInfoTitle: '{0} Información' dialogHeaderDescription: Aqui puede configurar parámetros relacionados con el proceso seleccionado. dialogHeaderTitle: Editar información para {0} - editExpressWorkflowTooltip: Editar Express Workflow editProcesses: Editar procesos - expressWorkflow: Workflow Express externalLink: Enlace externo externalLinkVisibility: Visibilidad goTo: 'Ir a:' @@ -1116,8 +1071,157 @@ ch.ivy.addon.portalkit.ui.jsf: process: Proceso searchResults: Resultados de la búsqueda searchResultsFor: '{0} resultados de búsqueda para "{1}"' - sidestep: - addAdhocTask: Añadir tarea Ad-hoc + statistic: + chart: + ExpandOrCollapseColumn: Abrir/Cerrar columnas + addChart: Agregar nueva grafica + addChartDialogHeader: Agregar grafica estadística al tablero + backToDashboard: Regresar al tablero + barchart: + Percentage: Porcentaje + daysOfWeek: + friday: Viernes + monday: Lunes + saturday: Sábado + sunday: Domingo + thursday: Jueves + tuesday: Martes + wednesday: Miércoles + expired: Vencido + in2Days: En 2 días + in3Days: En 3 días + monthsOfYear: + April: Abril + August: Agosto + December: Diciembre + February: Febrero + January: Enero + July: Julio + June: Junio + March: Marzo + May: Mayo + November: Noviembre + October: Octubre + September: Septiembre + today: Hoy + tomorrow: Mañana + weeksOfMonth: + fifthWeek: Quinta semana + firstWeek: Primera semana + fourthWeek: Cuarta semana + secondWeek: Segunda semana + sixthWeek: Sexta semana + thirdWeek: Tercera semana + caseCategory: Categoría de caso + chartCreationSuccessDetailMsg: El gráfico con el nombre {0} se creó con éxito + chartCreationSuccessTitle: El gráfico fue creado con éxito + elapsedTime: Tiempo transcurrido + elapsedTimeChart: + compareButton: Comparar + compareRole: 'Comparar el rol:' + elapsedTimeInHours: Tiempo transcurrido en horas + noEntriesFound: No se encontraron entradas con los criterios dados + taskCategory: Categoría de tarea + withRole: 'Con Rol:' + emptystate: + defaultEmptyMessages: No hay tabla de estadísticas para mostrar. + exception: + idNotFound: 'Chart Id not found with id: {0}' + noPermission: You do not have the permission to send this request! + expiryPeriod: Período de caducidad + loadingCharts: Por favor espere, los diagramas se están cargando + moveLeft: Muévete a la izquierda + moveRight: Muévete a la derecha + notAllowedToCreateChart: Ha cambiado los filtros aplicados. Por favor aplique los filtros. + other: Otros + restoreDefaultChart: Si continúa, todos los diagramas hechos por usted serán borrados. Los valores iniciales serán reestablecidos. + second: segundo + showAllCharts: Mostrar todas las estadísticas + statisticCarousel: Tiovivo de estadísticas + statistics: Estadísticas + taskByExpiry: + hour: (Hora) + thisMonth: Este mes + thisWeek: Esta semana + thisYear: Este año + taskByPriority: + addToDashboardLink: Agregar al tablero + exception: Excepción + high: Alto + low: Bajo + normal: Normal + taskExpiry: Vencimiento de tareas + chartInfo: + chartDetailsHeader: Detalles del gráfico + chartName: Nombre del gráfico + chartType: Tipo de gráfico + name: Información gráfica + chartType: + caseByFinishedTask: Caso por Tarea Terminada + caseByFinishedTaskDescription: Casos en los que al menos una tarea ha sido finalizada en el tiempo seleccionado + caseByFinishedTime: Caso por tiempo finalizado + caseByFinishedTimeDescription: Casos terminados en el periodo de tiempo seleccionado + caseByState: Caso por estado + casesByCategory: Casos por categoría + elapsedTimeByCaseCategory: Tiempo transcurrido por categoría de caso + elapsedTimeByCaseCategoryDescription: Tiempo de duración para casos terminados por categoría + taskByExpiry: Tarea por vencimiento + taskByPriority: Tarea por prioridad + defaultChart: + newChart: Diagrama nuevo + tasksByPriority: Tareas por prioridad + filter: + affectedCharts: Diagramas afectados + allSelected: Todos + caseCategoriesLabel: Categorías de casos + caseCategoryFilterDescription: Puede encontrar todos las categorias disponibles aqui. Solo las categorías seleccionadas serán consideradas en los diagramas creados + caseStateFilterDescription: Solo los estados seleccionados serán considerados en los diagramas + filter: Filtros + noRoles: No hay Roles + noSelectionCustomVarChar: Sin selección + noneSelected: Ninguno + roleFilterDescription: Puede encontra todos los roles disponibles aquí. Solo los roles seleccionados serán considerados en los diagramas + rolesLabel: Roles + selectAll: Seleccionar todo + taskPrioritiesLabel: Prioridades de tareas + taskPriorityFilterDescription: Puede filtrar tareas por prioridad. + timePeriod: Periodo de tiempo + timePeriodFilterDescription: Restringir el periodo de tiempo para casos y tareas + workflowStatesLabel: Estados de flujo de trabajo + taskAnalysis: + applyFilter: Aplicar filtros + caseCategory: Categoría de caso + caseCreator: Creador del caso + caseDescription: Descripción del caso + caseFilter: Filtros del caso + caseID: ID del caso + caseName: Nombre del caso + caseOwner: Propietario del caso + caseState: Estado del caso + downloadZipFileExplanation: |- + El número de tareas excede el Límite de Excel. Por ello se crearán varios archivos y se comprimirán en un archivo Zip. + + El número de tareas excede el Límite de Excel. Por ello se crearán varios archivos y se comprimirán en un archivo Zip. + taskAnalysis: Análisis de tareas + taskCategory: Categoría de la tarea + taskCreationTime: Tarea creada + taskDescription: Descripción de la tarea + taskExpiryTime: Fecha de expiración de la tarea + taskFilter: Filtros de tareas + taskFinishedTime: Tarea completada + taskID: ID de la tarea + taskPriority: Prioridad de tarea + taskResponsible: Resonsable de tarea + taskState: Estado de tarea + taskWorker: Editor de tareas + waitingDownloadMessage: 'Estamos creando su exporte, esto puede tardar unos minutos. ' + timePeriod: + custom: Personalizado + last6Month: Último 6 meses + lastMonth: El mes pasado + lastWeek: La semana pasada + validationErrors: + nameIsExisted: Ya existe una tabla con este nombre taskActivator: assign: Asignar cannotAssignTask: Esta tarea no puede ser asignada a otro usuario o grupo. @@ -1162,7 +1266,6 @@ ch.ivy.addon.portalkit.ui.jsf: expiry: Expiración failedDelayValidation: La marca de tiempo del retraso de la tarea no puede ser un valor vacío o un formato de fecha inválido failedExpiryValidation: La fecha de vencimiento de la tarea no puede estar en el pasado. - noAdhoc: Proceso AdHoc no disponible noDescription: Sin descripción noNotes: Sin notas processingTime: Tiempo de procesado @@ -1314,60 +1417,13 @@ Dialogs: CaseDescription: Editar un flujo de trabajo existente CaseName: Editar flujo de trabajo Tasks: - CreateWorkflow: - TaskDescription: Flujo de trabajo ha sido creado - TaskName: Flujo de trabajo ha sido creado - EditWorkflow: - TaskDescription: Un flujo de trabajo ha sido editado - TaskName: Flujo de trabajo editado - FinalReview: - TaskName: Control final - FinalWorkflowTask: - taskDescription: ¡El flujo de trabajo {0} ha sido {1}! - FormDefinition: - TaskDescription: ¡Por favor define el formulario! - TaskName: ¡Creación de formulario! - ProcessLoaded: - TaskName: Tarea para configurar el proceso Adhoc - SaveWorkflow: - TaskName: El flujo de trabajo express en tramitación TaskDetail: DataDescription: Datos y Descripción restoreToDefaultSettings: 'Restablecer la configuración por defecto ' switchToEditMode: Editar switchToViewMode: Guardar - WorkflowProperties: - TaskDescription: ¡Por favor configure las propiedades del flujo de trabajo! - TaskName: Propiedades del flujo de trabajo - WorkflowExecution: - ApprovalForm: - Approve: Aprobar - ApproveComment: Aprobar - CommentLabel: Comentario del aprobador - FieldSetApplicant: Solicitante - FieldSetForm: Formulario - FinishedTasks: Tareas terminadas - Fullname: Nombre completo - Reject: Rechazar - RejectComment: Rechazar - FinalReviewForm: - approvalStatus: Estado del aprobado - approver: Aprovador - noticed: Verificado - FinishedTasksForm: - Applicant: Solicitante - ApprovalResult: Estado del aprobado - FinishedTasks: Tareas terminadas - FormDetails: Detalles del formulario - UserTaskForm: - ApprovalResult: - Approved: Aprobado - Rejected: Rechazado - Formular: Formulario agileBPM: - TooltipForOriginalTask: Su tarea actual volverá a evaluarse cuando estén completados los flujos de trabajo ad hoc previos. define_WF: - AdhocWorkflowTasks: Tareas del flujo de trabajo ErrorSelectInvalidAssignee: El destinatario ya está seleccionado o es inválido ListOfSelectedUser: Lista de usuarios seleccionados ResponsibleDialogHeader: Usuarios responsables @@ -1384,14 +1440,6 @@ Dialogs: ch: ivy: addon: - express: - generic: - endpage: - subtitle: La última tarea se completó con éxito. - title: ¡Tarea completada con éxito! - expressNoItem: Aún no se ha completado ninguna Tarea Express - expressNoItemDescription: Aquí se mostrarán los resultados de las tareas completadas - expressWorkflowName: 'Detalles de negocio del caso #{0}' portal: generic: GlobalSearch: @@ -1422,7 +1470,7 @@ Dialogs: CaseOwner: Responsable del proceso Finished: Terminado GlobalSearchText: Los casos contienen la palabra clave "{0}" en ID del caso{1}. - ShowBusinessDetails: Detalles del negocio + ShowBusinessDetails: detalles del negocio caseNameNotAvailable: '[Nombre del caso no disponible]' defaultEmptyMessage: No hay casos CustomIFrameWidget: @@ -1443,13 +1491,12 @@ Dialogs: component: ShareLinkDialog: CopyLink: Copiar enlace - LinkCopied: ¡Enlace copiado + LinkCopied: Enlace copiado dashboard: component: CaseWidgetConfiguration: AddFilter: Añadir filtro ClientStatisticWidget: - IdNotFound: 'Chart Id not found with id: {0}' NoPermissionChartMessage: No tiene permiso para ver este gráfico. DashboardImportDetails: FileInfomation: Informacion del archivo @@ -1502,104 +1549,7 @@ Dialogs: invalidFileMessage: Tipo de archivo no permitido invalidSizeMessage: ¡El archivo es muy grande! maximumFileUploadElement: Ya existe un elemento de subir documentos - workflowCreation: - AdhocProcessName: Proceso adHoc para la tarea {0} - {1} - FormDefinition: - AddCheckboxField: Agregar nuevo campo - AddOptionboxField: Anexar nueva opción - AllowedFiletypes: Tipos de Archivo permitidos - BroadFooterArea: Pie de pagina amplio - BroadHeaderArea: Encabezado amplio - CheckboxFields: Campos de casillas de verificación - CreateField: Crear - DataProvider: Proveedor de datos - DragAndDropTooltip: Arrastre y suelte los elementos disponibles al encabezado, columna de la izquierda o de la derecha o al pie de página - ElementLabel: Etiqueta - ElementName: Nombre del elemento - Email: - Attachment: Anexo - EmailAddress: Dirección de E-Mail - EmailText: Texto de E-Mail - ResponseTo: Respuesta a - Subject: Asunto - ExecuteWorkflow: Ejecutar flujo de trabajo directamente - ExecuteWorkflowWarning: Tiene que procesar todas las tareas antes de poder ejecutar este processo - FieldSetAvailableFormelements: Elementos del formulario - FieldSetFormelements: Crear elementos de formulario - FieldSetFormelementsPlacing: Ubicación de elementos de formulario - FieldSetPreviewArea: Vista previa del formulario definido - FinishWorkflow: Fin del flujo de trabajo - InputArea: Área de entrada - InputCheckbox: Casilla de verificación - InputField: Campo de entrada - InputFileUpload: Carga de archivo - InputOptions: Botón Radial - InputType: Tipo de Entrada - InputTypes: - DateSelection: Seleccionador de Fecha - NumberField: Campo de numero - TextBox: Campo de texto - LeftColumn: Columna izquierda - NoCheckboxFieldYet: No hay campos de verificación definidos todavía - NoDataProvider: Proveedor de datos - NoFormelementsAvailable: ¡No hay elementos de formulario disponibles! - NoOptionboxFieldsYet: No hay tipos de casillas de verificación definidos todavía - NumberOfFiles: Numero de archivos - NumberOfRows: Numero de filas - OptionboxFields: Botones Radiales - OptionboxPlaceholder: Opción - Preview: Vista previa - RightColumn: Columna derecha - SaveWorkflow: Guardar Flujo de trabajo - UploadFileFormat: - Excel: Excel (xls/xlsx) - OtherFormats: Otros formatos de archivo - PDF: PDF (pdf) - Word: Word (doc/docx) - cancelCreateForm: 'Seguro que quiere cancelar? Perderá todos los datos. ' - otherFiletype: Otros tipos de archivos - ProcessName: Crear Flujo de Trabajo Express - TaskType: - Approval: Aprobado - Email: E-Mail de información - Review: Comprobación - UserTask: Tarea - UserTaskWithEmail: 'Tarea con E-Mail ' - WorkflowDefinition: - AbleToStart: Permiso de ejecución - AddProcessStep: Agregar paso de proceso - ChooseAssignee: - AddUserOrRole: 'Selecione un grupo o usuario porfavor:' - SelectedAssigneesFieldSet: Usuarios seleccionados - UserTooltip: Usuario - DefaultTemplateDescription: Abajo verá el patrón estandard - DeleteProcessStep: Retirar paso del proceso - Description: Describa su proceso - DueTimeInDays: Expiración en días - EndStep: Terminar - FormDefinitionStep: Definición de formulario - ProcessNameExists: Este nombre para el flujo de trabajo ya ha sido seleccionado - ProcessOwner: Responsable del proceso - Processdescription: Descripción de proceso - Processdetails: Propiedades del proceso - Processflow: Flujo de proceso - Processstep: Paso del proceso - Processtype: Tipo de proceso - ProcesstypeAdHoc: Una vez - ProcesstypeRepeating: Recurrente - TaskType: Tipo de tarea - UntilDaysTooltip: Después de la fecha de caducidad, esta tarea será asignada al grupo "todos" y su prioridad será alta - UserInterface: - ChangeSettingWarning: Todas las tareas definidas serán borradas, desea proceder? - CreateOwn: Crear propia - UseDefault: Usar patrón estandard - UserInterface: Interfaz de usuario - WorkflowPropertiesStep: Propiedades del flujo de trabajo - requiredMsgs: - ReqMsgGeneric: ¡Es un campo requerido! - processStep: Paso del proceso Labels: - AdhocWorkflow: Describe tu Flujo de Trabajo AppendTask-Explain: La tarea es añadida a la secuencia después de mi tarea. AppendTheTask: Anexar la tarea CreateNewDashboard: Crear un nuevo cuadro de mandos @@ -1642,13 +1592,13 @@ Labels: END_WITH: Termina con EQUAL: Igualdad GREATER: Greater - GREATER_OR_EQUAL: Mayor o igual + GREATER_OR_EQUAL: Greater or equal IN: En IS: Es IS_NOT: No es LAST: En los últimos LESS: Less - LESS_OR_EQUAL: Menor o igual + LESS_OR_EQUAL: Less or equal NEXT: En los próximos NOT_BETWEEN: No entre NOT_CONTAINS: No contiene @@ -1697,9 +1647,7 @@ Labels: TaskUser-Explain: Lista de usuario separados por coma ToggleMenu: Menú alternativo ViewAllResults: Ver todos los resultados - adhocTaskRequired: Deberá agregar al menos una tarea. disabledUserPrefix: (inactivo) - title: Flujo de trabajo Ad-hoc de auto servicio patterns: datePattern: dd.MM.yyyy dateTimePattern: dd.MM.yyyy HH:mm @@ -1729,18 +1677,7 @@ Processes: SynchronizeServerConfigurationCaseName: Sincronizar configuración del servidor portalHome: Portal Principal portalSettingSaved: Ajustes del portal guardados -ProcessPages: - selfServiceAdhocProcess: Auto servicio Axon Ivy - selfServiceDescription: 'Proceso de auto servicio: Lanzar un flujo de trabajo ad-hoc basado en un patrón de flujo predefinido' Texts: - Adhoc-Explain: |+ -

    - - Introduzca sus comentarios y presione Enviar para proceder al flujo de trabajo. - -

    - - AdhocWF-Explain: "

    \n\nDefinir y lanzar un flujo de trabajo es muy sencillo: seleccione un patrón de flujo, agregue algunas tareas y empieze el flujo de trabajo. \n\n

    \n\n

    \n\n\n\n

    \n\n" Approval-Explain: |+

    diff --git a/AxonIvyPortal/portal/cms/cms_fr.yaml b/AxonIvyPortal/portal/cms/cms_fr.yaml index 4fe4a3ffa1b..dbf70b270e2 100644 --- a/AxonIvyPortal/portal/cms/cms_fr.yaml +++ b/AxonIvyPortal/portal/cms/cms_fr.yaml @@ -1,26 +1,11 @@ -Categories: - AdhocExpressTasks: - name: Tâches Adhoc Express - CreateExpressWorkflow: - name: Créer un workflow express - ExpressWorkflow: - name: Flux de travail express ch.ivy.addon.portal.generic: CaseDetailsTemplate: noCaseId: Aucun numéro de dossier n'a été indiqué requestTabTitle: Demande statusTabTitle: Informations sur le dossier OpenTaskTemplate: - adhocHistory: l'historique adhoc - adhocHistoryTooltip: Afficher l'historique adhoc browserTabClosingWarning: Votre travail risque d'être perdu. Souhaitez-vous continuer ? - goToAdhocWarning: En démarrant un processus ad hoc, vos données non sauvegardées seront perdues. Voulez-vous continuer? goToSidestepWarning: En démarrant un processus sidestep, vos données non sauvegardées seront perdues. Voulez-vous continuer? - noteOfResultFromAdhocProcess: 'Remarque : Vous trouverez également toutes ces entrées dans l''historique du processus.' - reCreateAdhocWarning: Il existe déjà un processus ad hoc pour cette tâche, voulez-vous en créer un autre ? - resultFromAdhocProcess: Résultats du processus ad hoc - startAdHoc: Démarrer ad-hoc - startAdHocTooltip: Rediriger ce processus en ajoutant une étape ad hoc. PortalName: PortalName: Portal ch.ivy.addon.portalkit.ui.jsf: @@ -111,7 +96,6 @@ ch.ivy.addon.portalkit.ui.jsf: BY_CUSTOM_ORDER: Commande personnalisée BY_INDEX: Index de tri ProcessType: - EXPRESS_PROCESS: Flux de travail express EXTERNAL_LINK: Lien externe IVY_PROCESS: Processus d'entreprise ProcessWidgetMode: @@ -250,7 +234,6 @@ ch.ivy.addon.portalkit.ui.jsf: enableProcessViewer: Définissez cette propriété à true pour activer l'option de visualisation de processus dans les actions de Task/Case. enableScriptCheckingForUploadedDocumentNote: Défini sur true pour activer la vérification de script pour le document téléchargé. Actuellement, cette fonction prend en charge la vérification de PDF, Excel, Word. enableVirusScannerForUploadedDocumentNote: Définie sur true pour activer le scanner de virus pour le document téléchargé. Actuellement, cette fonction utilise l'API VIRUSTOTAL. - expressEndPageNote: Affiche la page de fin personnalisée à la fin de chaque processus Express. hideCaseCreator: |- La valeur "true" permet de masquer le créateur du dossier dans la liste des dossiers, le widget du dossier et les détails du dossier. Ce paramètre affecte toutes les requêtes de cas, par exemple pour la liste des cas, la recherche globale, les statistiques. @@ -258,6 +241,7 @@ ch.ivy.addon.portalkit.ui.jsf: hideChangePasswordButtonNote: Attribuez la valeur true à cette variable pour masquer l'option "Changer de mot de passe" dans le menu supérieur et l'option "Mot de passe oublié" sur la page de connexion. Si elle vaut false, ces options seront affichées. hideLogoutButtonNote: Si true, le bouton de déconnexion du menu supérieur sera masqué, sinon il sera affiché. hideRelatedCaseInfoFromHistory: Si la valeur est vraie, l'historique des cas n'affiche pas les informations relatives aux cas dans le tableau de l'historique. + hideStatisticWidget: Définissez la valeur sur "true" pour masquer le widget de statistiques de la page d'accueil et du menu de l'application. hideSystemNotesFromHistory: Si vrai, la remarque sur le cas/la tâche n'affiche aucune note de système pour les utilisateurs non administrateurs. hideSystemNotesFromHistoryAdministrator: Si vrai, la remarque sur le cas/la tâche n'affiche aucune note de système pour l'administrateur. hideSystemTasksFromHistory: Si vrai, la remarque sure le cas / de la tâche n'affiche aucune tâche du système pour les utilisateurs non administrateurs. @@ -276,6 +260,7 @@ ch.ivy.addon.portalkit.ui.jsf: showProcessInformation: Définissez la valeur false pour désactiver le lien vers l'option Afficher les informations du processus sur la page processus (mode grille) et détails du cas. showQuickGlobalSearch: Pour activer/désactiver l'affichage de la recherche globale rapide. showTaskDurationTime: Pour activer/désactiver l'affichage de la durée dans la page des détails de la tâche. + statisticChartScalingInterval: Intervalle en secondes pour effectuer les demandes de mise à l'échelle périodique des graphiques statistiques. Si la valeur de l'intervalle est inférieure à 10, la mise à l'échelle périodique des graphiques statistiques est désactivée. uploadDocumentWhiteListExtensionNote: 'Laissez la valeur vide si vous autorisez toutes les extensions. Si juste autoriser quelques extensions, listez les extensions ici, séparées par des virgules. Exemple: pdf, txt, doc, docx.' key: Clé link: Lien @@ -426,7 +411,6 @@ ch.ivy.addon.portalkit.ui.jsf: add: Ajouter addDocument: Ajouter un document addNote: Ajouter une note - adhoc: Adhoc allCategories: Toutes les catégories allowPng: Seulement les types .png autorisés apply: Utiliser @@ -437,7 +421,6 @@ ch.ivy.addon.portalkit.ui.jsf: backgroundColor: Couleur de fond cancel: Annuler case: Dossier - caseCategory: Catégorie des cas caseInformation: Information sur le cas caseName: Nom de cas categories: Catégories @@ -649,45 +632,6 @@ ch.ivy.addon.portalkit.ui.jsf: noUser: Il n'y a pas d'utilisateurs. tooltipHelper: Cliquez pour afficher tous les utilisateurs qui possèdent ce rôle directement ou indirectement userOfRoleTitle: Utilisateur du groupe {0} - expressManagement: - deployButton: Déployer - deployMessage: 'Déploiement des processus en cours ... ' - exportExpress: Export Express - exportExpressProcessTitle: Exporter des processus express - expressExportName: AXONIVY_Dataset_ExpressWorkflow_{0}.json - expressManagement: Gestion de l'express - expressMessages: - deployErrorLog: Erreur lors du déploiement {0} - deploymentFinishedLog: Processus du fichier {0} déployé avec succès dans Portal en {1}ms - endDeployLog: Déploiement Express terminé - invalidVersionLog: Version non supportée {0} d'Express - process: - duplicateProcessNameLog: '- Nom du processus dupliqué {0}' - installProcessFailedLog: '- Le déploiement du processus {0} a échoué' - installProcessFinishedLog: Installation du processus {0} réussie - installedProcessLog: Processus installé {0} - startDeployProcessLog: Commencer à déployer le processus {0} - startDeployLog: Commencez à déployer le(s) processus Express du fichier {0} vers Portal - status: - error: Erreur - failed: Echoué - info: Info - successful: Succès - warning: Attention - validate: - validateExpressVersion: Impossible de trouver la variable Express Version dans le système. Veuillez contacter votre administrateur. - validateProcessCoOwnerLog: '- Valider le processus Copropriétaire de {0}, l''utilisateur {1} n''est pas disponible dans le système' - validateProcessOwnerLog: '- Valider le propriétaire du processus de {0}, l''utilisateur {1} n''est pas disponible dans le système, changer le propriétaire du processus pour {2}.' - validateProcessPermissionLog: '- Valider la permission de processus de {0}, l''utilisateur {1} n''est pas disponible dans le système' - validateTaskDefUserLog: '- Valider les responsabilités de la définition de tâche de {0}, l''utilisateur {1} n''est pas disponible dans le système' - versionLog: 'Version de l''Express : {0}' - fileEmptyMessage: Le fichier est vide - importDialogHeaderTitle: Choisissez un Dataset de workflow Express, il doit s'agir d'un fichier JSON. - importExpress: Importation Express - importExpressProcessTitle: Importation de processus express - importHeaderTitle: 'La liste des processus Express sera exportée :' - processCount: processus(s) - waitingMessage: Les données sont recueillies … passwordValidation: criteria: Critères enablePasswordValidation: Activer la validation du mot de passe @@ -700,6 +644,11 @@ ch.ivy.addon.portalkit.ui.jsf: titlePage: Validation du mot de passe processChain: currentStepIsNotDefined: L'étape actuelle ({0}) de la chaîne de processus n'est pas définie + statisticWidget: + chartDeletionConfirmation: Êtes-vous sûr de vouloir supprimer cette statistique? + contextMenuDrilldown: Drilldown + contextMenuToCaseList: Aller à la liste des affaires + contextMenuToTaskList: Aller à la liste des tâches taskStart: cannotDelegateTaskMessage: Cette tâche ne peut pas être déléguée ä un autre utilisateur ou une autre groupe. cannotStartMessages: @@ -770,7 +719,14 @@ ch.ivy.addon.portalkit.ui.jsf: ShareThisDashboard: Partager ce tableau de bord StandardWidgets: Widgets standard StatisticWidget: + AvailableCharts: Graphiques de statistiques disponibles + Charts: 'Graphique(s) : {0}' + ConfigurationDescription: Vous pouvez configurer votre widget dans cette zone de configuration. Veuillez définir le graphique qui sera affiché sur votre tableau de bord. EmptyChartDataMessage: Nous n'avons pas assez de données pour créer un beau graphique ! + FilterChartText: Filtrer un graphique par nom + PlaceholderChartOption: Sélectionnez un graphique + PleaseSelectChart: Veuillez sélectionner un graphique + PreviewText: Veuillez sélectionner un graphique pour voir les données du canevas WelcomeWidgetIntroduction: Ce widget affiche un texte et une image de bienvenue sur le tableau de bord. WelcomeWidgetNotFoundMessage: Nous ne pouvons pas trouver l'image du widget, veuillez reconfigurer votre image ! WidgetFilterName: Nom du filtre du widget @@ -914,6 +870,7 @@ ch.ivy.addon.portalkit.ui.jsf: yourNotifications: Vos notifications yourProcessViewer: Votre visualisateur de processus yourProcesses: Vos processus + yourStatistics: Vos statistiques yourTasks: Vos tâches documentFiles: deleteDocumentNote: '{0} a supprimé(e) {1}' @@ -955,6 +912,7 @@ ch.ivy.addon.portalkit.ui.jsf: processElementId: Id de l'élément de processus stackTrace: StackTrace forgotPassword: + EmailAddress: Adresse e-mail empty: Vide forgotPassword: J'ai oublié mon mot de pas forgotPasswordError: Une erreur s'est produite lors du traitement de votre demande. Veuillez réessayer plus tard. @@ -1063,7 +1021,6 @@ ch.ivy.addon.portalkit.ui.jsf: addNewProcess: Ajouter un processus addNewProcessDialogHeader: Ajouter un nouveau processus utilisateur backToOverview: Retour à l'aperçu - deleteExpressWorkflowTooltip: Supprimer le Workflow Express deleteExternalLinkTooltip: Supprimer le lien externe deleteProcess: Supprimer processus deleteProcessItemConfirmation: Êtes-vous sûr de vouloir détruire le processus suivant ? @@ -1074,9 +1031,7 @@ ch.ivy.addon.portalkit.ui.jsf: dialogEditInfoTitle: '{0} Informations' dialogHeaderDescription: Dans cette zone, vous pouvez modifier certaines informations relatives au processus sélectionné. dialogHeaderTitle: Modifier les informations pour {0} - editExpressWorkflowTooltip: Modifier le Workflow Express editProcesses: Modifier des processus - expressWorkflow: Workflow Express externalLink: lien externe externalLinkVisibility: Visibilité goTo: 'Aller à:' @@ -1113,8 +1068,154 @@ ch.ivy.addon.portalkit.ui.jsf: process: Processus searchResults: Résultats de la recherche searchResultsFor: '{0} résultats pour "{1}"' - sidestep: - addAdhocTask: Ajouter une Ad-hoc tâche + statistic: + chart: + ExpandOrCollapseColumn: Agrandir/réduire les colonnes + addChart: Ajouter un nouveau diagramme + addChartDialogHeader: Ajouter un diagramme au tableau de bord + backToDashboard: Retour au tableau de bord + barchart: + Percentage: Pourcentage + daysOfWeek: + friday: Vendredi + monday: Lundi + saturday: samedi + sunday: dimanche + thursday: Jeudi + tuesday: Mardi + wednesday: Mercredi + expired: Expiré + in2Days: Dans 2 jours + in3Days: Dans 3 jours + monthsOfYear: + April: avril + August: août + December: décembre + February: février + January: janvier + July: juillet + June: juin + March: Mars + May: Mai + November: novembre + October: octobre + September: septembre + today: Aujourd'hui + tomorrow: Demain + weeksOfMonth: + fifthWeek: Cinquième semaine + firstWeek: Première semaine + fourthWeek: Quatrième semaine + secondWeek: Deuxième semaine + sixthWeek: Sixième semaine + thirdWeek: Troisième semaine + caseCategory: Catégorie des cas + chartCreationSuccessDetailMsg: Diagramme avec le nom {0} a été créé avec succès + chartCreationSuccessTitle: Diagramme a été créé avec succès + elapsedTime: Temps écoulé + elapsedTimeChart: + compareButton: Comparer + compareRole: Comparer les rôles + elapsedTimeInHours: Temps écoulé en heures + noEntriesFound: Aucun critère correspondant trouvé + taskCategory: Catégorie de tâche + withRole: 'Avec rôle:' + emptystate: + defaultEmptyMessages: Pas de diagrammes à afficher + exception: + idNotFound: 'Chart Id not found with id: {0}' + noPermission: You do not have the permission to send this request! + expiryPeriod: Période d'expiration + loadingCharts: Veuillez patienter, les graphiques sont en cours de chargement … + moveLeft: Déplacer vers la gauche + moveRight: Déplacer vers la droite + notAllowedToCreateChart: Vous n'êtes pas autorisé à créer un diagramme avant de cliquer sur le bouton Appliquer les filtres + other: Outres + restoreDefaultChart: Si vous continuez, vous perdrez tous les graphiques créés par vous-même. Les paramètres standard seront appliqués. + second: sec + showAllCharts: Voir tous les diagrammes + statisticCarousel: Carrousel de statistiques + statistics: Statistiques + taskByExpiry: + hour: (Heure) + thisMonth: Ce mois + thisWeek: Cette semaine + thisYear: Cette année + taskByPriority: + addToDashboardLink: Ajouter au tableau de bord + exception: Exception + high: Haute + low: Basse + normal: Normale + taskExpiry: Expiration de la tâche + chartInfo: + chartDetailsHeader: Détails du diagramme + chartName: Nom du diagramme + chartType: Type du diagramme + name: Infos graphiques + chartType: + caseByFinishedTask: Cas traités en période de temps + caseByFinishedTaskDescription: Cas où une tâche s'est terminée dans la période sélectionnée + caseByFinishedTime: Cas traités dans le temps + caseByFinishedTimeDescription: Cas qui se font dans la période sélectionnée + caseByState: Cas par état + casesByCategory: Affaires par catégorie + elapsedTimeByCaseCategory: Temps écoulé des cas accomplis + elapsedTimeByCaseCategoryDescription: Temps écoulé des cas finis par catégorie + taskByExpiry: Tâche par échéance + taskByPriority: Tâche par priorité + defaultChart: + newChart: Nouveau diagramme + tasksByPriority: Tãches par priorité + filter: + affectedCharts: Diagrammes concernés + allSelected: Tous + caseCategoriesLabel: Catégories de cas + caseCategoryFilterDescription: Vous pouvez trouver toutes les catégories de cas disponibles ici. Seules les catégories de cas sélectionnées sont prises en compte dans les diagrammes concernés. + caseStateFilterDescription: Seuls les états sélectionnés sont pris en compte dans les diagrammes concernés. + filter: Filtres + noRoles: Aucun rôle disponible + noSelectionCustomVarChar: Pas de choix. + noneSelected: Aucun + roleFilterDescription: Vous pouvez trouver tous les rôles de processus disponibles ici. Seuls les rôles sélectionnés sont pris en compte dans le diagramme concerné + rolesLabel: Rôle + selectAll: Tout sélectionner + taskPrioritiesLabel: Priorités de tâches + taskPriorityFilterDescription: Les tâches peuvent être sélectionnées en fonction de leur priorité. + timePeriod: Période de temps + timePeriodFilterDescription: Limite la période de temps pour les cas et les tâches. + workflowStatesLabel: État de flux de travail + taskAnalysis: + applyFilter: Appliquer les filtres + caseCategory: Catégorie de cas + caseCreator: Créateur de cas + caseDescription: Description du cas + caseFilter: Filtres de cas + caseID: ID de cas + caseName: Nom de cas + caseOwner: Propriétaire du cas + caseState: État du cas + downloadZipFileExplanation: Le nombre de tâches à exporter dépasse la limite des lignes Excel. Par conséquent, les données seront divisées en plusieurs fichiers Excel, puis compressées dans un fichier ZIP à télécharger. + taskAnalysis: Analyse des tâches + taskCategory: Catégorie de tâche + taskCreationTime: Tâche créée + taskDescription: Description de la tâche + taskExpiryTime: Expiration de la tâche + taskFilter: Filtres de la tâche + taskFinishedTime: Tâche terminée le + taskID: Id de tâche + taskPriority: Priorité de la tâche + taskResponsible: Tâche responsable + taskState: État de la tâche + taskWorker: Éditeur de tâche + waitingDownloadMessage: Nous créons l'export, cela peut prendre quelques minutes + timePeriod: + custom: Coutume + last6Month: Six derniers mois + lastMonth: Dernier Mois + lastWeek: Dernière semaine + validationErrors: + nameIsExisted: Un diagramme avec ce nom existe déjà taskActivator: assign: Assigner cannotAssignTask: Cette tâche ne peut être assignée à aucun autre utilisateur ou groupe. @@ -1159,7 +1260,6 @@ ch.ivy.addon.portalkit.ui.jsf: expiry: Expiration failedDelayValidation: L'horodatage du délai des tâches ne peut pas être une valeur vide ou un format de date non valide failedExpiryValidation: L'horodatage de l'expiration des tâches ne peut pas être dans le passé. - noAdhoc: Pas d'Adhoc disponible noDescription: Aucune description noNotes: Aucune note processingTime: Durée de traitement @@ -1311,60 +1411,13 @@ Dialogs: CaseDescription: Modifier un workflow existant CaseName: Modifier workflow Tasks: - CreateWorkflow: - TaskDescription: Le workflow a été créé - TaskName: Le workflow a été créé - EditWorkflow: - TaskDescription: Un processus a été modifié. - TaskName: Processus modifié - FinalReview: - TaskName: Finales chèques - FinalWorkflowTask: - taskDescription: Le workflow {0} a été terminé! - FormDefinition: - TaskDescription: Veuillez définir le formulaire ! - TaskName: Création du formulaire! - ProcessLoaded: - TaskName: Tâche pour la configuration Adhoc - SaveWorkflow: - TaskName: Création de workflow express en cours TaskDetail: DataDescription: Données et description restoreToDefaultSettings: Rétablir les paramètres par défaut switchToEditMode: Editer switchToViewMode: Enregistrer - WorkflowProperties: - TaskDescription: Veuillez configurer les propriétés du workflow ! - TaskName: Propriétés de workflow - WorkflowExecution: - ApprovalForm: - Approve: Approuver ! - ApproveComment: Approuver - CommentLabel: Commentaire de l'approbateur - FieldSetApplicant: Demandeur - FieldSetForm: Formulaire - FinishedTasks: Tâches finies - Fullname: Nom complet - Reject: Refuser ! - RejectComment: Refuser - FinalReviewForm: - approvalStatus: Statut d'approbation - approver: Approbateur - noticed: Prendre acte! - FinishedTasksForm: - Applicant: Demandeur - ApprovalResult: Résultat d'approbation - FinishedTasks: Tãches finies - FormDetails: Détails du formulaire - UserTaskForm: - ApprovalResult: - Approved: Approuvé - Rejected: Refusé - Formular: Formulaire agileBPM: - TooltipForOriginalTask: 'Votre tâche actuelle réapparaîtra dès que le workflow ad hoc sera terminé. ' define_WF: - AdhocWorkflowTasks: Tâches du workflow ErrorSelectInvalidAssignee: Le destinataire est déjà sélectionné ou invalide ListOfSelectedUser: Liste des utilisateurs sélectionnés ResponsibleDialogHeader: Utilisateurs responsables @@ -1381,14 +1434,6 @@ Dialogs: ch: ivy: addon: - express: - generic: - endpage: - subtitle: La dernière tâche a été accomplie avec succès - title: Tâche terminée avec succès! - expressNoItem: Pas de tâche Express terminée - expressNoItemDescription: Les résultats des tâches terminées sont affichés ici - expressWorkflowName: 'Détails de cas #{0}' portal: generic: GlobalSearch: @@ -1419,7 +1464,7 @@ Dialogs: CaseOwner: Responsable de processus Finished: Terminé GlobalSearchText: Les cas contiennent le mot-clé "{0}" dans Id du dossier{1}. - ShowBusinessDetails: Détails de l'entreprise + ShowBusinessDetails: Détails de la demande caseNameNotAvailable: '[Nom de cas pas disponible]' defaultEmptyMessage: Il n'y a pas de dossiers CustomIFrameWidget: @@ -1446,7 +1491,6 @@ Dialogs: CaseWidgetConfiguration: AddFilter: Ajouter un filtre ClientStatisticWidget: - IdNotFound: 'Chart Id not found with id: {0}' NoPermissionChartMessage: Vous n'avez pas l'autorisation requise pour consulter ce graphique. DashboardImportDetails: FileInfomation: Informations sur le fichier @@ -1499,104 +1543,7 @@ Dialogs: invalidFileMessage: Ce type de fichier n'est pas accepté! invalidSizeMessage: Le fichier est trop volumineux ! maximumFileUploadElement: Il existe déjà un élément de téléchargement de fichiers - workflowCreation: - AdhocProcessName: AdHoc processues pour tâche {0} - {1} - FormDefinition: - AddCheckboxField: Ajouter un nouveau champs - AddOptionboxField: Ajouter une nouvelle option - AllowedFiletypes: Types de fichier autorisés - BroadFooterArea: Zone de bas de page large - BroadHeaderArea: En-tête large - CheckboxFields: Champs de cases à cocher - CreateField: Créer - DataProvider: Fournisseur de données - DragAndDropTooltip: Veuillez placer les éléments disponibles par glisser/déposer dans l’en-tête, dans la colonne de droite ou en pied de page. - ElementLabel: Label - ElementName: Nom de l’élément - Email: - Attachment: Pièce jointe - EmailAddress: Adresse e-mail - EmailText: Texte d'email - ResponseTo: Réponse à - Subject: Sujet - ExecuteWorkflow: Lancer le workflow directement - ExecuteWorkflowWarning: Vous devez effectuer toutes les tâches avant de pouvoir exécuter ce workflow - FieldSetAvailableFormelements: Éléments de formulaire - FieldSetFormelements: Créer un élément de formulaire - FieldSetFormelementsPlacing: Placer les éléments de formulaire - FieldSetPreviewArea: Pré-visualiser le formulaire - FinishWorkflow: Fin de workflow - InputArea: Zone de texte - InputCheckbox: Case d’option à cocher - InputField: Champ de texte - InputFileUpload: Téléchargement de fichier - InputOptions: Bouton radio - InputType: Type d’entrée - InputTypes: - DateSelection: Calendrier - NumberField: Champ numérique - TextBox: Champ de texte - LeftColumn: Colonne de gauche - NoCheckboxFieldYet: Aucun type de champ de case d’option à cocher n’est pour l’instant défini - NoDataProvider: Fournisseur de données statiques spéciales - NoFormelementsAvailable: Aucun élément de formulaire n’est disponible ! - NoOptionboxFieldsYet: Aucun type de case d’’option à cocher n’est pour l’instant défini - NumberOfFiles: Nombre de fichiers - NumberOfRows: Nombre de lignes - OptionboxFields: Boutons radio - OptionboxPlaceholder: Option - Preview: Aperçu - RightColumn: Colonne de droite - SaveWorkflow: Sauvegarder le workflow - UploadFileFormat: - Excel: Excel (xls/xlsx) - OtherFormats: Autres formats de fichier - PDF: PDF (pdf) - Word: Word (doc/docx) - cancelCreateForm: Voulez-vous vraiment annuler? Toutes vos données seront perdues! - otherFiletype: Autres types de fichier - ProcessName: Créer un flux de travail Express - TaskType: - Approval: Approbation - Email: email d'information - Review: Revue - UserTask: Tâche - UserTaskWithEmail: Tâche avec email - WorkflowDefinition: - AbleToStart: Capable de commencer - AddProcessStep: Ajouter une étape de processus - ChooseAssignee: - AddUserOrRole: 'Veuillez sélectionner un groupe ou un utilisateur :' - SelectedAssigneesFieldSet: Cessionnaires sélectionnés - UserTooltip: Utilisateur - DefaultTemplateDescription: Voici le modèle par défaut - DeleteProcessStep: Supprimer l’étape de processus - Description: Décrivez votre processus - DueTimeInDays: Expiration en jours - EndStep: Fin - FormDefinitionStep: Définition du formulaire - ProcessNameExists: Ce nom de processus a été utilisé avant - ProcessOwner: Propriétaire du processus - Processdescription: Description du processus - Processdetails: Propriétés du processus - Processflow: Flux du processus - Processstep: Étape de processus - Processtype: Type de processus - ProcesstypeAdHoc: Une fois - ProcesstypeRepeating: Rrépétitif - TaskType: Type de tâche - UntilDaysTooltip: Après expiration, la tâche sera assignée au role “Everybody” et sa priorité sera passée en “haute”. - UserInterface: - ChangeSettingWarning: Toutes les tâches définies seront supprimées. Êtes-vous sûr? - CreateOwn: Créer propre - UseDefault: Coutume - UserInterface: Iinterface utilisateur - WorkflowPropertiesStep: Propriétés du workflow ! - requiredMsgs: - ReqMsgGeneric: est un champ obligatoire ! - processStep: Étape du processus Labels: - AdhocWorkflow: Décrivez votre workflow AppendTask-Explain: La tâche est ajoutée à la séquence après ma tâche. AppendTheTask: Ajouter la tâche CreateNewDashboard: Créer un nouveau tableau de bord @@ -1638,13 +1585,13 @@ Labels: EMPTY: Est vide END_WITH: Se termine par EQUAL: Égalité - GREATER_OR_EQUAL: Supérieur ou égal + GREATER_OR_EQUAL: Greater or equal IN: En IS: Est IS_NOT: N'est pas LAST: Au cours des dernières LESS: Less - LESS_OR_EQUAL: Inférieur ou égal + LESS_OR_EQUAL: Less or equal NEXT: Dans les prochains NOT_BETWEEN: Pas entre NOT_CONTAINS: Ne contient pas @@ -1686,9 +1633,7 @@ Labels: TaskUser-Explain: Liste d’utilisateurs séparés par des virgules ToggleMenu: Menu à bascule ViewAllResults: Voir tous les résultats - adhocTaskRequired: Vous devez ajouter au moins une tâche. disabledUserPrefix: (désactivé) - title: Workflow ad hoc Self Service patterns: datePattern: dd.MM.yyyy dateTimePattern: dd.MM.yyyy HH:mm @@ -1718,12 +1663,7 @@ Processes: SynchronizeServerConfigurationCaseName: Synchroniser la configuration du serveur portalHome: Page d'accueil portalSettingSaved: Les paramètres du portail sont enregistrés -ProcessPages: - selfServiceAdhocProcess: Axon Ivy Self Service - selfServiceDescription: 'Processus en libre service: lance un workflow ad hoc basé sur un modèle prédéfini. ' Texts: - Adhoc-Explain: '

    Rentrez votre commentaire et cliquez sur Envoyer afin de poursuivre.

    ' - AdhocWF-Explain: "

    \n\nDéfinir et démarrer un workflow en un clic. \n\n

    " Approval-Explain: "

    \n\nVeuillez choisir et cliquez sur Envoyer pour poursuivre. \n\n

    " QA-Explain: |-

    diff --git a/AxonIvyPortal/portal/config/variables.yaml b/AxonIvyPortal/portal/config/variables.yaml index 8822454e377..01d501e6498 100644 --- a/AxonIvyPortal/portal/config/variables.yaml +++ b/AxonIvyPortal/portal/config/variables.yaml @@ -38,6 +38,11 @@ Variables: # If set to true, icon info is shown beside the role name. DisplayUsersOfRole: false + # The standard sets of filters that Portal used to define the public filters set in the task analysis page. + # It will be shown as the public filters in the task analysis page. + # [file: json] + TaskAnalysisFilters: + # You can define your custom menu item via this JSON file. # It will be included to the left menu. # [file: json] @@ -76,6 +81,9 @@ Variables: # This setting will be taken over for all other dashboard. # [file: json] Dashboard: + # Set to true to hide Statistic widget from homepage and application menu. + HideStatisticWidget: false + # You can customize the name and icon of the main menu entry for Portal dashboards via this JSON file. # [file: json] MainMenuEntry: @@ -232,6 +240,10 @@ Variables: # For switch on/off the display of user/role avatars. ShowAvatar: true + + # Interval in seconds to do periodic statistic chart scaling requests. + # If the interval value is less than 10, periodic statistic chart scaling is disabled. + StatisticChartScalingInterval: 0 # The set number controls the amount of direct children roles that is shown in Role Management tab. # [enum: 10, 50, 100] diff --git a/AxonIvyPortal/portal/config/variables/Portal/StatisticCharts.json b/AxonIvyPortal/portal/config/variables/Portal/StatisticCharts.json new file mode 100644 index 00000000000..cdf9515e0ec --- /dev/null +++ b/AxonIvyPortal/portal/config/variables/Portal/StatisticCharts.json @@ -0,0 +1,25 @@ +[ + { + "id": "0", + "names": [ + { + "locale": "de", + "value": "Aufgaben nach Priorität" + }, + { + "locale": "en", + "value": "Tasks by Priority" + }, + { + "locale": "fr", + "value": "Tãches par priorité" + }, + { + "locale": "es", + "value": "Tareas por prioridad" + } + ], + "type": "TASK_BY_PRIORITY", + "filter": {} + } +] \ No newline at end of file diff --git a/AxonIvyPortal/portal/config/variables/Portal/TaskAnalysisFilters.json b/AxonIvyPortal/portal/config/variables/Portal/TaskAnalysisFilters.json new file mode 100644 index 00000000000..9e26dfeeb6e --- /dev/null +++ b/AxonIvyPortal/portal/config/variables/Portal/TaskAnalysisFilters.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/AxonIvyPortal/portal/processes/Start Processes/PortalStart.p.json b/AxonIvyPortal/portal/processes/Start Processes/PortalStart.p.json index da5eb804fdc..115ea4beff4 100644 --- a/AxonIvyPortal/portal/processes/Start Processes/PortalStart.p.json +++ b/AxonIvyPortal/portal/processes/Start Processes/PortalStart.p.json @@ -81,6 +81,85 @@ "connect" : [ { "id" : "f196", "to" : "f143" } ] + }, { + "id" : "S32", + "type" : "EmbeddedProcess", + "name" : "Authorize", + "elements" : [ { + "id" : "S32-f167", + "type" : "Script", + "name" : "Init isAuthorized", + "config" : { + "output" : { + "code" : [ + "import ch.ivy.addon.portalkit.util.PermissionUtils;", + "import ch.ivy.addon.portalkit.enums.PortalPermission;", + "", + "in.isAuthorized = PermissionUtils.hasPermission(PortalPermission.STATISTIC_ANALYZE_TASK.getPermission());" + ] + } + }, + "visual" : { + "at" : { "x" : 176, "y" : 160 } + }, + "connect" : [ + { "id" : "S32-f170", "to" : "S32-f165" } + ] + }, { + "id" : "S32-f79", + "type" : "TaskEnd", + "visual" : { + "at" : { "x" : 296, "y" : 240 } + } + }, { + "id" : "S32-f165", + "type" : "Alternative", + "name" : "Authorized?", + "config" : { + "conditions" : { + "S32-f1" : "in.isAuthorized" + } + }, + "visual" : { + "at" : { "x" : 296, "y" : 160 }, + "labelOffset" : { "y" : -16 } + }, + "connect" : [ + { "id" : "S32-f1", "to" : "S32-g1", "label" : { + "name" : "Yes" + } }, + { "id" : "S32-f161", "to" : "S32-f79", "label" : { + "name" : "No", + "segment" : 0.55, + "offset" : { "x" : 11, "y" : -13 } + } } + ] + }, { + "id" : "S32-g0", + "type" : "EmbeddedStart", + "name" : "in 1", + "visual" : { + "at" : { "x" : 64, "y" : 160 } + }, + "parentConnector" : "f171", + "connect" : [ + { "id" : "S32-f0", "to" : "S32-f167" } + ] + }, { + "id" : "S32-g1", + "type" : "EmbeddedEnd", + "name" : "out 1", + "visual" : { + "at" : { "x" : 448, "y" : 160 } + }, + "parentConnector" : "f194" + } ], + "visual" : { + "at" : { "x" : 200, "y" : 3160 } + }, + "connect" : [ + { "id" : "f194", "to" : "f166" } + ] }, { "id" : "S22", "type" : "EmbeddedProcess", @@ -279,7 +358,7 @@ "parentConnector" : "f192" } ], "visual" : { - "at" : { "x" : 200, "y" : 3400 } + "at" : { "x" : 200, "y" : 3480 } }, "connect" : [ { "id" : "f192", "to" : "f137" } @@ -359,7 +438,7 @@ ] } ], "visual" : { - "at" : { "x" : 200, "y" : 3320 } + "at" : { "x" : 200, "y" : 3400 } }, "connect" : [ { "id" : "f190", "to" : "f237" } @@ -439,7 +518,7 @@ ] } ], "visual" : { - "at" : { "x" : 200, "y" : 3240 } + "at" : { "x" : 200, "y" : 3320 } }, "connect" : [ { "id" : "f187", "to" : "f232" } @@ -886,6 +965,64 @@ "connect" : [ { "id" : "f210", "to" : "f65" } ] + }, { + "id" : "S00", + "type" : "EmbeddedProcess", + "name" : "Authorize", + "elements" : [ { + "id" : "S00-f281", + "type" : "TaskEnd", + "visual" : { + "at" : { "x" : 152, "y" : 232 } + } + }, { + "id" : "S00-f279", + "type" : "Alternative", + "name" : "Authorized?", + "config" : { + "conditions" : { + "S00-f1" : "ch.ivy.addon.portalkit.util.PermissionUtils.checkAccessFullStatisticsListPermission()" + } + }, + "visual" : { + "at" : { "x" : 152, "y" : 144 }, + "labelOffset" : { "y" : -16 } + }, + "connect" : [ + { "id" : "S00-f1", "to" : "S00-g1", "label" : { + "name" : "Yes" + } }, + { "id" : "S00-f282", "to" : "S00-f281", "label" : { + "name" : "No", + "segment" : 0.56 + } } + ] + }, { + "id" : "S00-g0", + "type" : "EmbeddedStart", + "name" : "in 1", + "visual" : { + "at" : { "x" : 64, "y" : 144 } + }, + "parentConnector" : "f26", + "connect" : [ + { "id" : "S00-f0", "to" : "S00-f279" } + ] + }, { + "id" : "S00-g1", + "type" : "EmbeddedEnd", + "name" : "out 1", + "visual" : { + "at" : { "x" : 320, "y" : 144 } + }, + "parentConnector" : "f27" + } ], + "visual" : { + "at" : { "x" : 200, "y" : 960 } + }, + "connect" : [ + { "id" : "f27", "to" : "f32" } + ] }, { "id" : "S90", "type" : "EmbeddedProcess", @@ -939,7 +1076,7 @@ "parentConnector" : "f209" } ], "visual" : { - "at" : { "x" : 344, "y" : 960 } + "at" : { "x" : 344, "y" : 880 } }, "connect" : [ { "id" : "f209", "to" : "f274" } @@ -1022,7 +1159,7 @@ } }, "visual" : { - "at" : { "x" : 96, "y" : 480 }, + "at" : { "x" : 96, "y" : 400 }, "labelOffset" : { "x" : -23, "y" : 41 } }, "connect" : [ @@ -1082,7 +1219,7 @@ "sudo" : true }, "visual" : { - "at" : { "x" : 488, "y" : 480 } + "at" : { "x" : 488, "y" : 400 } }, "connect" : [ { "id" : "f2", "to" : "f1" } @@ -1112,7 +1249,7 @@ } }, "visual" : { - "at" : { "x" : 96, "y" : 320 }, + "at" : { "x" : 96, "y" : 240 }, "labelOffset" : { "x" : -55, "y" : 41 } }, "connect" : [ @@ -1122,7 +1259,7 @@ "id" : "f57", "type" : "TaskEnd", "visual" : { - "at" : { "x" : 592, "y" : 720 } + "at" : { "x" : 592, "y" : 640 } } }, { "id" : "f58", @@ -1135,7 +1272,7 @@ } }, "visual" : { - "at" : { "x" : 96, "y" : 720 }, + "at" : { "x" : 96, "y" : 640 }, "labelOffset" : { "x" : -15, "y" : 41 } }, "connect" : [ @@ -1160,7 +1297,7 @@ } }, "visual" : { - "at" : { "x" : 96, "y" : 960 }, + "at" : { "x" : 96, "y" : 880 }, "labelOffset" : { "x" : -23, "y" : 33 } }, "connect" : [ @@ -1177,7 +1314,7 @@ } }, "visual" : { - "at" : { "x" : 96, "y" : 880 }, + "at" : { "x" : 96, "y" : 800 }, "labelOffset" : { "x" : -31, "y" : 41 } }, "connect" : [ @@ -1187,13 +1324,13 @@ "id" : "f105", "type" : "TaskEnd", "visual" : { - "at" : { "x" : 736, "y" : 960 } + "at" : { "x" : 736, "y" : 880 } } }, { "id" : "f64", "type" : "TaskEnd", "visual" : { - "at" : { "x" : 592, "y" : 880 } + "at" : { "x" : 592, "y" : 800 } } }, { "id" : "f1", @@ -1205,18 +1342,18 @@ } }, "visual" : { - "at" : { "x" : 592, "y" : 480 } + "at" : { "x" : 592, "y" : 400 } }, "connect" : [ { "id" : "f30", "to" : "f22" }, { "id" : "f36", "to" : "S70" }, - { "id" : "f19", "to" : "f5", "via" : [ { "x" : 592, "y" : 528 }, { "x" : 1008, "y" : 528 } ] } + { "id" : "f19", "to" : "f5", "via" : [ { "x" : 592, "y" : 448 }, { "x" : 1008, "y" : 448 } ] } ] }, { "id" : "f0", "type" : "Alternative", "visual" : { - "at" : { "x" : 1008, "y" : 320 } + "at" : { "x" : 1008, "y" : 240 } }, "connect" : [ { "id" : "f92", "to" : "S60" } @@ -1230,7 +1367,7 @@ } }, "visual" : { - "at" : { "x" : 1008, "y" : 480 } + "at" : { "x" : 1008, "y" : 400 } }, "connect" : [ { "id" : "f20", "to" : "f0" }, @@ -1256,12 +1393,48 @@ } }, "visual" : { - "at" : { "x" : 96, "y" : 560 }, + "at" : { "x" : 96, "y" : 480 }, "labelOffset" : { "x" : -39, "y" : 41 } }, "connect" : [ - { "id" : "f13", "to" : "f4", "via" : [ { "x" : 344, "y" : 560 } ] } + { "id" : "f13", "to" : "f4", "via" : [ { "x" : 344, "y" : 480 } ] } ] + }, { + "id" : "f32", + "type" : "DialogCall", + "name" : "Statistic", + "config" : { + "dialog" : "ch.ivy.addon.portal.generic.admin.PortalDashBoard:start()" + }, + "visual" : { + "at" : { "x" : 344, "y" : 960 } + }, + "connect" : [ + { "id" : "f35", "to" : "f34" } + ] + }, { + "id" : "f70", + "type" : "RequestStart", + "name" : "StatisticPage.ivp", + "config" : { + "signature" : "StatisticPage", + "request" : { + "isVisibleOnStartList" : false + } + }, + "visual" : { + "at" : { "x" : 96, "y" : 960 }, + "labelOffset" : { "x" : -15, "y" : 33 } + }, + "connect" : [ + { "id" : "f26", "to" : "S00" } + ] + }, { + "id" : "f34", + "type" : "TaskEnd", + "visual" : { + "at" : { "x" : 448, "y" : 960 } + } }, { "id" : "f39", "type" : "RequestStart", @@ -1711,7 +1884,7 @@ "homepage if you have" ], "visual" : { - "at" : { "x" : 1240, "y" : 320 }, + "at" : { "x" : 1240, "y" : 240 }, "size" : { "width" : 144, "height" : 44 } } }, { @@ -1733,7 +1906,7 @@ "id" : "f22", "type" : "Alternative", "visual" : { - "at" : { "x" : 592, "y" : 320 } + "at" : { "x" : 592, "y" : 240 } }, "connect" : [ { "id" : "f141", "to" : "f0" } @@ -1747,7 +1920,7 @@ } }, "visual" : { - "at" : { "x" : 344, "y" : 480 } + "at" : { "x" : 344, "y" : 400 } }, "connect" : [ { "id" : "f29", "to" : "f31" }, @@ -1766,7 +1939,7 @@ } }, "visual" : { - "at" : { "x" : 344, "y" : 320 } + "at" : { "x" : 344, "y" : 240 } }, "connect" : [ { "id" : "f49", "to" : "f31" }, @@ -1791,7 +1964,7 @@ } }, "visual" : { - "at" : { "x" : 344, "y" : 400 } + "at" : { "x" : 344, "y" : 320 } } }, { "id" : "f12", @@ -2147,11 +2320,11 @@ } }, "visual" : { - "at" : { "x" : 96, "y" : 240 }, + "at" : { "x" : 96, "y" : 160 }, "labelOffset" : { "x" : -39, "y" : 33 } }, "connect" : [ - { "id" : "f47", "to" : "f21", "via" : [ { "x" : 344, "y" : 240 } ] } + { "id" : "f47", "to" : "f21", "via" : [ { "x" : 344, "y" : 160 } ] } ] }, { "id" : "f122", @@ -2263,7 +2436,7 @@ "sudo" : true }, "visual" : { - "at" : { "x" : 488, "y" : 321 }, + "at" : { "x" : 488, "y" : 241 }, "size" : { "height" : 62 } }, "connect" : [ @@ -2364,7 +2537,7 @@ } } ], "visual" : { - "at" : { "x" : 1096, "y" : 320 } + "at" : { "x" : 1096, "y" : 240 } } }, { "id" : "S10", @@ -2584,7 +2757,7 @@ } } ], "visual" : { - "at" : { "x" : 1165, "y" : 479 }, + "at" : { "x" : 1165, "y" : 399 }, "size" : { "width" : 251, "height" : 65 } } }, { @@ -2683,7 +2856,7 @@ "parentConnector" : "f25" } ], "visual" : { - "at" : { "x" : 488, "y" : 720 } + "at" : { "x" : 488, "y" : 640 } }, "connect" : [ { "id" : "f25", "to" : "f57" } @@ -2782,7 +2955,7 @@ "parentConnector" : "f17" } ], "visual" : { - "at" : { "x" : 488, "y" : 880 } + "at" : { "x" : 488, "y" : 800 } }, "connect" : [ { "id" : "f17", "to" : "f64" } @@ -2882,7 +3055,7 @@ "parentConnector" : "f40" } ], "visual" : { - "at" : { "x" : 848, "y" : 480 }, + "at" : { "x" : 848, "y" : 400 }, "size" : { "width" : 248, "height" : 64 } }, "connect" : [ @@ -3135,6 +3308,42 @@ "connect" : [ { "id" : "f160", "to" : "f158" } ] + }, { + "id" : "f163", + "type" : "RequestStart", + "name" : "showTaskAnalysis.ivp", + "config" : { + "signature" : "showTaskAnalysis", + "request" : { + "isVisibleOnStartList" : false + } + }, + "visual" : { + "at" : { "x" : 96, "y" : 3160 }, + "labelOffset" : { "x" : -31, "y" : 41 } + }, + "connect" : [ + { "id" : "f171", "to" : "S32" } + ] + }, { + "id" : "f164", + "type" : "TaskEnd", + "visual" : { + "at" : { "x" : 448, "y" : 3160 } + } + }, { + "id" : "f166", + "type" : "DialogCall", + "name" : "Task Analysis dialog", + "config" : { + "dialog" : "ch.ivy.addon.portal.generic.TaskAnalysis:start()" + }, + "visual" : { + "at" : { "x" : 344, "y" : 3160 } + }, + "connect" : [ + { "id" : "f169", "to" : "f164" } + ] }, { "id" : "f188", "type" : "RequestStart", @@ -3196,7 +3405,7 @@ "signature" : "DefaultApplicationHomePageInTeams" }, "visual" : { - "at" : { "x" : 96, "y" : 400 }, + "at" : { "x" : 96, "y" : 320 }, "labelOffset" : { "x" : -79, "y" : 41 } }, "connect" : [ @@ -3218,7 +3427,7 @@ } }, "visual" : { - "at" : { "x" : 200, "y" : 400 } + "at" : { "x" : 200, "y" : 320 } }, "connect" : [ { "id" : "f205", "to" : "f203" } @@ -3227,7 +3436,7 @@ "id" : "f203", "type" : "Alternative", "visual" : { - "at" : { "x" : 200, "y" : 320 } + "at" : { "x" : 200, "y" : 240 } }, "connect" : [ { "id" : "f43", "to" : "f21" } @@ -3240,7 +3449,7 @@ "signature" : "DefaultCaseListPageInTeams" }, "visual" : { - "at" : { "x" : 96, "y" : 640 }, + "at" : { "x" : 96, "y" : 560 }, "labelOffset" : { "x" : -55, "y" : 41 } }, "connect" : [ @@ -3262,10 +3471,10 @@ } }, "visual" : { - "at" : { "x" : 200, "y" : 640 } + "at" : { "x" : 200, "y" : 560 } }, "connect" : [ - { "id" : "f61", "to" : "S71", "via" : [ { "x" : 344, "y" : 640 } ] } + { "id" : "f61", "to" : "S71", "via" : [ { "x" : 344, "y" : 560 } ] } ] }, { "id" : "f214", @@ -3283,10 +3492,10 @@ } }, "visual" : { - "at" : { "x" : 200, "y" : 800 } + "at" : { "x" : 200, "y" : 720 } }, "connect" : [ - { "id" : "f24", "to" : "S80", "via" : [ { "x" : 344, "y" : 800 } ] } + { "id" : "f24", "to" : "S80", "via" : [ { "x" : 344, "y" : 720 } ] } ] }, { "id" : "f215", @@ -3296,7 +3505,7 @@ "signature" : "DefaultTaskListPageInTeams" }, "visual" : { - "at" : { "x" : 96, "y" : 800 }, + "at" : { "x" : 96, "y" : 720 }, "labelOffset" : { "x" : -55, "y" : 41 } }, "connect" : [ @@ -3341,7 +3550,7 @@ "id" : "f224", "type" : "TaskEnd", "visual" : { - "at" : { "x" : 304, "y" : 3160 } + "at" : { "x" : 304, "y" : 3240 } } }, { "id" : "f225", @@ -3358,7 +3567,7 @@ } }, "visual" : { - "at" : { "x" : 200, "y" : 3160 }, + "at" : { "x" : 200, "y" : 3240 }, "size" : { "width" : 116 } }, "connect" : [ @@ -3387,7 +3596,7 @@ } }, "visual" : { - "at" : { "x" : 96, "y" : 3160 }, + "at" : { "x" : 96, "y" : 3240 }, "labelOffset" : { "x" : -31, "y" : 33 } }, "connect" : [ @@ -3412,7 +3621,7 @@ } }, "visual" : { - "at" : { "x" : 96, "y" : 3240 }, + "at" : { "x" : 96, "y" : 3320 }, "labelOffset" : { "x" : -31, "y" : 33 } }, "connect" : [ @@ -3422,7 +3631,7 @@ "id" : "f230", "type" : "TaskEnd", "visual" : { - "at" : { "x" : 448, "y" : 3240 } + "at" : { "x" : 448, "y" : 3320 } } }, { "id" : "f232", @@ -3437,7 +3646,7 @@ } }, "visual" : { - "at" : { "x" : 344, "y" : 3240 } + "at" : { "x" : 344, "y" : 3320 } }, "connect" : [ { "id" : "f231", "to" : "f230" } @@ -3461,7 +3670,7 @@ } }, "visual" : { - "at" : { "x" : 96, "y" : 3320 }, + "at" : { "x" : 96, "y" : 3400 }, "labelOffset" : { "x" : -31, "y" : 33 } }, "connect" : [ @@ -3471,7 +3680,7 @@ "id" : "f235", "type" : "TaskEnd", "visual" : { - "at" : { "x" : 448, "y" : 3320 } + "at" : { "x" : 448, "y" : 3400 } } }, { "id" : "f237", @@ -3486,7 +3695,7 @@ } }, "visual" : { - "at" : { "x" : 344, "y" : 3320 } + "at" : { "x" : 344, "y" : 3400 } }, "connect" : [ { "id" : "f236", "to" : "f235" } @@ -3502,7 +3711,7 @@ } }, "visual" : { - "at" : { "x" : 96, "y" : 3400 }, + "at" : { "x" : 96, "y" : 3480 }, "labelOffset" : { "x" : -31, "y" : 33 } }, "connect" : [ @@ -3512,7 +3721,7 @@ "id" : "f41", "type" : "TaskEnd", "visual" : { - "at" : { "x" : 448, "y" : 3400 } + "at" : { "x" : 448, "y" : 3480 } } }, { "id" : "f137", @@ -3522,7 +3731,7 @@ "dialog" : "ch.ivy.addon.portal.setting.PortalManagement:start()" }, "visual" : { - "at" : { "x" : 344, "y" : 3400 } + "at" : { "x" : 344, "y" : 3480 } }, "connect" : [ { "id" : "f129", "to" : "f41" } @@ -3604,7 +3813,7 @@ "sudo" : true }, "visual" : { - "at" : { "x" : 200, "y" : 960 } + "at" : { "x" : 200, "y" : 880 } }, "connect" : [ { "id" : "f15", "to" : "S90" } @@ -3623,7 +3832,7 @@ } }, "visual" : { - "at" : { "x" : 560, "y" : 960 }, + "at" : { "x" : 560, "y" : 880 }, "size" : { "width" : 256 } }, "connect" : [ @@ -3693,7 +3902,7 @@ "parentConnector" : "f176" } ], "visual" : { - "at" : { "x" : 344, "y" : 720 } + "at" : { "x" : 344, "y" : 640 } }, "connect" : [ { "id" : "f176", "to" : "S30" } @@ -3761,7 +3970,7 @@ "parentConnector" : "f179" } ], "visual" : { - "at" : { "x" : 344, "y" : 880 } + "at" : { "x" : 344, "y" : 800 } }, "connect" : [ { "id" : "f179", "to" : "S20" } @@ -3898,7 +4107,7 @@ } }, "visual" : { - "at" : { "x" : 96, "y" : 3488 }, + "at" : { "x" : 96, "y" : 3568 }, "labelOffset" : { "x" : -31, "y" : 41 } }, "connect" : [ @@ -3908,7 +4117,7 @@ "id" : "f251", "type" : "TaskEnd", "visual" : { - "at" : { "x" : 952, "y" : 3488 } + "at" : { "x" : 952, "y" : 3568 } } }, { "id" : "f252", @@ -3929,7 +4138,7 @@ } }, "visual" : { - "at" : { "x" : 96, "y" : 3672 }, + "at" : { "x" : 96, "y" : 3752 }, "labelOffset" : { "x" : -31, "y" : 41 } }, "connect" : [ @@ -3939,7 +4148,7 @@ "id" : "f253", "type" : "TaskEnd", "visual" : { - "at" : { "x" : 920, "y" : 3672 } + "at" : { "x" : 920, "y" : 3752 } } }, { "id" : "S63", @@ -3994,7 +4203,7 @@ "parentConnector" : "f260" } ], "visual" : { - "at" : { "x" : 504, "y" : 3672 } + "at" : { "x" : 504, "y" : 3752 } }, "connect" : [ { "id" : "f260", "to" : "f255" } @@ -4014,7 +4223,7 @@ } }, "visual" : { - "at" : { "x" : 332, "y" : 3672 }, + "at" : { "x" : 332, "y" : 3752 }, "size" : { "width" : 136 } }, "connect" : [ @@ -4034,7 +4243,7 @@ } }, "visual" : { - "at" : { "x" : 720, "y" : 3672 }, + "at" : { "x" : 720, "y" : 3752 }, "size" : { "width" : 256 } }, "connect" : [ @@ -4093,7 +4302,7 @@ "parentConnector" : "f261" } ], "visual" : { - "at" : { "x" : 504, "y" : 3488 } + "at" : { "x" : 504, "y" : 3568 } }, "connect" : [ { "id" : "f261", "to" : "f256" } @@ -4112,7 +4321,7 @@ } }, "visual" : { - "at" : { "x" : 720, "y" : 3488 }, + "at" : { "x" : 720, "y" : 3568 }, "size" : { "width" : 260, "height" : 58 } }, "connect" : [ @@ -4132,7 +4341,7 @@ } }, "visual" : { - "at" : { "x" : 332, "y" : 3488 }, + "at" : { "x" : 332, "y" : 3568 }, "size" : { "width" : 136 } }, "connect" : [ @@ -4159,7 +4368,7 @@ } }, "visual" : { - "at" : { "x" : 96, "y" : 152 } + "at" : { "x" : 96, "y" : 72 } }, "connect" : [ { "id" : "f212", "to" : "f170" } @@ -4186,10 +4395,10 @@ } }, "visual" : { - "at" : { "x" : 216, "y" : 152 } + "at" : { "x" : 216, "y" : 72 } }, "connect" : [ - { "id" : "f218", "to" : "f21", "via" : [ { "x" : 344, "y" : 152 } ] } + { "id" : "f218", "to" : "f21", "via" : [ { "x" : 344, "y" : 72 } ] } ] }, { "id" : "f219", @@ -4200,7 +4409,7 @@ } }, "visual" : { - "at" : { "x" : 192, "y" : 3488 } + "at" : { "x" : 192, "y" : 3568 } }, "connect" : [ { "id" : "f233", "to" : "f223" }, @@ -4222,7 +4431,7 @@ } }, "visual" : { - "at" : { "x" : 192, "y" : 3576 } + "at" : { "x" : 192, "y" : 3656 } } }, { "id" : "f239", @@ -4234,7 +4443,7 @@ } }, "visual" : { - "at" : { "x" : 192, "y" : 3672 } + "at" : { "x" : 192, "y" : 3752 } }, "connect" : [ { "id" : "f244", "to" : "f254" }, @@ -4311,7 +4520,7 @@ ] } ], "visual" : { - "at" : { "x" : 200, "y" : 3760 } + "at" : { "x" : 200, "y" : 3840 } }, "connect" : [ { "id" : "f266", "to" : "f247" } @@ -4320,7 +4529,7 @@ "id" : "f246", "type" : "TaskEnd", "visual" : { - "at" : { "x" : 592, "y" : 3760 } + "at" : { "x" : 592, "y" : 3840 } } }, { "id" : "f247", @@ -4335,7 +4544,7 @@ } }, "visual" : { - "at" : { "x" : 416, "y" : 3760 }, + "at" : { "x" : 416, "y" : 3840 }, "size" : { "width" : 256 } }, "connect" : [ @@ -4360,7 +4569,7 @@ } }, "visual" : { - "at" : { "x" : 96, "y" : 3760 }, + "at" : { "x" : 96, "y" : 3840 }, "labelOffset" : { "x" : -55, "y" : 33 } }, "connect" : [ @@ -4377,7 +4586,7 @@ } }, "visual" : { - "at" : { "x" : 96, "y" : 3872 } + "at" : { "x" : 96, "y" : 3952 } }, "connect" : [ { "id" : "f267", "to" : "f16" } @@ -4390,7 +4599,7 @@ "dialog" : "com.axonivy.portal.component.NotificationFullPage:start()" }, "visual" : { - "at" : { "x" : 240, "y" : 3872 } + "at" : { "x" : 240, "y" : 3952 } }, "connect" : [ { "id" : "f268", "to" : "f50" } @@ -4399,7 +4608,7 @@ "id" : "f50", "type" : "TaskEnd", "visual" : { - "at" : { "x" : 376, "y" : 3872 } + "at" : { "x" : 376, "y" : 3952 } } }, { "id" : "f269", @@ -4420,7 +4629,7 @@ } }, "visual" : { - "at" : { "x" : 96, "y" : 3976 } + "at" : { "x" : 96, "y" : 4056 } }, "connect" : [ { "id" : "f273", "to" : "f281" } @@ -4445,7 +4654,7 @@ } }, "visual" : { - "at" : { "x" : 488, "y" : 3976 } + "at" : { "x" : 488, "y" : 4056 } }, "connect" : [ { "id" : "f277", "to" : "f278" } @@ -4454,7 +4663,7 @@ "id" : "f270", "type" : "TaskEnd", "visual" : { - "at" : { "x" : 936, "y" : 3976 } + "at" : { "x" : 936, "y" : 4056 } } }, { "id" : "f278", @@ -4470,7 +4679,7 @@ } }, "visual" : { - "at" : { "x" : 703, "y" : 3975 }, + "at" : { "x" : 703, "y" : 4055 }, "size" : { "width" : 255, "height" : 61 } }, "connect" : [ @@ -4579,7 +4788,7 @@ } }, "visual" : { - "at" : { "x" : 200, "y" : 3976 } + "at" : { "x" : 200, "y" : 4056 } }, "connect" : [ { "id" : "f293", "to" : "S02" } @@ -4652,7 +4861,7 @@ "parentConnector" : "f294" } ], "visual" : { - "at" : { "x" : 344, "y" : 3976 } + "at" : { "x" : 344, "y" : 4056 } }, "connect" : [ { "id" : "f294", "to" : "f271" } diff --git a/AxonIvyPortal/portal/processes/SynchronizeDataProcesses/CleanUpObsoletedUserData.p.json b/AxonIvyPortal/portal/processes/SynchronizeDataProcesses/CleanUpObsoletedUserData.p.json new file mode 100644 index 00000000000..29f7bc55dc2 --- /dev/null +++ b/AxonIvyPortal/portal/processes/SynchronizeDataProcesses/CleanUpObsoletedUserData.p.json @@ -0,0 +1,58 @@ +{ + "$schema" : "https://json-schema.axonivy.com/process/11.3.0/process.json", + "id" : "1626C02D46BF5153", + "description" : "This is a scheduled process of Portal", + "config" : { + "data" : "ch.ivy.add.portalkit.Data" + }, + "elements" : [ { + "id" : "f6", + "type" : "TaskEnd", + "visual" : { + "at" : { "x" : 120, "y" : 320 } + } + }, { + "id" : "f5", + "type" : "ProgramStart", + "name" : "PortalCleanObsoleteData", + "config" : { + "javaClass" : "ch.ivy.addon.portalkit.util.CronByGlobalVariableTriggerStartEventBean", + "userConfig" : { + "variable" : "PortalStartTimeCleanObsoletedDataExpression" + }, + "link" : "eventLink.ivp" + }, + "visual" : { + "at" : { "x" : 120, "y" : 104 }, + "labelOffset" : { "x" : 104, "y" : 20 }, + "description" : "This is a scheduled process of Portal" + }, + "connect" : [ + { "id" : "f4", "to" : "f2" } + ] + }, { + "id" : "f2", + "type" : "Script", + "name" : [ + "Delete finished hidden", + "system cases" + ], + "config" : { + "output" : { + "code" : [ + "import ch.ivy.addon.portalkit.service.DeleteFinishedHiddenCasesService;", + "DeleteFinishedHiddenCasesService deletFinishedHiddenCasesService = new DeleteFinishedHiddenCasesService();", + "deletFinishedHiddenCasesService.deleteFinishedHiddenCases();" + ] + }, + "sudo" : true + }, + "visual" : { + "at" : { "x" : 120, "y" : 208 }, + "size" : { "width" : 144 } + }, + "connect" : [ + { "id" : "f1", "to" : "f6" } + ] + } ] +} \ No newline at end of file diff --git a/AxonIvyPortal/portal/src/ch/addon/portal/generic/menu/MenuView.java b/AxonIvyPortal/portal/src/ch/addon/portal/generic/menu/MenuView.java index 2691ea927f8..2272604d94b 100644 --- a/AxonIvyPortal/portal/src/ch/addon/portal/generic/menu/MenuView.java +++ b/AxonIvyPortal/portal/src/ch/addon/portal/generic/menu/MenuView.java @@ -47,6 +47,7 @@ import ch.ivy.addon.portalkit.service.ApplicationMultiLanguage; import ch.ivy.addon.portalkit.service.IvyCacheService; import ch.ivy.addon.portalkit.service.MainMenuEntryService; +import ch.ivy.addon.portalkit.service.StatisticService; import ch.ivy.addon.portalkit.util.DashboardUtils; import ch.ivy.addon.portalkit.util.UrlUtils; import ch.ivy.addon.portalkit.util.UserUtils; @@ -176,7 +177,7 @@ private MenuElement buildDashboardItem() { String defaultTitle = (String) dashboardMenu.getValue(); String title = board.getTitles().stream() - .filter(name -> StringUtils.equalsIgnoreCase(name.getLocale().toString(), currentLanguage) + .filter(name -> StatisticService.equalsLanguageLocale(name, currentLanguage) && StringUtils.isNotBlank(name.getValue())) .map(DisplayName::getValue).findFirst().orElse(defaultTitle); dashboardMenu.setValue(title); @@ -272,6 +273,7 @@ public void loadBreadcrumb(String viewName, ITask userTask, ICase userCase) { case TECHNICAL_CASE -> buildBreadCrumbForTechnicalCaseList(userCase); case RELATED_TASK -> buildBreadCrumbForRelatedTask(userCase); case PROCESS -> buildBreadCrumbForProcess(); + case STATISTICS -> buildBreadCrumbForStatistic(); case TASK_DETAIL -> buildBreadCrumbForTaskDetails(userTask); case CASE_DETAIL -> buildBreadCrumbForCaseDetails(userCase); case USER_PROFILE -> buildBreadCrumbForUserProfile(); @@ -353,6 +355,14 @@ private void buildBreadCrumbForProcess() { breadcrumbModel.getElements().add(processListSubmenuItem); } + private void buildBreadCrumbForStatistic() { + setPortalHomeMenuToBreadcrumbModel(); + + DefaultMenuItem statisticListSubmenuItem = buildStatisticListMenuItem(); + statisticListSubmenuItem.setDisabled(true); + breadcrumbModel.getElements().add(statisticListSubmenuItem); + } + private void buildBreadCrumbForTaskDetails(ITask userTask) { setPortalHomeMenuToBreadcrumbModel(); breadcrumbModel.getElements().add(buildTaskListMenuItem()); @@ -410,6 +420,11 @@ private DefaultMenuItem buildProcessListMenuItem() { return buildMenuItemFromPortalSubMenuItem(processSubMenuItem); } + private DefaultMenuItem buildStatisticListMenuItem() { + StatisticSubMenuItem statisticSubMenuItem = new StatisticSubMenuItem(); + return buildMenuItemFromPortalSubMenuItem(statisticSubMenuItem); + } + private MenuItem buildTaskDetailsMenuItem(ITask userTask) { String taskName = StringUtils.isEmpty(userTask.getName()) ? Ivy.cms().co("/ch.ivy.addon.portalkit.ui.jsf/components/taskStart/taskNameNotAvailable") : userTask.names().current(); return DefaultMenuItem.builder() diff --git a/AxonIvyPortal/portal/src/ch/addon/portal/generic/menu/PortalMenuItem.java b/AxonIvyPortal/portal/src/ch/addon/portal/generic/menu/PortalMenuItem.java index c9ecce281e4..7755d32184b 100644 --- a/AxonIvyPortal/portal/src/ch/addon/portal/generic/menu/PortalMenuItem.java +++ b/AxonIvyPortal/portal/src/ch/addon/portal/generic/menu/PortalMenuItem.java @@ -109,6 +109,7 @@ private String generateMenuId(MenuKind menuKind) { case PROCESS: case TASK: case CASE: + case STATISTICS: case CUSTOM: menuFormat = SUB_MENU_ID_FORMAT; break; diff --git a/AxonIvyPortal/portal/src/ch/addon/portal/generic/menu/PortalMenuNavigator.java b/AxonIvyPortal/portal/src/ch/addon/portal/generic/menu/PortalMenuNavigator.java index cbc352d7266..aab7bffe407 100644 --- a/AxonIvyPortal/portal/src/ch/addon/portal/generic/menu/PortalMenuNavigator.java +++ b/AxonIvyPortal/portal/src/ch/addon/portal/generic/menu/PortalMenuNavigator.java @@ -26,8 +26,10 @@ import ch.ivy.addon.portalkit.configuration.Application; import ch.ivy.addon.portalkit.constant.IvyCacheIdentifier; import ch.ivy.addon.portalkit.enums.BreadCrumbKind; +import ch.ivy.addon.portalkit.enums.GlobalVariable; import ch.ivy.addon.portalkit.enums.MenuKind; import ch.ivy.addon.portalkit.enums.SessionAttribute; +import ch.ivy.addon.portalkit.service.GlobalSettingService; import ch.ivy.addon.portalkit.service.IvyCacheService; import ch.ivy.addon.portalkit.service.RegisteredApplicationService; import ch.ivy.addon.portalkit.util.PermissionUtils; @@ -62,6 +64,9 @@ public static void navigateToTargetPage(Map> params) throws case CASE: PortalNavigator.navigateToPortalCase(); break; + case STATISTICS: + PortalNavigator.navigateToPortalStatistic(); + break; default: break; } @@ -157,6 +162,7 @@ private record PortalSubMenuItemWrapper(Locale loadedLocale, List p private static List getSubmenuList() { List subMenuItems = new ArrayList<>(); + GlobalSettingService globalSettingService = GlobalSettingService.getInstance(); if(PermissionUtils.checkAccessFullProcessListPermission()) { subMenuItems.add(new ProcessSubMenuItem()); @@ -170,6 +176,11 @@ private static List getSubmenuList() { subMenuItems.add(new CaseSubMenuItem()); } + if(PermissionUtils.checkAccessFullStatisticsListPermission() + && !globalSettingService.findBooleanGlobalSettingValue(GlobalVariable.HIDE_STATISTIC_WIDGET)) { + subMenuItems.add(new StatisticSubMenuItem()); + } + subMenuItems.addAll(CustomSubMenuItemService.findAll()); return subMenuItems; } diff --git a/AxonIvyPortal/portal/src/ch/addon/portal/generic/menu/StatisticSubMenuItem.java b/AxonIvyPortal/portal/src/ch/addon/portal/generic/menu/StatisticSubMenuItem.java new file mode 100644 index 00000000000..1701385cb82 --- /dev/null +++ b/AxonIvyPortal/portal/src/ch/addon/portal/generic/menu/StatisticSubMenuItem.java @@ -0,0 +1,17 @@ +package ch.addon.portal.generic.menu; + +import com.axonivy.portal.components.publicapi.ApplicationMultiLanguageAPI; + +import ch.addon.portal.generic.userprofile.homepage.HomepageType; +import ch.ivy.addon.portal.generic.navigation.PortalNavigator; +import ch.ivy.addon.portalkit.enums.MenuKind; + +public class StatisticSubMenuItem extends SubMenuItem { + public StatisticSubMenuItem() { + this.icon = "si si-pie-line-graph"; + this.menuKind = MenuKind.STATISTICS; + this.label = ApplicationMultiLanguageAPI.getCmsValueByUserLocale("/ch.ivy.addon.portalkit.ui.jsf/statistic/chart/statistics"); + this.name = HomepageType.STATISTICS.name(); + this.link = PortalNavigator.getSubMenuItemUrlOfCurrentApplication(MenuKind.STATISTICS); + } +} diff --git a/AxonIvyPortal/portal/src/ch/addon/portal/generic/userprofile/homepage/HomepageMapper.java b/AxonIvyPortal/portal/src/ch/addon/portal/generic/userprofile/homepage/HomepageMapper.java index 07a8c049dbf..241838b8613 100644 --- a/AxonIvyPortal/portal/src/ch/addon/portal/generic/userprofile/homepage/HomepageMapper.java +++ b/AxonIvyPortal/portal/src/ch/addon/portal/generic/userprofile/homepage/HomepageMapper.java @@ -23,6 +23,8 @@ public static Homepage toHomepage(SubMenuItem menuItem) { homepage.setType(HomepageType.TASK); } else if (menuItem.getMenuKind() == MenuKind.CASE) { homepage.setType(HomepageType.CASE); + } else if (menuItem.getMenuKind() == MenuKind.STATISTICS) { + homepage.setType(HomepageType.STATISTICS); } else if (menuItem.getMenuKind() == MenuKind.CUSTOM) { homepage.setType(HomepageType.CUSTOM); } else { diff --git a/AxonIvyPortal/portal/src/ch/addon/portal/generic/userprofile/homepage/HomepageType.java b/AxonIvyPortal/portal/src/ch/addon/portal/generic/userprofile/homepage/HomepageType.java index 1daa0efa627..c0b0487db9a 100644 --- a/AxonIvyPortal/portal/src/ch/addon/portal/generic/userprofile/homepage/HomepageType.java +++ b/AxonIvyPortal/portal/src/ch/addon/portal/generic/userprofile/homepage/HomepageType.java @@ -1,7 +1,7 @@ package ch.addon.portal.generic.userprofile.homepage; public enum HomepageType { - DASHBOARD, PROCESS, TASK, CASE, CUSTOM; + DASHBOARD, PROCESS, TASK, CASE, STATISTICS, CUSTOM; public static HomepageType getType(String typeName) { for (HomepageType type : HomepageType.values()) { diff --git a/AxonIvyPortal/portal/src/ch/addon/portal/generic/userprofile/homepage/HomepageUtils.java b/AxonIvyPortal/portal/src/ch/addon/portal/generic/userprofile/homepage/HomepageUtils.java index a0e09fa30ed..8df31614d0c 100644 --- a/AxonIvyPortal/portal/src/ch/addon/portal/generic/userprofile/homepage/HomepageUtils.java +++ b/AxonIvyPortal/portal/src/ch/addon/portal/generic/userprofile/homepage/HomepageUtils.java @@ -88,6 +88,7 @@ private static void adjustHomepageStartLink(Homepage homepage) { case PROCESS -> findRelativeUrlByKeywork(PortalNavigator.PORTAL_PROCESS_START); case TASK -> findRelativeUrlByKeywork(PortalNavigator.PORTAL_TASK_START); case CASE -> findRelativeUrlByKeywork(PortalNavigator.PORTAL_CASE_START); + case STATISTICS -> findRelativeUrlByKeywork(PortalNavigator.PORTAL_STATISTIC_START); default -> ""; }; if (StringUtils.isNotEmpty(relativeUrl)) { diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portal/generic/bean/DashboardDetailModificationBean.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portal/generic/bean/DashboardDetailModificationBean.java index 3c0483041ba..6925c0484af 100644 --- a/AxonIvyPortal/portal/src/ch/ivy/addon/portal/generic/bean/DashboardDetailModificationBean.java +++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portal/generic/bean/DashboardDetailModificationBean.java @@ -7,6 +7,7 @@ import static ch.ivy.addon.portalkit.enums.DashboardWidgetType.NOTIFICATION; import static ch.ivy.addon.portalkit.enums.DashboardWidgetType.PROCESS; import static ch.ivy.addon.portalkit.enums.DashboardWidgetType.PROCESS_VIEWER; +import static ch.ivy.addon.portalkit.enums.DashboardWidgetType.STATISTIC; import static ch.ivy.addon.portalkit.enums.DashboardWidgetType.TASK; import static ch.ivy.addon.portalkit.enums.DashboardWidgetType.WELCOME; import static org.apache.commons.lang3.StringUtils.EMPTY; @@ -69,6 +70,7 @@ import ch.ivy.addon.portalkit.dto.dashboard.ProcessDashboardWidget; import ch.ivy.addon.portalkit.dto.dashboard.ProcessViewerDashboardWidget; import ch.ivy.addon.portalkit.dto.dashboard.SingleProcessDashboardWidget; +import ch.ivy.addon.portalkit.dto.dashboard.StatisticDashboardWidget; import ch.ivy.addon.portalkit.dto.dashboard.TaskDashboardWidget; import ch.ivy.addon.portalkit.dto.dashboard.WelcomeDashboardWidget; import ch.ivy.addon.portalkit.dto.dashboard.WidgetSample; @@ -82,6 +84,7 @@ import ch.ivy.addon.portalkit.jsf.Attrs; import ch.ivy.addon.portalkit.jsf.ManagedBeans; import ch.ivy.addon.portalkit.service.DashboardService; +import ch.ivy.addon.portalkit.service.StatisticService; import ch.ivy.addon.portalkit.service.exception.PortalException; import ch.ivy.addon.portalkit.util.CustomWidgetUtils; import ch.ivy.addon.portalkit.util.DashboardUtils; @@ -271,6 +274,11 @@ public void create(WidgetSample sample) { widget = getDefaultCustomDashboardWidget(); ((CustomDashboardWidget) widget).getData().setType(DashboardCustomWidgetType.EXTERNAL_URL); } + case STATISTIC -> { + newWidgetHeader = translate("/ch.ivy.addon.portalkit.ui.jsf/dashboard/configuration/newWidgetHeader", + Arrays.asList(translate("/ch.ivy.addon.portalkit.ui.jsf/dashboard/statisticChartWidget"))); + widget = getDefaultStatisticDashboardWidget(); + } case PROCESS_VIEWER -> { newWidgetHeader = translate("/ch.ivy.addon.portalkit.ui.jsf/dashboard/configuration/newWidgetHeader", Arrays.asList(translate("/ch.ivy.addon.portalkit.ui.jsf/ProcessViewer/ProcessViewerText"))); @@ -374,6 +382,12 @@ private ProcessDashboardWidget getDefaultProcessDashboardWidget() { return (ProcessDashboardWidget) DashboardWidgetUtils.buildDefaultWidget(widgetId, widgetName, PROCESS); } + private StatisticDashboardWidget getDefaultStatisticDashboardWidget() { + String widgetId = DashboardWidgetUtils.generateNewWidgetId(STATISTIC); + String widgetName = translate("/ch.ivy.addon.portalkit.ui.jsf/dashboard/yourStatistics"); + return (StatisticDashboardWidget) DashboardWidgetUtils.buildDefaultWidget(widgetId, widgetName, STATISTIC); + } + private ClientStatisticDashboardWidget getDefaultClientStatisticDashboardWidget(String widgetName, String chartId) { String widgetId = DashboardWidgetUtils.generateNewWidgetId(CLIENT_STATISTIC); ClientStatisticDashboardWidget widget = null; @@ -465,6 +479,9 @@ public void saveWidget() { CustomDashboardWidget customWidget = (CustomDashboardWidget) widget; unifyCustomWidgetData(customWidget); } + case STATISTIC -> { + updateStatisticWidgetData(widget); + } case WELCOME -> { updateWelcomeWidget(widget); } @@ -524,6 +541,14 @@ private void updateProcessWidgetSize(ProcessDashboardWidget processWidget, int h } } + private void updateStatisticWidgetData(DashboardWidget widget) { + var statisticWidget = (StatisticDashboardWidget) widget; + var displayName = StatisticService.getInstance().getDisplayNameInUserLanguageForChart(statisticWidget.getChart()); + if (displayName != null) { + statisticWidget.setName(displayName.getValue()); + } + } + /** * Add image to CMS, remove temp image CMS * @@ -789,6 +814,11 @@ public void prepareEditWidget(DashboardWidget widget) { }; setWidget(clonedWidget); } + case STATISTIC -> { + var statisticDashboardWidget = new StatisticDashboardWidget((StatisticDashboardWidget) widget); + setWidget(statisticDashboardWidget); + } + default -> { setWidget(editWidget); } diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portal/generic/bean/NavigatorBean.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portal/generic/bean/NavigatorBean.java index c354bba7337..b7b95b68259 100644 --- a/AxonIvyPortal/portal/src/ch/ivy/addon/portal/generic/bean/NavigatorBean.java +++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portal/generic/bean/NavigatorBean.java @@ -28,5 +28,8 @@ public String getTaskPage() { public String getCasePage() { return MenuKind.CASE.toString(); } - + + public String getStatisticPage() { + return MenuKind.STATISTICS.toString(); + } } diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portal/generic/bean/StatisticBean.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portal/generic/bean/StatisticBean.java new file mode 100644 index 00000000000..8320f00ff36 --- /dev/null +++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portal/generic/bean/StatisticBean.java @@ -0,0 +1,31 @@ +package ch.ivy.addon.portal.generic.bean; + +import java.io.Serializable; + +import javax.annotation.PostConstruct; +import javax.faces.bean.ManagedBean; +import javax.faces.bean.ViewScoped; + +import org.apache.commons.lang3.StringUtils; + +import ch.ivy.addon.portalkit.enums.GlobalVariable; +import ch.ivy.addon.portalkit.service.GlobalSettingService; + +@ManagedBean +@ViewScoped +public class StatisticBean implements Serializable { + private static final long serialVersionUID = 1L; + + private String isHideStatisticWidget; + + @PostConstruct + public void init() { + GlobalSettingService globalSettingService = GlobalSettingService.getInstance(); + isHideStatisticWidget = + globalSettingService.findGlobalSettingValue(GlobalVariable.HIDE_STATISTIC_WIDGET); + } + + public boolean isHiddenStatisticWidget() { + return StringUtils.isNotBlank(isHideStatisticWidget) ? Boolean.parseBoolean(isHideStatisticWidget) : false; + } +} diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portal/generic/bean/UserMenuBean.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portal/generic/bean/UserMenuBean.java index eaba4acc941..ac4daad3bde 100644 --- a/AxonIvyPortal/portal/src/ch/ivy/addon/portal/generic/bean/UserMenuBean.java +++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portal/generic/bean/UserMenuBean.java @@ -107,6 +107,10 @@ private boolean loggedByExternalSecuritySystem() { return Ivy.session().getSessionUser() != null && Ivy.session().getSessionUser().getExternalId() != null; } + public boolean isHiddenStatisticWidget() { + return GlobalSettingService.getInstance().findGlobalSettingValueAsBoolean(GlobalVariable.HIDE_STATISTIC_WIDGET); + } + public boolean getIsShowGlobalSearch() { return isShowGlobalSearch; } diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portal/generic/navigation/PortalNavigator.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portal/generic/navigation/PortalNavigator.java index b02592f9776..230f77efb2f 100644 --- a/AxonIvyPortal/portal/src/ch/ivy/addon/portal/generic/navigation/PortalNavigator.java +++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portal/generic/navigation/PortalNavigator.java @@ -24,6 +24,7 @@ public final class PortalNavigator extends BaseNavigator{ private static final String PORTAL_PROCESS = "Start Processes/PortalStart/DefaultProcessStartListPage.ivp"; private static final String PORTAL_TASK = "Start Processes/PortalStart/DefaultTaskListPage.ivp"; private static final String PORTAL_CASE = "Start Processes/PortalStart/CaseListPage.ivp"; + private static final String PORTAL_STATISTIC = "Start Processes/PortalStart/StatisticPage.ivp"; private static final String PORTAL_CASE_DETAILS = "Start Processes/PortalStart/DefaultCaseDetailPage.ivp"; private static final String PORTAL_RELATED_TASKS_OF_CASE = "Start Processes/PortalStart/RelatedTasksOfCasePage.ivp"; private static final String PORTAL_RELATED_TASKS_OF_CASE_IN_FRAME = "Start Processes/PortalStart/RelatedTasksOfCasePageInFrame.ivp"; @@ -44,6 +45,7 @@ public final class PortalNavigator extends BaseNavigator{ public static final String PORTAL_PROCESS_START = "/DefaultProcessStartListPage.ivp"; public static final String PORTAL_TASK_START = "/DefaultTaskListPage.ivp"; public static final String PORTAL_CASE_START = "/CaseListPage.ivp"; + public static final String PORTAL_STATISTIC_START = "/StatisticPage.ivp"; public static final String PORTAL_USER_PROFILE_START = "/UserProfile.ivp"; public static final String PORTAL_CASE_DETAILS_IN_IFRAME_START = "/CaseDetailsInIFrame.ivp"; private static final String UUID = "uuid"; @@ -97,6 +99,7 @@ public static String getSubMenuItemUrlOfCurrentApplication(MenuKind menuKind) { case PROCESS -> PORTAL_PROCESS; case TASK -> PORTAL_TASK; case CASE -> PORTAL_CASE; + case STATISTICS -> PORTAL_STATISTIC; default -> StringUtils.EMPTY; }; return ProcessStartAPI.findRelativeUrlByProcessStartFriendlyRequestPath(subMenuUrl); @@ -120,6 +123,10 @@ public static void navigateToPortalTask() { navigateByKeyword(PORTAL_TASK_START, PORTAL_TASK, new HashMap<>()); } + public static void navigateToPortalStatistic() { + navigateByKeyword(PORTAL_STATISTIC_START, PORTAL_STATISTIC, new HashMap<>()); + } + public static void navigateToPortalCaseDetails(String uuid) { Map params = new HashMap<>(); params.put(ID, uuid); diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portal/generic/view/TaskAnalysisView.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portal/generic/view/TaskAnalysisView.java new file mode 100644 index 00000000000..c993547f8a6 --- /dev/null +++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portal/generic/view/TaskAnalysisView.java @@ -0,0 +1,162 @@ +package ch.ivy.addon.portal.generic.view; + +import org.apache.commons.lang3.StringUtils; + +import ch.ivy.addon.portalkit.datamodel.internal.TaskAnalysisLazyDataModel; +import ch.ivyteam.ivy.environment.Ivy; + +public class TaskAnalysisView { + + public static class Builder { + + private String pageTitle = StringUtils.EMPTY; + private TaskAnalysisLazyDataModel dataModel; + private String keyword = StringUtils.EMPTY; + private long taskId = -1L; + private boolean canLinkBackCaseDetail = Boolean.FALSE; + private String caseName = StringUtils.EMPTY; + private boolean hideTaskFilter = Boolean.FALSE; + private boolean showHeaderToolbar = Boolean.TRUE; + private String noTaskFoundMessage = Ivy.cms().co("/ch.ivy.addon.portalkit.ui.jsf/components/taskView/noTask"); + private boolean compactMode = Boolean.TRUE; + private Integer chunkSize = 10; + + public Builder pageTitle(String pageTitle) { + this.pageTitle = pageTitle; + return this; + } + + public Builder caseName(String caseName) { + this.caseName = caseName; + return this; + } + + public Builder dataModel(TaskAnalysisLazyDataModel taskAnalysisLazyDataModel) { + this.dataModel = taskAnalysisLazyDataModel; + return this; + } + + public Builder keyword(String keyword) { + this.keyword = keyword; + return this; + } + + public Builder taskId(long taskId) { + this.taskId = taskId; + return this; + } + + public Builder canLinkBackCaseDetail(boolean canLinkBackCaseDetail) { + this.canLinkBackCaseDetail = canLinkBackCaseDetail; + return this; + } + + public Builder hideTaskFilter(boolean hideTaskFilter) { + this.hideTaskFilter = hideTaskFilter; + return this; + } + + public Builder showHeaderToolbar(boolean showHeaderToolbar) { + this.showHeaderToolbar = showHeaderToolbar; + return this; + } + + public Builder noTaskFoundMessage(String noTaskFoundMessage) { + this.noTaskFoundMessage = noTaskFoundMessage; + return this; + } + + public Builder compactMode(boolean compactMode) { + this.compactMode = compactMode; + return this; + } + + public Builder chunkSize(Integer chunkSize) { + this.chunkSize = chunkSize; + return this; + } + + public TaskAnalysisView createNewTaskView() { + return new TaskAnalysisView(this); + } + } + + private final String pageTitle; + private TaskAnalysisLazyDataModel dataModel; + private final String keyword; + private final long taskId; + private final String caseName; + private final boolean canLinkBackCaseDetail; + private final boolean hideTaskFilter; + private final boolean showHeaderToolbar; + private final String noTaskFoundMessage; + private final boolean compactMode; + private final Integer chunkSize; + + private TaskAnalysisView(Builder builder) { + pageTitle = builder.pageTitle; + dataModel = builder.dataModel; + keyword = builder.keyword; + taskId = builder.taskId; + canLinkBackCaseDetail = builder.canLinkBackCaseDetail; + caseName = builder.caseName; + hideTaskFilter = builder.hideTaskFilter; + showHeaderToolbar = builder.showHeaderToolbar; + noTaskFoundMessage = builder.noTaskFoundMessage; + compactMode = builder.compactMode; + chunkSize = builder.chunkSize; + } + + public String getNoTaskFoundMessage() { + return noTaskFoundMessage; + } + + public static Builder create() { + return new Builder(); + } + + public String getPageTitle() { + return pageTitle; + } + + public TaskAnalysisLazyDataModel getDataModel() { + return dataModel; + } + + public void setDataModel(TaskAnalysisLazyDataModel dataModel) { + this.dataModel = dataModel; + } + + public String getKeyword() { + return keyword; + } + + public long getTaskId() { + return taskId; + } + + public boolean canLinkBackCaseDetail() { + return canLinkBackCaseDetail; + } + + public String getCaseName() { + return caseName; + } + + public boolean isHideTaskFilter() { + return hideTaskFilter; + } + + public boolean isShowHeaderToolbar() { + return showHeaderToolbar; + } + + public boolean isCompactMode() { + return compactMode; + } + + public Integer getChunkSize() { + return chunkSize; + } + +} diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bean/DashboardStatisticChartBean.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bean/DashboardStatisticChartBean.java new file mode 100644 index 00000000000..5a994ba8502 --- /dev/null +++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bean/DashboardStatisticChartBean.java @@ -0,0 +1,196 @@ +package ch.ivy.addon.portalkit.bean; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; + +import javax.faces.bean.ManagedBean; +import javax.faces.bean.ViewScoped; + +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; +import org.primefaces.event.ItemSelectEvent; + +import ch.ivy.addon.portalkit.dto.dashboard.StatisticDashboardWidget; +import ch.ivy.addon.portalkit.enums.GlobalVariable; +import ch.ivy.addon.portalkit.enums.StatisticChartType; +import ch.ivy.addon.portalkit.service.GlobalSettingService; +import ch.ivy.addon.portalkit.service.StatisticService; +import ch.ivy.addon.portalkit.statistics.StatisticChart; +import ch.ivy.addon.portalkit.statistics.StatisticChartDrilldownUtils; +import ch.ivyteam.ivy.environment.Ivy; + +@ViewScoped +@ManagedBean +public class DashboardStatisticChartBean implements Serializable { + + private static final long serialVersionUID = -8491957877380766526L; + private List availableCharts; + private StatisticChart selectedChart; + private boolean isPublicDashboard; + private boolean isRenderedRefreshChartPoll; + private long statisticChartScalingInterval; + + public void initChartConfiguration(StatisticDashboardWidget widget, boolean isPublicDashboard) { + if (widget != null && widget.getChart() != null) { + selectedChart = widget.getChart(); + } else { + selectedChart = new StatisticChart(); + selectedChart.setType(StatisticChartType.TASK_BY_PRIORITY); + selectedChart.setDonutChartModel(StatisticService.getInstance().createDonutChartPlaceholder()); + } + this.isPublicDashboard = isPublicDashboard; + } + + public void fetchStatisticCharts() { + availableCharts = new ArrayList<>(); + if (isPublicDashboard) { + availableCharts.addAll(StatisticService.getInstance().getPublicConfig()); + } else { + availableCharts.addAll(StatisticService.getInstance().findStatisticCharts()); + } + } + + public void initSettings() { + var chartScalingSetting = GlobalSettingService.getInstance().findGlobalSettingValue(GlobalVariable.STATISTIC_CHART_SCALING_INTERVAL); + statisticChartScalingInterval = StringUtils.isNotBlank(chartScalingSetting) ? Long.valueOf(chartScalingSetting) : 0; + isRenderedRefreshChartPoll = statisticChartScalingInterval > StatisticChartCreationBean.MINIMUM_STATISTIC_CHART_SCALING_INTERVAL + && !Ivy.session().isSessionUserUnknown(); + } + + public List completeCharts(String filter) { + if (CollectionUtils.isEmpty(availableCharts)) { + fetchStatisticCharts(); + } + return availableCharts.stream().filter(chart -> StringUtils.containsAnyIgnoreCase(getDisplayChartName(chart), filter)) + .collect(Collectors.toList()); + } + + public boolean isCaseByFinishedTime(StatisticChart chart) { + if (chart == null) { + return false; + } + return StatisticService.getInstance().isCaseByFinishedTime(chart) && Objects.nonNull(chart.getDonutChartModel()); + } + + public boolean isCaseByFinishedTask(StatisticChart chart) { + if (chart == null) { + return false; + } + return StatisticService.getInstance().isCaseByFinishedTask(chart) && Objects.nonNull(chart.getDonutChartModel()); + } + + public boolean isElapsedTimeByCaseCategory(StatisticChart chart) { + if (chart == null) { + return false; + } + return StatisticService.getInstance().isElapsedTimeByCaseCategory(chart) && Objects.nonNull(chart.getBarChartModel()); + } + + public boolean isCaseByState(StatisticChart chart) { + if (chart == null) { + return false; + } + return StatisticService.getInstance().isCaseByState(chart) && Objects.nonNull(chart.getDonutChartModel()); + } + + public boolean isTaskByPriority(StatisticChart chart) { + if (chart == null) { + return false; + } + return StatisticService.getInstance().isTaskByPriority(chart) && Objects.nonNull(chart.getDonutChartModel()); + } + + public boolean isTaskByExpiry(StatisticChart chart) { + if (chart == null) { + return false; + } + return StatisticService.getInstance().isTaskByExpiry(chart) && Objects.nonNull(chart.getBarChartModel()); + } + + public boolean isCasesByCategory(StatisticChart chart) { + if (chart == null) { + return false; + } + return StatisticService.getInstance().isCasesByCategory(chart) && Objects.nonNull(chart.getBarChartModel()); + } + + public List completeStatisticChart(String filter) { + return getAvailableCharts().stream().filter(chart -> getDisplayChartName(chart).contains(filter)) + .collect(Collectors.toList()); + } + + public List getAvailableCharts() { + return availableCharts; + } + + public void setAvailableCharts(List availableCharts) { + this.availableCharts = availableCharts; + } + + public String getDisplayChartName(StatisticChart chart) { + if (chart == null) { + return ""; + } + var displayName = StatisticService.getInstance().getDisplayNameInUserLanguageForChart(chart); + return Objects.isNull(displayName) ? chart.getName() : displayName.getValue(); + } + + public StatisticChart getSelectedChart() { + return selectedChart; + } + + public void setSelectedChart(StatisticChart selectedChart) { + this.selectedChart = selectedChart; + } + + public void drilldownCaseByState(ItemSelectEvent event) { + StatisticChart selectedStatisticChart = getSelectedStatisticChart(event); + if (selectedStatisticChart == null) { + return; + } + StatisticChartDrilldownUtils.drilldownCaseByState(event, selectedStatisticChart); + } + + private StatisticChart getSelectedStatisticChart(ItemSelectEvent event) { + String selectedChartId = (String) event.getComponent().getAttributes().get("selectedChartId"); + var charts = StatisticService.getInstance().findAll(); + return charts.stream() + .filter(chart -> StringUtils.equals(chart.getId(), selectedChartId)) + .findFirst().orElse(null); + } + + public void drilldownTaskByPriority(ItemSelectEvent event) { + StatisticChart selectedStatisticChart = getSelectedStatisticChart(event); + if (selectedStatisticChart == null) { + return; + } + StatisticChartDrilldownUtils.drilldownTaskByPriority(event, selectedStatisticChart); + } + + public void toTaskByExpiryTaskList(ItemSelectEvent event) { + StatisticChart selectedStatisticChart = getSelectedStatisticChart(event); + if (selectedStatisticChart == null) { + return; + } + StatisticChartDrilldownUtils.toTaskByExpiryTaskList(event, selectedStatisticChart); + } + + public void toCasesByCategoryCaseList(ItemSelectEvent event) { + StatisticChart selectedStatisticChart = getSelectedStatisticChart(event); + if (selectedStatisticChart == null) { + return; + } + StatisticChartDrilldownUtils.toCasesByCategoryCaseList(event, selectedStatisticChart); + } + + public boolean isRenderedRefreshChartPoll() { + return isRenderedRefreshChartPoll; + } + + public long getStatisticChartScalingInterval() { + return statisticChartScalingInterval; + } +} diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bean/ElapsedTimeDetailsBean.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bean/ElapsedTimeDetailsBean.java new file mode 100644 index 00000000000..ff541b5955e --- /dev/null +++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bean/ElapsedTimeDetailsBean.java @@ -0,0 +1,60 @@ +package ch.ivy.addon.portalkit.bean; + +import java.io.Serializable; + +import javax.faces.bean.ManagedBean; +import javax.faces.bean.ViewScoped; + +import org.primefaces.model.SortMeta; + +import ch.ivy.addon.portalkit.dto.DisplayName; +import ch.ivy.addon.portalkit.service.StatisticService; +import ch.ivy.addon.portalkit.statistics.StatisticChart; +import ch.ivy.addon.portalkit.statistics.StatisticChartConstants; +import ch.ivy.addon.portalkit.util.DateTimeFormatterUtils; +import ch.ivy.addon.portalkit.util.SortFieldUtil; +import ch.ivy.addon.portalkit.util.UserUtils; +import ch.ivyteam.ivy.environment.Ivy; + +@ManagedBean +@ViewScoped +public class ElapsedTimeDetailsBean implements Serializable { + private static final long serialVersionUID = 1L; + + private String selectedCaseCategory; + private String chartName; + + public void initialize(String caseCategory, StatisticChart statisticChart) { + setSelectedCaseCategory(caseCategory); + String currentLanguage = UserUtils.getUserLanguage(); + chartName = statisticChart.getNames().stream() + .filter(name -> StatisticService.equalsLanguageLocale(name, currentLanguage)) + .map(DisplayName::getValue) + .findFirst().orElse(""); + } + + public String getSelectedCaseCategory() { + return selectedCaseCategory; + } + + public void setSelectedCaseCategory(String selectedCaseCategory) { + this.selectedCaseCategory = selectedCaseCategory; + } + + public String getExcelFileName() { + String fileName = chartName + "_" + selectedCaseCategory; + fileName = fileName.replace(" ", "_"); + if (Ivy.cms().co(StatisticChartConstants.NO_CATEGORY_CMS).equals(selectedCaseCategory)) { + fileName = fileName.replace("[", "").replace("]", ""); + } + return fileName; + } + + public String calculateElapsedTime(Number secondsValue) { + return DateTimeFormatterUtils.formatToExactTime(secondsValue); + } + + public SortMeta getSortById() { + return SortFieldUtil.buildSortMeta("ID", false); + } +} diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bean/StatisticChartCreationBean.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bean/StatisticChartCreationBean.java new file mode 100644 index 00000000000..a5f298db15a --- /dev/null +++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bean/StatisticChartCreationBean.java @@ -0,0 +1,403 @@ +package ch.ivy.addon.portalkit.bean; + +import java.io.Serializable; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.annotation.PostConstruct; +import javax.faces.bean.ManagedBean; +import javax.faces.bean.ViewScoped; +import javax.faces.context.FacesContext; + +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; +import org.primefaces.model.charts.bar.BarChartModel; +import org.primefaces.model.charts.donut.DonutChartModel; + +import ch.ivy.addon.portalkit.bo.CaseStateStatistic; +import ch.ivy.addon.portalkit.bo.CaseCategoryStatistic; +import ch.ivy.addon.portalkit.bo.ElapsedTimeStatistic; +import ch.ivy.addon.portalkit.bo.ExpiryStatistic; +import ch.ivy.addon.portalkit.bo.PriorityStatistic; +import ch.ivy.addon.portalkit.enums.GlobalVariable; +import ch.ivy.addon.portalkit.enums.StatisticChartType; +import ch.ivy.addon.portalkit.enums.StatisticTimePeriodSelection; +import ch.ivy.addon.portalkit.service.GlobalSettingService; +import ch.ivy.addon.portalkit.service.StatisticService; +import ch.ivy.addon.portalkit.statistics.StatisticChartQueryUtils; +import ch.ivy.addon.portalkit.statistics.StatisticFilter; +import ch.ivyteam.ivy.security.IRole; +import ch.ivyteam.ivy.security.IUser; +import ch.ivyteam.ivy.workflow.CaseState; +import ch.ivyteam.ivy.workflow.WorkflowPriority; +import ch.ivyteam.ivy.workflow.query.CaseQuery; +import ch.ivyteam.ivy.workflow.query.TaskQuery; + +@ManagedBean +@ViewScoped +public class StatisticChartCreationBean implements Serializable { + + private static final long serialVersionUID = 1L; + + private DonutChartModel taskByPriorityModel; + private DonutChartModel caseByStateModel; + private DonutChartModel caseByFinishedTimeModel; + private DonutChartModel caseByFinishedTaskModel; + private BarChartModel taskByExpiryModel; + private BarChartModel elapsedTimeModel; + private BarChartModel casesByCategoryModel; + private StatisticService statisticService; + private Map> customFieldFilters = new HashMap<>(); + + public static final int CASE_CATEGORIES_TYPE = 0; + public static final int MINIMUM_STATISTIC_CHART_SCALING_INTERVAL = 10; + + @PostConstruct + public void init() { + statisticService = StatisticService.getInstance(); + initStatisticChart(); + } + + /** + * Create a StatisticChart's placeholder when the data is collecting. + */ + private void initStatisticChart() { + taskByPriorityModel = statisticService.createDonutChartPlaceholder(); + caseByStateModel = statisticService.createDonutChartPlaceholder(); + caseByFinishedTimeModel = statisticService.createDonutChartPlaceholder(); + caseByFinishedTaskModel = statisticService.createDonutChartPlaceholder(); + taskByExpiryModel = statisticService.createBarChartPlaceholder(); + elapsedTimeModel = statisticService.createBarChartPlaceholder(); + casesByCategoryModel = statisticService.createBarChartPlaceholder(); + } + + /** + * Update filters + * + * @param filter + * @param oldFilter + */ + public void updateFilters(StatisticFilter filter, StatisticFilter oldFilter) { + filter.setCustomFieldFilters(this.customFieldFilters); + if(filter.getTimePeriodSelection() != StatisticTimePeriodSelection.CUSTOM) { + filter.setCreatedDateFrom(null); + filter.setCreatedDateTo(null); + } + if (oldFilter != null) { + setOldFiltersFromCurrentValues(filter, oldFilter); + } + } + + public void clearChartModels() { + initStatisticChart(); + } + + private void setOldFiltersFromCurrentValues(StatisticFilter filter, StatisticFilter oldFilter) { + oldFilter.setTimePeriodSelection(filter.getTimePeriodSelection()); + Date createdDateFrom = filter.getCreatedDateFrom(); + Date createdDateTo = filter.getCreatedDateTo(); + oldFilter.setCreatedDateFrom(createdDateFrom == null ? null : new Date(createdDateFrom.getTime())); + oldFilter.setCreatedDateTo(createdDateTo == null ? null : new Date(createdDateTo.getTime())); + oldFilter.setIsAllCaseStatesSelected(filter.getIsAllCaseStatesSelected()); + oldFilter.setIsAllRolesSelected(filter.getIsAllRolesSelected()); + oldFilter.setIsAllTaskPrioritiesSelected(filter.getIsAllTaskPrioritiesSelected()); + + updateCaseCategory(filter, oldFilter); + + if (!filter.getIsAllRolesSelected()) { + updateOldListFromNewList(oldFilter.getSelectedRoles(), filter.getSelectedRoles()); + } + if (!filter.getIsAllCaseStatesSelected()) { + updateOldListFromNewList(oldFilter.getSelectedCaseStates(), filter.getSelectedCaseStates()); + } + if (!filter.getIsAllTaskPrioritiesSelected()) { + updateOldListFromNewList(oldFilter.getSelectedTaskPriorities(), filter.getSelectedTaskPriorities()); + } + oldFilter.setCustomFieldFilters(filter.getCustomFieldFilters()); + } + + private void updateCaseCategory(StatisticFilter filter, StatisticFilter oldFilter) { + filter.setSelectedCaseCategories(filter.getCaseCategories().getCategoryPaths()); + oldFilter.setSelectedCaseCategories(filter.getSelectedCaseCategories()); + } + + public boolean checkIfAnyFilterChanges(StatisticFilter filter, StatisticFilter oldFilter) { + if (oldFilter.getTimePeriodSelection() != filter.getTimePeriodSelection()) { + return true; + } + if (isDateChanged(oldFilter.getCreatedDateFrom(), filter.getCreatedDateFrom())) { + return true; + } + if (isDateChanged(oldFilter.getCreatedDateTo(), filter.getCreatedDateTo())) { + return true; + } + if (checkIfAnyCaseStateChanged(filter, oldFilter)) { + return true; + } + if (checkIfAnyTaskPriorityChanged(filter, oldFilter)) { + return true; + } + if (checkIfAnyCaseCategoryChanged(filter, oldFilter)) { + return true; + } + if (checkIfAnyRoleChanged(filter, oldFilter)) { + return true; + } + return checkIfAnyCustomFieldChanged(filter, oldFilter); + } + + private boolean checkIfAnyCaseStateChanged(StatisticFilter filter, StatisticFilter oldFilter) { + //compare check box select all of case states + if (oldFilter.getIsAllCaseStatesSelected() != filter.getIsAllCaseStatesSelected()) { + return true; + } + //compare other check box of case states if select all is not checked + return !filter.getIsAllCaseStatesSelected() && !oldFilter.getSelectedCaseStates().equals(filter.getSelectedCaseStates()); + } + + private boolean checkIfAnyTaskPriorityChanged(StatisticFilter filter, StatisticFilter oldFilter) { + //compare check box select all of task priorities + if (oldFilter.getIsAllTaskPrioritiesSelected() != filter.getIsAllTaskPrioritiesSelected()) { + return true; + } + //compare other check box of task priorities if select all is not checked + return !filter.getIsAllTaskPrioritiesSelected() && !oldFilter.getSelectedTaskPriorities().equals(filter.getSelectedTaskPriorities()); + } + + private boolean checkIfAnyCaseCategoryChanged(StatisticFilter filter, StatisticFilter oldFilter) { + return !oldFilter.getCaseCategories().getCategoryPaths().equals(filter.getCaseCategories().getCategoryPaths()); + } + + private boolean checkIfAnyRoleChanged(StatisticFilter filter, StatisticFilter oldFilter) { + //compare check box select all of roles + if (oldFilter.getIsAllRolesSelected() != filter.getIsAllRolesSelected()) { + return true; + } + //compare other check box of roles if select all is not checked + return !filter.getIsAllRolesSelected() && !oldFilter.getSelectedRoles().equals(filter.getSelectedRoles()); + } + + private boolean checkIfAnyCustomFieldChanged(StatisticFilter filter, StatisticFilter oldFilter) { + for (Map.Entry> entry : filter.getCustomFieldFilters().entrySet()) { + List list = oldFilter.getCustomFieldFilters().get(entry.getKey()); + if (list != null && entry.getValue() != null && !CollectionUtils.isEqualCollection(list, entry.getValue())) { + return true; + } + } + return false; + } + + private boolean isDateChanged(Date oldDate, Date currentDate) { + if (oldDate == null) { + return currentDate != null; + } + if (currentDate == null) { + return true; + } + return oldDate.compareTo(currentDate) != 0; + } + + public void updateRolesCheckboxes(StatisticFilter filter) { + List selectedRoles = filter.getSelectedRoles(); + if (filter.getIsAllRolesSelected()) { + for (Object obj : filter.getRoles()) { + if (obj instanceof IUser) { + IUser user = (IUser) obj; + addToListIfNotExist(selectedRoles, user.getMemberName()); + } else if (obj instanceof IRole) { + IRole role = (IRole) obj; + addToListIfNotExist(selectedRoles, role.getMemberName()); + } + } + } else { + selectedRoles.clear(); + } + } + + public void updateCaseStatesCheckboxes(StatisticFilter filter) { + List selectedCaseStates = filter.getSelectedCaseStates(); + if (filter.getIsAllCaseStatesSelected()) { + for (CaseState state : filter.getCaseStates()) { + addToListIfNotExist(selectedCaseStates, state); + } + } else { + selectedCaseStates.clear(); + } + } + + public void updateTaskPrioritiesCheckboxes(StatisticFilter filter) { + List selectedTaskPriorities = filter.getSelectedTaskPriorities(); + if (filter.getIsAllTaskPrioritiesSelected()) { + for (WorkflowPriority priority : filter.getTaskPriorities()) { + addToListIfNotExist(selectedTaskPriorities, priority); + } + } else { + selectedTaskPriorities.clear(); + } + } + + private void updateOldListFromNewList(List oldList, List newList) { + oldList.clear(); + if (!newList.isEmpty()) { + oldList.addAll(newList); + } + } + + private void addToListIfNotExist(List list, T element) { + if (!list.contains(element)) { + list.add(element); + } + } + + /** + * Create model for "Task by Priority" chart from given statistic filter + * + * @param filter statistic filter + */ + public void updateTaskByPriorityModel(StatisticFilter filter) { + TaskQuery query = StatisticChartQueryUtils.generateTaskQuery(filter); + PriorityStatistic priorityStatisticData = statisticService.getPriorityStatisticData(query); + taskByPriorityModel = statisticService.generateTaskByPriorityModel(priorityStatisticData, false); + } + + /** + * Create model for "Task by Expiry Date" chart from given statistic filter + * + * @param filter statistic filter + */ + public void updateTaskByExpiryModel(StatisticFilter filter) { + TaskQuery taskQuery = StatisticChartQueryUtils.generateTaskQueryForExpiry(filter); + ExpiryStatistic expiryStatisticData = statisticService.getExpiryStatisticData(taskQuery); + taskByExpiryModel = statisticService.generateTaskByExpiryModel(expiryStatisticData, false, StringUtils.EMPTY, StringUtils.EMPTY, StringUtils.EMPTY); + } + + /** + * Create model for "Case by State" chart from given statistic filter + * + * @param filter statistic filter + */ + public void updateCaseByStateModel(StatisticFilter filter) { + CaseQuery caseQuery = StatisticChartQueryUtils.generateCaseQueryForCaseState(filter); + CaseStateStatistic caseStateStatisticData = statisticService.getCaseStateStatisticData(caseQuery); + caseByStateModel = statisticService.generateCaseByStateModel(caseStateStatisticData,StatisticChartType.CASES_BY_STATE, false); + } + + /** + * Create model for "Case by Finished task" chart from given statistic filter + * @param filter + */ + public void updateCaseByFinishedTaskModel(StatisticFilter filter) { + CaseQuery caseQuery = StatisticChartQueryUtils.generateCaseQueryForCaseHaveFinishedTask(filter); + CaseStateStatistic caseStateStatisticData = statisticService.getCaseStateStatisticData(caseQuery); + caseByFinishedTaskModel = statisticService.generateCaseByStateModel(caseStateStatisticData, StatisticChartType.CASES_BY_FINISHED_TASK, false); + } + + /** + * Create model for "Case by Finished time" chart from given statistic filter + * @param filter + */ + public void updateCaseByFinishedTimeModel(StatisticFilter filter) { + CaseQuery caseQuery = StatisticChartQueryUtils.generateCaseQueryByFinishedTime(filter); + CaseStateStatistic caseStateStatisticData = statisticService.getCaseStateStatisticData(caseQuery); + caseByFinishedTimeModel = statisticService.generateCaseByStateModel(caseStateStatisticData, StatisticChartType.CASES_BY_FINISHED_TIME, false); + } + + /** + * Create model for "Elapsed time by Case Category" chart from given statistic filter + * + * @param filter statistic filter + */ + public void updateElapsedTimeByCaseCategory(StatisticFilter filter) { + CaseQuery caseQuery = StatisticChartQueryUtils.generateCaseQuery(filter, true); + ElapsedTimeStatistic elapsedTimeStatisticData = statisticService.getElapsedTimeStatisticData(caseQuery); + setElapsedTimeModel(statisticService.generateElapsedTimeModel(elapsedTimeStatisticData, false)); + } + + /** + * Create model for "Cases by Category" chart from given statistic filter + * + * @param filter statistic filter + */ + public void updateCasesByCategoryModel(StatisticFilter filter) { + CaseQuery caseQuery = StatisticChartQueryUtils.generateCaseQueryForCasesByCategoryChart(filter, null); + CaseCategoryStatistic caseCategoryStatisticData = statisticService.getCasesByCategoryStatisticData(caseQuery,filter.getCaseCategories().getCategoryPaths()); + casesByCategoryModel = statisticService.generateCasesByCategoryModel(caseCategoryStatisticData, false); + } + + public DonutChartModel getTaskByPriorityModel() { + return taskByPriorityModel; + } + + public void setTaskByPriorityModel(DonutChartModel taskByPriorityModel) { + this.taskByPriorityModel = taskByPriorityModel; + } + + public DonutChartModel getCaseByStateModel() { + return caseByStateModel; + } + + public void setCaseByStateModel(DonutChartModel caseByStateModel) { + this.caseByStateModel = caseByStateModel; + } + + public BarChartModel getTaskByExpiryModel() { + return taskByExpiryModel; + } + + public void setTaskByExpiryModel(BarChartModel taskByExpiryModel) { + this.taskByExpiryModel = taskByExpiryModel; + } + + public BarChartModel getElapsedTimeModel() { + return elapsedTimeModel; + } + + public void setElapsedTimeModel(BarChartModel elapsedTimeModel) { + this.elapsedTimeModel = elapsedTimeModel; + } + + public DonutChartModel getCaseByFinishedTaskModel() { + return caseByFinishedTaskModel; + } + + public void setCaseByFinishedTaskModel(DonutChartModel caseByFinishedTaskModel) { + this.caseByFinishedTaskModel = caseByFinishedTaskModel; + } + + public DonutChartModel getCaseByFinishedTimeModel() { + return caseByFinishedTimeModel; + } + + public void setCaseByFinishedTimeModel(DonutChartModel caseByFinishedTimeModel) { + this.caseByFinishedTimeModel = caseByFinishedTimeModel; + } + + public BarChartModel getCasesByCategoryModel() { + return casesByCategoryModel; + } + + public void setCasesByCategoryModel(BarChartModel casesByCategoryModel) { + this.casesByCategoryModel = casesByCategoryModel; + } + + public List populateCustomStringFieldAutoComplete(String query) { + Map params = FacesContext.getCurrentInstance().getExternalContext().getRequestParameterMap(); + String fieldName = params.get("fieldName"); + return statisticService.getCustomFields(fieldName, query); + } + + public void setCustomFieldFilter(String customFieldName, List values) { + this.customFieldFilters.put(customFieldName, values); + } + + public long getStatisticChartScalingInterval() { + String statisticChartScalingInterval = GlobalSettingService.getInstance().findGlobalSettingValue(GlobalVariable.STATISTIC_CHART_SCALING_INTERVAL); + return StringUtils.isNotBlank(statisticChartScalingInterval) ? Long.valueOf(statisticChartScalingInterval) : 0; + } + + public int getMinimumStatisticChartScalingInterval() { + return MINIMUM_STATISTIC_CHART_SCALING_INTERVAL; + } +} \ No newline at end of file diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bean/StatisticDashboardBean.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bean/StatisticDashboardBean.java new file mode 100644 index 00000000000..d4555dbf550 --- /dev/null +++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bean/StatisticDashboardBean.java @@ -0,0 +1,268 @@ +package ch.ivy.addon.portalkit.bean; + +import java.io.Serializable; +import java.text.DateFormat; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Locale; + +import javax.faces.bean.ManagedBean; +import javax.faces.bean.ViewScoped; + +import org.apache.commons.lang3.StringUtils; +import org.primefaces.event.ItemSelectEvent; +import org.primefaces.model.charts.donut.DonutChartModel; + +import ch.ivy.addon.portalkit.dto.DisplayName; +import ch.ivy.addon.portalkit.enums.StatisticChartType; +import ch.ivy.addon.portalkit.enums.StatisticTimePeriodSelection; +import ch.ivy.addon.portalkit.ivydata.bo.IvyLanguage; +import ch.ivy.addon.portalkit.ivydata.service.impl.LanguageService; +import ch.ivy.addon.portalkit.jsf.Attrs; +import ch.ivy.addon.portalkit.service.DateTimeGlobalSettingService; +import ch.ivy.addon.portalkit.service.StatisticService; +import ch.ivy.addon.portalkit.statistics.StatisticChart; +import ch.ivy.addon.portalkit.statistics.StatisticChartDrilldownUtils; +import ch.ivy.addon.portalkit.statistics.StatisticFilter; +import ch.ivyteam.ivy.environment.Ivy; + +@ManagedBean +@ViewScoped +public class StatisticDashboardBean implements Serializable { + private static final long serialVersionUID = 1L; + private static final int YEAR_CHART_WIDTH = 750; + private static final int MONTH_CHART_WIDTH = 500; + private static final int WEEK_CHART_WIDTH = 600; + private static final int DAY_CHART_WIDTH = 500; + private static final String GREATER_EQUAL = ">= %s"; + private static final String LESS_EQUAL = "<= %s"; + private static final String DASH = "%s - %s"; + private StatisticService statisticService = StatisticService.getInstance(); + private ItemSelectEvent taskByExpiryItemSelectEvent; + private ItemSelectEvent casesByCategoryItemSelectEvent; + + public String getChartWidthStyle(List chartList) { + List chartIdSuffixes = new ArrayList<>(); + for (StatisticChart chart : chartList) { + String chartId = chart.getId(); + if (chartId.contains("_")) { + // chart with format: id + _ + suffix is lower level (month/week/day/hour) + // chart when drilldown + chartIdSuffixes.add(chartId.substring(chartId.indexOf('_') + 1)); + } + } + int maxWidth = 0; + for (String suffix : chartIdSuffixes) { + if (StatisticService.selectThisYear(suffix)) { + maxWidth = Math.max(maxWidth, YEAR_CHART_WIDTH); + } else if (StatisticService.selectWeekOfMonth(suffix)) { + maxWidth = Math.max(maxWidth, WEEK_CHART_WIDTH); + } else if (StatisticService.selectMonthOfYear(suffix)) { + maxWidth = Math.max(maxWidth, MONTH_CHART_WIDTH); + } else if (StatisticService.selectDayOfWeek(suffix)) { + maxWidth = Math.max(maxWidth, DAY_CHART_WIDTH); + } + } + if (maxWidth > 0) { + return String.format("width: %spx", maxWidth); + } + return ""; + } + + public void drilldownTaskByPriority(ItemSelectEvent event) { + StatisticChart selectedStatisticChart = getSelectedStatisticChart(event); + StatisticChartDrilldownUtils.drilldownTaskByPriority(event, selectedStatisticChart); + } + + public void drilldownCaseByState(ItemSelectEvent event) { + StatisticChart selectedStatisticChart = getSelectedStatisticChart(event); + StatisticChartDrilldownUtils.drilldownCaseByState(event, selectedStatisticChart); + } + + public void drilldownElapsedTime(ItemSelectEvent event) { + StatisticChart selectedStatisticChart = getSelectedStatisticChart(event); + StatisticChartDrilldownUtils.drilldownElapsedTime(event, selectedStatisticChart); + } + + public void onSelectDrilldownTaskByExpiry(ItemSelectEvent event) { + StatisticChart selectedStatisticChart = getSelectedStatisticChart(event); + taskByExpiryItemSelectEvent = event; + StatisticChartDrilldownUtils.onSelectDrilldownTaskByExpiry(event, selectedStatisticChart); + } + + public void toTaskByExpiryTaskList(ItemSelectEvent event) { + StatisticChart selectedStatisticChart = getSelectedStatisticChart(event); + StatisticChartDrilldownUtils.toTaskByExpiryTaskList(event, selectedStatisticChart); + } + + // It's used for "Go to task list" selection from Statistic Dashboard + public void goToExpiriedTaskList() { + toTaskByExpiryTaskList(taskByExpiryItemSelectEvent); + releaseJSFEvent(); + } + + public void drilldownTaskByExpiry() { + StatisticChart selectedStatisticChart = getSelectedStatisticChart(taskByExpiryItemSelectEvent); + StatisticChartDrilldownUtils.drilldownTaskByExpiry(taskByExpiryItemSelectEvent, selectedStatisticChart); + releaseJSFEvent(); + } + + public void drilldownCasesByCategory() { + StatisticChart selectedStatisticChart = getSelectedStatisticChart(casesByCategoryItemSelectEvent); + StatisticChartDrilldownUtils.drilldownCasesByCategory(casesByCategoryItemSelectEvent, selectedStatisticChart); + releaseJSFEvent(); + } + + public void onSelectDrilldownCasesByCategory(ItemSelectEvent event) { + StatisticChart selectedStatisticChart = getSelectedStatisticChart(event); + casesByCategoryItemSelectEvent = event; + StatisticChartDrilldownUtils.onSelectDrilldownCasesByCategory(event, selectedStatisticChart); + } + + //It's used for "Go to case list" selection from Statistic Dashboard + public void goToCasesByCategoryList() { + toCasesByCategoryList(casesByCategoryItemSelectEvent); + releaseJSFEvent(); + } + + public void toCasesByCategoryList(ItemSelectEvent event) { + StatisticChart selectedStatisticChart = getSelectedStatisticChart(event); + StatisticChartDrilldownUtils.toCasesByCategoryCaseList(event, selectedStatisticChart); + } + + private void releaseJSFEvent() { + // Do not store JSF Event in a JSF bean that is not bound to request scope + this.taskByExpiryItemSelectEvent = null; + this.casesByCategoryItemSelectEvent = null; + } + + public StatisticChart createDefaultEmptyChart() { + StatisticChart emptyChart = new StatisticChart(); + emptyChart.setNames(generateNamesForEmptyChart()); + emptyChart.setType(StatisticChartType.TASK_BY_PRIORITY); + StatisticService service = StatisticService.getInstance(); + DonutChartModel model = service.createDonutChartPlaceholder(); + model.getOptions().getTitle().setText(Ivy.cms().co("/ch.ivy.addon.portalkit.ui.jsf/statistic/chart/emptystate/defaultEmptyMessages")); + emptyChart.setDonutChartModel(model); + return emptyChart; + } + + private List generateNamesForEmptyChart() { + List namesForEmptyChart = new ArrayList<>(); + IvyLanguage ivyLanguage = LanguageService.getInstance().getIvyLanguageOfUser(); + for (String language : ivyLanguage.getSupportedLanguages()) { + DisplayName name = new DisplayName(); + name.setLocale(Locale.forLanguageTag(language)); + name.setValue(Ivy.cms().coLocale(("/ch.ivy.addon.portalkit.ui.jsf/statistic/chart/statistics"), language)); + namesForEmptyChart.add(name); + } + return namesForEmptyChart; + } + + private static StatisticChart getSelectedStatisticChart(ItemSelectEvent event) { + String selectedChartId = (String) event.getComponent().getAttributes().get("selectedChartId"); + List statisticCharts = + Attrs.currentContext().getAttribute("#{data.statisticChartList}", List.class); + for (StatisticChart chart : statisticCharts) { + if (chart.getId() == selectedChartId) { + return chart; + } + } + return null; + } + + public String concatCreatedDate(StatisticFilter filter) { + StatisticTimePeriodSelection timeSelection = filter.getTimePeriodSelection(); + if (timeSelection != StatisticTimePeriodSelection.CUSTOM) { + return timeSelection.getLabel(); + } + + Date createdDateForm = filter.getCreatedDateFrom(); + Date createdDateTo = filter.getCreatedDateTo(); + DateFormat formatter = DateTimeGlobalSettingService.getInstance().getDefaultDateTimeFormatter(); + + if (createdDateForm != null && createdDateTo != null) { + return String.format(DASH, formatter.format(createdDateForm), formatter.format(createdDateTo)); + } + + if (createdDateForm != null) { + return String.format(GREATER_EQUAL, formatter.format(createdDateForm)); + } + + if (createdDateTo != null) { + return String.format(LESS_EQUAL, formatter.format(createdDateTo)); + } + + return StringUtils.EMPTY; + } + + public boolean isChartModelNotInitialized(List statisticChartList) { + for (StatisticChart statisticChart : statisticChartList) { + if (statisticChart.getBarChartModel() == null && statisticChart.getDonutChartModel() == null) { + return true; + } + } + return false; + } + + public boolean isTaskByPriority(StatisticChart statisticChart) { + if (statisticChart == null) { + return false; + } + return statisticService.isTaskByPriority(statisticChart); + } + + public boolean isTaskByExpiry(StatisticChart statisticChart) { + if (statisticChart == null) { + return false; + } + return statisticService.isTaskByExpiry(statisticChart); + } + + public boolean isTaskByExpiryHour(StatisticChart statisticChart) { + if (statisticChart == null) { + return false; + } + return statisticService.isTaskByExpiryHour(statisticChart); + } + + public boolean isCaseByState(StatisticChart statisticChart) { + if (statisticChart == null) { + return false; + } + return statisticService.isCaseByState(statisticChart); + } + + public boolean isCaseByFinishedTask(StatisticChart statisticChart) { + if (statisticChart == null) { + return false; + } + return statisticService.isCaseByFinishedTask(statisticChart); + } + + public boolean isCaseByFinishedTime(StatisticChart statisticChart) { + if (statisticChart == null) { + return false; + } + return statisticService.isCaseByFinishedTime(statisticChart); + } + + public boolean isElapsedTimeByCaseCategory(StatisticChart statisticChart) { + if (statisticChart == null) { + return false; + } + return statisticService.isElapsedTimeByCaseCategory(statisticChart); + } + + public boolean isCasesByCategory(StatisticChart statisticChart) { + if (statisticChart == null) { + return false; + } + return statisticService.isCasesByCategory(statisticChart); + } + + public String getId(StatisticChart chart) { + return chart.getId(); + } +} diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bean/TaskAnalysisWidgetBean.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bean/TaskAnalysisWidgetBean.java new file mode 100644 index 00000000000..cc917cfdec7 --- /dev/null +++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bean/TaskAnalysisWidgetBean.java @@ -0,0 +1,113 @@ +package ch.ivy.addon.portalkit.bean; + +import java.io.Serializable; +import java.util.HashMap; +import java.util.Map; + +import javax.annotation.PostConstruct; +import javax.faces.bean.ManagedBean; +import javax.faces.bean.ViewScoped; + +import org.primefaces.event.ToggleEvent; +import org.primefaces.model.SortMeta; +import org.primefaces.model.Visibility; + +import ch.ivy.addon.portalkit.datamodel.internal.TaskAnalysisLazyDataModel; +import ch.ivy.addon.portalkit.enums.TaskAndCaseAnalysisColumn; +import ch.ivy.addon.portalkit.exporter.Exporter; +import ch.ivy.addon.portalkit.service.GlobalSettingService; +import ch.ivy.addon.portalkit.service.TaskAnalysisFilterService; +import ch.ivy.addon.portalkit.taskfilter.impl.TaskAnalysisFilterData; +import ch.ivy.addon.portalkit.util.SortFieldUtil; +import ch.ivyteam.ivy.environment.Ivy; + +@ManagedBean +@ViewScoped +public class TaskAnalysisWidgetBean implements Serializable { + + private static final long serialVersionUID = 1L; + private TaskAnalysisLazyDataModel dataModel; + private Map columns; + private boolean isHideCaseCreator; + private boolean isCaseOwnerEnabled; + + public TaskAnalysisWidgetBean() { + } + + @PostConstruct + public void init() { + isCaseOwnerEnabled = GlobalSettingService.getInstance().isCaseOwnerEnabled(); + isHideCaseCreator = GlobalSettingService.getInstance().isHideCaseCreator(); + Ivy.log().error(isHideCaseCreator); + columns = new HashMap<>(); + for(TaskAndCaseAnalysisColumn column : TaskAndCaseAnalysisColumn.values()) { + if (column.name().equals(TaskAndCaseAnalysisColumn.CASE_CREATOR.name()) + && isHideCaseCreator) { + columns.put(column.name(), false); + } + columns.put(column.name(), column.isDefaultColumn()); + } + + } + + public TaskAnalysisLazyDataModel getDataModel() { + return dataModel; + } + + public void setDataModel(TaskAnalysisLazyDataModel dataModel) { + this.dataModel = dataModel; + } + + public boolean isDeleteFilterEnabledFor(TaskAnalysisFilterData filterData) { + TaskAnalysisFilterService filterService = new TaskAnalysisFilterService(); + return filterService.isDeleteFilterEnabledFor(filterData); + } + + public void onToggleColumns(ToggleEvent e) { + TaskAndCaseAnalysisColumn toggledColumn = TaskAndCaseAnalysisColumn.values()[(Integer) e.getData()]; + if (isHideCaseCreator() && TaskAndCaseAnalysisColumn.CASE_CREATOR.equals(toggledColumn)) { + toggledColumn = TaskAndCaseAnalysisColumn.CASE_STATE; + } + + // If the selected column has index of "Case Owner" column + // but the case owner feature is disabled + // shift the selected column to "Application" + if (!isCaseOwnerEnabled() && TaskAndCaseAnalysisColumn.CASE_OWNER.equals(toggledColumn)) { + toggledColumn = TaskAndCaseAnalysisColumn.APPLICATION; + } + columns.put(toggledColumn.name(), e.getVisibility() == Visibility.VISIBLE); + } + + public Map getColumns() { + return columns; + } + + public void setColumns(Map columns) { + this.columns = columns; + } + + public int getMaxTaskNumberInExcel() { + return Exporter.MAX_ROW_NUMBER_IN_EXCEL; + } + + + public boolean isHideCaseCreator() { + return isHideCaseCreator; + } + + public void setHideCaseCreator(boolean isHideCaseCreator) { + this.isHideCaseCreator = isHideCaseCreator; + } + + public boolean isCaseOwnerEnabled() { + return isCaseOwnerEnabled; + } + + public void setCaseOwnerEnabled(boolean isCaseOwnerEnabled) { + this.isCaseOwnerEnabled = isCaseOwnerEnabled; + } + + public SortMeta getSortByTaskName() { + return SortFieldUtil.buildSortMeta("TASK_NAME", false); + } +} diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/casefilter/impl/CaseCategoryFilter.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/casefilter/impl/CaseCategoryFilter.java index b5c1a20fa09..e1facab3d3c 100644 --- a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/casefilter/impl/CaseCategoryFilter.java +++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/casefilter/impl/CaseCategoryFilter.java @@ -32,7 +32,7 @@ public class CaseCategoryFilter extends CaseFilter { @Override public String label() { - return Ivy.cms().co("/ch.ivy.addon.portalkit.ui.jsf/common/caseCategory"); + return Ivy.cms().co("/ch.ivy.addon.portalkit.ui.jsf/statistic/chart/caseCategory"); } @Override diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/casefilter/impl/TaskAnalysisCaseFilterContainer.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/casefilter/impl/TaskAnalysisCaseFilterContainer.java new file mode 100644 index 00000000000..34a91d7aeab --- /dev/null +++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/casefilter/impl/TaskAnalysisCaseFilterContainer.java @@ -0,0 +1,14 @@ +package ch.ivy.addon.portalkit.casefilter.impl; + +import java.util.Collections; + +import ch.ivy.addon.portalkit.comparator.CaseFilterComparator; + +public class TaskAnalysisCaseFilterContainer extends DefaultCaseFilterContainer { + + public TaskAnalysisCaseFilterContainer() { + super(); + Collections.sort(filters, new CaseFilterComparator()); + } + +} diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/converter/StatisticConverter.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/converter/StatisticConverter.java new file mode 100644 index 00000000000..bd136d4feb2 --- /dev/null +++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/converter/StatisticConverter.java @@ -0,0 +1,30 @@ +package ch.ivy.addon.portalkit.converter; + +import javax.faces.convert.FacesConverter; + +import ch.ivy.addon.portalkit.statistics.StatisticChart; + +@FacesConverter("statisticConverter") +public class StatisticConverter extends AbstractConverter { + + @Override + protected Class getType() { + return StatisticConverter.class; + } + + @Override + protected boolean isEmptyObject(Object item) { + if (item == null || !(item instanceof StatisticChart)) { + return false; + } + var chart = (StatisticChart) item; + return chart.getType() == null && chart.getNames() == null; + } + + @Override + protected StatisticChart createNewObject(String selectedValue) { + var newChart = new StatisticChart(); + newChart.setName(selectedValue); + return newChart; + } +} diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/datamodel/internal/ElapsedTimeLazyDataModel.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/datamodel/internal/ElapsedTimeLazyDataModel.java new file mode 100644 index 00000000000..3936cca0a30 --- /dev/null +++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/datamodel/internal/ElapsedTimeLazyDataModel.java @@ -0,0 +1,172 @@ +package ch.ivy.addon.portalkit.datamodel.internal; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +import org.apache.commons.lang3.StringUtils; +import org.primefaces.model.FilterMeta; +import org.primefaces.model.LazyDataModel; +import org.primefaces.model.SortMeta; +import org.primefaces.model.SortOrder; + +import ch.ivy.addon.portalkit.bean.IvyComponentLogicCaller; +import ch.ivy.addon.portalkit.constant.PortalConstants; +import ch.ivy.addon.portalkit.enums.CaseSortField; +import ch.ivy.addon.portalkit.ivydata.searchcriteria.CaseSearchCriteria; +import ch.ivy.addon.portalkit.jsf.Attrs; +import ch.ivy.addon.portalkit.util.PermissionUtils; +import ch.ivyteam.ivy.jsf.primefaces.sort.SortMetaConverter; +import ch.ivyteam.ivy.process.call.SubProcessCall; +import ch.ivyteam.ivy.workflow.CaseState; +import ch.ivyteam.ivy.workflow.ICase; +import ch.ivyteam.ivy.workflow.query.CaseQuery; +import ch.ivyteam.ivy.workflow.query.CaseQuery.OrderByColumnQuery; + +public class ElapsedTimeLazyDataModel extends LazyDataModel { + private static final long serialVersionUID = 1L; + protected final List data; + + protected String caseWidgetComponentId; + protected int rowIndex; + protected CaseSearchCriteria criteria; + public ElapsedTimeLazyDataModel() { + this("statistics-widget:statistic-dashboard-widget:elapsed-time-chart-details"); + } + + public ElapsedTimeLazyDataModel(String caseWidgetComponentId) { + super(); + data = new ArrayList<>(); + this.caseWidgetComponentId = caseWidgetComponentId; + buildCriteria(); + } + + @Override + public List load(int first, int pageSize, Map sortBy, Map filterBy) { + SortMetaConverter sort = new SortMetaConverter(sortBy); + criteria.setSortField(sort.toField()); + criteria.setSortDescending(sort.toOrder() == SortOrder.DESCENDING); + if (first == 0) { + initializedDataModel(); + } + List foundCases = findCases(criteria, first, pageSize); + data.addAll(foundCases); + return foundCases; + } + + /** + * Builds and converts CaseQuery to JsonQuery and put it into CaseSearchCriteria. + */ + protected void buildQueryToSearchCriteria() { + if (criteria.getCustomCaseQuery() == null) { + CaseQuery customCaseQuery = SubProcessCall.withPath(PortalConstants.BUILD_CASE_QUERY_CALLABLE) + .withStartSignature("buildCaseQuery()") + .call() + .get("caseQuery", CaseQuery.class); + criteria.setCustomCaseQuery(customCaseQuery); + } + CaseQuery caseQuery = buildCaseQuery(); + + /** + * Filter CaseSearchCriteria with noCategory + */ + if (StringUtils.isEmpty(criteria.getCategory())) { + caseQuery.where().and().category().isEqual(""); + } + buildSortCaseQuery(caseQuery); + this.criteria.setFinalCaseQuery(caseQuery); + } + + + private CaseQuery buildCaseQuery() { + return criteria.createQuery(); + } + + private List findCases(CaseSearchCriteria criteria, int first, int pageSize) { + IvyComponentLogicCaller> findCaseCaller = new IvyComponentLogicCaller<>(); + int startIndex = first; + int count = pageSize; + if (startIndex < 0) { + startIndex = 0; + count = first + pageSize; + } + String componentId = Attrs.currentContext().getBuildInAttribute("clientId"); + return findCaseCaller.invokeComponentLogic(componentId, "#{logic.findCases}", + new Object[] {criteria, startIndex, count}); + } + + private void initializedDataModel() { + data.clear(); + buildQueryToSearchCriteria(); + setRowCount(getCaseCount(criteria)); + } + + private int getCaseCount(CaseSearchCriteria criteria) { + IvyComponentLogicCaller countCaseCaller = new IvyComponentLogicCaller<>(); + String componentId = Attrs.currentContext().getBuildInAttribute("clientId"); + Long caseCount = countCaseCaller.invokeComponentLogic(componentId, "#{logic.countCases}", new Object[] { criteria }); + return caseCount.intValue(); + } + + private void buildCriteria() { + criteria = new CaseSearchCriteria(); + criteria.setBusinessCase(true); + criteria.setIncludedStates(new ArrayList<>(Arrays.asList(CaseState.DONE))); + criteria.setSortField(CaseSortField.ID.toString()); + criteria.setSortDescending(true); + criteria.setAdminQuery(PermissionUtils.checkReadAllCasesPermission()); + } + + private void buildSortCaseQuery(CaseQuery caseQuery) { + CaseSortField sortColumn = CaseSortField.valueOf(criteria.getSortField()); + OrderByColumnQuery orderQuery = null; + if (sortColumn.equals(CaseSortField.ELAPSED_TIME)) { + orderQuery = caseQuery.orderBy().businessRuntime(); + if (criteria.isSortDescending()) { + orderQuery.descending(); + } else { + orderQuery.ascending(); + } + } + } + + public void setCategory(String category) { + criteria.setCategory(category); + } + + public CaseSearchCriteria getCriteria() { + return criteria; + } + + public void setCriteria(CaseSearchCriteria criteria) { + this.criteria = criteria; + } + + @Override + public void setRowIndex(int index) { + int idx = index; + if (idx >= data.size()) { + idx = -1; + } + this.rowIndex = idx; + } + + @Override + public ICase getRowData() { + return data.get(rowIndex); + } + + @Override + public boolean isRowAvailable() { + if (data == null) { + return false; + } + return rowIndex >= 0 && rowIndex < data.size(); + } + + @Override + public int count(Map filterBy) { + return 0; + } +} diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/datamodel/internal/TaskAnalysisLazyDataModel.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/datamodel/internal/TaskAnalysisLazyDataModel.java new file mode 100644 index 00000000000..87668085503 --- /dev/null +++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/datamodel/internal/TaskAnalysisLazyDataModel.java @@ -0,0 +1,455 @@ +package ch.ivy.addon.portalkit.datamodel.internal; + +import static ch.ivy.addon.portalkit.enums.FilterType.ALL_ADMINS; +import static ch.ivy.addon.portalkit.enums.FilterType.ALL_USERS; + +import java.lang.reflect.InvocationTargetException; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +import javax.faces.event.ValueChangeEvent; + +import org.apache.commons.beanutils.BeanUtils; +import org.apache.commons.collections.CollectionUtils; +import org.primefaces.model.FilterMeta; +import org.primefaces.model.SortMeta; +import org.primefaces.model.SortOrder; + +import ch.ivy.addon.portalkit.casefilter.CaseFilter; +import ch.ivy.addon.portalkit.casefilter.CaseFilterContainer; +import ch.ivy.addon.portalkit.casefilter.impl.TaskAnalysisCaseFilterContainer; +import ch.ivy.addon.portalkit.constant.PortalConstants; +import ch.ivy.addon.portalkit.datamodel.TaskLazyDataModel; +import ch.ivy.addon.portalkit.enums.CaseSortField; +import ch.ivy.addon.portalkit.enums.FilterType; +import ch.ivy.addon.portalkit.enums.TaskAndCaseAnalysisColumn; +import ch.ivy.addon.portalkit.enums.TaskSortField; +import ch.ivy.addon.portalkit.ivydata.searchcriteria.CaseSearchCriteria; +import ch.ivy.addon.portalkit.ivydata.searchcriteria.TaskSearchCriteria; +import ch.ivy.addon.portalkit.service.TaskAnalysisFilterService; +import ch.ivy.addon.portalkit.taskfilter.TaskFilter; +import ch.ivy.addon.portalkit.taskfilter.TaskFilterContainer; +import ch.ivy.addon.portalkit.taskfilter.impl.TaskAnalysisFilterData; +import ch.ivy.addon.portalkit.taskfilter.impl.TaskAnalysisTaskFilterContainer; +import ch.ivy.addon.portalkit.taskfilter.impl.TaskFilterData; +import ch.ivy.addon.portalkit.util.PermissionUtils; +import ch.ivy.addon.portalkit.util.UserUtils; +import ch.ivyteam.ivy.business.data.store.BusinessDataInfo; +import ch.ivyteam.ivy.environment.Ivy; +import ch.ivyteam.ivy.jsf.primefaces.sort.SortMetaConverter; +import ch.ivyteam.ivy.process.call.SubProcessCall; +import ch.ivyteam.ivy.workflow.ITask; +import ch.ivyteam.ivy.workflow.query.CaseQuery; +import ch.ivyteam.ivy.workflow.query.TaskQuery; +import ch.ivyteam.ivy.workflow.query.TaskQuery.IFilterQuery; +import ch.ivyteam.ivy.workflow.query.TaskQuery.OrderByColumnQuery; + +public class TaskAnalysisLazyDataModel extends TaskLazyDataModel { + + private static final long serialVersionUID = -6615871274830927272L; + + private static final String TASK_COLUMN_PREFIX = "TASK_"; + + private TaskAnalysisFilterData selectedTaskAnalysisFilterData; + private TaskAnalysisFilterData defaultTaskAnalysisFilterData; + + private CaseSearchCriteria caseCriteria; + private List caseFilters; + private List selectedCaseFilters; + private List oldSelectedCaseFilters = new ArrayList<>(); + private CaseFilterContainer caseFilterContainer; + + public TaskAnalysisLazyDataModel() { + super(); + isNotKeepFilter = true; + selectedCaseFilters = new ArrayList<>(); + buildCaseCriteria(); + buildDefaultTaskAnalysisFilterData(); + } + + public TaskAnalysisFilterData buildDefaultTaskAnalysisFilterData() { + if (defaultTaskAnalysisFilterData == null) { + defaultTaskAnalysisFilterData = new TaskAnalysisFilterData(); + defaultTaskAnalysisFilterData.setFilterName(Ivy.cms().co("/ch.ivy.addon.portalkit.ui.jsf/taskList/defaultFilter")); + defaultTaskAnalysisFilterData.setType(FilterType.DEFAULT); + collectFiltersForDefaultFilterSet(); + } + isSelectedDefaultFilter = isSelectedDefaultFilter == null ? true : isSelectedDefaultFilter; + return defaultTaskAnalysisFilterData; + } + + @Override + public TaskFilterData buildDefaultTaskFilterData() { + return null; + } + + @Override + public void initFilterContainer() { + filterContainer = new TaskAnalysisTaskFilterContainer(criteria.isAdminQuery()); + } + + @Override + public List load(int first, int pageSize, Map sortBy, Map filterBy) { + SortMetaConverter sort = new SortMetaConverter(sortBy); + criteria.setSortField(sort.toField()); + criteria.setSortDescending(sort.toOrder() == SortOrder.DESCENDING); + + if (first == 0) { + initializedDataModel(criteria); + } + + List foundTasks = findTasks(criteria, first, pageSize); + data.addAll(foundTasks); + return foundTasks; + } + + @Override + protected void buildCriteria() { + criteria = new TaskSearchCriteria(); + criteria.setIncludedStates(new ArrayList<>(TaskSearchCriteria.STANDARD_STATES)); + criteria.setSortField(TaskSortField.ID.toString()); + criteria.setSortDescending(true); + } + + public List getTaskFilters() { + return filters; + } + + public List getSelectedTaskFilters() { + return selectedFilters; + } + + public void setSelectedTaskFilters(List selectedFilters) { + this.selectedFilters = selectedFilters; + } + + public TaskFilterContainer getTaskFilterContainer() { + return filterContainer; + } + + public void setTaskFilterContainer(TaskFilterContainer filterContainer) { + this.filterContainer = filterContainer; + } + + public TaskAnalysisFilterData getSelectedTaskAnalysisFilterData() { + return selectedTaskAnalysisFilterData; + } + + public void setSelectedTaskAnalysisFilterData(TaskAnalysisFilterData selectedTaskAnalysisFilterData) { + this.selectedTaskAnalysisFilterData = selectedTaskAnalysisFilterData; + } + + @Override + public void onFilterApply() { + selectedTaskAnalysisFilterData = null; + isSelectedDefaultFilter = false; + } + @Override + public void removeFilter(TaskFilter filter) { + filter.resetValues(); + selectedFilters.remove(filter); + updateSelectedFilter(); + } + + public void removeFilter(CaseFilter filter) { + filter.resetValues(); + selectedCaseFilters.remove(filter); + updateSelectedFilter(); + } + + @Override + public void resetFilters() { + for (TaskFilter selectedFilter : selectedFilters) { + selectedFilter.resetValues(); + } + for (CaseFilter selectedCaseFilter : selectedCaseFilters) { + selectedCaseFilter.resetValues(); + } + selectedFilters = new ArrayList<>(); + selectedCaseFilters = new ArrayList<>(); + selectedTaskAnalysisFilterData = null; + isSelectedDefaultFilter = false; + } + + public boolean isSameTaskFilterData(TaskAnalysisFilterData filterToBeRemoved) { + if (filterToBeRemoved == null || selectedTaskAnalysisFilterData == null) { + return false; + } + return filterToBeRemoved.getFilterGroupId().equals(selectedTaskAnalysisFilterData.getFilterGroupId()) + && filterToBeRemoved.getType() == selectedTaskAnalysisFilterData.getType() + && filterToBeRemoved.getFilterName().equals(selectedTaskAnalysisFilterData.getFilterName()); + } + + /** + * Save all filter settings to business data + * + * @param filterName + * @param filterType + * @param taskFilterGroupId + * @return TaskAnalysisFilterData + */ + public TaskAnalysisFilterData saveTaskAnalysisFilter(String filterName, FilterType filterType, Long taskFilterGroupId) { + TaskAnalysisFilterData taskAnalysisFilterData = new TaskAnalysisFilterData(); + List taskFiltersToSave = new ArrayList<>(selectedFilters); + taskAnalysisFilterData.setTaskFilters(taskFiltersToSave); + List filtersToSave = new ArrayList<>(selectedCaseFilters); + taskAnalysisFilterData.setCaseFilters(filtersToSave); + taskAnalysisFilterData.setUserId(Ivy.session().getSessionUser().getId()); + taskAnalysisFilterData.setSecurityMemberId(Ivy.session().getSessionUser().getSecurityMemberId()); + taskAnalysisFilterData.setFilterGroupId(taskFilterGroupId); + taskAnalysisFilterData.setFilterName(filterName); + taskAnalysisFilterData.setType(filterType); + boolean isPublic = ALL_USERS == taskAnalysisFilterData.getType() || ALL_ADMINS == taskAnalysisFilterData.getType(); + taskAnalysisFilterData.setIsPublic(isPublic); + TaskAnalysisFilterService taskFilterService = new TaskAnalysisFilterService(); + taskFilterService.save(taskAnalysisFilterData); + BusinessDataInfo info = taskFilterService.save(taskAnalysisFilterData); + taskAnalysisFilterData = taskFilterService.findById(info.getId()); + return taskAnalysisFilterData; + } + + /** + * Apply filter settings loaded from business data to this {@link #TaskAnalysisLazyDataModel} + * + * @param taskAnalysisFilterData + * @throws ReflectiveOperationException + */ + public void applyFilter(TaskAnalysisFilterData taskAnalysisFilterData) throws ReflectiveOperationException { + isSelectedDefaultFilter = FilterType.DEFAULT.equals(taskAnalysisFilterData.getType()); + selectedTaskAnalysisFilterData = taskAnalysisFilterData; + new TaskAnalysisFilterService().applyFilter(this, taskAnalysisFilterData); + } + + /** + * Builds TaskQuery and put it into TaskSearchCriteria. + */ + @Override + protected void buildQueryToSearchCriteria() { + if (criteria.getCustomTaskQuery() == null) { + TaskQuery taskQuery = SubProcessCall.withPath(PortalConstants.BUILD_TASK_QUERY_CALLABLE) + .withStartSignature("buildTaskQuery()") + .call() + .get("taskQuery", TaskQuery.class); + criteria.setCustomTaskQuery(taskQuery); + } + + if (filterContainer != null) { + if (selectedFilters.contains(filterContainer.getStateFilter())) { + criteria.setIncludedStates(new ArrayList<>()); + } else { + criteria.setIncludedStates(filterContainer.getStateFilter().getSelectedFilteredStates()); + } + } + if (caseFilterContainer != null) { + if (selectedCaseFilters.contains(caseFilterContainer.getStateFilter())) { + caseCriteria.setIncludedStates(new ArrayList<>()); + } else { + caseCriteria.setIncludedStates(caseFilterContainer.getStateFilter().getSelectedFilteredStates()); + } + } + + TaskQuery taskQuery = buildTaskQuery(); + if (CollectionUtils.isNotEmpty(selectedCaseFilters)) { + CaseQuery caseQuery = buildCaseQuery(); + taskQuery = taskQuery.where().cases(caseQuery); + } + + String sortField = criteria.getSortField(); + if (sortField.startsWith(TASK_COLUMN_PREFIX)) { + buildSortTaskQuery(taskQuery); + } + + extendSort(taskQuery); + criteria.setFinalTaskQuery(taskQuery); + } + + @Override + protected TaskQuery buildTaskQuery() { + TaskQuery taskQuery = criteria.createQuery(); + IFilterQuery filterQuery = taskQuery.where(); + selectedFilters.forEach(selectedFilter -> { + TaskQuery subQuery = selectedFilter.buildQuery(); + if (subQuery != null) { + filterQuery.and(subQuery); + } + }); + return taskQuery; + } + + private CaseQuery buildCaseQuery() { + CaseQuery caseQuery = caseCriteria.createQuery(); + CaseQuery.IFilterQuery filterQuery = caseQuery.where(); + selectedCaseFilters.forEach(selectedFilter -> { + CaseQuery subQuery = selectedFilter.buildQuery(); + if (subQuery != null) { + filterQuery.and(subQuery); + } + }); + return caseQuery; + } + + private void buildSortTaskQuery(TaskQuery taskQuery) { + TaskAndCaseAnalysisColumn sortColumn = TaskAndCaseAnalysisColumn.valueOf(criteria.getSortField()); + OrderByColumnQuery orderQuery = switch (sortColumn) { + case TASK_ACTIVATOR -> taskQuery.orderBy().activatorDisplayName(); + case TASK_CATEGORY -> taskQuery.orderBy().category(); + case TASK_CREATION_TIME -> taskQuery.orderBy().startTimestamp(); + case TASK_EXPIRY_TIME -> taskQuery.orderBy().expiryTimestamp(); + case TASK_FINISHED_TIME -> taskQuery.orderBy().endTimestamp(); + case TASK_NAME -> taskQuery.orderBy().name(); + case TASK_PRIORITY -> taskQuery.orderBy().priority(); + case TASK_STATE -> taskQuery.orderBy().state(); + case TASK_WORKER -> taskQuery.orderBy().workerUserDisplayName(); + default -> taskQuery.orderBy().taskId(); + }; + + if (sortColumn == TaskAndCaseAnalysisColumn.TASK_EXPIRY_TIME) { + if (criteria.isSortDescending()) { + orderQuery.descendingNullFirst(); + } else { + orderQuery.ascendingNullLast(); + } + return; + } + + if (criteria.isSortDescending()) { + orderQuery.descending(); + } else { + orderQuery.ascending(); + } + } + + @Override + public void initFilters() throws ReflectiveOperationException { + super.initFilters(); + initCaseFilters(); + if (isNotKeepFilter) { + applyFilter(defaultTaskAnalysisFilterData); + } + } + + @Override + public void collectFiltersForDefaultFilterSet() { + defaultTaskAnalysisFilterData.setTaskFilters(new ArrayList<>()); + defaultTaskAnalysisFilterData.setCaseFilters(new ArrayList<>()); + } + + @Override + public void checkToApplyDefaultSet() { + if (isNotKeepFilter && defaultTaskAnalysisFilterData != null) { + selectedFilters.addAll(defaultTaskAnalysisFilterData.getTaskFilters()); + } + } + + private void setValuesForCaseStateFilter(CaseSearchCriteria criteria) { + if (caseFilterContainer != null) { + caseFilterContainer.getStateFilter().setFilteredStates(new ArrayList<>(criteria.getIncludedStates())); + caseFilterContainer.getStateFilter().setSelectedFilteredStates(criteria.getIncludedStates()); + } + } + + @SuppressWarnings("unchecked") + public void onCaseFilterChange(ValueChangeEvent event) { + oldSelectedCaseFilters = (List) event.getOldValue(); + } + + @SuppressWarnings("unchecked") + @Override + public void updateSelectedFilter() { + List toggleFilters = (List) CollectionUtils.subtract(selectedFilters, oldSelectedFilters); + if (CollectionUtils.isNotEmpty(toggleFilters)) { + toggleFilters.forEach(filter -> filter.resetValues()); + } + resetFilterData(); + } + + public void resetFilterData() { + if (selectedTaskAnalysisFilterData != null) { + selectedTaskAnalysisFilterData = null; + } + this.isSelectedDefaultFilter = false; + } + + @SuppressWarnings("unchecked") + public void updateSelectedCaseFilter() { + List toggleFilters = + (List) CollectionUtils.subtract(selectedCaseFilters, oldSelectedCaseFilters); + if (CollectionUtils.isNotEmpty(toggleFilters)) { + toggleFilters.forEach(filter -> filter.resetValues()); + } + resetFilterData(); + } + + public List getSelectedCaseFilters() { + return selectedCaseFilters; + } + + public void setSelectedCaseFilters(List selectedCaseFilters) { + this.selectedCaseFilters = selectedCaseFilters; + } + + public CaseFilterContainer getCaseFilterContainer() { + return caseFilterContainer; + } + + public void setCaseFilterContainer(CaseFilterContainer caseFilterContainer) { + this.caseFilterContainer = caseFilterContainer; + } + + public List getCaseFilters() { + return caseFilters; + } + + protected void buildCaseCriteria() { + caseCriteria = new CaseSearchCriteria(); + caseCriteria.setBusinessCase(true); + caseCriteria.setIncludedStates(new ArrayList<>(CaseSearchCriteria.STANDARD_STATES)); + caseCriteria.extendStatesQueryByPermission(PermissionUtils.checkReadAllCasesPermission()); + caseCriteria.setSortField(CaseSortField.ID.toString()); + caseCriteria.setSortDescending(true); + } + + private void restoreSessionAdvancedCaseFilters() throws IllegalAccessException, InvocationTargetException { + if (!isNotKeepFilter) { + List sessionCaseFilters = UserUtils.getSessionCaseAdvancedFilterAttribute(); + for (CaseFilter filter : caseFilters) { + for (CaseFilter sessionCaseFilter : sessionCaseFilters) { + copyProperties(sessionCaseFilter, filter); + } + } + } else if (defaultTaskAnalysisFilterData != null) { + selectedCaseFilters.addAll(defaultTaskAnalysisFilterData.getCaseFilters()); + } + } + + private void copyProperties(CaseFilter sessionCaseFilter, CaseFilter filter) throws IllegalAccessException, + InvocationTargetException { + if (sessionCaseFilter.getClass() == filter.getClass()) { + BeanUtils.copyProperties(filter, sessionCaseFilter); + selectedCaseFilters.add(filter); + } +} + + protected void initCaseFilterContainer() { + caseFilterContainer = new TaskAnalysisCaseFilterContainer(); + } + + private void initCaseFilters() throws IllegalAccessException, InvocationTargetException { + if (caseFilterContainer == null) { + initCaseFilterContainer(); + caseFilters = caseFilterContainer.getFilters(); + setValuesForCaseStateFilter(caseCriteria); + restoreSessionAdvancedCaseFilters(); + } + } + + public TaskAnalysisFilterData getDefaultTaskAnalysisFilterData() { + return defaultTaskAnalysisFilterData; + } + + public void setDefaultTaskAnalysisFilterData(TaskAnalysisFilterData defaultTaskAnalysisFilterData) { + this.defaultTaskAnalysisFilterData = defaultTaskAnalysisFilterData; + } + +} diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/dto/dashboard/DashboardWidget.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/dto/dashboard/DashboardWidget.java index abb9fc4d04a..13de4b3e52f 100644 --- a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/dto/dashboard/DashboardWidget.java +++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/dto/dashboard/DashboardWidget.java @@ -35,6 +35,7 @@ @Type(value = ImageProcessDashboardWidget.class, name = "image-process"), @Type(value = CompactProcessDashboardWidget.class, name = "compact-process"), @Type(value = CombinedProcessDashboardWidget.class, name = "combined-process"), + @Type(value = StatisticDashboardWidget.class, name = "statistic"), @Type(value = CustomDashboardWidget.class, name = "custom"), @Type(value = ProcessViewerDashboardWidget.class, name = "process-viewer"), @Type(value = WelcomeDashboardWidget.class, name = "welcome"), diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/dto/dashboard/StatisticDashboardWidget.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/dto/dashboard/StatisticDashboardWidget.java new file mode 100644 index 00000000000..bcc63ccaef3 --- /dev/null +++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/dto/dashboard/StatisticDashboardWidget.java @@ -0,0 +1,128 @@ +package ch.ivy.addon.portalkit.dto.dashboard; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.stream.Collectors; + +import org.apache.commons.collections4.CollectionUtils; +import org.primefaces.model.charts.bar.BarChartDataSet; +import org.primefaces.model.charts.donut.DonutChartDataSet; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; + +import ch.ivy.addon.portalkit.enums.DashboardWidgetType; +import ch.ivy.addon.portalkit.service.StatisticService; +import ch.ivy.addon.portalkit.statistics.StatisticChart; +import ch.ivy.addon.portalkit.statistics.StatisticChartConstants; + +@JsonInclude(JsonInclude.Include.NON_EMPTY) +public class StatisticDashboardWidget extends DashboardWidget { + + private static final long serialVersionUID = 1803106705231907546L; + private StatisticChart chart; + @JsonIgnore + private boolean isChartEmpty; + private boolean showFullscreenMode; + + public StatisticDashboardWidget() { + setShowFullscreenMode(true); + } + + public StatisticDashboardWidget(StatisticDashboardWidget widget) { + super(widget); + chart = widget.getChart(); + showFullscreenMode = widget.showFullscreenMode; + } + + @JsonIgnore + @Override + public void resetWidgetFilters() {} + + @Override + public DashboardWidgetType getType() { + return DashboardWidgetType.STATISTIC; + } + + @Override + public String getName() { + if (chart != null) { + var displayName = StatisticService.getInstance().getDisplayNameInUserLanguageForChart(chart); + if (displayName != null) { + return displayName.getValue(); + } + } + return super.getName(); + } + + @JsonIgnore + public void generateChartModel() { + if (chart != null) { + StatisticService.getInstance().generateChartModelForStatisticCharts(Arrays.asList(chart)); + isChartEmpty = isChartDataSetEmpty(); + } + } + + @JsonIgnore + private boolean isChartDataSetEmpty() { + if (chart == null) { + return true; + } + var dataset = new ArrayList(); + var donutChart = chart.getDonutChartModel(); + var barChart = chart.getBarChartModel(); + if (donutChart != null && donutChart.getData().getDataSet().size() == 1) { + var donutDataset = (DonutChartDataSet) donutChart.getData().getDataSet().get(0); + dataset.addAll(donutDataset.getData().stream() + .filter(data -> data.intValue() != 0) + .collect(Collectors.toList())); + } else if (barChart != null && barChart.getData().getDataSet().size() == 1) { + var barDataset = (BarChartDataSet) barChart.getData().getDataSet().get(0); + if(barDataset.getData() != null) { + dataset.addAll(barDataset.getData().stream() + .filter(data -> data.intValue() != 0) + .collect(Collectors.toList())); + } + } + return CollectionUtils.isEmpty(dataset); + } + + public StatisticChart getChart() { + return chart; + } + + public void setChart(StatisticChart chart) { + this.chart = chart; + } + + public boolean isChartEmpty() { + return isChartEmpty; + } + + public void setChartEmpty(boolean isChartEmpty) { + this.isChartEmpty = isChartEmpty; + } + + @JsonIgnore + public String getEmptyChartIcon() { + if (chart != null) { + if (chart.getDonutChartModel() != null) { + return StatisticChartConstants.DONUT_CHART_ICON; + } else if (chart.getBarChartModel() != null) { + return StatisticChartConstants.BAR_CHART_ICON; + } + } + return StatisticChartConstants.DEFAULT_CHART_ICON; + } + + @Override + public void cancelUserFilter() {} + + public void setShowFullscreenMode(boolean showFullscreenMode) { + this.showFullscreenMode = showFullscreenMode; + } + + public boolean isShowFullscreenMode() { + return showFullscreenMode; + } +} diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/enums/BreadCrumbKind.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/enums/BreadCrumbKind.java index 0aed15f228a..030acdee864 100644 --- a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/enums/BreadCrumbKind.java +++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/enums/BreadCrumbKind.java @@ -1,6 +1,6 @@ package ch.ivy.addon.portalkit.enums; public enum BreadCrumbKind { - HOME, PROCESS, TASK, TASK_DETAIL, CASE_DETAIL, CASE, TECHNICAL_CASE, RELATED_TASK, USER_PROFILE, + HOME, PROCESS, TASK, TASK_DETAIL, CASE_DETAIL, CASE, TECHNICAL_CASE, RELATED_TASK, STATISTICS, USER_PROFILE, ABSENCES_MANAGEMENT, DASHBOARD_CONFIGURATION, EDIT_DASHBOARD_DETAILS, PROCESS_VIEWER, PORTAL_MANAGEMENT, NOTIFICATION; } diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/enums/DashboardWidgetType.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/enums/DashboardWidgetType.java index 7bba1a175b5..942d804bb2e 100644 --- a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/enums/DashboardWidgetType.java +++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/enums/DashboardWidgetType.java @@ -3,7 +3,7 @@ import ch.ivyteam.ivy.environment.Ivy; public enum DashboardWidgetType { - TASK, CASE, PROCESS, NEW, CUSTOM, PROCESS_VIEWER, WELCOME, NEWS, NOTIFICATION, CLIENT_STATISTIC; + TASK, CASE, PROCESS, STATISTIC, NEW, CUSTOM, PROCESS_VIEWER, WELCOME, NEWS, NOTIFICATION, CLIENT_STATISTIC; public static DashboardWidgetType typeOf(String typeName) { for (DashboardWidgetType type : DashboardWidgetType.values()) { diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/enums/GlobalVariable.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/enums/GlobalVariable.java index 946dd5b9550..8725049d1fc 100644 --- a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/enums/GlobalVariable.java +++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/enums/GlobalVariable.java @@ -35,6 +35,7 @@ public enum GlobalVariable { HIDE_SYSTEM_TASKS_FROM_HISTORY_ADMINISTRATOR("Portal.Histories.HideSystemTasksForAdministrator", GlobalVariableType.SELECTION, Option.FALSE.toString(), "hideSystemTasksFromHistoryAdministrator"), HIDE_SYSTEM_NOTES_FROM_HISTORY("Portal.Histories.HideSystemNotes", GlobalVariableType.SELECTION, Option.TRUE.toString(), "hideSystemNotesFromHistory"), HIDE_SYSTEM_NOTES_FROM_HISTORY_ADMINISTRATOR("Portal.Histories.HideSystemNotesForAdministrator", GlobalVariableType.SELECTION, Option.FALSE.toString(), "hideSystemNotesFromHistoryAdministrator"), + HIDE_STATISTIC_WIDGET("Portal.Dashboard.HideStatisticWidget", GlobalVariableType.SELECTION, Option.FALSE.toString(), "hideStatisticWidget"), ENABLE_GROUP_CHAT("Portal.Chat.EnableGroup", GlobalVariableType.SELECTION, Option.FALSE.toString(), "enableGroupChat"), ENABLE_PRIVATE_CHAT("Portal.Chat.EnablePrivate", GlobalVariableType.SELECTION, Option.FALSE.toString(), "enablePrivateChat"), CHAT_RESPONSE_TIMEOUT("Portal.Chat.ResponseTimeout", GlobalVariableType.NUMBER, "0", "chatResponseTimeout"), @@ -69,6 +70,7 @@ public enum GlobalVariable { HIDE_RELATED_CASE_INFO_FROM_HISTORY("Portal.Histories.HideRelatedCaseInfo", GlobalVariableType.SELECTION, Option.TRUE.toString(), "hideRelatedCaseInfoFromHistory"), SHOW_ERROR_LOG_TO_CONSOLE("Portal.ShowErrorLogToConsole", GlobalVariableType.SELECTION, Option.FALSE.toString(), "showErrorLogToConsole"), SHOW_AVATAR("Portal.ShowAvatar",GlobalVariableType.SELECTION,Option.TRUE.toString(),"showAvatar"), + STATISTIC_CHART_SCALING_INTERVAL("Portal.StatisticChartScalingInterval", GlobalVariableType.NUMBER, "0", "statisticChartScalingInterval"), ROLE_DIRECT_CHILDREN_LIMIT("Portal.RoleDirectChildrenLimit", GlobalVariableType.SELECTION, "50", "RoleDirectChildrenLimit", new Object[] { 10, 50, 100}), ROLE_PARENT_LIMIT("Portal.RoleParentLimit", GlobalVariableType.SELECTION, "10", "RoleParentLimit", new Object[] { 5, 10, 20}), SHOW_LOGIN_FOOTER("Portal.LoginPage.ShowFooter", GlobalVariableType.SELECTION, Option.TRUE.toString(), "ShowLoginPageFooter"), diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/enums/MenuKind.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/enums/MenuKind.java index 4b0a5a2dfa3..d188a1e3bff 100644 --- a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/enums/MenuKind.java +++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/enums/MenuKind.java @@ -1,7 +1,7 @@ package ch.ivy.addon.portalkit.enums; public enum MenuKind { - DASHBOARD, PROCESS, TASK, CASE, CUSTOM, EXTERNAL_LINK, THIRD_PARTY; + DASHBOARD, PROCESS, TASK, CASE, STATISTICS, CUSTOM, EXTERNAL_LINK, THIRD_PARTY; @Override public String toString() { diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/enums/PortalPermission.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/enums/PortalPermission.java index 695d80f210d..7e17a6fbf67 100644 --- a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/enums/PortalPermission.java +++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/enums/PortalPermission.java @@ -15,10 +15,12 @@ public enum PortalPermission { DASHBOARD_SHARE_LINK("ShareDashboardLink", PortalPermissionGroup.GENERAL_PERMISSIONS_GROUP), TASK_WRITE_ACTIVATOR_OWN_TASKS("TaskWriteActivatorOwnTasks", PortalPermissionGroup.TASK_PERMISSIONS_GROUP), TASK_DISPLAY_ADDITIONAL_OPTIONS("TaskDisplayAdditionalOptions", PortalPermissionGroup.TASK_PERMISSIONS_GROUP), - + STATISTIC_ADD_DASHBOARD_CHART("StatisticAddDashboardChart", PortalPermissionGroup.STATISTIC_GROUP), + STATISTIC_ANALYZE_TASK("StatisticAnalyzeTask", PortalPermissionGroup.STATISTIC_GROUP), ACCESS_FULL_PROCESS_LIST("AccessFullProcessList", PortalPermissionGroup.GENERAL_PERMISSIONS_GROUP), ACCESS_FULL_TASK_LIST("AccessFullTaskList", PortalPermissionGroup.GENERAL_PERMISSIONS_GROUP), ACCESS_FULL_CASE_LIST("AccessFullCaseList", PortalPermissionGroup.GENERAL_PERMISSIONS_GROUP), + ACCESS_FULL_STATISTICS_LIST("AccessFullStatisticsList", PortalPermissionGroup.GENERAL_PERMISSIONS_GROUP), SHOW_ALL_TASKS_OF_CASE("ShowAllTasksOfCase", PortalPermissionGroup.CASE_PERMISSIONS_GROUP), SHOW_CASE_DETAILS("ShowCaseDetails", PortalPermissionGroup.CASE_PERMISSIONS_GROUP), CASE_DETAILS_SHARE_LINK("ShareCaseDetailsLink", PortalPermissionGroup.CASE_PERMISSIONS_GROUP), diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/enums/PortalVariable.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/enums/PortalVariable.java index 0b3e466272f..3735477c05a 100644 --- a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/enums/PortalVariable.java +++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/enums/PortalVariable.java @@ -4,6 +4,7 @@ public enum PortalVariable { PASSWORD_VALIDATION("Portal.PasswordValidation"), ANNOUNCEMENT("Portal.Announcement"), THIRD_PARTY_APP("Portal.ThirdPartyApplications"), + STATISTIC_CHART("Portal.StatisticCharts"), WIDGET_FILTER("Portal.Dashboard.WidgetFilters"), EXTERNAL_LINK("Portal.Processes.ExternalLinks"), TASK_DETAIL("Portal.TaskDetails"), diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/enums/StatisticChartType.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/enums/StatisticChartType.java new file mode 100644 index 00000000000..b3cfa7476f5 --- /dev/null +++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/enums/StatisticChartType.java @@ -0,0 +1,34 @@ +package ch.ivy.addon.portalkit.enums; + +public enum StatisticChartType { + TASK_BY_PRIORITY("/ch.ivy.addon.portalkit.ui.jsf/statistic/chartType/taskByPriority", null, "taskByPriorityChartExtender"), + CASES_BY_STATE("/ch.ivy.addon.portalkit.ui.jsf/statistic/chartType/caseByState", null, "caseByStateChartExtender"), + CASES_BY_FINISHED_TASK("/ch.ivy.addon.portalkit.ui.jsf/statistic/chartType/caseByFinishedTask", "/ch.ivy.addon.portalkit.ui.jsf/statistic/chartType/caseByFinishedTaskDescription", "caseByStateFinishTaskChartExtender"), + CASES_BY_FINISHED_TIME("/ch.ivy.addon.portalkit.ui.jsf/statistic/chartType/caseByFinishedTime", "/ch.ivy.addon.portalkit.ui.jsf/statistic/chartType/caseByFinishedTimeDescription", "caseByStateFinishTimeChartExtender"), + TASK_BY_EXPIRY("/ch.ivy.addon.portalkit.ui.jsf/statistic/chartType/taskByExpiry", null, "taskByExpiryChartDefaultExtender"), + ELAPSED_TIME_BY_CASE_CATEGORY("/ch.ivy.addon.portalkit.ui.jsf/statistic/chartType/elapsedTimeByCaseCategory", "/ch.ivy.addon.portalkit.ui.jsf/statistic/chartType/elapsedTimeByCaseCategoryDescription", "elapsedTimeChartExtender"), + CASES_BY_CATEGORY("/ch.ivy.addon.portalkit.ui.jsf/statistic/chartType/casesByCategory", null, "casesByCategoryChartExtender"); + + private String cmsUri; + private String cmsDescriptionUri; + private String chartExtender; + + private StatisticChartType(String cmsUri, String cmsDescriptionUri, String chartExtender) { + this.cmsUri = cmsUri; + this.cmsDescriptionUri = cmsDescriptionUri; + this.chartExtender = chartExtender; + } + + public String getCmsUri() { + return cmsUri; + } + + public String getCmsDescriptionUri() { + return cmsDescriptionUri; + } + + public String getChartExtender() { + return chartExtender; + } + +} diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/enums/StatisticTimePeriodSelection.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/enums/StatisticTimePeriodSelection.java new file mode 100644 index 00000000000..f381ed29b33 --- /dev/null +++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/enums/StatisticTimePeriodSelection.java @@ -0,0 +1,20 @@ +package ch.ivy.addon.portalkit.enums; + +import ch.ivyteam.ivy.environment.Ivy; + +public enum StatisticTimePeriodSelection { + CUSTOM("custom"), + LAST_WEEK("lastWeek"), + LAST_MONTH("lastMonth"), + LAST_6_MONTH("last6Month"); + +private final String label; + + StatisticTimePeriodSelection(String label) { + this.label = label; + } + + public String getLabel() { + return Ivy.cms().co("/ch.ivy.addon.portalkit.ui.jsf/statistic/timePeriod/" + label); + } +} diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/enums/TaskAndCaseAnalysisColumn.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/enums/TaskAndCaseAnalysisColumn.java new file mode 100644 index 00000000000..ef6539bcf5c --- /dev/null +++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/enums/TaskAndCaseAnalysisColumn.java @@ -0,0 +1,41 @@ +package ch.ivy.addon.portalkit.enums; + + +public enum TaskAndCaseAnalysisColumn { + CASE_NAME(false, true), + CASE_DESCRIPTION(false, false), + CASE_ID(false, false), + CASE_CATEGORY(false, false), + CASE_CREATOR(false, false), + CASE_STATE(false, true), + TASK_NAME(true, true), + TASK_ID(true, false), + TASK_CATEGORY(true, false), + TASK_DESCRIPTION(true, false), + TASK_ACTIVATOR(true, false), + TASK_WORKER(true, false), + TASK_PRIORITY(true, true), + TASK_STATE(true, false), + TASK_CREATION_TIME(true, true), + TASK_EXPIRY_TIME(true, false), + TASK_FINISHED_TIME(true, true), + CASE_OWNER(false, false), + APPLICATION(false, false); + + private boolean isTaskField; + private boolean isDefaultColumn; + + + private TaskAndCaseAnalysisColumn(boolean isTaskField, boolean isDefaultColumn) { + this.isTaskField = isTaskField; + this.isDefaultColumn = isDefaultColumn; + } + + public boolean isTaskField() { + return isTaskField; + } + + public boolean isDefaultColumn() { + return isDefaultColumn; + } +} diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/exporter/CaseExporter.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/exporter/CaseExporter.java index 036f0782505..791df33e853 100644 --- a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/exporter/CaseExporter.java +++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/exporter/CaseExporter.java @@ -67,7 +67,7 @@ public String getColumnName(String column) { */ protected String getSpecialColumnName(String column) { if (CaseSortField.NAME.name().equals(column)) { - return Ivy.cms().co("/ch.ivy.addon.portalkit.ui.jsf/common/caseName"); + return Ivy.cms().co("/ch.ivy.addon.portalkit.ui.jsf/statistic/taskAnalysis/caseName"); } else if (CaseLazyDataModel.DESCRIPTION.equals(column)) { return Ivy.cms().co("/ch.ivy.addon.portalkit.ui.jsf/common/description"); } diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/exporter/internal/TaskAnalysisExporter.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/exporter/internal/TaskAnalysisExporter.java new file mode 100644 index 00000000000..951b815bd3c --- /dev/null +++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/exporter/internal/TaskAnalysisExporter.java @@ -0,0 +1,168 @@ +package ch.ivy.addon.portalkit.exporter.internal; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Date; +import java.util.List; +import java.util.Map; + +import org.apache.commons.lang3.StringUtils; + +import ch.ivy.addon.portalkit.enums.TaskAndCaseAnalysisColumn; +import ch.ivy.addon.portalkit.exporter.Exporter; +import ch.ivy.addon.portalkit.util.SecurityMemberDisplayNameUtils; +import ch.ivyteam.ivy.environment.Ivy; +import ch.ivyteam.ivy.workflow.ITask; + +public class TaskAnalysisExporter extends Exporter{ + private Map taskAnalysisColumnsVisibility; + + public TaskAnalysisExporter(Map columnsVisibility) { + this.taskAnalysisColumnsVisibility = columnsVisibility; + } + + @Override + protected List generateHeaders() { + List headers = new ArrayList<>(); + for (TaskAndCaseAnalysisColumn column : TaskAndCaseAnalysisColumn.values()) { + if (isColumnVisible(column)) + headers.add(getColumnName(column)); + } + return headers; + } + + private String getColumnName(TaskAndCaseAnalysisColumn column) { + switch (column) { + case CASE_NAME: + return Ivy.cms().co("/ch.ivy.addon.portalkit.ui.jsf/statistic/taskAnalysis/caseName"); + case CASE_DESCRIPTION: + return Ivy.cms().co("/ch.ivy.addon.portalkit.ui.jsf/statistic/taskAnalysis/caseDescription"); + case CASE_ID: + return Ivy.cms().co("/ch.ivy.addon.portalkit.ui.jsf/statistic/taskAnalysis/caseID"); + case CASE_CATEGORY: + return Ivy.cms().co("/ch.ivy.addon.portalkit.ui.jsf/statistic/taskAnalysis/caseCategory"); + case CASE_CREATOR: + return Ivy.cms().co("/ch.ivy.addon.portalkit.ui.jsf/statistic/taskAnalysis/caseCreator"); + case CASE_OWNER: + return Ivy.cms().co("/ch.ivy.addon.portalkit.ui.jsf/statistic/taskAnalysis/caseOwner"); + case CASE_STATE: + return Ivy.cms().co("/ch.ivy.addon.portalkit.ui.jsf/statistic/taskAnalysis/caseState"); + case TASK_NAME: + return Ivy.cms().co("/ch.ivy.addon.portalkit.ui.jsf/common/taskName"); + case TASK_ID: + return Ivy.cms().co("/ch.ivy.addon.portalkit.ui.jsf/statistic/taskAnalysis/taskID"); + case TASK_CATEGORY: + return Ivy.cms().co("/ch.ivy.addon.portalkit.ui.jsf/statistic/taskAnalysis/taskCategory"); + case TASK_DESCRIPTION: + return Ivy.cms().co("/ch.ivy.addon.portalkit.ui.jsf/statistic/taskAnalysis/taskDescription"); + case TASK_ACTIVATOR: + return Ivy.cms().co("/ch.ivy.addon.portalkit.ui.jsf/statistic/taskAnalysis/taskResponsible"); + case TASK_WORKER: + return Ivy.cms().co("/ch.ivy.addon.portalkit.ui.jsf/statistic/taskAnalysis/taskWorker"); + case TASK_PRIORITY: + return Ivy.cms().co("/ch.ivy.addon.portalkit.ui.jsf/statistic/taskAnalysis/taskPriority"); + case TASK_STATE: + return Ivy.cms().co("/ch.ivy.addon.portalkit.ui.jsf/statistic/taskAnalysis/taskState"); + case TASK_CREATION_TIME: + return Ivy.cms().co("/ch.ivy.addon.portalkit.ui.jsf/statistic/taskAnalysis/taskCreationTime"); + case TASK_EXPIRY_TIME: + return Ivy.cms().co("/ch.ivy.addon.portalkit.ui.jsf/statistic/taskAnalysis/taskExpiryTime"); + case TASK_FINISHED_TIME: + return Ivy.cms().co("/ch.ivy.addon.portalkit.ui.jsf/statistic/taskAnalysis/taskFinishedTime"); + case APPLICATION: + return Ivy.cms().co("/ch.ivy.addon.portalkit.ui.jsf/taskList/defaultColumns/APPLICATION"); + default: + return ""; + } + } + + private Object getColumnValue(TaskAndCaseAnalysisColumn column, ITask task) { + switch (column) { + case CASE_NAME: + return StringUtils.isEmpty(task.getCase().names().current()) ? Ivy.cms().co("/Dialogs/ch/ivy/addon/portalkit/component/CaseWidget/caseNameNotAvailable") : task.getCase().names().current(); + case CASE_DESCRIPTION: + return task.getCase().descriptions().current(); + case CASE_ID: + return String.valueOf(task.getCase().getId()); + case CASE_CATEGORY: + return task.getCase().getCategory().getPath(); + case CASE_CREATOR: + if (task.getCase().getCreatorUserName() == null) { + return Ivy.cms().co("/ch.ivy.addon.portalkit.ui.jsf/common/notAvailable"); + } + return SecurityMemberDisplayNameUtils.generateBriefDisplayNameForSecurityMember(task.getCase().getCreatorUser(), task.getCase().getCreatorUserName()); + case CASE_OWNER: + if (task.getCase().getOwnerName() == null) { + return Ivy.cms().co("/ch.ivy.addon.portalkit.ui.jsf/common/notAvailable"); + } + return SecurityMemberDisplayNameUtils.generateBriefDisplayNameForSecurityMember(task.getCase().getOwner(), task.getCase().getOwnerName()); + case CASE_STATE: + return task.getCase().getState().toString(); + case TASK_NAME: + return StringUtils.isEmpty(task.names().current()) ? Ivy.cms().co("/ch.ivy.addon.portalkit.ui.jsf/components/taskStart/taskNameNotAvailable") : task.names().current(); + case TASK_ID: + return String.valueOf(task.getId()); + case TASK_CATEGORY: + return task.getCategory().getPath(); + case TASK_DESCRIPTION: + return task.descriptions().current(); + case TASK_ACTIVATOR: + if (task.getActivatorName() == null) { + return Ivy.cms().co("/ch.ivy.addon.portalkit.ui.jsf/common/notAvailable"); + } + return SecurityMemberDisplayNameUtils.generateBriefDisplayNameForSecurityMember(task.getActivator(), task.getActivatorName()); + case TASK_WORKER: + if (task.getWorkerUserName() == null) { + return Ivy.cms().co("/ch.ivy.addon.portalkit.ui.jsf/common/notAvailable"); + } + return SecurityMemberDisplayNameUtils.generateBriefDisplayNameForUser(task.getWorkerUser(), task.getWorkerUserName()); + case TASK_PRIORITY: + return task.getPriority().toString(); + case TASK_STATE: + return task.getState().toString(); + case TASK_CREATION_TIME: + return task.getStartTimestamp(); + case TASK_EXPIRY_TIME: + return task.getExpiryTimestamp(); + case TASK_FINISHED_TIME: + return task.getEndTimestamp(); + case APPLICATION: + return task.getApplication().getName(); + default: + return ""; + } + } + + @Override + public List> generateData(List tasks) { + List> rows = new ArrayList<>(); + for (T t : tasks) { + if (t instanceof ITask) { + List row = new ArrayList<>(); + for (TaskAndCaseAnalysisColumn column : TaskAndCaseAnalysisColumn.values()) { + if (isColumnVisible(column)) + row.add(getColumnValue(column, (ITask)t)); + } + rows.add(row); + } + } + return rows; + + } + + @Override + public String generateFileName(Date creationDate, String extension, String suffix) { + String fileNameSuffix = createFileNameSuffix(creationDate, suffix); + return Ivy.cms().co("/ch.ivy.addon.portalkit.ui.jsf/components/taskView/exportedTasksCasesFileName", + Arrays.asList(fileNameSuffix, extension)); + } + + private boolean isColumnVisible(TaskAndCaseAnalysisColumn column) { + return taskAnalysisColumnsVisibility.get(column.name()); + } + + @Override + public String getColumnName(String column) { + return null; + } +} diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/ivydata/service/impl/CaseService.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/ivydata/service/impl/CaseService.java index 1b73953ff2a..66dcc5da22d 100644 --- a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/ivydata/service/impl/CaseService.java +++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/ivydata/service/impl/CaseService.java @@ -28,6 +28,7 @@ import ch.ivy.addon.portalkit.ivydata.searchcriteria.CaseCustomFieldSearchCriteria; import ch.ivy.addon.portalkit.ivydata.searchcriteria.CaseSearchCriteria; import ch.ivy.addon.portalkit.service.GlobalSettingService; +import ch.ivy.addon.portalkit.statistics.StatisticChartConstants; import ch.ivy.addon.portalkit.util.CategoryUtils; import ch.ivy.addon.portalkit.util.PermissionUtils; import ch.ivyteam.ivy.environment.Ivy; @@ -434,9 +435,9 @@ private void loopToSelectedNode(CaseCategoryStatistic caseCategoryStatistic, Cat private void putNode(CaseCategoryStatistic caseCategoryStatistic, CategoryTree category) { StringBuilder categoryPath = new StringBuilder(category.getCategory().getPath()); if (!category.getChildren().isEmpty()) { - categoryPath.append(CategoryUtils.PARENT_CATEGORY_DELIMITER); //parent Node + categoryPath.append(StatisticChartConstants.PARENT_CATEGORY_DELIMITER); //parent Node } else { - categoryPath.append(CategoryUtils.CHILD_CATEGORY_DELIMITER); // child Node + categoryPath.append(StatisticChartConstants.CHILD_CATEGORY_DELIMITER); // child Node } categoryPath.append(category.getRawPath()); caseCategoryStatistic.getNumberOfCasesByCategory().put(categoryPath.toString(), category.count()); diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/security/PortalSecurity.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/security/PortalSecurity.java index 9e9db3e44f4..77c23d7ba29 100644 --- a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/security/PortalSecurity.java +++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/security/PortalSecurity.java @@ -69,9 +69,9 @@ private static class Permissions { IPermission.USER_READ_OWN_SUBSTITUTIONS); private static final List EVERYBODY_PERMISSIONS = Arrays.asList( - + PortalPermission.STATISTIC_ADD_DASHBOARD_CHART, PortalPermission.ACCESS_FULL_CASE_LIST, PortalPermission.ACCESS_FULL_TASK_LIST, - PortalPermission.ACCESS_FULL_PROCESS_LIST, + PortalPermission.ACCESS_FULL_PROCESS_LIST, PortalPermission.ACCESS_FULL_STATISTICS_LIST, PortalPermission.TASK_CASE_ADD_NOTE, PortalPermission.TASK_CASE_SHOW_MORE_NOTE, PortalPermission.TASK_DISPLAY_ADDITIONAL_OPTIONS, PortalPermission.SHOW_ALL_TASKS_OF_CASE, PortalPermission.TASK_DISPLAY_RESET_ACTION, PortalPermission.TASK_DISPLAY_RESERVE_ACTION, diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/service/StatisticService.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/service/StatisticService.java new file mode 100644 index 00000000000..f9d9182ccf7 --- /dev/null +++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/service/StatisticService.java @@ -0,0 +1,1435 @@ +package ch.ivy.addon.portalkit.service; + +import static ch.ivy.addon.portalkit.enums.StatisticChartType.CASES_BY_FINISHED_TASK; +import static ch.ivy.addon.portalkit.enums.StatisticChartType.CASES_BY_STATE; +import static ch.ivy.addon.portalkit.enums.StatisticChartType.TASK_BY_EXPIRY; +import static ch.ivy.addon.portalkit.enums.StatisticChartType.TASK_BY_PRIORITY; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.AFTER_18; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.APRIL_CMS; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.AUGUST_CMS; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.BEFORE_8; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.CASE_CATEGORIES_CMS; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.CASE_QUERY; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.CATEGORIES_CMS; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.CHILD_CATEGORY_DELIMITER; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.CHILD_CATEGORY_DELIMITER_REGEX; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.CREATED_CASE_KEY; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.DECEMBER_CMS; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.DONE_CASE_KEY; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.ELAPSED_TIME_DETAIL_CHART_NAME_CMS; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.EXCEPTION_PRIORITY_KEY; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.EXPIRED_KEY; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.EXPIRY_PERIOD_CMS; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.FAILED_CASE_KEY; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.FEBRUARY_CMS; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.FIFTHWEEK_CMS; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.FIRSTWEEK_CMS; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.FOURTHWEEK_CMS; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.FRIDAY_CMS; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.HIGH_PRIORITY_KEY; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.IN_10; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.IN_11; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.IN_12; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.IN_13; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.IN_14; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.IN_15; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.IN_16; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.IN_17; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.IN_8; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.IN_9; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.JANUARY_CMS; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.JULY_CMS; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.JUNE_CMS; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.LOW_PRIORITY_KEY; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.MARCH_CMS; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.MAY_CMS; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.MONDAY_CMS; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.NEW_CHART_CMS; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.NORMAL_PRIORITY_KEY; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.NOVEMBER_CMS; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.NO_CATEGORY_CMS; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.OCTOBER_CMS; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.PARENT_CATEGORY_DELIMITER; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.PARENT_CATEGORY_DELIMITER_REGEX; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.RESULT; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.RUNNING_CASE_KEY; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.SATURDAY_CMS; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.SECONDWEEK_CMS; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.SELECTED_CATEGORIES; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.SELECTED_CATEGORY; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.SEPTEMBER_CMS; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.SIXTHWEEK_CMS; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.SUNDAY_CMS; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.TASK_CMS; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.TASK_QUERY; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.THIRDWEEK_CMS; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.THIS_MONTH_EXPIRY_KEY; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.THIS_WEEK_EXPIRY_KEY; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.THIS_YEAR_EXPIRY_KEY; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.THURSDAY_CMS; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.TODAY_EXPIRY_KEY; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.TUESDAY_CMS; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.WEDNESDAY_CMS; + +import java.math.BigDecimal; +import java.math.RoundingMode; +import java.time.Year; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Calendar; +import java.util.Comparator; +import java.util.Date; +import java.util.HashMap; +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Objects; +import java.util.Optional; +import java.util.function.Predicate; +import java.util.stream.Collectors; + +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.ObjectUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.time.DateUtils; +import org.primefaces.component.barchart.BarChart; +import org.primefaces.component.donutchart.DonutChart; +import org.primefaces.event.ItemSelectEvent; +import org.primefaces.model.charts.ChartData; +import org.primefaces.model.charts.axes.cartesian.CartesianAxes; +import org.primefaces.model.charts.axes.cartesian.CartesianScaleTitle; +import org.primefaces.model.charts.axes.cartesian.CartesianScales; +import org.primefaces.model.charts.axes.cartesian.linear.CartesianLinearAxes; +import org.primefaces.model.charts.axes.cartesian.linear.CartesianLinearTicks; +import org.primefaces.model.charts.bar.BarChartDataSet; +import org.primefaces.model.charts.bar.BarChartModel; +import org.primefaces.model.charts.bar.BarChartOptions; +import org.primefaces.model.charts.donut.DonutChartDataSet; +import org.primefaces.model.charts.donut.DonutChartModel; +import org.primefaces.model.charts.donut.DonutChartOptions; +import org.primefaces.model.charts.optionconfig.legend.Legend; +import org.primefaces.model.charts.optionconfig.legend.LegendLabel; +import org.primefaces.model.charts.optionconfig.title.Title; + +import com.axonivy.portal.components.service.IvyAdapterService; + +import ch.ivy.addon.portalkit.bo.CaseCategoryStatistic; +import ch.ivy.addon.portalkit.bo.CaseStateStatistic; +import ch.ivy.addon.portalkit.bo.ElapsedTimeStatistic; +import ch.ivy.addon.portalkit.bo.ExpiryStatistic; +import ch.ivy.addon.portalkit.bo.PriorityStatistic; +import ch.ivy.addon.portalkit.constant.PortalConstants; +import ch.ivy.addon.portalkit.dto.DisplayName; +import ch.ivy.addon.portalkit.enums.PortalVariable; +import ch.ivy.addon.portalkit.enums.StatisticChartType; +import ch.ivy.addon.portalkit.ivydata.searchcriteria.CaseCustomFieldSearchCriteria; +import ch.ivy.addon.portalkit.statistics.StatisticChart; +import ch.ivy.addon.portalkit.statistics.StatisticChartQueryUtils; +import ch.ivy.addon.portalkit.statistics.StatisticChartTimeUtils; +import ch.ivy.addon.portalkit.statistics.StatisticFilter; +import ch.ivy.addon.portalkit.util.UserUtils; +import ch.ivyteam.ivy.environment.Ivy; +import ch.ivyteam.ivy.process.call.SubProcessCall; +import ch.ivyteam.ivy.workflow.query.CaseQuery; +import ch.ivyteam.ivy.workflow.query.TaskQuery; + +public class StatisticService extends JsonConfigurationService { + + private static final String CHART_LEGEND_POSITION_LEFT = "left"; + private static final String CHART_LEGEND_POSITION_RIGHT = "right"; + private static final String CHART_LEGEND_POSITION_BOTTOM = "bottom"; + private int numberOfDefaultCharts; + private final static String LOADING_MESSAGE = "/ch.ivy.addon.portalkit.ui.jsf/statistic/chart/loadingCharts"; + + private static StatisticService instance; + + private StatisticService() {} + + public static StatisticService getInstance() { + if (instance == null) { + instance = new StatisticService(); + } + return instance; + } + + public int getNumberOfDefaultCharts() { + return numberOfDefaultCharts; + } + + /** + * Find all statistic charts of the current login user + * Include public and private charts + * @return list of StatisticChart sorted by position + */ + public List findStatisticCharts() { + List charts = new ArrayList<>(getPublicConfig()); + numberOfDefaultCharts = charts.size(); + charts.addAll(getPrivateConfig().stream().sorted(Comparator.comparingLong(StatisticChart::getPosition)) + .collect(Collectors.toList())); + return charts; + } + + /** + * Charts load from business data don't have list roles for current user + * This method initialize role list for charts load from business data + * @param result + */ + private void initRolesForSavedChart(List result) { + List arrs = Arrays.asList(TASK_BY_PRIORITY, CASES_BY_STATE, TASK_BY_EXPIRY, CASES_BY_FINISHED_TASK); + List roles = null; + // Find first chart which unselect all roles, when all roles are unselected, getRoles() from filter return empty + StatisticChart firstChartUnselectAllRoles = result + .stream() + .filter(chart -> arrs.contains(chart.getType()) && CollectionUtils.isEmpty(chart.getFilter().getSelectedRoles())) + .findFirst() + .orElse(null); + + if (firstChartUnselectAllRoles != null) { + StatisticFilter filter = firstChartUnselectAllRoles.getFilter(); + filter.initRoles(); + roles = filter.getRoles(); + + // set all roles for other charts which unselect all roles + for (StatisticChart chart : result) { + if (arrs.contains(chart.getType()) && CollectionUtils.isEmpty(chart.getFilter().getSelectedRoles()) && !chart.getId().equals(firstChartUnselectAllRoles.getId())){ + chart.getFilter().setRoles(roles); + } + } + } + } + + /** + * Get Task by Priority statistic data + * + * @param taskQuery + * @return Task by Priority statistic data + */ + public PriorityStatistic getPriorityStatisticData(TaskQuery taskQuery) { + Map params = new HashMap<>(); + params.put(TASK_QUERY, taskQuery); + + Map response = + IvyAdapterService.startSubProcessInProjectAndAllRequired("analyzePriorityStatistic(ch.ivyteam.ivy.workflow.query.TaskQuery)", params); + return (PriorityStatistic) response.get(RESULT); + } + + /** + * Get Task by Expiry statistic data + * + * @param taskQuery + * @return Task by Expiry statistic data + */ + public ExpiryStatistic getExpiryStatisticData(TaskQuery taskQuery) { + Map params = new HashMap<>(); + params.put(TASK_QUERY, taskQuery); + + Map response = + IvyAdapterService.startSubProcessInProjectAndAllRequired("analyzeExpiryStatistic(ch.ivyteam.ivy.workflow.query.TaskQuery)", params); + return (ExpiryStatistic) response.get(RESULT); + } + + /** + * Get Case by State statistic data + * + * @param caseQuery + * @return Case by State statistic data + */ + public CaseStateStatistic getCaseStateStatisticData(CaseQuery caseQuery) { + Map params = new HashMap<>(); + params.put(CASE_QUERY, caseQuery); + + Map response = + IvyAdapterService.startSubProcessInProjectAndAllRequired("analyzeCaseStateStatistic(ch.ivyteam.ivy.workflow.query.CaseQuery)", params); + return (CaseStateStatistic) response.get(RESULT); + } + + /** + * Get Elapsed time by Case Category data + * + * @param caseQuery + * @return Elapsed time by Case Category data + */ + public ElapsedTimeStatistic getElapsedTimeStatisticData(CaseQuery caseQuery) { + Map params = new HashMap<>(); + params.put(CASE_QUERY, caseQuery); + + Map response = + IvyAdapterService.startSubProcessInProjectAndAllRequired("analyzeElapsedTimeStatistic(ch.ivyteam.ivy.workflow.query.CaseQuery)", params); + return (ElapsedTimeStatistic) response.get(RESULT); + } + + /** + * Get Cases by Case Category data + * + * @param caseQuery + * @param categoryNodes + * @return Cases by Case Category data + */ + public CaseCategoryStatistic getCasesByCategoryStatisticData(CaseQuery caseQuery, List categoryNodes) { + Map params = new HashMap<>(); + params.put(CASE_QUERY, caseQuery); + params.put(SELECTED_CATEGORIES, categoryNodes); + Map response = + IvyAdapterService.startSubProcessInProjectAndAllRequired("analyzeCasesByCategoryStatistic(ch.ivyteam.ivy.workflow.query.CaseQuery,java.util.List)", params); + return (CaseCategoryStatistic) response.get(RESULT); + } + + public CaseCategoryStatistic getCasesByCategoryDrilldownStatisticData(CaseQuery caseQuery, String categoryNode) { + Map params = new HashMap<>(); + params.put(CASE_QUERY, caseQuery); + params.put(SELECTED_CATEGORY, categoryNode); + Map response = + IvyAdapterService.startSubProcessInProjectAndAllRequired("analyzeCasesByCategoryDrilldownStatistic(ch.ivyteam.ivy.workflow.query.CaseQuery,String)", params); + return (CaseCategoryStatistic) response.get(RESULT); + } + + @SuppressWarnings("unchecked") + public List getCustomFields(String fieldName, String keyword){ + CaseCustomFieldSearchCriteria criteria = new CaseCustomFieldSearchCriteria(); + criteria.setKeyword(keyword); + criteria.setFieldName(fieldName); + return SubProcessCall.withPath(PortalConstants.ANALYZE_STATISTIC_CALLABLE) + .withStartSignature("findCaseCustomFields(CaseCustomFieldSearchCriteria)") + .withParam("caseCustomFieldSearchCriteria", criteria).call().get(RESULT, List.class); + } + + /** + * generate data for "Task by Priority" chart + * + * @param priorityStatistic statistic data + * @return generated data + */ + private Map generateDataForTaskByPriorityChart(PriorityStatistic priorityStatistic) { + Map chartData = new LinkedHashMap<>(); + chartData.put(Ivy.cms().co(EXCEPTION_PRIORITY_KEY), priorityStatistic.getException()); + chartData.put(Ivy.cms().co(HIGH_PRIORITY_KEY), priorityStatistic.getHigh()); + chartData.put(Ivy.cms().co(NORMAL_PRIORITY_KEY), priorityStatistic.getNormal()); + chartData.put(Ivy.cms().co(LOW_PRIORITY_KEY), priorityStatistic.getLow()); + return chartData; + } + + /** + * generate data for "Task by Expiry" overview chart + * + * @param expiryStatistic statistic data + * @param selectedValue selected value + * @param previousSelectedMonth previous selected month + * @param previousSelectedWeek previous selected week + * @return generated data + */ + private Map generateDataForTaskByExpiryOverviewChart(ExpiryStatistic expiryStatistic, + String selectedValue, String previousSelectedMonth, String previousSelectedWeek) { + Map chartData; + Map numberOfTasksByExpiryTime = expiryStatistic.getNumberOfTasksByExpiryTime(); + if (selectThisYear(selectedValue)) { + chartData = generateExpiryModelForDrilldownLevelYear(numberOfTasksByExpiryTime); + } else if (selectMonthOfYear(selectedValue)) { + chartData = generateExpiryModelForDrilldownLevelMonth(numberOfTasksByExpiryTime, selectedValue); + } else if (selectWeekOfMonth(selectedValue)) { + chartData = generateExpiryModelForDrilldownLevelWeek(numberOfTasksByExpiryTime, selectedValue, previousSelectedMonth); + } else if (selectDayOfWeek(selectedValue)) { + chartData = + generateExpiryModelForDrilldownLevelDay(numberOfTasksByExpiryTime, selectedValue, previousSelectedWeek, + previousSelectedMonth); + } else { + chartData = generateDefaultExpiryModel(numberOfTasksByExpiryTime); + } + + return chartData; + } + + private Map generateExpiryModelForDrilldownLevelDay(Map numberOfTasksByExpiryTime, + String selectedDay, String previousSelectedWeek, String previousSelectedMonth) { + Map chartData = new LinkedHashMap<>(); + + Long taskExpireBefore8 = 0L; + Long taskExpireIn8 = 0L; + Long taskExpireIn9 = 0L; + Long taskExpireIn10 = 0L; + Long taskExpireIn11 = 0L; + Long taskExpireIn12 = 0L; + Long taskExpireIn13 = 0L; + Long taskExpireIn14 = 0L; + Long taskExpireIn15 = 0L; + Long taskExpireIn16 = 0L; + Long taskExpireIn17 = 0L; + Long taskExpireAfter18 = 0L; + Long[] taskExpireInHour = + {taskExpireIn8, taskExpireIn9, taskExpireIn10, taskExpireIn11, taskExpireIn12, taskExpireIn13, taskExpireIn14, + taskExpireIn15, taskExpireIn16, taskExpireIn17}; + + for (Entry result : numberOfTasksByExpiryTime.entrySet()) { + if (new Date().after(result.getKey())) { + continue; + } + Date resultDate = result.getKey(); + Calendar cal = Calendar.getInstance(); + cal.setTime(resultDate); + + if (StatisticChartTimeUtils.isSameDay(resultDate, selectedDay, previousSelectedWeek, previousSelectedMonth)) { + if (cal.get(Calendar.HOUR_OF_DAY) < 8) { + taskExpireBefore8 += result.getValue(); + } else if (cal.get(Calendar.HOUR_OF_DAY) >= 18) { + taskExpireAfter18 += result.getValue(); + } else { + int hourIndex = cal.get(Calendar.HOUR_OF_DAY); + taskExpireInHour[hourIndex - 8] += result.getValue(); // example: hourIndex = 8 => taskExpireInHour[ 8 - 8] = + // taskExpireInHour[0] = taskExpireIn8 += + // result.getValue() ... + } + } + + } + + chartData.put(BEFORE_8, taskExpireBefore8); + chartData.put(IN_8, taskExpireInHour[0]); + chartData.put(IN_9, taskExpireInHour[1]); + chartData.put(IN_10, taskExpireInHour[2]); + chartData.put(IN_11, taskExpireInHour[3]); + chartData.put(IN_12, taskExpireInHour[4]); + chartData.put(IN_13, taskExpireInHour[5]); + chartData.put(IN_14, taskExpireInHour[6]); + chartData.put(IN_15, taskExpireInHour[7]); + chartData.put(IN_16, taskExpireInHour[8]); + chartData.put(IN_17, taskExpireInHour[9]); + chartData.put(AFTER_18, taskExpireAfter18); + + return chartData; + } + + private Map generateExpiryModelForDrilldownLevelWeek(Map numberOfTasksByExpiryTime, + String selectedWeek, String previousSelectedMonth) { + Map chartData = new LinkedHashMap<>(); + + Date firstDateOfSelectedWeek = + StatisticChartTimeUtils.truncateMinutesPart(StatisticChartTimeUtils.getFirstDateOfWeek(selectedWeek, + previousSelectedMonth)); + Date firstDateOfNextWeek = + StatisticChartTimeUtils.truncateMinutesPart(DateUtils.addWeeks(firstDateOfSelectedWeek, 1)); + + if (!StringUtils.isEmpty(previousSelectedMonth)) { + Date firstDateOfMonth = + StatisticChartTimeUtils.truncateMinutesPart(StatisticChartTimeUtils + .getFirstDateOfMonth(previousSelectedMonth)); + if (firstDateOfMonth.compareTo(firstDateOfSelectedWeek) > 0) { + firstDateOfSelectedWeek = firstDateOfMonth; + } + Date firstDayOfNextMonth = DateUtils.addMonths(firstDateOfMonth, 1); + if (firstDateOfNextWeek.compareTo(firstDayOfNextMonth) > 0) { + firstDateOfNextWeek = firstDayOfNextMonth; + } + } + + Long taskExpireOnMonday = 0L; + Long taskExpireOnTuesday = 0L; + Long taskExpireOnWednesday = 0L; + Long taskExpireOnThursday = 0L; + Long taskExpireOnFriday = 0L; + Long taskExpireOnSaturday = 0L; + Long taskExpireOnSunday = 0L; + Long[] taskExpireOnDaysOfWeek = + {taskExpireOnMonday, taskExpireOnTuesday, taskExpireOnWednesday, taskExpireOnThursday, taskExpireOnFriday, + taskExpireOnSaturday, taskExpireOnSunday}; + + for (Entry result : numberOfTasksByExpiryTime.entrySet()) { + if (new Date().after(result.getKey())) { + continue; + } + Date resultDate = StatisticChartTimeUtils.truncateMinutesPart(result.getKey()); + Calendar cal = Calendar.getInstance(); + cal.setTime(resultDate); + + if (checkIfDateBetweenRange(firstDateOfSelectedWeek, firstDateOfNextWeek, resultDate)) { + int dayOfWeekIndex = cal.get(Calendar.DAY_OF_WEEK); + if (dayOfWeekIndex == 1) { // SUNDAY + taskExpireOnDaysOfWeek[6] += result.getValue(); // index 6 means taskExpireOnSunday + } else {// MONDAY TO SATURDAY - day of week index from 2 to 7 + taskExpireOnDaysOfWeek[dayOfWeekIndex - 2] += result.getValue(); + } + } + } + + chartData.put(Ivy.cms().co(MONDAY_CMS), taskExpireOnDaysOfWeek[0]); + chartData.put(Ivy.cms().co(TUESDAY_CMS), taskExpireOnDaysOfWeek[1]); + chartData.put(Ivy.cms().co(WEDNESDAY_CMS), taskExpireOnDaysOfWeek[2]); + chartData.put(Ivy.cms().co(THURSDAY_CMS), taskExpireOnDaysOfWeek[3]); + chartData.put(Ivy.cms().co(FRIDAY_CMS), taskExpireOnDaysOfWeek[4]); + chartData.put(Ivy.cms().co(SATURDAY_CMS), taskExpireOnDaysOfWeek[5]); + chartData.put(Ivy.cms().co(SUNDAY_CMS), taskExpireOnDaysOfWeek[6]); + + return chartData; + } + + private Map generateExpiryModelForDrilldownLevelMonth(Map numberOfTasksByExpiryTime, + String selectedValue) { + Map chartData = new LinkedHashMap<>(); + + Long taskExpireOnFirstWeek = 0L; + Long taskExpireOnSecondWeek = 0L; + Long taskExpireOnThirdWeek = 0L; + Long taskExpireOnFourthWeek = 0L; + Long taskExpireOnFifthWeek = 0L; + Long taskExpireOnSixthWeek = 0L; + + Date firstDateOfSelectedMonth = StatisticChartTimeUtils.getFirstDateOfMonth(selectedValue); + Date firstDateOfWeek = StatisticChartTimeUtils.getFirstDateOfWeekContainsDate(firstDateOfSelectedMonth); + + Date firstDateOfFirstWeek = StatisticChartTimeUtils.truncateMinutesPart(firstDateOfSelectedMonth); + Date firstDateOfSecondWeek = StatisticChartTimeUtils.truncateMinutesPart(DateUtils.addDays(firstDateOfWeek, 7)); + Date firstDateOfThirdWeek = StatisticChartTimeUtils.truncateMinutesPart(DateUtils.addDays(firstDateOfWeek, 14)); + Date firstDateOfFourthWeek = StatisticChartTimeUtils.truncateMinutesPart(DateUtils.addDays(firstDateOfWeek, 21)); + Date firstDateOfFifthWeek = StatisticChartTimeUtils.truncateMinutesPart(DateUtils.addDays(firstDateOfWeek, 28)); + Date firstDateOfSixthWeek = StatisticChartTimeUtils.truncateMinutesPart(DateUtils.addDays(firstDateOfWeek, 35)); + Date firstDateOfNextMonth = + StatisticChartTimeUtils.truncateMinutesPart(DateUtils.addMonths(firstDateOfSelectedMonth, 1)); + + for (Entry result : numberOfTasksByExpiryTime.entrySet()) { + if (new Date().after(result.getKey())) { + continue; + } + Date resultDate = StatisticChartTimeUtils.truncateMinutesPart(result.getKey()); + if (checkIfDateBetweenRange(firstDateOfFirstWeek, firstDateOfSecondWeek, resultDate)) { + taskExpireOnFirstWeek += result.getValue(); + } + if (checkIfDateBetweenRange(firstDateOfSecondWeek, firstDateOfThirdWeek, resultDate)) { + taskExpireOnSecondWeek += result.getValue(); + } + if (checkIfDateBetweenRange(firstDateOfThirdWeek, firstDateOfFourthWeek, resultDate)) { + taskExpireOnThirdWeek += result.getValue(); + } + if (checkIfDateBetweenRange(firstDateOfFourthWeek, firstDateOfFifthWeek, resultDate)) { + taskExpireOnFourthWeek += result.getValue(); + } + Long[] taskOfFifthAndSixWeek = + calculateTaskExpireOnFifthAndSixthWeek(firstDateOfFifthWeek, firstDateOfSixthWeek, firstDateOfNextMonth, + resultDate, result.getValue()); + taskExpireOnFifthWeek += taskOfFifthAndSixWeek[0]; + taskExpireOnSixthWeek += taskOfFifthAndSixWeek[1]; + } + + chartData.put(Ivy.cms().co(FIRSTWEEK_CMS), taskExpireOnFirstWeek); + chartData.put(Ivy.cms().co(SECONDWEEK_CMS), taskExpireOnSecondWeek); + chartData.put(Ivy.cms().co(THIRDWEEK_CMS), taskExpireOnThirdWeek); + chartData.put(Ivy.cms().co(FOURTHWEEK_CMS), taskExpireOnFourthWeek); + if (firstDateOfNextMonth.compareTo(firstDateOfFifthWeek) > 0) { + chartData.put(Ivy.cms().co(FIFTHWEEK_CMS), taskExpireOnFifthWeek); + } + if (firstDateOfNextMonth.compareTo(firstDateOfSixthWeek) > 0) { + chartData.put(Ivy.cms().co(SIXTHWEEK_CMS), taskExpireOnSixthWeek); + } + return chartData; + } + + private Long[] calculateTaskExpireOnFifthAndSixthWeek(Date firstDateOfFifthWeek, Date firstDateOfSixthWeek, + Date firstDateOfNextMonth, Date resultDate, Long resultValue) { + Long taskExpireOnFifthWeek = 0L; + Long taskExpireOnSixthWeek = 0L; + if (firstDateOfSixthWeek.compareTo(firstDateOfNextMonth) < 0) { + if (checkIfDateBetweenRange(firstDateOfFifthWeek, firstDateOfSixthWeek, resultDate)) { + taskExpireOnFifthWeek = resultValue; + } + if (checkIfDateBetweenRange(firstDateOfSixthWeek, firstDateOfNextMonth, resultDate)) { + taskExpireOnSixthWeek = resultValue; + } + } else { + if (checkIfDateBetweenRange(firstDateOfFifthWeek, firstDateOfNextMonth, resultDate)) { + taskExpireOnFifthWeek = resultValue; + } + } + return new Long[] {taskExpireOnFifthWeek, taskExpireOnSixthWeek}; + } + + private boolean checkIfDateBetweenRange(Date startDate, Date endDate, Date resultDate) { + return startDate.compareTo(resultDate) <= 0 && endDate.compareTo(resultDate) > 0; + } + + private Map generateExpiryModelForDrilldownLevelYear(Map numberOfTasksByExpiryTime) { + Map chartData = new LinkedHashMap<>(); + + Long taskExpireOnJanuary = 0L; + Long taskExpireOnFebruary = 0L; + Long taskExpireOnMarch = 0L; + Long taskExpireOnApril = 0L; + Long taskExpireOnMay = 0L; + Long taskExpireOnJune = 0L; + Long taskExpireOnJuly = 0L; + Long taskExpireOnAugust = 0L; + Long taskExpireOnSeptember = 0L; + Long taskExpireOnOctober = 0L; + Long taskExpireOnNovember = 0L; + Long taskExpireOnDecember = 0L; + Long[] takExpireOnMonths = + {taskExpireOnJanuary, taskExpireOnFebruary, taskExpireOnMarch, taskExpireOnApril, taskExpireOnMay, + taskExpireOnJune, taskExpireOnJuly, taskExpireOnAugust, taskExpireOnSeptember, taskExpireOnOctober, + taskExpireOnNovember, taskExpireOnDecember}; + + if (numberOfTasksByExpiryTime != null) { + for (Entry result : numberOfTasksByExpiryTime.entrySet()) { + if (new Date().after(result.getKey())) { + continue; + } + Date resultDate = StatisticChartTimeUtils.truncateMinutesPart(result.getKey()); + Calendar cal = Calendar.getInstance(); + cal.setTime(resultDate); + + int thisYear = Year.now().getValue(); + if (cal.get(Calendar.YEAR) == thisYear) { + int monthIndex = cal.get(Calendar.MONTH); // from JANUARY to DECEMBER, month index from 0 to 11 + takExpireOnMonths[monthIndex] += result.getValue(); + } + } + } + + chartData.put(Ivy.cms().co(JANUARY_CMS), takExpireOnMonths[0]); + chartData.put(Ivy.cms().co(FEBRUARY_CMS), takExpireOnMonths[1]); + chartData.put(Ivy.cms().co(MARCH_CMS), takExpireOnMonths[2]); + chartData.put(Ivy.cms().co(APRIL_CMS), takExpireOnMonths[3]); + chartData.put(Ivy.cms().co(MAY_CMS), takExpireOnMonths[4]); + chartData.put(Ivy.cms().co(JUNE_CMS), takExpireOnMonths[5]); + chartData.put(Ivy.cms().co(JULY_CMS), takExpireOnMonths[6]); + chartData.put(Ivy.cms().co(AUGUST_CMS), takExpireOnMonths[7]); + chartData.put(Ivy.cms().co(SEPTEMBER_CMS), takExpireOnMonths[8]); + chartData.put(Ivy.cms().co(OCTOBER_CMS), takExpireOnMonths[9]); + chartData.put(Ivy.cms().co(NOVEMBER_CMS), takExpireOnMonths[10]); + chartData.put(Ivy.cms().co(DECEMBER_CMS), takExpireOnMonths[11]); + return chartData; + } + + private Map generateDefaultExpiryModel(Map numberOfTasksByExpiryTime) { + Map chartData = new LinkedHashMap<>(); + // Calculate result + Long expiredTasks = 0L; + Long taskExpireToday = 0L; + Long taskExpireThisWeek = 0L; + Long taskExpireThisMonth = 0L; + Long taskExpireThisYear = 0L; + + Date today = StatisticChartTimeUtils.truncateMinutesPart(new Date()); + Date firstDateOfWeek = + StatisticChartTimeUtils.truncateMinutesPart(StatisticChartTimeUtils.getFirstDateOfWeekContainsDate(new Date())); + Date firstDateOfNextWeek = StatisticChartTimeUtils.truncateMinutesPart(DateUtils.addWeeks(firstDateOfWeek, 1)); + Date firstDateOfMonth = + StatisticChartTimeUtils.truncateMinutesPart(StatisticChartTimeUtils.getFirstDateOfThisMonth()); + Date firsDateOfNextMonth = StatisticChartTimeUtils.truncateMinutesPart(DateUtils.addMonths(firstDateOfMonth, 1)); + Date firsDateOfYear = StatisticChartTimeUtils.truncateMinutesPart(StatisticChartTimeUtils.getFirstDateOfThisYear()); + Date firsDateOfNextYear = StatisticChartTimeUtils.truncateMinutesPart(DateUtils.addYears(firsDateOfYear, 1)); + + if (numberOfTasksByExpiryTime != null) { + for (Entry result : numberOfTasksByExpiryTime.entrySet()) { + Date resultDate = StatisticChartTimeUtils.truncateMinutesPart(result.getKey()); + + if (new Date().after(result.getKey())) { + expiredTasks += result.getValue(); + continue; // Not include expired tasks to other bars + } + + if (today.compareTo(resultDate) == 0) { + taskExpireToday += result.getValue(); + } + + if (firstDateOfWeek.compareTo(resultDate) <= 0 && firstDateOfNextWeek.compareTo(resultDate) > 0) { + taskExpireThisWeek += result.getValue(); + } + if (firstDateOfMonth.compareTo(resultDate) <= 0 && firsDateOfNextMonth.compareTo(resultDate) > 0) { + taskExpireThisMonth += result.getValue(); + } + if (firsDateOfYear.compareTo(resultDate) <= 0 && firsDateOfNextYear.compareTo(resultDate) > 0) { + taskExpireThisYear += result.getValue(); + } + } + } + + chartData.put(Ivy.cms().co(EXPIRED_KEY), expiredTasks); + chartData.put(Ivy.cms().co(TODAY_EXPIRY_KEY), taskExpireToday); + chartData.put(Ivy.cms().co(THIS_WEEK_EXPIRY_KEY), taskExpireThisWeek); + chartData.put(Ivy.cms().co(THIS_MONTH_EXPIRY_KEY), taskExpireThisMonth); + chartData.put(Ivy.cms().co(THIS_YEAR_EXPIRY_KEY), taskExpireThisYear); + + return chartData; + } + + /** + * generate data for "Case by State" chart + * Build with correct order: CREATED, RUNNING, DONE, FAILED + * + * @param caseStateStatistic statistic data + * @return generated data + */ + private Map generateDataForCaseStateChart(CaseStateStatistic caseStateStatistic) { + Map chartData = new LinkedHashMap<>(); + chartData.put(Ivy.cms().co(CREATED_CASE_KEY), caseStateStatistic.getCreated()); + chartData.put(Ivy.cms().co(RUNNING_CASE_KEY), caseStateStatistic.getRunning()); + chartData.put(Ivy.cms().co(DONE_CASE_KEY), caseStateStatistic.getDone()); + chartData.put(Ivy.cms().co(FAILED_CASE_KEY), caseStateStatistic.getFailed()); + return chartData; + } + + /** + * generate data for "Elapsed Time by Case Category" chart + * + * @param elapsedTimeStatistic statistic data + * @return generated data + */ + private Map generateDataForElapsedTimeChart(ElapsedTimeStatistic elapsedTimeStatistic) { + Map chartData = new LinkedHashMap<>(); + if(!Objects.isNull(elapsedTimeStatistic.getAverageElapsedTimeByCategory())) { + for (Entry entry : elapsedTimeStatistic.getAverageElapsedTimeByCategory().entrySet()) { + String key = entry.getKey(); + if (StringUtils.isBlank(key)) { + key = Ivy.cms().co(NO_CATEGORY_CMS); + } + chartData.put(key, entry.getValue()); + } + } + return chartData; + } + + /** + * Add statistic chart to business data + * + * @param filter filter to generate json query for statistic chart + * @param chartNames chart names + * @param chartType chart type + * @param isDefault is a default chart + * @return Added statistic chart + */ + public StatisticChart createStatisticChart(StatisticFilter filter, List chartNames, + StatisticChartType chartType, boolean isDefault) { + StatisticChart statisticChart = new StatisticChart(); + + updateChartNames(chartNames); + statisticChart.setType(chartType); + statisticChart.setNames(chartNames); + statisticChart.setPosition(getPrivateConfig().size() + getPublicConfig().size()); + statisticChart.setIsPublic(isDefault); + + if (filter.getIsAllCaseStatesSelected()) { + StatisticFilter newFilter = ObjectUtils.clone(filter); + if (filter.getIsAllRolesSelected()) { + newFilter.setSelectedRoles(new ArrayList<>()); + } + statisticChart.setFilter(newFilter); + } else { + statisticChart.setFilter(filter); + } + return save(statisticChart); + } + + private void updateChartNames(List chartNames) { + if (chartNames == null) { + chartNames = new ArrayList<>(); + } + + for (DisplayName chartName : chartNames) { + if (StringUtils.isBlank(chartName.getValue())) { + chartName.setValue(Ivy.cms().co(NEW_CHART_CMS)); + } + } + } + + private DonutChartModel createDonutChartModel(Map chartData, StatisticChartType chartType) { + DonutChartModel model = new DonutChartModel(); + ChartData data = new ChartData(); + DonutChartOptions options = new DonutChartOptions(); + data.setLabels(chartData.keySet().stream().collect(Collectors.toList())); + options.setLegend(buildChartLegend(CHART_LEGEND_POSITION_RIGHT, true)); + + model.setData(data); + model.setOptions(options); + model.setExtender(chartType.getChartExtender()); + return model; + } + + private Legend buildChartLegend(String legendPosition, boolean isDisplay) { + Legend legend = new Legend(); + legend.setPosition(legendPosition); + legend.setDisplay(isDisplay); + LegendLabel labels = new LegendLabel(); + legend.setLabels(labels); + return legend; + } + + /** + * Generate chart model for "Task By Priority" chart + * + * @param statisticData statistic data + * @param isSetDefaultName + * @return chart model for "Task By Priority" chart + */ + public DonutChartModel generateTaskByPriorityModel(PriorityStatistic statisticData, boolean isSetDefaultName) { + Map chartData = generateDataForTaskByPriorityChart(statisticData); + boolean isEmptyData = chartData.isEmpty(); + + if (isEmptyData) { + chartData.put(Ivy.cms().co("/ch.ivy.addon.portalkit.ui.jsf/common/tasks"), 0); + } + + DonutChartModel model = createDonutChartModel(chartData, StatisticChartType.TASK_BY_PRIORITY); + DonutChartDataSet dataSet = createDonutChartDataSet(chartData); + model.getData().addChartDataSet(dataSet); + + if (isSetDefaultName) { + Title title = generateChartTitle(StatisticChartType.TASK_BY_PRIORITY, false); + model.getOptions().setTitle(title); + } + + return model; + } + + private Title generateChartTitle(StatisticChartType chartType, boolean isDisplayed) { + Title title = new Title(); + title.setDisplay(isDisplayed); + title.setText(Ivy.cms().co(chartType.getCmsUri())); + return title; + } + + private DonutChartDataSet createDonutChartDataSet(Map chartData) { + DonutChartDataSet dataSet = new DonutChartDataSet(); + dataSet.setData(chartData.values().stream().collect(Collectors.toList())); + return dataSet; + } + + /** + * Generate chart model for "Task By Expiry" chart + * + * @param statisticData statistic data + * @param isSetDefaultName + * @param selectedValue selected value + * @param previousSelectedMonth previous selected month + * @param previousSelectedWeek previous selected week + * @return chart model for "Task By Expiry" chart + */ + public BarChartModel generateTaskByExpiryModel(ExpiryStatistic statisticData, boolean isSetDefaultName, + String selectedValue, String previousSelectedMonth, String previousSelectedWeek) { + Map chartData = generateDataForTaskByExpiryOverviewChart(statisticData, selectedValue, + previousSelectedMonth, previousSelectedWeek); + + BarChartModel model = new BarChartModel(); + ChartData data = new ChartData(); + BarChartDataSet dataSet = new BarChartDataSet(); + BarChartOptions options = new BarChartOptions(); + CartesianScales scales = new CartesianScales(); + + options.setLegend(buildChartLegend(CHART_LEGEND_POSITION_BOTTOM, false)); + + if (chartData.size() != 0) { + buildBarChartDataSet(chartData, data, dataSet); + + String label = Ivy.cms().co(EXPIRY_PERIOD_CMS); + if (selectDayOfWeek(selectedValue)) { + label = label + " " + Ivy.cms().co("/ch.ivy.addon.portalkit.ui.jsf/statistic/chart/taskByExpiry/hour"); + } + scales.addXAxesData(createLinearAxes(CHART_LEGEND_POSITION_LEFT, label)); + scales.addYAxesData(createLinearAxes(CHART_LEGEND_POSITION_BOTTOM, Ivy.cms().co(TASK_CMS))); + } + data.addChartDataSet(dataSet); + + if (isSetDefaultName) { + options.setTitle(generateChartTitle(StatisticChartType.TASK_BY_EXPIRY, false)); + } + options.setScales(scales); + model.setData(data); + model.setOptions(options); + model.setExtender(getTaskByExpiryChartExtenderBySelectedValue(selectedValue)); + + return model; + } + + private void buildBarChartDataSet(Map chartData, ChartData data, BarChartDataSet dataSet) { + dataSet.setData(chartData.values().stream().collect(Collectors.toList())); + data.setLabels(chartData.keySet().stream().collect(Collectors.toList())); + } + + private String getTaskByExpiryChartExtenderBySelectedValue(String selectedValue) { + String extender = ""; + String today = Ivy.cms().co(TODAY_EXPIRY_KEY); + String week = Ivy.cms().co(THIS_WEEK_EXPIRY_KEY); + String month = Ivy.cms().co(THIS_MONTH_EXPIRY_KEY); + String year = Ivy.cms().co(THIS_YEAR_EXPIRY_KEY); + if (selectedValue.equalsIgnoreCase(today) || selectDayOfWeek(selectedValue)) { + extender = "taskByExpiryChartTodayExtender"; + } else if (selectedValue.equalsIgnoreCase(week) || selectWeekOfMonth(selectedValue)) { + extender = "taskByExpiryChartThisWeekExtender"; + } else if (selectedValue.equalsIgnoreCase(month) || selectMonthOfYear(selectedValue)) { + extender = "taskByExpiryChartThisMonthExtender"; + } else if (selectedValue.equalsIgnoreCase(year)) { + extender = "taskByExpiryChartThisYearExtender"; + } else { + extender = "taskByExpiryChartDefaultExtender"; + } + return extender; + } + + private CartesianLinearAxes createLinearAxes(String position, String axesLabel) { + CartesianLinearAxes newAxesData = new CartesianLinearAxes(); + newAxesData.setPosition(position); + CartesianLinearTicks ticks = new CartesianLinearTicks(); + newAxesData.setBeginAtZero(true); + newAxesData.setTicks(ticks); + + CartesianScaleTitle scaleLabel = new CartesianScaleTitle(); + scaleLabel.setDisplay(true); + scaleLabel.setText(axesLabel); + + newAxesData.setScaleTitle(scaleLabel); + + return newAxesData; + } + + /** + * Generate chart model for "Case By State" chart + * + * @param statisticData statistic data + * @param chartType statistic chart type + * @param isSetDefaultName + * @return chart model for "Case By State" chart + */ + public DonutChartModel generateCaseByStateModel(CaseStateStatistic statisticData, StatisticChartType chartType, + boolean isSetDefaultName) { + Map chartData = generateDataForCaseStateChart(statisticData); + boolean isEmptyData = chartData.isEmpty(); + + if (isEmptyData) { + chartData.put(Ivy.cms().co("/ch.ivy.addon.portalkit.ui.jsf/caseList/cases"), 0); + } + + DonutChartModel model = createDonutChartModel(chartData, chartType); + DonutChartDataSet dataSet = createDonutChartDataSet(chartData); + model.getData().addChartDataSet(dataSet); + if (isSetDefaultName) { + model.getOptions().setTitle(generateChartTitle(chartType, false)); + } + return model; + } + + /** + * Generate chart model for "Elapsed time by Case Category" chart + * + * @param statisticData statistic data + * @param isSetDefaultName + * @return chart model for "Elapsed time by Case Category" chart + */ + public BarChartModel generateElapsedTimeModel(ElapsedTimeStatistic statisticData, boolean isSetDefaultName) { + Map chartData = getElapsedTimeChartData(statisticData); + + BarChartModel model = new BarChartModel(); + ChartData data = new ChartData(); + BarChartDataSet dataSet = new BarChartDataSet(); + BarChartOptions options = new BarChartOptions(); + CartesianScales scales = new CartesianScales(); + if (chartData.size() != 0) { + buildBarChartDataSet(new HashMap<>(chartData), data, dataSet); + + scales.addXAxesData(createLinearAxes(CHART_LEGEND_POSITION_LEFT, Ivy.cms().co(CASE_CATEGORIES_CMS))); + scales.addYAxesData(createLinearAxes(CHART_LEGEND_POSITION_BOTTOM, Ivy.cms().co(ELAPSED_TIME_DETAIL_CHART_NAME_CMS))); + } + + data.addChartDataSet(dataSet); + if (isSetDefaultName) { + options.setTitle(generateChartTitle(StatisticChartType.ELAPSED_TIME_BY_CASE_CATEGORY, false)); + } + options.setScales(scales); + options.setLegend(buildChartLegend(CHART_LEGEND_POSITION_BOTTOM, false)); + + model.setData(data); + model.setOptions(options); + model.setExtender("elapsedTimeChartExtender"); + return model; + } + + private Map getElapsedTimeChartData(ElapsedTimeStatistic statisticData) { + Map caseCategoryToElapsedTime = generateDataForElapsedTimeChart(statisticData); + + if (caseCategoryToElapsedTime.isEmpty()) { + caseCategoryToElapsedTime.put(StringUtils.EMPTY, 0); + } + + for (Iterator> iterator = caseCategoryToElapsedTime.entrySet().iterator(); iterator.hasNext();) { + Entry chartDataEntry = iterator.next(); + float floatValueOfChartData = chartDataEntry.getValue().floatValue()/3600; + BigDecimal roundElapsedTime = new BigDecimal(floatValueOfChartData).setScale(2, RoundingMode.HALF_UP); + chartDataEntry.setValue(roundElapsedTime); + } + + return new HashMap<>(caseCategoryToElapsedTime); + } + + /** + * Generate chart model for "Cases By Category" chart + * + * @param statisticData statistic data + * @param isSetDefaultName + * @return chart model for "Cases By Category" chart + */ + public BarChartModel generateCasesByCategoryModel(CaseCategoryStatistic statisticData, boolean isSetDefaultName) { + BarChartModel model = new BarChartModel(); + ChartData data = new ChartData(); + BarChartDataSet dataSet = new BarChartDataSet(); + BarChartOptions options = new BarChartOptions(); + CartesianScales scales = new CartesianScales(); + if (statisticData.getNumberOfCasesByCategory().size() != 0) { + buildBarChartDataSet(new LinkedHashMap<>(statisticData.getNumberOfCasesByCategory()), data, dataSet); + + scales.addXAxesData(createLinearAxes(CHART_LEGEND_POSITION_LEFT, Ivy.cms().co(CASE_CATEGORIES_CMS))); + scales.addYAxesData(createLinearAxes(CHART_LEGEND_POSITION_BOTTOM, Ivy.cms().co(CATEGORIES_CMS))); + } + + data.addChartDataSet(dataSet); + if (isSetDefaultName) { + options.setTitle(generateChartTitle(StatisticChartType.CASES_BY_CATEGORY, false)); + } + options.setScales(scales); + options.setLegend(buildChartLegend(CHART_LEGEND_POSITION_BOTTOM, false)); + + model.setData(data); + model.setOptions(options); + model.setExtender("casesByCategoryChartExtender"); + return model; + } + + public boolean isTaskByPriority(StatisticChart statisticChart) { + return statisticChart.getType() == StatisticChartType.TASK_BY_PRIORITY; + } + + public boolean isTaskByExpiry(StatisticChart statisticChart) { + return statisticChart.getType() == StatisticChartType.TASK_BY_EXPIRY; + } + + public boolean isTaskByExpiryHour(StatisticChart statisticChart) { + String taskScaleLabel = StringUtils.EMPTY; + + List scales = Optional.ofNullable(statisticChart.getBarChartModel()).map(BarChartModel::getOptions) + .map(BarChartOptions::getScales).map(CartesianScales::getXAxes).orElse(new ArrayList<>()); + if (!scales.isEmpty()) { + taskScaleLabel = Optional.ofNullable(scales.get(0)).map(CartesianAxes::getScaleTitle) + .map(CartesianScaleTitle::getText).orElse(StringUtils.EMPTY); + } + + return statisticChart.getType() == StatisticChartType.TASK_BY_EXPIRY + && taskScaleLabel.contains(Ivy.cms().co("/ch.ivy.addon.portalkit.ui.jsf/statistic/chart/taskByExpiry/hour")); + } + + public boolean isCaseByState(StatisticChart statisticChart) { + return statisticChart.getType() == StatisticChartType.CASES_BY_STATE; + } + + public boolean isElapsedTimeByCaseCategory(StatisticChart statisticChart) { + return statisticChart.getType() == StatisticChartType.ELAPSED_TIME_BY_CASE_CATEGORY; + } + + public boolean isCaseByFinishedTask(StatisticChart statisticChart) { + return statisticChart.getType() == StatisticChartType.CASES_BY_FINISHED_TASK; + } + + public boolean isCaseByFinishedTime(StatisticChart statisticChart) { + return statisticChart.getType() == StatisticChartType.CASES_BY_FINISHED_TIME; + } + + public boolean isCasesByCategory(StatisticChart statisticChart) { + return statisticChart.getType() == StatisticChartType.CASES_BY_CATEGORY; + } + + /** + * + * @param statisticChartList + */ + public void generateChartModelForStatisticCharts(List statisticChartList) { + if (!statisticChartList.isEmpty()) { + initRolesForSavedChart(statisticChartList); + } + + for (StatisticChart statisticChart : statisticChartList) { + switch (statisticChart.getType()) { + case TASK_BY_PRIORITY: + statisticChart.setDonutChartModel(buildChartModelForTaskPriority(statisticChart)); + break; + case TASK_BY_EXPIRY: + statisticChart.setBarChartModel(buildChartModelForTaskExpiry(statisticChart)); + break; + case CASES_BY_STATE: + statisticChart.setDonutChartModel(buildChartModelForCaseState(statisticChart)); + break; + case ELAPSED_TIME_BY_CASE_CATEGORY: + statisticChart.setBarChartModel(buildChartModelForCaseElapsedTime(statisticChart)); + break; + case CASES_BY_FINISHED_TASK: + statisticChart.setDonutChartModel(buildCharModelForCaseHasFinishedTask(statisticChart)); + break; + case CASES_BY_FINISHED_TIME: + statisticChart.setDonutChartModel(buildChartModelForCaseFinishedTime(statisticChart)); + break; + case CASES_BY_CATEGORY: + statisticChart.setBarChartModel(buildChartModelForCasesByCategory(statisticChart)); + break; + default: + break; + } + + DisplayName currentDisplayName = getDisplayNameInUserLanguageForChart(statisticChart); + statisticChart.setName(currentDisplayName.getValue()); + } + } + + public DisplayName getDisplayNameInUserLanguageForChart(StatisticChart statisticChart) { + String userLanguage = UserUtils.getUserLanguage(); + return CollectionUtils.emptyIfNull(statisticChart.getNames()).stream() + .filter(name -> equalsLanguageLocale(name, userLanguage)) + .findFirst().orElse(new DisplayName()); + } + + /** + * Create placeholder chart for Statistic + * @param statisticChartList + * @return list of statisticChart with placeholder chart + */ + public List generatePlaceholderForChart(List statisticChartList) { + DonutChartModel donutChartModel = createDonutChartPlaceholder(); + BarChartModel barChartModel = createBarChartPlaceholder(); + for (StatisticChart statisticChart : statisticChartList) { + switch (statisticChart.getType()) { + case TASK_BY_PRIORITY: + case CASES_BY_STATE: + case CASES_BY_FINISHED_TASK: + case CASES_BY_FINISHED_TIME: + statisticChart.setDonutChartModel(donutChartModel); + break; + case TASK_BY_EXPIRY: + case ELAPSED_TIME_BY_CASE_CATEGORY: + case CASES_BY_CATEGORY: + statisticChart.setBarChartModel(barChartModel); + break; + default: + break; + } + } + return statisticChartList; + } + + /** + * Create a BarChart's placeholder when Statistic chart is loading + * @return BarChartModel + * + */ + public BarChartModel createBarChartPlaceholder() { + BarChartModel model = new BarChartModel(); + ChartData data = new ChartData(); + BarChartDataSet dataSet = new BarChartDataSet(); + dataSet.setData(new ArrayList<>()); + dataSet.setLabel(Ivy.cms().co(LOADING_MESSAGE)); + data.addChartDataSet(dataSet); + model.setData(data); + return model; + } + + /** + * Create a DonutChart's placeholder when Statistic chart is loading + * @return DonutChartModel + * + */ + public DonutChartModel createDonutChartPlaceholder() { + DonutChartModel model = new DonutChartModel(); + Title title = new Title(); + title.setDisplay(true); + title.setText(Ivy.cms().co(LOADING_MESSAGE)); + model.setOptions(new DonutChartOptions()); + model.getOptions().setTitle(title); + return model; + } + + private DonutChartModel buildChartModelForCaseFinishedTime(StatisticChart statisticChart) { + CaseStateStatistic caseByFinishedTimeData = new CaseStateStatistic(); + if (statisticChart.getFilter() != null) { + caseByFinishedTimeData = + getCaseStateStatisticData(StatisticChartQueryUtils + .generateCaseQueryByFinishedTime(statisticChart.getFilter())); + } + return generateCaseByStateModel(caseByFinishedTimeData, StatisticChartType.CASES_BY_FINISHED_TIME, true); + } + + private DonutChartModel buildCharModelForCaseHasFinishedTask(StatisticChart statisticChart) { + CaseStateStatistic caseByFinishedTaskData = new CaseStateStatistic(); + if (statisticChart.getFilter() != null) { + caseByFinishedTaskData = + getCaseStateStatisticData(StatisticChartQueryUtils.generateCaseQueryForCaseHaveFinishedTask( + statisticChart.getFilter())); + } + return generateCaseByStateModel(caseByFinishedTaskData, StatisticChartType.CASES_BY_FINISHED_TASK, true); + } + + private BarChartModel buildChartModelForCaseElapsedTime(StatisticChart statisticChart) { + ElapsedTimeStatistic elapsedTimeData = new ElapsedTimeStatistic(); + if (statisticChart.getFilter() != null) { + elapsedTimeData = + getElapsedTimeStatisticData(StatisticChartQueryUtils.generateCaseQuery(statisticChart.getFilter(), true)); + } + return generateElapsedTimeModel(elapsedTimeData, true); + } + + private DonutChartModel buildChartModelForCaseState(StatisticChart statisticChart) { + CaseStateStatistic caseStateData = new CaseStateStatistic(); + if (statisticChart.getFilter() != null) { + caseStateData = + getCaseStateStatisticData(StatisticChartQueryUtils.generateCaseQueryForCaseState(statisticChart.getFilter())); + } + return generateCaseByStateModel(caseStateData, StatisticChartType.CASES_BY_STATE, true); + } + + private DonutChartModel buildChartModelForTaskPriority(StatisticChart statisticChart) { + PriorityStatistic taskByPriorityData = new PriorityStatistic(); + if (statisticChart.getFilter() != null) { + taskByPriorityData = + getPriorityStatisticData(StatisticChartQueryUtils.generateTaskQuery(statisticChart.getFilter())); + } + return generateTaskByPriorityModel(taskByPriorityData, true); + } + + private BarChartModel buildChartModelForTaskExpiry(StatisticChart statisticChart) { + if (!statisticChart.getId().contains("_")) { + ExpiryStatistic taskByExpiryData = new ExpiryStatistic(); + if (statisticChart.getFilter() != null) { + taskByExpiryData = + getExpiryStatisticData(StatisticChartQueryUtils.generateTaskQueryForExpiry(statisticChart.getFilter())); + } + return generateTaskByExpiryModel(taskByExpiryData, true, StringUtils.EMPTY, StringUtils.EMPTY, StringUtils.EMPTY); + } + return statisticChart.getBarChartModel(); + } + + private BarChartModel buildChartModelForCasesByCategory(StatisticChart statisticChart) { + if (!statisticChart.getId().contains("_")) { + CaseCategoryStatistic casesByCategoryData = new CaseCategoryStatistic(); + if (statisticChart.getFilter() != null) { + casesByCategoryData = getCasesByCategoryStatisticData( + StatisticChartQueryUtils.generateCaseQueryForCasesByCategoryChart(statisticChart.getFilter(), null), + statisticChart.getFilter().getCaseCategories().getCategoryPaths()); + } + return generateCasesByCategoryModel(casesByCategoryData, true); + } + return statisticChart.getBarChartModel(); + } + + public static boolean selectThisYear(String selectedItem) { + return StringUtils.containsIgnoreCase(selectedItem, Ivy.cms().co(THIS_YEAR_EXPIRY_KEY)); + } + + public static boolean selectMonthOfYear(String selectedItem) { + if (selectedItem.isEmpty()) { + return false; + } + String[] monthsOfYear = + {Ivy.cms().co(JANUARY_CMS), Ivy.cms().co(FEBRUARY_CMS), Ivy.cms().co(MARCH_CMS), Ivy.cms().co(APRIL_CMS), + Ivy.cms().co(MAY_CMS), Ivy.cms().co(JUNE_CMS), Ivy.cms().co(JULY_CMS), Ivy.cms().co(AUGUST_CMS), + Ivy.cms().co(SEPTEMBER_CMS), Ivy.cms().co(OCTOBER_CMS), Ivy.cms().co(NOVEMBER_CMS), + Ivy.cms().co(DECEMBER_CMS)}; + + return Arrays.asList(monthsOfYear).contains(selectedItem) + || StringUtils.containsIgnoreCase(selectedItem, Ivy.cms().co(THIS_MONTH_EXPIRY_KEY)); + } + + public static boolean selectWeekOfMonth(String selectedItem) { + if (selectedItem.isEmpty()) { + return false; + } + String[] weeksOfMonth = + {Ivy.cms().co(FIRSTWEEK_CMS), Ivy.cms().co(SECONDWEEK_CMS), Ivy.cms().co(THIRDWEEK_CMS), + Ivy.cms().co(FOURTHWEEK_CMS), Ivy.cms().co(FIFTHWEEK_CMS), Ivy.cms().co(SIXTHWEEK_CMS)}; + + return Arrays.asList(weeksOfMonth).contains(selectedItem) + || StringUtils.containsIgnoreCase(selectedItem, Ivy.cms().co(THIS_WEEK_EXPIRY_KEY)); + } + + public static boolean selectDayOfWeek(String selectedItem) { + if (selectedItem.isEmpty()) { + return false; + } + String[] daysOfWeek = + {Ivy.cms().co(MONDAY_CMS), Ivy.cms().co(TUESDAY_CMS), Ivy.cms().co(WEDNESDAY_CMS), Ivy.cms().co(THURSDAY_CMS), + Ivy.cms().co(FRIDAY_CMS), Ivy.cms().co(SATURDAY_CMS), Ivy.cms().co(SUNDAY_CMS)}; + + return Arrays.asList(daysOfWeek).contains(selectedItem) + || StringUtils.containsIgnoreCase(selectedItem, Ivy.cms().co(TODAY_EXPIRY_KEY)); + } + + public static boolean selectHourOfDay(String selectedItem) { + if (selectedItem.isEmpty()) { + return false; + } + String[] hoursOfDay = {BEFORE_8, IN_8, IN_9, IN_10, IN_11, IN_12, IN_13, IN_14, IN_15, IN_16, IN_17, AFTER_18}; + + return Arrays.asList(hoursOfDay).contains(selectedItem); + } + + public StatisticChart drilldownExpiryChart(String selectedValue, StatisticChart selectedChart, + String previousSelectedMonth, String previousSelectedWeek) { + ExpiryStatistic taskByExpiryData = + getExpiryStatisticData(StatisticChartQueryUtils.generateTaskQuery(selectedChart.getFilter())); + StatisticChart newStatisticChart = new StatisticChart(); + newStatisticChart.setId(selectedChart.getId() + "_" + selectedValue); // chart with format: id + _ + suffix is lower + // level (month/week/day/hour) chart when + // drill down + + List newNames = new ArrayList<>(); + for (DisplayName name : selectedChart.getNames()) { + DisplayName newName = new DisplayName(); + newName.setLocale(name.getLocale()); + newName.setValue(name.getValue().concat(" - ").concat(selectedValue)); + newNames.add(newName); + } + + newStatisticChart.setNames(newNames); + newStatisticChart.setName(getDisplayNameInUserLanguageForChart(newStatisticChart).getValue()); + newStatisticChart.setFilter(selectedChart.getFilter()); + newStatisticChart.setType(StatisticChartType.TASK_BY_EXPIRY); + newStatisticChart.setBarChartModel(generateTaskByExpiryModel(taskByExpiryData, true, selectedValue, + previousSelectedMonth, previousSelectedWeek)); + return newStatisticChart; + } + + public StatisticChart drilldownCasesByCategory(String selectedValue, StatisticChart selectedChart) { + CaseCategoryStatistic caseCategoryStatisticData = getCasesByCategoryDrilldownStatisticData( + StatisticChartQueryUtils.generateCaseQueryForCasesByCategoryChart(selectedChart.getFilter(), selectedValue), selectedValue); + StatisticChart newStatisticChart = new StatisticChart(); + newStatisticChart.setId(selectedChart.getId() + "_" + selectedValue); + List newNames = new ArrayList<>(); + for (DisplayName name : selectedChart.getNames()) { + DisplayName newName = new DisplayName(); + newName.setLocale(name.getLocale()); + newName.setValue(name.getValue().concat(" - ").concat(selectedValue)); + newNames.add(newName); + } + newStatisticChart.setNames(newNames); + newStatisticChart.setName(getDisplayNameInUserLanguageForChart(newStatisticChart).getValue()); + newStatisticChart.setFilter(selectedChart.getFilter()); + newStatisticChart.setType(StatisticChartType.CASES_BY_CATEGORY); + newStatisticChart.setBarChartModel(generateCasesByCategoryModel(caseCategoryStatisticData, false)); + return newStatisticChart; + } + + @SuppressWarnings("unchecked") + public static String getSelectedValueOfDonutChart(ItemSelectEvent event) { + try { + List labels = (List) ((DonutChart) event.getSource()).getModel().getData().getLabels(); + int index = event.getItemIndex(); + return labels.get(index); + } catch (Exception e) { + Ivy.log().error(e); + return StringUtils.EMPTY; + } + } + + @SuppressWarnings("unchecked") + public static String getSelectedValueOfBarChart(ItemSelectEvent event) { + try { + List labels = (List) ((BarChart) event.getSource()).getModel().getData().getLabels(); + int index = event.getItemIndex(); + return labels.get(index); + } catch (Exception e) { + Ivy.log().error(e); + return StringUtils.EMPTY; + } + } + + /** + * this method only for chart case by Category + * the labels of chart is name category (CMS) + category delimiter + path category + * Split category delimiter to get path category for case query + * @param event + * @return labels + */ + @SuppressWarnings("unchecked") + public static String getSelectedValueOfBarChartCasesByCategory(ItemSelectEvent event) { + try { + List labels = (List) ((BarChart) event.getSource()).getModel().getData().getLabels(); + int index = event.getItemIndex(); + if(labels.get(index).contains(PARENT_CATEGORY_DELIMITER)) { + return labels.get(index).split(PARENT_CATEGORY_DELIMITER_REGEX)[1]; + } + if(labels.get(index).contains(CHILD_CATEGORY_DELIMITER)) { + return labels.get(index).split(CHILD_CATEGORY_DELIMITER_REGEX)[1]; + } + return labels.get(index); + } catch (Exception e) { + Ivy.log().error(e); + return StringUtils.EMPTY; + } + } + + public static Boolean hasChildNode(String value) { + return !value.contains(PARENT_CATEGORY_DELIMITER); + } + + public boolean checkStatisticChartNameExisted(String chartName, String language) { + List privateCharts = getPrivateConfig(); + List allCharts = new ArrayList<>(privateCharts); + allCharts.addAll(getPublicConfig()); + + Predicate predicate = chart -> CollectionUtils.emptyIfNull(chart.getNames()).stream() + .filter(name -> equalsDisplayName(chartName, language, name)) + .findFirst().isPresent(); + return allCharts.stream() + .filter(predicate) + .findFirst().isPresent(); + } + + private boolean equalsDisplayName(String chartName, String language, DisplayName displayName) { + return equalsLanguageLocale(displayName, language) && StringUtils.equals(displayName.getValue(), chartName); + } + + public static boolean equalsLanguageLocale(DisplayName displayName, String language) { + return StringUtils.equalsIgnoreCase(displayName.getLocale().toString(), language); + } + + public boolean isDefaultChart(List statisticCharts) { + return statisticCharts.stream().anyMatch(StatisticChart::getIsPublic); + } + + public boolean isSame(List first, List second) { + if (CollectionUtils.isEmpty(first) || CollectionUtils.isEmpty(second) || first.size() != second.size()) { + return false; + } + return first.stream().allMatch(s -> second.contains(s)); + } + + public List updateExistedChartsWithNewCharts(List existedCharts) { + List newCharts = getPublicConfig(); + if (CollectionUtils.isEmpty(newCharts)) { + return existedCharts; + } + if (CollectionUtils.isEmpty(existedCharts)) { + return new ArrayList<>(newCharts); + } + + existedCharts.removeAll(filterObsoletedChartsByNewCharts(existedCharts, newCharts)); + existedCharts.stream().sorted(Comparator.comparingLong(StatisticChart::getPosition)).collect(Collectors.toList()); + List allCharts = new ArrayList<>(newCharts); + allCharts.addAll(existedCharts); + return allCharts; + } + + private List filterObsoletedChartsByNewCharts(List targetList, List newCharts) { + List obsoletedCharts = new ArrayList<>(); + for (StatisticChart newChart : newCharts) { + if (newChart.getId() == null) { + continue; + } + targetList.forEach(existedChart -> { + if (existedChart.getId().equals(newChart.getId())) { + obsoletedCharts.add(existedChart); + } + }); + } + return obsoletedCharts; + } + + @Override + public Class getType() { + return StatisticChart.class; + } + + @Override + public String getConfigKey() { + return PortalVariable.STATISTIC_CHART.key; + } +} diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/service/TaskAnalysisFilterService.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/service/TaskAnalysisFilterService.java new file mode 100644 index 00000000000..8c2a82e4773 --- /dev/null +++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/service/TaskAnalysisFilterService.java @@ -0,0 +1,57 @@ +package ch.ivy.addon.portalkit.service; + + +import java.util.ArrayList; +import java.util.List; + +import ch.ivy.addon.portalkit.casefilter.CaseFilter; +import ch.ivy.addon.portalkit.datamodel.internal.TaskAnalysisLazyDataModel; +import ch.ivy.addon.portalkit.taskfilter.TaskFilter; +import ch.ivy.addon.portalkit.taskfilter.impl.TaskAnalysisFilterData; + +public class TaskAnalysisFilterService extends AbstractFilterService { + @Override + public Class getType() { + return TaskAnalysisFilterData.class; + } + + public void applyFilter(TaskAnalysisLazyDataModel dataModel, TaskAnalysisFilterData savedFilterData) + throws ReflectiveOperationException { + applyTaskFilter(dataModel, savedFilterData); + applyCaseFilter(dataModel, savedFilterData); + } + + private void applyTaskFilter(TaskAnalysisLazyDataModel dataModel, TaskAnalysisFilterData savedFilterData) + throws ReflectiveOperationException { + List filters = dataModel.getTaskFilterContainer().getFilters(); + dataModel.setSelectedTaskFilters(new ArrayList<>()); + for (int i = 0; i < filters.size(); i++) { + TaskFilter taskFilter = dataModel.getTaskFilterContainer().getFilters().get(i); + for (int j = 0; j < savedFilterData.getTaskFilters().size(); j++) { + TaskFilter savedTaskFilter = savedFilterData.getTaskFilters().get(j); + if (taskFilter.getClass().equals(savedTaskFilter.getClass())) { + copyFilterValues(taskFilter, savedTaskFilter); + dataModel.getSelectedTaskFilters().add(taskFilter); + break; + } + } + } + } + + public void applyCaseFilter(TaskAnalysisLazyDataModel dataModel, TaskAnalysisFilterData savedFilterData) + throws ReflectiveOperationException { + List filters = dataModel.getCaseFilterContainer().getFilters(); + dataModel.setSelectedCaseFilters(new ArrayList<>()); + for (int i = 0; i < filters.size(); i++) { + CaseFilter filter = dataModel.getCaseFilterContainer().getFilters().get(i); + for (int j = 0; j < savedFilterData.getCaseFilters().size(); j++) { + CaseFilter savedFilter = savedFilterData.getCaseFilters().get(j); + if (filter.getClass().equals(savedFilter.getClass())) { + copyFilterValues(filter, savedFilter); + dataModel.getSelectedCaseFilters().add(filter); + break; + } + } + } + } +} diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/statistics/StatisticCaseCategoryFilter.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/statistics/StatisticCaseCategoryFilter.java new file mode 100644 index 00000000000..ca96b51e52b --- /dev/null +++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/statistics/StatisticCaseCategoryFilter.java @@ -0,0 +1,83 @@ +package ch.ivy.addon.portalkit.statistics; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; + +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; +import org.primefaces.model.CheckboxTreeNode; + +import com.fasterxml.jackson.annotation.JsonIgnore; + +import ch.ivy.addon.portalkit.bo.CategoryNode; +import ch.ivy.addon.portalkit.util.CaseTreeUtils; +import ch.ivy.addon.portalkit.util.CaseUtils; +import ch.ivy.addon.portalkit.util.CategoryUtils; +import ch.ivyteam.ivy.workflow.query.CaseQuery; +import ch.ivyteam.ivy.workflow.query.CaseQuery.IFilterQuery; + +public class StatisticCaseCategoryFilter implements Serializable { + + private static final long serialVersionUID = -1200590667880254731L; + + @JsonIgnore + private CheckboxTreeNode[] categories; + @JsonIgnore + private CheckboxTreeNode root; + + private List categoryPaths = new ArrayList<>(); + + public CaseQuery buildQuery() { + if (CollectionUtils.isEmpty(categoryPaths)) { + return null; + } + CaseQuery caseQuery = CaseUtils.createBusinessCaseQuery(); + IFilterQuery filterQuery = caseQuery.where(); + for (String category : categoryPaths) { + if (StringUtils.equals(category, CategoryUtils.NO_CATEGORY)) { + filterQuery.or().category().isEqual(StringUtils.EMPTY); + } else { + filterQuery.or().category().isEqualIgnoreCase(category); + } + } + return caseQuery; + } + + public CheckboxTreeNode[] getCategories() { + return categories; + } + + public void setCategories(CheckboxTreeNode[] categories) { + this.categories = categories; + this.categoryPaths = CategoryUtils.getCategoryPaths(categories); + } + + public CheckboxTreeNode getRoot() { + if (root == null) { + root = CaseTreeUtils.buildCaseCategoryCheckboxTreeRoot(); + } + return root; + } + + public void setRoot(CheckboxTreeNode root) { + this.root = root; + } + + /** + * get Case's category path by data from Tree node component + * @return list of paths for case's category + */ + public List getCategoryPaths() { + return this.categoryPaths; + } + + /** + * set Case's category path to categoryPaths is provided and update categories by the change on Tree + * @param categoryPaths + */ + public void setCategoryPaths(List categoryPaths) { + this.categoryPaths = categoryPaths; + categories = CategoryUtils.recoverSelectedCategories(root, categoryPaths); + } +} diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/statistics/StatisticChart.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/statistics/StatisticChart.java new file mode 100644 index 00000000000..1baca908bd4 --- /dev/null +++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/statistics/StatisticChart.java @@ -0,0 +1,114 @@ +package ch.ivy.addon.portalkit.statistics; + + +import java.util.List; + +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; +import org.primefaces.model.charts.bar.BarChartModel; +import org.primefaces.model.charts.donut.DonutChartModel; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; + +import ch.ivy.addon.portalkit.configuration.AbstractConfiguration; +import ch.ivy.addon.portalkit.dto.DisplayName; +import ch.ivy.addon.portalkit.enums.StatisticChartType; + +@JsonInclude(JsonInclude.Include.NON_EMPTY) +public class StatisticChart extends AbstractConfiguration { + private List names; + private StatisticChartType type; + private StatisticFilter filter; + private long position; + private List permissions; + @JsonIgnore + private DonutChartModel donutChartModel; + @JsonIgnore + private BarChartModel barChartModel; + @JsonIgnore + private String name; + + public List getNames() { + return names; + } + + public void setNames(List names) { + this.names = names; + } + + public StatisticChartType getType() { + return type; + } + + public void setType(StatisticChartType type) { + this.type = type; + } + + public long getPosition() { + return position; + } + + public void setPosition(long position) { + this.position = position; + } + + public DonutChartModel getDonutChartModel() { + return donutChartModel; + } + + public void setDonutChartModel(DonutChartModel donutChartModel) { + this.donutChartModel = donutChartModel; + } + + public BarChartModel getBarChartModel() { + return barChartModel; + } + + public void setBarChartModel(BarChartModel barChartModel) { + this.barChartModel = barChartModel; + } + + public StatisticFilter getFilter() { + return filter; + } + + public void setFilter(StatisticFilter filter) { + this.filter = filter; + } + + @Override + public boolean equals(Object object) { + if (object == null) { + return false; + } + StatisticChart chart = (StatisticChart) object; + EqualsBuilder builder = new EqualsBuilder(); + builder.append(getId(), chart.getId()); + return builder.isEquals(); + } + + @Override + public int hashCode() { + HashCodeBuilder builder = new HashCodeBuilder(); + builder.append(getId()); + return builder.hashCode(); + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public List getPermissions() { + return permissions; + } + + public void setPermissions(List permissions) { + this.permissions = permissions; + } + +} diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/statistics/StatisticChartConstants.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/statistics/StatisticChartConstants.java new file mode 100644 index 00000000000..db65209109a --- /dev/null +++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/statistics/StatisticChartConstants.java @@ -0,0 +1,100 @@ +package ch.ivy.addon.portalkit.statistics; + + +public class StatisticChartConstants { + + public static final String EXPIRED_KEY = "/ch.ivy.addon.portalkit.ui.jsf/statistic/chart/barchart/expired"; + public static final String TODAY_EXPIRY_KEY = "/ch.ivy.addon.portalkit.ui.jsf/statistic/chart/barchart/today"; + public static final String THIS_WEEK_EXPIRY_KEY = + "/ch.ivy.addon.portalkit.ui.jsf/statistic/chart/taskByExpiry/thisWeek"; + public static final String THIS_MONTH_EXPIRY_KEY = + "/ch.ivy.addon.portalkit.ui.jsf/statistic/chart/taskByExpiry/thisMonth"; + public static final String THIS_YEAR_EXPIRY_KEY = + "/ch.ivy.addon.portalkit.ui.jsf/statistic/chart/taskByExpiry/thisYear"; + + public static final String JANUARY_CMS = "/ch.ivy.addon.portalkit.ui.jsf/statistic/chart/barchart/monthsOfYear/January"; + public static final String FEBRUARY_CMS = "/ch.ivy.addon.portalkit.ui.jsf/statistic/chart/barchart/monthsOfYear/February"; + public static final String MARCH_CMS = "/ch.ivy.addon.portalkit.ui.jsf/statistic/chart/barchart/monthsOfYear/March"; + public static final String APRIL_CMS = "/ch.ivy.addon.portalkit.ui.jsf/statistic/chart/barchart/monthsOfYear/April"; + public static final String MAY_CMS = "/ch.ivy.addon.portalkit.ui.jsf/statistic/chart/barchart/monthsOfYear/May"; + public static final String JUNE_CMS = "/ch.ivy.addon.portalkit.ui.jsf/statistic/chart/barchart/monthsOfYear/June"; + public static final String JULY_CMS = "/ch.ivy.addon.portalkit.ui.jsf/statistic/chart/barchart/monthsOfYear/July"; + public static final String AUGUST_CMS = "/ch.ivy.addon.portalkit.ui.jsf/statistic/chart/barchart/monthsOfYear/August"; + public static final String SEPTEMBER_CMS = "/ch.ivy.addon.portalkit.ui.jsf/statistic/chart/barchart/monthsOfYear/September"; + public static final String OCTOBER_CMS = "/ch.ivy.addon.portalkit.ui.jsf/statistic/chart/barchart/monthsOfYear/October"; + public static final String NOVEMBER_CMS = "/ch.ivy.addon.portalkit.ui.jsf/statistic/chart/barchart/monthsOfYear/November"; + public static final String DECEMBER_CMS = "/ch.ivy.addon.portalkit.ui.jsf/statistic/chart/barchart/monthsOfYear/December"; + + public static final String FIRSTWEEK_CMS = "/ch.ivy.addon.portalkit.ui.jsf/statistic/chart/barchart/weeksOfMonth/firstWeek"; + public static final String SECONDWEEK_CMS = "/ch.ivy.addon.portalkit.ui.jsf/statistic/chart/barchart/weeksOfMonth/secondWeek"; + public static final String THIRDWEEK_CMS = "/ch.ivy.addon.portalkit.ui.jsf/statistic/chart/barchart/weeksOfMonth/thirdWeek"; + public static final String FOURTHWEEK_CMS = "/ch.ivy.addon.portalkit.ui.jsf/statistic/chart/barchart/weeksOfMonth/fourthWeek"; + public static final String FIFTHWEEK_CMS = "/ch.ivy.addon.portalkit.ui.jsf/statistic/chart/barchart/weeksOfMonth/fifthWeek"; + public static final String SIXTHWEEK_CMS = "/ch.ivy.addon.portalkit.ui.jsf/statistic/chart/barchart/weeksOfMonth/sixthWeek"; + + public static final String MONDAY_CMS = "/ch.ivy.addon.portalkit.ui.jsf/statistic/chart/barchart/daysOfWeek/monday"; + public static final String TUESDAY_CMS = "/ch.ivy.addon.portalkit.ui.jsf/statistic/chart/barchart/daysOfWeek/tuesday"; + public static final String WEDNESDAY_CMS = "/ch.ivy.addon.portalkit.ui.jsf/statistic/chart/barchart/daysOfWeek/wednesday"; + public static final String THURSDAY_CMS = "/ch.ivy.addon.portalkit.ui.jsf/statistic/chart/barchart/daysOfWeek/thursday"; + public static final String FRIDAY_CMS = "/ch.ivy.addon.portalkit.ui.jsf/statistic/chart/barchart/daysOfWeek/friday"; + public static final String SATURDAY_CMS = "/ch.ivy.addon.portalkit.ui.jsf/statistic/chart/barchart/daysOfWeek/saturday"; + public static final String SUNDAY_CMS = "/ch.ivy.addon.portalkit.ui.jsf/statistic/chart/barchart/daysOfWeek/sunday"; + + public static final String NEW_CHART_CMS = "/ch.ivy.addon.portalkit.ui.jsf/statistic/defaultChart/newChart"; + + public static final String BEFORE_8 = "<8"; + public static final String IN_8 = "8"; + public static final String IN_9 = "9"; + public static final String IN_10 = "10"; + public static final String IN_11 = "11"; + public static final String IN_12 = "12"; + public static final String IN_13 = "13"; + public static final String IN_14 = "14"; + public static final String IN_15 = "15"; + public static final String IN_16 = "16"; + public static final String IN_17 = "17"; + public static final String AFTER_18 = ">18"; + + public static final String EXCEPTION_PRIORITY_KEY = + "/ch.ivy.addon.portalkit.ui.jsf/statistic/chart/taskByPriority/exception"; + public static final String HIGH_PRIORITY_KEY = "/ch.ivy.addon.portalkit.ui.jsf/statistic/chart/taskByPriority/high"; + public static final String NORMAL_PRIORITY_KEY = + "/ch.ivy.addon.portalkit.ui.jsf/statistic/chart/taskByPriority/normal"; + public static final String LOW_PRIORITY_KEY = "/ch.ivy.addon.portalkit.ui.jsf/statistic/chart/taskByPriority/low"; + + public static final String CREATED_CASE_KEY = "/ch.ivy.addon.portalkit.ui.jsf/caseState/CREATED"; + public static final String RUNNING_CASE_KEY = "/ch.ivy.addon.portalkit.ui.jsf/caseState/RUNNING"; + public static final String DONE_CASE_KEY = "/ch.ivy.addon.portalkit.ui.jsf/caseState/DONE"; + public static final String FAILED_CASE_KEY = "/ch.ivy.addon.portalkit.ui.jsf/caseState/FAILED"; + + public static final String EXPIRY_PERIOD_CMS = "/ch.ivy.addon.portalkit.ui.jsf/statistic/chart/expiryPeriod"; + public static final String TASK_CMS = "/ch.ivy.addon.portalkit.ui.jsf/common/tasks"; + public static final String TASK_DATATIP_CMS = "/ch.ivy.addon.portalkit.ui.jsf/common/tasks"; + public static final String SECOND_DATATIP_CMS = "/ch.ivy.addon.portalkit.ui.jsf/statistic/chart/second"; + public static final String PERCENTAGE_CMS = "/ch.ivy.addon.portalkit.ui.jsf/statistic/chart/barchart/Percentage"; + public static final String CASE_CATEGORIES_CMS = "/ch.ivy.addon.portalkit.ui.jsf/statistic/filter/caseCategoriesLabel"; + public static final String NO_CATEGORY_CMS = "/ch.ivy.addon.portalkit.ui.jsf/common/noCategory"; + + public static final String ELAPSED_TIME_DETAIL_CHART_NAME_CMS = "/ch.ivy.addon.portalkit.ui.jsf/statistic/chart/elapsedTimeChart/elapsedTimeInHours"; + + public static final String USER_ID = "userId"; + public static final String NAME = "name"; + + public static final String TASK_QUERY = "taskQuery"; + public static final String CASE_QUERY = "caseQuery"; + public static final String RESULT = "result"; + + public static final String DEFAULT_CHART_ICON = "si-pie-line-graph"; + public static final String DONUT_CHART_ICON = "si-analytics-pie-2"; + public static final String BAR_CHART_ICON = "si-analytics-bars"; + + public static final String CATEGORIES_CMS = "/ch.ivy.addon.portalkit.ui.jsf/common/categories"; + public static final String SELECTED_CATEGORIES = "selectedCategories"; + public static final String SELECTED_CATEGORY = "selectedCategory"; + public static final String PARENT_CATEGORY_DELIMITER = "\\\\"; + public static final String CHILD_CATEGORY_DELIMITER = "\\"; + public static final String PARENT_CATEGORY_DELIMITER_REGEX = "\\\\\\\\"; + public static final String CHILD_CATEGORY_DELIMITER_REGEX = "\\\\"; + + private StatisticChartConstants() {} +} diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/statistics/StatisticChartDrilldownUtils.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/statistics/StatisticChartDrilldownUtils.java new file mode 100644 index 00000000000..5c86d2071cb --- /dev/null +++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/statistics/StatisticChartDrilldownUtils.java @@ -0,0 +1,102 @@ +package ch.ivy.addon.portalkit.statistics; + +import static org.apache.commons.lang3.StringUtils.EMPTY; + +import org.primefaces.event.ItemSelectEvent; + +import ch.ivy.addon.portalkit.bean.IvyComponentLogicCaller; +import ch.ivy.addon.portalkit.dto.DisplayName; +import ch.ivy.addon.portalkit.jsf.Attrs; +import ch.ivy.addon.portalkit.service.StatisticService; +import ch.ivy.addon.portalkit.util.UserUtils; +import ch.ivyteam.ivy.workflow.query.TaskQuery; + +public class StatisticChartDrilldownUtils { + public static final String CLIENT_ID = "clientId"; + public static final String DRILLDOWN_TASK_PRIORITY_METHOD = "#{logic.drilldownTaskByPriority}"; + public static final String DRILLDOWN_CASE_STATE_METHOD = "#{logic.drilldownCaseByState}"; + public static final String DRILLDOWN_ELAPSED_TIME_METHOD = "#{logic.drilldownElapsedTime}"; + public static final String ONSELECT_DRILLDOWN_TASK_EXPIRY_METHOD = "#{logic.onSelectDrilldownTaskByExpiry}"; + public static final String TOTASK_EXPIRY_TASK_LIST_METHOD = "#{logic.toTaskByExpiryTaskList}"; + public static final String DRILLDOWN_TASK_EXPIRY_METHOD = "#{logic.drilldownTaskByExpiry}"; + public static final String PREVIOUS_SELECTED_MONTH_FIELD = "#{data.previousSelectedMonth}"; + public static final String PREVIOUS_SELECTED_WEEK_FIELD = "#{data.previousSelectedWeek}"; + public static final String PREVIOUS_SELECTED_DAY_FIELD = "#{data.previousSelectedDay}"; + public static final String DRILLDOWN_CASES_BY_CATEGORY_METHOD = "#{logic.drilldownCasesByCategory}"; + public static final String TO_CASES_BY_CATEGORY_CASE_LIST_METHOD = "#{logic.goToCasesByCategoryList}"; + public static final String ONSELECT_DRILLDOWN_CASES_BY_CATEGORY_METHOD = "#{logic.onSelectDrilldownCasesByCategory}"; + + public static void drilldownTaskByPriority(ItemSelectEvent event, StatisticChart chart) { + var taskQuery = StatisticChartQueryUtils.getQueryForSelectedItemOfTaskByPriorityChart(event, chart); + var currentLanguage = UserUtils.getUserLanguage(); + var chartName = chart.getNames().stream() + .filter(name -> StatisticService.equalsLanguageLocale(name, currentLanguage)) + .map(DisplayName::getValue).findFirst().orElse(EMPTY); + callIvyComponentLogic(DRILLDOWN_TASK_PRIORITY_METHOD, new Object[] {chartName, taskQuery}); + } + + public static void drilldownCaseByState(ItemSelectEvent event, StatisticChart chart) { + var caseQuery = StatisticChartQueryUtils.getQueryForSelectedItemByCaseByState(event, chart); + callIvyComponentLogic(DRILLDOWN_CASE_STATE_METHOD, new Object[] {chart, caseQuery}); + } + + public static void drilldownElapsedTime(ItemSelectEvent event, StatisticChart chart) { + var selectedCaseCategory = StatisticService.getSelectedValueOfBarChart(event); + callIvyComponentLogic(DRILLDOWN_ELAPSED_TIME_METHOD, new Object[] {chart, selectedCaseCategory}); + } + + public static void onSelectDrilldownTaskByExpiry(ItemSelectEvent event, StatisticChart chart) { + var selectedDrilldownItem = StatisticService.getSelectedValueOfBarChart(event); + var selectedItemOfDrilldown = StatisticService.getSelectedValueOfBarChart(event); + var isDrilldownToTaskList = StatisticService.selectHourOfDay(selectedDrilldownItem); + var taskQuery = generateQueryForTaskByExpiry(event, chart); + callIvyComponentLogic(ONSELECT_DRILLDOWN_TASK_EXPIRY_METHOD, + new Object[] {isDrilldownToTaskList, selectedItemOfDrilldown, chart, taskQuery}); + } + + public static void toTaskByExpiryTaskList(ItemSelectEvent event, StatisticChart chart) { + var selectedItemOfDrilldown = StatisticService.getSelectedValueOfBarChart(event); + var taskQuery = generateQueryForTaskByExpiry(event, chart); + callIvyComponentLogic(TOTASK_EXPIRY_TASK_LIST_METHOD, new Object[] {selectedItemOfDrilldown, chart, taskQuery}); + } + + public static void drilldownTaskByExpiry(ItemSelectEvent event, StatisticChart chart) { + var selectedItemOfDrilldown = StatisticService.getSelectedValueOfBarChart(event); + callIvyComponentLogic(DRILLDOWN_TASK_EXPIRY_METHOD, new Object[] {chart, selectedItemOfDrilldown}); + } + + public static void onSelectDrilldownCasesByCategory(ItemSelectEvent event, StatisticChart chart) { + var selectedDrilldownItem = StatisticService.getSelectedValueOfBarChart(event); + var isDrilldownToCaseList = StatisticService.hasChildNode(selectedDrilldownItem); + var caseQuery = StatisticChartQueryUtils.getQueryForSelectedItemByCasesByCategory(event, chart); + callIvyComponentLogic(ONSELECT_DRILLDOWN_CASES_BY_CATEGORY_METHOD, + new Object[] {isDrilldownToCaseList, chart, caseQuery}); + } + + public static void drilldownCasesByCategory(ItemSelectEvent event, StatisticChart chart) { + var selectedItemOfDrilldown = StatisticService.getSelectedValueOfBarChartCasesByCategory(event); + callIvyComponentLogic(DRILLDOWN_CASES_BY_CATEGORY_METHOD, new Object[] {chart, selectedItemOfDrilldown}); + } + + public static void toCasesByCategoryCaseList(ItemSelectEvent event, StatisticChart chart) { + var casesQuery = StatisticChartQueryUtils.getQueryForSelectedItemByCasesByCategory(event, chart); + callIvyComponentLogic(TO_CASES_BY_CATEGORY_CASE_LIST_METHOD, new Object[] {chart, casesQuery}); + } + + private static TaskQuery generateQueryForTaskByExpiry(ItemSelectEvent event, StatisticChart statisticChart) { + String previousSelectedMonth = Attrs.currentContext().getAttribute(PREVIOUS_SELECTED_MONTH_FIELD, String.class); + String previousSelectedWeek = Attrs.currentContext().getAttribute(PREVIOUS_SELECTED_WEEK_FIELD, String.class); + String previousSelectedDay = Attrs.currentContext().getAttribute(PREVIOUS_SELECTED_DAY_FIELD, String.class); + return StatisticChartQueryUtils.getQueryForSelectedItemOfTaskByExpiryChart(event, statisticChart, + previousSelectedMonth, previousSelectedWeek, previousSelectedDay); + } + + private static void callIvyComponentLogic(String methodSignature, Object[] paramValues) { + var ivyComponentLogicCaller = new IvyComponentLogicCaller(); + ivyComponentLogicCaller.invokeComponentLogic(getComponentId(), methodSignature, paramValues); + } + + private static String getComponentId() { + return Attrs.currentContext().getBuildInAttribute(CLIENT_ID); + } +} diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/statistics/StatisticChartQueryUtils.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/statistics/StatisticChartQueryUtils.java new file mode 100644 index 00000000000..beb430c24d4 --- /dev/null +++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/statistics/StatisticChartQueryUtils.java @@ -0,0 +1,666 @@ +package ch.ivy.addon.portalkit.statistics; + +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.AFTER_18; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.BEFORE_8; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.CREATED_CASE_KEY; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.DONE_CASE_KEY; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.EXCEPTION_PRIORITY_KEY; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.FAILED_CASE_KEY; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.HIGH_PRIORITY_KEY; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.LOW_PRIORITY_KEY; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.NORMAL_PRIORITY_KEY; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.RUNNING_CASE_KEY; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.TODAY_EXPIRY_KEY; +import static ch.ivyteam.ivy.workflow.WorkflowPriority.EXCEPTION; +import static ch.ivyteam.ivy.workflow.WorkflowPriority.HIGH; +import static ch.ivyteam.ivy.workflow.WorkflowPriority.LOW; +import static ch.ivyteam.ivy.workflow.WorkflowPriority.NORMAL; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.stream.Collectors; + +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.time.DateUtils; +import org.primefaces.event.ItemSelectEvent; + +import ch.ivy.addon.portalkit.enums.StatisticChartType; +import ch.ivy.addon.portalkit.enums.StatisticTimePeriodSelection; +import ch.ivy.addon.portalkit.service.StatisticService; +import ch.ivy.addon.portalkit.util.CaseUtils; +import ch.ivy.addon.portalkit.util.CategoryUtils; +import ch.ivy.addon.portalkit.util.Dates; +import ch.ivyteam.ivy.environment.Ivy; +import ch.ivyteam.ivy.security.IRole; +import ch.ivyteam.ivy.workflow.CaseState; +import ch.ivyteam.ivy.workflow.TaskState; +import ch.ivyteam.ivy.workflow.WorkflowPriority; +import ch.ivyteam.ivy.workflow.query.CaseQuery; +import ch.ivyteam.ivy.workflow.query.TaskQuery; +import ch.ivyteam.ivy.workflow.query.TaskQuery.IFilterQuery; + +public class StatisticChartQueryUtils { + + private static final String FROM_DATE_KEY = "fromDate"; + private static final String TO_DATE_KEY = "toDate"; + + private StatisticChartQueryUtils() { + + } + + /** + * Get updated task query for Task by Priority chart based on selected item + * + * @param event + * @param statisticChart + * @return updated task query + */ + public static TaskQuery getQueryForSelectedItemOfTaskByPriorityChart(ItemSelectEvent event, StatisticChart statisticChart) { + TaskQuery query = StatisticChartQueryUtils.generateTaskQuery(statisticChart.getFilter()); + String selectedValue = StatisticService.getSelectedValueOfDonutChart(event); + WorkflowPriority priority = null; + + if (selectedValue.equals(Ivy.cms().co(EXCEPTION_PRIORITY_KEY))) { + priority = EXCEPTION; + } else if (selectedValue.equals(Ivy.cms().co(HIGH_PRIORITY_KEY))) { + priority = HIGH; + } else if (selectedValue.equals(Ivy.cms().co(NORMAL_PRIORITY_KEY))) { + priority = NORMAL; + } else if (selectedValue.equals(Ivy.cms().co(LOW_PRIORITY_KEY))) { + priority = LOW; + } + return priority != null ? query.where().and().priority().isEqual(priority) : query; + } + + /** + * Get updated task query for Task by Expiry chart based on selected item + * + * @param event + * @param statisticChart statistic chart + * @param previousSelectedMonth previous selected month + * @param previousSelectedWeek previous selected week + * @param previousSelectedDay previous selected day + * @return updated task query + */ + public static TaskQuery getQueryForSelectedItemOfTaskByExpiryChart(ItemSelectEvent event, StatisticChart statisticChart, String previousSelectedMonth, String previousSelectedWeek, String previousSelectedDay) { + TaskQuery query = StatisticChartQueryUtils.generateTaskQueryForExpiry(statisticChart.getFilter()); + String selectedValue = StatisticService.getSelectedValueOfBarChart(event); + Date fromDate; + Date toDate; + HashMap fromToDateMap; + if (StringUtils.equals(Ivy.cms().co("/ch.ivy.addon.portalkit.ui.jsf/statistic/chart/barchart/expired"), selectedValue)) { + query.where().isExpired().isEqual(true).and().state().isNotEqual(TaskState.DONE); + return query; + } else if (StatisticService.selectHourOfDay(selectedValue)) { + fromToDateMap = calculateTimeRangeOfSelectedHour(selectedValue, previousSelectedMonth, previousSelectedWeek, previousSelectedDay); + fromDate = fromToDateMap.get(FROM_DATE_KEY); + toDate = fromToDateMap.get(TO_DATE_KEY); + } else if (StatisticService.selectDayOfWeek(selectedValue)) { + fromToDateMap = calculateTimeRangeOfSelectedDay(selectedValue, previousSelectedMonth, previousSelectedWeek); + fromDate = fromToDateMap.get(FROM_DATE_KEY); + toDate = fromToDateMap.get(TO_DATE_KEY); + } else if (StatisticService.selectWeekOfMonth(selectedValue)) { + fromToDateMap = calculateTimeRangeOfSelectedWeek(selectedValue, previousSelectedMonth); + fromDate = fromToDateMap.get(FROM_DATE_KEY); + toDate = fromToDateMap.get(TO_DATE_KEY); + } else if (StatisticService.selectMonthOfYear(selectedValue)) { + fromToDateMap = calculateTimeRangeOfSelectedMonth(selectedValue); + fromDate = fromToDateMap.get(FROM_DATE_KEY); + toDate = fromToDateMap.get(TO_DATE_KEY); + } else { + fromDate = StatisticChartTimeUtils.truncateMinutesPart(StatisticChartTimeUtils.getFirstDateOfThisYear()); + toDate = DateUtils.addYears(fromDate, 1); + } + + query.where().and().expiryTimestamp().isGreaterOrEqualThan(fromDate).and().expiryTimestamp() + .isLowerThan(toDate).and().isExpired().isEqual(false).and().state().isNotEqual(TaskState.DONE); + + return query; + } + + private static HashMap calculateTimeRangeOfSelectedHour(String selectedValue, String previousSelectedMonth, String previousSelectedWeek, String previousSelectedDay) { + Date fromDate; + Date toDate; + HashMap fromToDate = new HashMap<>(); + Date currentDate; + if (StringUtils.containsIgnoreCase(previousSelectedDay, Ivy.cms().co(TODAY_EXPIRY_KEY))) { + currentDate = new Date(); + } else { + int shiftDays = StatisticChartTimeUtils.getShiftDaysFromDayOfWeek(previousSelectedDay); + currentDate = DateUtils.addDays(StatisticChartTimeUtils.getFirstDateOfWeek(previousSelectedWeek, previousSelectedMonth), shiftDays); + } + + Date dateWithoutTime = StatisticChartTimeUtils.truncateMinutesPart(currentDate); + if (selectedValue.equals(BEFORE_8)) { + fromDate = dateWithoutTime; + toDate = DateUtils.setHours(dateWithoutTime, 8); + } else if (selectedValue.equals(AFTER_18)) { + fromDate = DateUtils.setHours(dateWithoutTime, 18); + toDate = DateUtils.addDays(dateWithoutTime, 1); + } else { + fromDate = DateUtils.setHours(dateWithoutTime, Integer.parseInt(selectedValue)); + toDate = DateUtils.setHours(dateWithoutTime, Integer.parseInt(selectedValue) + 1); + } + fromToDate.put(FROM_DATE_KEY, fromDate); + fromToDate.put(TO_DATE_KEY, toDate); + return fromToDate; + } + + private static HashMap calculateTimeRangeOfSelectedDay(String selectedValue, String previousSelectedMonth, String previousSelectedWeek) { + Date fromDate; + Date toDate; + HashMap fromToDate = new HashMap<>(); + if (StringUtils.containsIgnoreCase(selectedValue, Ivy.cms().co(TODAY_EXPIRY_KEY))) { + fromDate = StatisticChartTimeUtils.truncateMinutesPart(new Date()); + } else { + int shiftDays = StatisticChartTimeUtils.getShiftDaysFromDayOfWeek(selectedValue); + fromDate = DateUtils.addDays(StatisticChartTimeUtils.getFirstDateOfWeek(previousSelectedWeek, previousSelectedMonth), shiftDays); + fromDate = StatisticChartTimeUtils.truncateMinutesPart(fromDate); + } + toDate = DateUtils.addDays(fromDate, 1); + fromToDate.put(FROM_DATE_KEY, fromDate); + fromToDate.put(TO_DATE_KEY, toDate); + return fromToDate; + } + + private static HashMap calculateTimeRangeOfSelectedWeek(String selectedValue, String previousSelectedMonth) { + Date fromDate; + Date toDate; + HashMap fromToDate = new HashMap<>(); + fromDate = StatisticChartTimeUtils.truncateMinutesPart(StatisticChartTimeUtils.getFirstDateOfWeek(selectedValue, previousSelectedMonth)); + toDate = DateUtils.addWeeks(fromDate, 1); + + if (!StringUtils.isEmpty(previousSelectedMonth)) { + Date firstDateOfMonth = StatisticChartTimeUtils.truncateMinutesPart(StatisticChartTimeUtils.getFirstDateOfMonth(previousSelectedMonth)); + if (firstDateOfMonth.compareTo(fromDate) > 0) { + fromDate = firstDateOfMonth; + } + Date firstDayOfNextMonth = DateUtils.addMonths(firstDateOfMonth, 1); + if (toDate.compareTo(firstDayOfNextMonth) > 0) { + toDate = firstDayOfNextMonth; + } + } + fromToDate.put(FROM_DATE_KEY, fromDate); + fromToDate.put(TO_DATE_KEY, toDate); + return fromToDate; + } + + private static HashMap calculateTimeRangeOfSelectedMonth(String selectedValue) { + Date fromDate; + Date toDate; + HashMap fromToDate = new HashMap<>(); + fromDate = StatisticChartTimeUtils.truncateMinutesPart(StatisticChartTimeUtils.getFirstDateOfMonth(selectedValue)); + toDate = DateUtils.addMonths(fromDate, 1); + fromToDate.put(FROM_DATE_KEY, fromDate); + fromToDate.put(TO_DATE_KEY, toDate); + return fromToDate; + } + + /** + * Get updated task query for Case by State chart based on selected item + * + * @param event + * @param statisticChart + * @return case query for selected item by case state + */ + public static CaseQuery getQueryForSelectedItemByCaseByState(ItemSelectEvent event, StatisticChart statisticChart) { + CaseQuery query = CaseUtils.createBusinessCaseQuery(); + if(statisticChart.getType() == StatisticChartType.CASES_BY_STATE){ + query = StatisticChartQueryUtils.generateCaseQueryForCaseState(statisticChart.getFilter()); + } + else if(statisticChart.getType() == StatisticChartType.CASES_BY_FINISHED_TIME) { + query = StatisticChartQueryUtils.generateCaseQueryByFinishedTime(statisticChart.getFilter()); + } + else if(statisticChart.getType() == StatisticChartType.CASES_BY_FINISHED_TASK) { + query = StatisticChartQueryUtils.generateCaseQueryForCaseHaveFinishedTask(statisticChart.getFilter()); + } + + String selectedValue = StatisticService.getSelectedValueOfDonutChart(event); + + if (selectedValue.equals(Ivy.cms().co(CREATED_CASE_KEY))) { + query.where().state().isEqual(CaseState.CREATED); + } else if (selectedValue.equals(Ivy.cms().co(RUNNING_CASE_KEY))) { + query.where().state().isEqual(CaseState.RUNNING); + } else if (selectedValue.equals(Ivy.cms().co(DONE_CASE_KEY))) { + query.where().state().isEqual(CaseState.DONE); + } else if (selectedValue.equals(Ivy.cms().co(FAILED_CASE_KEY))) { + query.where().state().isEqual(CaseState.DESTROYED); + } + + return query; + } + + /** + * Get updated case query for Cases by Category chart based on selected item + * + * @param event + * @param statisticChart + * @return case query for selected item by case category + */ + public static CaseQuery getQueryForSelectedItemByCasesByCategory(ItemSelectEvent event, StatisticChart statisticChart) { + CaseQuery query = CaseUtils.createBusinessCaseQuery(); + query = StatisticChartQueryUtils.generateCaseQueryForCasesByCategoryChart(statisticChart.getFilter(), StatisticService.getSelectedValueOfBarChartCasesByCategory(event)); + return query; + } + + /** + * Generate task query for statistic + * + * @param filter statistic filter + * @return generated task query + */ + public static TaskQuery generateTaskQuery(StatisticFilter filter) { + TaskQuery taskQuery = TaskQuery.create(); + + // Filter by created date + if (!isStartTimeFilterEmpty(filter)) { + taskQuery.where().and(generateTaskQueryForStartTimestamp(filter)); + } + + // Filter by roles + if (!filter.getIsAllRolesSelected()) { + taskQuery.where().and(generateTaskQueryForRoles(filter)); + } + + if (!filter.getIsAllTaskPrioritiesSelected()) { + taskQuery.where().and(generateTaskQueryForTaskPriority(filter)); + } + + if (isGenerateCaseQuery(filter)) { + taskQuery.where().and().cases(generateCaseQuery(filter, false)); + } + + return taskQuery; + } + + private static boolean isStartTimeFilterEmpty(StatisticFilter filter) { + return filter.getTimePeriodSelection() == StatisticTimePeriodSelection.CUSTOM + && filter.getCreatedDateFrom() == null && filter.getCreatedDateTo() == null; + } + + private static boolean isGenerateCaseQuery(StatisticFilter filter) { + return !isStartTimeFilterEmpty(filter) || !filter.getIsAllCaseStatesSelected() + || CollectionUtils.isNotEmpty(filter.getSelectedCaseCategories()) || isCustomFieldFilterNotEmpty(filter); + } + + private static TaskQuery generateTaskQueryForRoles(StatisticFilter filter) { + TaskQuery subTaskQueryForRoles = TaskQuery.create(); + if (CollectionUtils.isNotEmpty(filter.getSelectedRoles())) { + filter.getSelectedRoles().forEach(role -> subTaskQueryForRoles.where().or().activatorName().isEqual(role)); + } else { + subTaskQueryForRoles.where().and().activatorName().isNotLike("#%"); //exclude other users + List roles = CollectionUtils.emptyIfNull(filter.getRoles()).stream().filter(role -> role instanceof IRole).map(role -> (IRole)role).collect(Collectors.toList()); + roles.forEach(role -> subTaskQueryForRoles.where().and().activatorName().isNotEqual(role.getMemberName())); //exclude role + } + + return subTaskQueryForRoles; + } + + private static TaskQuery generateTaskQueryForStartTimestamp(StatisticFilter filter) { + TaskQuery subTaskQueryForCreatedDate = TaskQuery.create(); + if(filter.getTimePeriodSelection() == null || filter.getTimePeriodSelection() == StatisticTimePeriodSelection.CUSTOM){ + Date createdDateFrom = filter.getCreatedDateFrom(); + Date createdDateTo = filter.getCreatedDateTo(); + if (createdDateFrom != null || createdDateTo != null) { + if (createdDateFrom != null) { + subTaskQueryForCreatedDate.where().startTimestamp().isGreaterOrEqualThan(createdDateFrom); + } + if (createdDateTo != null) { + subTaskQueryForCreatedDate.where().startTimestamp().isLowerOrEqualThan(createdDateTo); + } + } + } else if (filter.getTimePeriodSelection() == StatisticTimePeriodSelection.LAST_WEEK){ + subTaskQueryForCreatedDate.where().startTimestamp().isGreaterOrEqualThan(Dates.getMondayOfLastWeek()); + subTaskQueryForCreatedDate.where().startTimestamp().isLowerOrEqualThan(Dates.getSundayOfLastWeek()); + } else if (filter.getTimePeriodSelection() == StatisticTimePeriodSelection.LAST_MONTH) { + subTaskQueryForCreatedDate.where().startTimestamp().isGreaterOrEqualThan(Dates.getFirstDayOfLastMonth()); + subTaskQueryForCreatedDate.where().startTimestamp().isLowerOrEqualThan(Dates.getLastDayOfLastMonth()); + } else if (filter.getTimePeriodSelection() == StatisticTimePeriodSelection.LAST_6_MONTH){ + subTaskQueryForCreatedDate.where().startTimestamp().isGreaterOrEqualThan(Dates.getFirstDayOfLast6Month()); + } + return subTaskQueryForCreatedDate; + } + + /** + * Generate task query for expiry statistic + * + * @param filter statistic filter + * @return generated task query + */ + public static TaskQuery generateTaskQueryForExpiry(StatisticFilter filter) { + TaskQuery taskQuery = generateTaskQuery(filter); + filterOnlyTasksExpireInThisYear(taskQuery); + return taskQuery; + } + + /** + * Generate case query for statistic + * + * @param filter statistic filter + * @param isElapsedStatistic for elapsed statistic + * @return generated case query + */ + public static CaseQuery generateCaseQuery(StatisticFilter filter, boolean isElapsedStatistic) { + CaseQuery caseQuery = CaseUtils.createBusinessCaseQuery(); + + // Filter by created date + if (!isStartTimeFilterEmpty(filter)) { + caseQuery.where().and(generateCaseQueryForStartTimestamp(filter)); + } + + // Filter by case state + if (!filter.getIsAllCaseStatesSelected()) { + caseQuery.where().and(generateCaseQueryForCaseState(filter, isElapsedStatistic)); + } + // Filter by case category + if (isCaseCategoriesNotEmpty(filter)) { + CaseQuery query = generateCaseQueryForCaseCategory(filter); + if (query != null) { + caseQuery.where().and(query); + } + } + + // Filter by custom field + if (isCustomFieldFilterNotEmpty(filter)) { + generateCaseQueryForCustomField(filter, caseQuery); + } + return caseQuery; + } + + private static boolean isCustomFieldFilterNotEmpty(StatisticFilter filter) { + return filter.getCustomFieldFilters() != null && !filter.getCustomFieldFilters().values().isEmpty(); + } + + private static CaseQuery generateCaseQueryForCaseState(StatisticFilter filter, boolean forElapsedStatistic) { + List selectedCaseStates = Optional.ofNullable(filter.getSelectedCaseStates()).orElse(new ArrayList<>()); + CaseQuery subCaseQueryForSelectedCaseStates = CaseUtils.createBusinessCaseQuery(); + + if (selectedCaseStates.isEmpty()) { + List caseStates = Arrays.asList(CaseState.values()); + caseStates.forEach(caseState -> subCaseQueryForSelectedCaseStates.where().and().state().isNotEqual(caseState)); + } else if (forElapsedStatistic) { + subCaseQueryForSelectedCaseStates.where().or().state().isEqual(CaseState.DONE); + } else { + selectedCaseStates.forEach(caseState -> subCaseQueryForSelectedCaseStates.where().or().state().isEqual(caseState)); + } + return subCaseQueryForSelectedCaseStates; + } + + private static CaseQuery generateCaseQueryForStartTimestamp(StatisticFilter filter) { + CaseQuery subCaseQueryForCreatedDate = CaseUtils.createBusinessCaseQuery(); + if(filter.getTimePeriodSelection() == null || filter.getTimePeriodSelection() == StatisticTimePeriodSelection.CUSTOM){ + Date createdDateFrom = filter.getCreatedDateFrom(); + Date createdDateTo = filter.getCreatedDateTo(); + if (createdDateFrom != null || createdDateTo != null) { + + if (createdDateFrom != null) { + subCaseQueryForCreatedDate.where().startTimestamp().isGreaterOrEqualThan(createdDateFrom); + } + if (createdDateTo != null) { + subCaseQueryForCreatedDate.where().startTimestamp().isLowerOrEqualThan(createdDateTo); + } + } + } + else if (filter.getTimePeriodSelection() == StatisticTimePeriodSelection.LAST_WEEK){ + subCaseQueryForCreatedDate.where().startTimestamp().isGreaterOrEqualThan(Dates.getMondayOfLastWeek()); + subCaseQueryForCreatedDate.where().startTimestamp().isLowerOrEqualThan(Dates.getSundayOfLastWeek()); + } + else if (filter.getTimePeriodSelection() == StatisticTimePeriodSelection.LAST_MONTH) { + subCaseQueryForCreatedDate.where().startTimestamp().isGreaterOrEqualThan(Dates.getFirstDayOfLastMonth()); + subCaseQueryForCreatedDate.where().startTimestamp().isLowerOrEqualThan(Dates.getLastDayOfLastMonth()); + } + else if (filter.getTimePeriodSelection() == StatisticTimePeriodSelection.LAST_6_MONTH) { + subCaseQueryForCreatedDate.where().startTimestamp().isGreaterOrEqualThan(Dates.getFirstDayOfLast6Month()); + } + return subCaseQueryForCreatedDate; + } + + private static void generateCaseQueryForRole(StatisticFilter filter, CaseQuery caseQuery) { + TaskQuery taskQuery = TaskQuery.create(); + taskQuery.where().and(generateTaskQueryForRoles(filter)); + caseQuery.where().and().tasks(taskQuery); + } + + /** + * generate case query for case which having finished task + * @param filter + * @return case query for case which having finished task + */ + public static CaseQuery generateCaseQueryForCaseHaveFinishedTask(StatisticFilter filter) { + CaseQuery caseQuery = generateCaseQuery(filter, false); + caseQuery.where().and().tasks(generateTaskQueryForFinishedTask(filter)); + return caseQuery; + } + + /** + * generate case query by finished time + * @param filter + * @return case query by finished time + */ + public static CaseQuery generateCaseQueryByFinishedTime(StatisticFilter filter) { + CaseQuery caseQuery = CaseUtils.createBusinessCaseQuery(); + // Filter by finished date + generateCaseQueryForEndTimestamp(filter, caseQuery); + + // Filter by case state + List selectedCaseStates = Optional.ofNullable(filter.getSelectedCaseStates()).orElse(new ArrayList<>()); + CaseQuery subCaseQueryForSelectedCaseStates = CaseUtils.createBusinessCaseQuery(); + ch.ivyteam.ivy.workflow.query.CaseQuery.IFilterQuery subCaseFilterForSelectedCaseStates = + subCaseQueryForSelectedCaseStates.where(); + + if (selectedCaseStates.contains(CaseState.DONE)) { + subCaseFilterForSelectedCaseStates.and().state().isEqual(CaseState.DONE); + } + else { + //if user don't choose Done state, generate query to get no information + subCaseFilterForSelectedCaseStates.and().state().isEqual(CaseState.DONE); + subCaseFilterForSelectedCaseStates.and().state().isEqual(CaseState.RUNNING); + } + caseQuery.where().and(subCaseQueryForSelectedCaseStates); + + if (isCaseCategoriesNotEmpty(filter)) { + CaseQuery query = generateCaseQueryForCaseCategory(filter); + if (query != null) { + caseQuery.where().and(query); + } + } + + // Filter by customVarChar + generateCaseQueryForCustomField(filter, caseQuery); + + return caseQuery; + } + + /** + * generate case query for case by state + * + * @param filter + * @return case query for case by state + */ + public static CaseQuery generateCaseQueryForCaseState(StatisticFilter filter) { + CaseQuery caseQuery = CaseUtils.createBusinessCaseQuery(); + if (isGenerateCaseQuery(filter)) { + caseQuery = StatisticChartQueryUtils.generateCaseQuery(filter, false); + } + if (!filter.getIsAllRolesSelected()) { + generateCaseQueryForRole(filter, caseQuery); + } + return caseQuery; + } + + private static void generateCaseQueryForEndTimestamp(StatisticFilter filter, CaseQuery caseQuery) { + CaseQuery subCaseQueryForCreatedDate = CaseUtils.createBusinessCaseQuery(); + ch.ivyteam.ivy.workflow.query.CaseQuery.IFilterQuery subCaseFilterForCreatedDate = subCaseQueryForCreatedDate.where(); + if(filter.getTimePeriodSelection() == null || filter.getTimePeriodSelection() == StatisticTimePeriodSelection.CUSTOM){ + Date startTimePeriod = filter.getCreatedDateFrom(); + Date endTimePeriod = filter.getCreatedDateTo(); + if (startTimePeriod != null || endTimePeriod != null) { + + if (startTimePeriod != null) { + subCaseFilterForCreatedDate.endTimestamp().isGreaterOrEqualThan(startTimePeriod); + } + if (endTimePeriod != null) { + subCaseFilterForCreatedDate.endTimestamp().isLowerOrEqualThan(endTimePeriod); + } + caseQuery.where().and(subCaseQueryForCreatedDate); + } + } + else if (filter.getTimePeriodSelection() == StatisticTimePeriodSelection.LAST_WEEK){ + subCaseFilterForCreatedDate.endTimestamp().isGreaterOrEqualThan(Dates.getMondayOfLastWeek()); + subCaseFilterForCreatedDate.endTimestamp().isLowerOrEqualThan(Dates.getSundayOfLastWeek()); + caseQuery.where().and(subCaseQueryForCreatedDate); + } + else if (filter.getTimePeriodSelection() == StatisticTimePeriodSelection.LAST_MONTH) { + subCaseFilterForCreatedDate.endTimestamp().isGreaterOrEqualThan(Dates.getFirstDayOfLastMonth()); + subCaseFilterForCreatedDate.endTimestamp().isLowerOrEqualThan(Dates.getLastDayOfLastMonth()); + caseQuery.where().and(subCaseQueryForCreatedDate); + } + else if (filter.getTimePeriodSelection() == StatisticTimePeriodSelection.LAST_6_MONTH) { + subCaseFilterForCreatedDate.endTimestamp().isGreaterOrEqualThan(Dates.getFirstDayOfLast6Month()); + caseQuery.where().and(subCaseQueryForCreatedDate); + } + caseQuery.where().and().endTimestamp().isNotNull(); + } + + private static TaskQuery generateTaskQueryForFinishedTask(StatisticFilter filter) { + TaskQuery taskQuery = TaskQuery.create(); + + // Filter by end date + taskQuery.where().and(generateTaskQueryForEndTimestamp(filter)); + taskQuery.where().and().endTimestamp().isNotNull(); + + //Filter by DONE state + taskQuery.where().and().state().isEqual(TaskState.DONE); + + //Filter by role which finished task + if(!filter.getIsAllRolesSelected()) { + taskQuery.where().and(generateTaskQueryForRoles(filter)); + } + + // Filter by task priority + if(!filter.getIsAllTaskPrioritiesSelected()) { + taskQuery.where().and(generateTaskQueryForTaskPriority(filter)); + } + + return taskQuery; + } + + private static boolean isCaseCategoriesNotEmpty(StatisticFilter filter) { + return (CollectionUtils.isNotEmpty(filter.getSelectedCaseCategories())) + || (filter.getCaseCategories() != null && filter.getCaseCategories().getCategories() != null && filter.getCaseCategories().getCategories().length > 0); + } + + private static CaseQuery generateCaseQueryForCaseCategory(StatisticFilter filter) { + return Optional.ofNullable(filter).map(StatisticFilter::getCaseCategories).map(StatisticCaseCategoryFilter::buildQuery).orElse(null); + } + + private static TaskQuery generateTaskQueryForEndTimestamp(StatisticFilter filter) { + TaskQuery subTaskQueryForCreatedDate = TaskQuery.create(); + IFilterQuery subTaskFilterForCreatedDate = subTaskQueryForCreatedDate.where(); + if(filter.getTimePeriodSelection() == null || filter.getTimePeriodSelection() == StatisticTimePeriodSelection.CUSTOM){ + Date createdDateFrom = filter.getCreatedDateFrom(); + Date createdDateTo = filter.getCreatedDateTo(); + if (createdDateFrom != null || createdDateTo != null) { + if (createdDateFrom != null) { + subTaskFilterForCreatedDate.endTimestamp().isGreaterOrEqualThan(createdDateFrom); + } + if (createdDateTo != null) { + subTaskFilterForCreatedDate.endTimestamp().isLowerOrEqualThan(createdDateTo); + } + } + } + else if (filter.getTimePeriodSelection() == StatisticTimePeriodSelection.LAST_WEEK){ + subTaskFilterForCreatedDate.endTimestamp().isGreaterOrEqualThan(Dates.getMondayOfLastWeek()); + subTaskFilterForCreatedDate.endTimestamp().isLowerOrEqualThan(Dates.getSundayOfLastWeek()); + } + else if (filter.getTimePeriodSelection() == StatisticTimePeriodSelection.LAST_MONTH) { + subTaskFilterForCreatedDate.endTimestamp().isGreaterOrEqualThan(Dates.getFirstDayOfLastMonth()); + subTaskFilterForCreatedDate.endTimestamp().isLowerOrEqualThan(Dates.getLastDayOfLastMonth()); + } + else if (filter.getTimePeriodSelection() == StatisticTimePeriodSelection.LAST_6_MONTH){ + subTaskFilterForCreatedDate.endTimestamp().isGreaterOrEqualThan(Dates.getFirstDayOfLast6Month()); + } + return subTaskQueryForCreatedDate; + } + + private static TaskQuery generateTaskQueryForTaskPriority(StatisticFilter filter) { + List selectedPriorities = + Optional.ofNullable(filter.getSelectedTaskPriorities()).orElse(new ArrayList<>()); + TaskQuery subTaskQueryForPriority = TaskQuery.create(); + if (!selectedPriorities.isEmpty()) { + selectedPriorities.forEach(priority -> subTaskQueryForPriority.where().or().priority().isEqual(priority)); + } else { + List priorities = Optional.ofNullable(filter.getTaskPriorities()).orElse(new ArrayList<>()); + priorities.forEach(priority -> subTaskQueryForPriority.where().and().priority().isNotEqual(priority)); + } + return subTaskQueryForPriority; + } + + private static void filterOnlyTasksExpireInThisYear(TaskQuery taskQuery) { + Date firsDateOfThisYear = StatisticChartTimeUtils.truncateMinutesPart(StatisticChartTimeUtils.getFirstDateOfThisYear()); + Date firsDateOfNextYear = StatisticChartTimeUtils.truncateMinutesPart(DateUtils.addYears(firsDateOfThisYear, 1)); + + TaskQuery taskQueryForExpiryDate = TaskQuery.create(); + IFilterQuery filterQueryForExpiryDate = taskQueryForExpiryDate.where(); + filterQueryForExpiryDate.and().state().isNotEqual(TaskState.DESTROYED).and().expiryTimestamp().isGreaterOrEqualThan(firsDateOfThisYear).and().expiryTimestamp() + .isLowerThan(firsDateOfNextYear).and().expiryTimestamp().isNotNull(); + + taskQuery.where().and(taskQueryForExpiryDate); + } + + private static void generateCaseQueryForCustomField(StatisticFilter filter, CaseQuery caseQuery) { + Map> customFieldFilters = filter.getCustomFieldFilters(); + if (customFieldFilters != null) { + customFieldFilters.forEach((k,v) -> { + if (CollectionUtils.isNotEmpty(v)) { + CaseQuery subTaskQueryForCustomVarCharField = CaseUtils.createBusinessCaseQuery(); + ch.ivyteam.ivy.workflow.query.CaseQuery.IFilterQuery subCaseFilterForCustomVarCharField = subTaskQueryForCustomVarCharField.where(); + v.forEach(item -> subCaseFilterForCustomVarCharField.or().customField().stringField(k).isEqual(item)); + caseQuery.where().and(subTaskQueryForCustomVarCharField); + } + }); + } + } + + /** + * Generate case query for statistic + * + * @param filter statistic filter + * @param selectedCategoryValue for selected category + * @return generated case query + */ + public static CaseQuery generateCaseQueryForCasesByCategoryChart(StatisticFilter filter, String selectedCategoryValue) { + CaseQuery caseQuery = CaseUtils.createBusinessCaseQuery(); + + // Filter by created date + if (!isStartTimeFilterEmpty(filter)) { + caseQuery.where().and(generateCaseQueryForStartTimestamp(filter)); + } + + // Filter by case state + if (!filter.getIsAllCaseStatesSelected()) { + caseQuery.where().and(generateCaseQueryForCaseState(filter)); + } + // Filter by case category + if (isCaseCategoriesNotEmpty(filter)) { + CaseQuery query = generateCaseQueryForCaseCategory(filter); + if (query != null) { + caseQuery.where().and(query); + } + } + if(StringUtils.isNotBlank(selectedCategoryValue)) { + if(selectedCategoryValue.equalsIgnoreCase(Ivy.cms().co(CategoryUtils.NO_CATEGORY_CMS))) { + caseQuery.where().and().category().isEqual(StringUtils.EMPTY); + } else { + caseQuery.where().and().category().isLike("%"+selectedCategoryValue.trim()+"%"); + } + } + return caseQuery; + } +} \ No newline at end of file diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/statistics/StatisticChartTimeUtils.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/statistics/StatisticChartTimeUtils.java new file mode 100644 index 00000000000..f1fa629e258 --- /dev/null +++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/statistics/StatisticChartTimeUtils.java @@ -0,0 +1,150 @@ +package ch.ivy.addon.portalkit.statistics; + +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.APRIL_CMS; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.AUGUST_CMS; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.DECEMBER_CMS; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.FEBRUARY_CMS; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.FIFTHWEEK_CMS; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.FIRSTWEEK_CMS; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.FOURTHWEEK_CMS; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.FRIDAY_CMS; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.JANUARY_CMS; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.JULY_CMS; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.JUNE_CMS; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.MARCH_CMS; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.MAY_CMS; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.MONDAY_CMS; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.NOVEMBER_CMS; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.OCTOBER_CMS; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.SATURDAY_CMS; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.SECONDWEEK_CMS; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.SEPTEMBER_CMS; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.SIXTHWEEK_CMS; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.SUNDAY_CMS; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.THIRDWEEK_CMS; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.THIS_MONTH_EXPIRY_KEY; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.THIS_WEEK_EXPIRY_KEY; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.THURSDAY_CMS; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.TODAY_EXPIRY_KEY; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.TUESDAY_CMS; +import static ch.ivy.addon.portalkit.statistics.StatisticChartConstants.WEDNESDAY_CMS; + +import java.util.Arrays; +import java.util.Calendar; +import java.util.Date; + +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.time.DateUtils; + +import ch.ivyteam.ivy.environment.Ivy; + +public class StatisticChartTimeUtils { + + private StatisticChartTimeUtils() { + + } + + public static int getShiftDaysFromDayOfWeek(String dayOfWeek) { + int shiftDays = 0; + if (dayOfWeek.equals(Ivy.cms().co(MONDAY_CMS))) { + shiftDays = 0; + } else if (dayOfWeek.equals(Ivy.cms().co(TUESDAY_CMS))) { + shiftDays = 1; + } else if (dayOfWeek.equals(Ivy.cms().co(WEDNESDAY_CMS))) { + shiftDays = 2; + } else if (dayOfWeek.equals(Ivy.cms().co(THURSDAY_CMS))) { + shiftDays = 3; + } else if (dayOfWeek.equals(Ivy.cms().co(FRIDAY_CMS))) { + shiftDays = 4; + } else if (dayOfWeek.equals(Ivy.cms().co(SATURDAY_CMS))) { + shiftDays = 5; + } else if (dayOfWeek.equals(Ivy.cms().co(SUNDAY_CMS))) { + shiftDays = 6; + } + return shiftDays; + } + + public static Date getFirstDateOfThisMonth() { + Calendar calendar = Calendar.getInstance(); + while (calendar.get(Calendar.DAY_OF_MONTH) > 1) { + calendar.add(Calendar.DATE, -1); + } + return calendar.getTime(); + } + + public static Date getFirstDateOfMonth(String selectedMonth) { + if (StringUtils.containsIgnoreCase(selectedMonth, Ivy.cms().co(THIS_MONTH_EXPIRY_KEY))) { + return getFirstDateOfThisMonth(); + } + Calendar cal = Calendar.getInstance(); + cal.set(Calendar.DAY_OF_MONTH, 1); + String[] monthsOfYear = + {Ivy.cms().co(JANUARY_CMS), Ivy.cms().co(FEBRUARY_CMS), Ivy.cms().co(MARCH_CMS), Ivy.cms().co(APRIL_CMS), + Ivy.cms().co(MAY_CMS), Ivy.cms().co(JUNE_CMS), Ivy.cms().co(JULY_CMS), Ivy.cms().co(AUGUST_CMS), + Ivy.cms().co(SEPTEMBER_CMS), Ivy.cms().co(OCTOBER_CMS), Ivy.cms().co(NOVEMBER_CMS), + Ivy.cms().co(DECEMBER_CMS)}; + int monthIndex = Arrays.asList(monthsOfYear).indexOf(selectedMonth); + cal.set(Calendar.MONTH, monthIndex); + return cal.getTime(); + } + + public static Date getFirstDateOfWeek(String selectedWeek, String selectedMonth) { + + Date firstDateOfWeek = new Date(); + if (StringUtils.containsIgnoreCase(selectedWeek, Ivy.cms().co(THIS_WEEK_EXPIRY_KEY))) { + firstDateOfWeek = getFirstDateOfWeekContainsDate(new Date()); + } else { + Date firstDateOfMonth = getFirstDateOfMonth(selectedMonth); + Date firstDateOfFirstWeek = getFirstDateOfWeekContainsDate(firstDateOfMonth); + if (StringUtils.containsIgnoreCase(selectedWeek, Ivy.cms().co(FIRSTWEEK_CMS))) { + firstDateOfWeek = firstDateOfFirstWeek; + } else if (StringUtils.containsIgnoreCase(selectedWeek, Ivy.cms().co(SECONDWEEK_CMS))) { + firstDateOfWeek = truncateMinutesPart(DateUtils.addWeeks(firstDateOfFirstWeek, 1)); + } else if (StringUtils.containsIgnoreCase(selectedWeek, Ivy.cms().co(THIRDWEEK_CMS))) { + firstDateOfWeek = truncateMinutesPart(DateUtils.addWeeks(firstDateOfFirstWeek, 2)); + } else if (StringUtils.containsIgnoreCase(selectedWeek, Ivy.cms().co(FOURTHWEEK_CMS))) { + firstDateOfWeek = truncateMinutesPart(DateUtils.addWeeks(firstDateOfFirstWeek, 3)); + } else if (StringUtils.containsIgnoreCase(selectedWeek, Ivy.cms().co(FIFTHWEEK_CMS))) { + firstDateOfWeek = truncateMinutesPart(DateUtils.addWeeks(firstDateOfFirstWeek, 4)); + } else if (StringUtils.containsIgnoreCase(selectedWeek, Ivy.cms().co(SIXTHWEEK_CMS))) { + firstDateOfWeek = truncateMinutesPart(DateUtils.addWeeks(firstDateOfFirstWeek, 5)); + } + } + + return firstDateOfWeek; + } + + public static Date getFirstDateOfWeekContainsDate(Date containedDate) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(containedDate); + while (calendar.get(Calendar.DAY_OF_WEEK) > Calendar.MONDAY) { + calendar.add(Calendar.DATE, -1); + } + return calendar.getTime(); + } + + public static boolean isSameDay(Date resultDate, String selectedDay, String previousSelectedWeek, + String previousSelectedMonth) { + int shiftDays = 0; + if (StringUtils.containsIgnoreCase(selectedDay, Ivy.cms().co(TODAY_EXPIRY_KEY))) { + return DateUtils.isSameDay(resultDate, new Date()); + } else { + shiftDays = getShiftDaysFromDayOfWeek(selectedDay); + } + + Date compareDate = DateUtils.addDays(getFirstDateOfWeek(previousSelectedWeek, previousSelectedMonth), shiftDays); + return DateUtils.isSameDay(resultDate, compareDate); + } + + public static Date getFirstDateOfThisYear() { + Calendar calendar = Calendar.getInstance(); + while (calendar.get(Calendar.DAY_OF_YEAR) > 1) { + calendar.add(Calendar.DATE, -1); + } + return calendar.getTime(); + } + + public static Date truncateMinutesPart(Date date) { + return DateUtils.truncate(date, Calendar.DATE); + } +} diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/statistics/StatisticFilter.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/statistics/StatisticFilter.java new file mode 100644 index 00000000000..768270ee0fa --- /dev/null +++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/statistics/StatisticFilter.java @@ -0,0 +1,357 @@ +package ch.ivy.addon.portalkit.statistics; + +import static ch.ivy.addon.portalkit.enums.StatisticTimePeriodSelection.CUSTOM; +import static ch.ivy.addon.portalkit.enums.StatisticTimePeriodSelection.LAST_6_MONTH; +import static ch.ivy.addon.portalkit.enums.StatisticTimePeriodSelection.LAST_MONTH; +import static ch.ivy.addon.portalkit.enums.StatisticTimePeriodSelection.LAST_WEEK; +import static ch.ivyteam.ivy.workflow.CaseState.CREATED; +import static ch.ivyteam.ivy.workflow.CaseState.DONE; +import static ch.ivyteam.ivy.workflow.CaseState.RUNNING; +import static ch.ivyteam.ivy.workflow.WorkflowPriority.EXCEPTION; +import static ch.ivyteam.ivy.workflow.WorkflowPriority.HIGH; +import static ch.ivyteam.ivy.workflow.WorkflowPriority.LOW; +import static ch.ivyteam.ivy.workflow.WorkflowPriority.NORMAL; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; + +import ch.ivy.addon.portalkit.enums.AdditionalProperty; +import ch.ivy.addon.portalkit.enums.StatisticTimePeriodSelection; +import ch.ivy.addon.portalkit.util.PermissionUtils; +import ch.ivyteam.ivy.environment.Ivy; +import ch.ivyteam.ivy.security.IRole; +import ch.ivyteam.ivy.workflow.CaseState; +import ch.ivyteam.ivy.workflow.WorkflowPriority; + +@JsonInclude(JsonInclude.Include.NON_EMPTY) +public class StatisticFilter implements Cloneable { + + private StatisticTimePeriodSelection timePeriodSelection = StatisticTimePeriodSelection.CUSTOM; + @JsonIgnore + private List allTimePeriodSelection = Arrays.asList(CUSTOM, LAST_WEEK, LAST_MONTH, LAST_6_MONTH); + private Date createdDateFrom; + private Date createdDateTo; + + @JsonIgnore + private StatisticCaseCategoryFilter caseCategories = new StatisticCaseCategoryFilter(); + private List selectedCaseCategories = new ArrayList<>(); + private boolean isAllCategoriesSelected; + + @JsonIgnore + private List roles = new ArrayList<>(); + private List selectedRoles = new ArrayList<>(); + private boolean isAllRolesSelected = true; + + @JsonIgnore + private List caseStates = new ArrayList<>(Arrays.asList(CREATED, RUNNING, DONE)); + private List selectedCaseStates = new ArrayList<>(); + private boolean isAllCaseStatesSelected = true; + + @JsonIgnore + private List taskPriorities = Arrays.asList(EXCEPTION, HIGH, NORMAL, LOW); + private List selectedTaskPriorities = new ArrayList<>(); + private boolean isAllTaskPrioritiesSelected = true; + private Map> customFieldFilters; + + private List selectedCustomVarCharFields1 = new ArrayList<>(); + private List selectedCustomVarCharFields2 = new ArrayList<>(); + private List selectedCustomVarCharFields3 = new ArrayList<>(); + private List selectedCustomVarCharFields4 = new ArrayList<>(); + private List selectedCustomVarCharFields5 = new ArrayList<>(); + + public void init() { + initCustomFieldFromDeprecatedCustomVarChar(); + List distinctRoles = findDistinctRoles(); + + this.roles.add(Ivy.session().getSessionUser()); + this.roles.addAll(distinctRoles); + + this.selectedRoles = new ArrayList<>(distinctRoles.stream().map(IRole::getMemberName).collect(Collectors.toList())); + this.selectedRoles.add(0, Ivy.session().getSessionUser().getMemberName()); + + // Initialize list of case states + extendCaseStatesForAdmin(); + this.selectedCaseStates = new ArrayList<>(this.caseStates); + + // Initialize list of task priorities + this.selectedTaskPriorities = new ArrayList<>(this.taskPriorities); + + // Initialize list of case categories + caseCategories = new StatisticCaseCategoryFilter(); + } + + private void extendCaseStatesForAdmin() { + if (PermissionUtils.checkReadAllCasesPermission() && !caseStates.contains(CaseState.DESTROYED)) { + caseStates.add(CaseState.DESTROYED); + } + } + + private List findDistinctRoles() { + List allRoles = Ivy.session().getSessionUser().getAllRoles(); + allRoles.removeIf(role -> role.getProperty(AdditionalProperty.HIDE.toString()) != null); + List distinctRoles = allRoles + .stream() + .sorted((r1, r2) -> StringUtils.compareIgnoreCase(r1.getDisplayName(), r2.getDisplayName())) + .collect(Collectors.toList()); + return distinctRoles; + } + + public void initRoles() { + this.roles.clear(); + this.roles.add(Ivy.session().getSessionUser()); + this.roles.addAll(findDistinctRoles()); + } + + public Date getCreatedDateFrom() { + return createdDateFrom; + } + + public void setCreatedDateFrom(Date createdDateFrom) { + this.createdDateFrom = createdDateFrom; + } + + public Date getCreatedDateTo() { + return createdDateTo; + } + + public void setCreatedDateTo(Date createdDateTo) { + this.createdDateTo = createdDateTo; + } + + public StatisticCaseCategoryFilter getCaseCategories() { + return caseCategories; + } + + public void setCaseCategories(StatisticCaseCategoryFilter caseCategories) { + this.caseCategories = caseCategories; + } + + public List getRoles() { + return roles; + } + + public void setRoles(List roles) { + this.roles = roles; + } + + public List getSelectedRoles() { + return selectedRoles; + } + + public void setSelectedRoles(List selectedRoles) { + this.selectedRoles = selectedRoles; + } + + public List getCaseStates() { + return caseStates; + } + + public void setCaseStates(List caseStates) { + this.caseStates = caseStates; + } + + public List getSelectedCaseStates() { + return selectedCaseStates; + } + + public void setSelectedCaseStates(List selectedCaseStates) { + this.selectedCaseStates = selectedCaseStates; + } + + public List getTaskPriorities() { + return taskPriorities; + } + + public void setTaskPriorities(List taskPriorities) { + this.taskPriorities = taskPriorities; + } + + public List getSelectedTaskPriorities() { + return selectedTaskPriorities; + } + + public void setSelectedTaskPriorities(List selectedTaskPriorities) { + this.selectedTaskPriorities = selectedTaskPriorities; + } + + public String getCaseStateName(CaseState state) { + return Ivy.cms().co("/ch.ivy.addon.portalkit.ui.jsf/caseState/" + state); + } + + public String getPriorityName(WorkflowPriority priority) { + return Ivy.cms().co("/ch.ivy.addon.portalkit.ui.jsf/taskPriority/" + priority); + } + + public StatisticTimePeriodSelection getTimePeriodSelection() { + return timePeriodSelection; + } + + public void setTimePeriodSelection(StatisticTimePeriodSelection timePeriodSelection) { + this.timePeriodSelection = timePeriodSelection; + } + + public List getAllTimePeriodSelection() { + return allTimePeriodSelection; + } + + public void setAllTimePeriodSelection(List allTimePeriodSelection) { + this.allTimePeriodSelection = allTimePeriodSelection; + } + + @Deprecated + public boolean getIsAllCategoriesSelected() { + return isAllCategoriesSelected; + } + + @Deprecated + public void setIsAllCategoriesSelected(boolean isAllCategoriesSelected) { + this.isAllCategoriesSelected = isAllCategoriesSelected; + // For migration + if (isAllCategoriesSelected && this.caseCategories != null) { + this.caseCategories.setCategoryPaths(new ArrayList<>()); + } + } + + public List getSelectedCaseCategories() { + return selectedCaseCategories; + } + + public void setSelectedCaseCategories(List selectedCaseCategories) { + this.selectedCaseCategories = selectedCaseCategories; + if (this.caseCategories != null) { + this.caseCategories.setCategoryPaths(selectedCaseCategories); + } + } + + public boolean getIsAllRolesSelected() { + return isAllRolesSelected; + } + + public void setIsAllRolesSelected(boolean isAllRolesSelected) { + this.isAllRolesSelected = isAllRolesSelected; + } + + public boolean getIsAllCaseStatesSelected() { + return isAllCaseStatesSelected; + } + + public void setIsAllCaseStatesSelected(boolean isAllCaseStatesSelected) { + this.isAllCaseStatesSelected = isAllCaseStatesSelected; + } + + public boolean getIsAllTaskPrioritiesSelected() { + return isAllTaskPrioritiesSelected; + } + + public void setIsAllTaskPrioritiesSelected(boolean isAllTaskPrioritiesSelected) { + this.isAllTaskPrioritiesSelected = isAllTaskPrioritiesSelected; + } + + @Override + public Object clone() throws CloneNotSupportedException { + return super.clone(); + } + + public Map> getCustomFieldFilters() { + return customFieldFilters; + } + + public void setCustomFieldFilters(Map> customFieldFilters) { + this.customFieldFilters = customFieldFilters; + } + + public List getCustomFieldFilter(String customFieldName) { + return this.customFieldFilters.get(customFieldName); + } + + public List findSavedCustomFields(){ + if (customFieldFilters == null) { + initCustomFieldFromDeprecatedCustomVarChar(); + } + return customFieldFilters.entrySet() + .stream() + .filter(item -> CollectionUtils.isNotEmpty(item.getValue())) + .map(Map.Entry::getKey) + .collect(Collectors.toList()); + } + + @Deprecated + public List getSelectedCustomVarCharFields1() { + return selectedCustomVarCharFields1; + } + + @Deprecated + public void setSelectedCustomVarCharFields1(List selectedCustomVarCharFields1) { + this.selectedCustomVarCharFields1 = selectedCustomVarCharFields1; + } + + @Deprecated + public List getSelectedCustomVarCharFields2() { + return selectedCustomVarCharFields2; + } + + @Deprecated + public void setSelectedCustomVarCharFields2(List selectedCustomVarCharFields2) { + this.selectedCustomVarCharFields2 = selectedCustomVarCharFields2; + } + + @Deprecated + public List getSelectedCustomVarCharFields3() { + return selectedCustomVarCharFields3; + } + + @Deprecated + public void setSelectedCustomVarCharFields3(List selectedCustomVarCharFields3) { + this.selectedCustomVarCharFields3 = selectedCustomVarCharFields3; + } + + @Deprecated + public List getSelectedCustomVarCharFields4() { + return selectedCustomVarCharFields4; + } + + @Deprecated + public void setSelectedCustomVarCharFields4(List selectedCustomVarCharFields4) { + this.selectedCustomVarCharFields4 = selectedCustomVarCharFields4; + } + + @Deprecated + public List getSelectedCustomVarCharFields5() { + return selectedCustomVarCharFields5; + } + + @Deprecated + public void setSelectedCustomVarCharFields5(List selectedCustomVarCharFields5) { + this.selectedCustomVarCharFields5 = selectedCustomVarCharFields5; + } + + private void initCustomFieldFromDeprecatedCustomVarChar() { + customFieldFilters = new HashMap<>(); + if (CollectionUtils.isNotEmpty(selectedCustomVarCharFields1)) { + customFieldFilters.put("CustomVarCharFields1", selectedCustomVarCharFields1); + } + if (CollectionUtils.isNotEmpty(selectedCustomVarCharFields2)) { + customFieldFilters.put("CustomVarCharFields2", selectedCustomVarCharFields2); + } + if (CollectionUtils.isNotEmpty(selectedCustomVarCharFields3)) { + customFieldFilters.put("CustomVarCharFields3", selectedCustomVarCharFields3); + } + if (CollectionUtils.isNotEmpty(selectedCustomVarCharFields4)) { + customFieldFilters.put("CustomVarCharFields4", selectedCustomVarCharFields4); + } + if (CollectionUtils.isNotEmpty(selectedCustomVarCharFields5)) { + customFieldFilters.put("CustomVarCharFields5", selectedCustomVarCharFields5); + } + } +} diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/taskfilter/impl/TaskAnalysisFilterData.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/taskfilter/impl/TaskAnalysisFilterData.java new file mode 100644 index 00000000000..bb20eb6b955 --- /dev/null +++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/taskfilter/impl/TaskAnalysisFilterData.java @@ -0,0 +1,53 @@ +package ch.ivy.addon.portalkit.taskfilter.impl; + +import java.util.ArrayList; +import java.util.List; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; + +import ch.ivy.addon.portalkit.casefilter.CaseFilter; +import ch.ivy.addon.portalkit.filter.AbstractFilterData; +import ch.ivy.addon.portalkit.taskfilter.TaskFilter; + +@SuppressWarnings("rawtypes") +@JsonInclude(JsonInclude.Include.NON_EMPTY) +public class TaskAnalysisFilterData extends AbstractFilterData { + private List taskFilters = new ArrayList<>(); + private List caseFilters = new ArrayList<>(); + + public List getTaskFilters() { + return taskFilters; + } + + public void setTaskFilters(List taskFilters) { + this.taskFilters = taskFilters; + } + + public List getCaseFilters() { + return caseFilters; + } + + public void setCaseFilters(List caseFilters) { + this.caseFilters = caseFilters; + } + + @Override + public void setFilters(List filters) { + throw new UnsupportedOperationException(); + } + + @Override + @JsonIgnore + public List getFilters() { + throw new UnsupportedOperationException(); + } + + @Override + @JsonIgnore + public String getKeyword() { + return super.getKeyword(); + } + + +} diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/taskfilter/impl/TaskAnalysisTaskFilterContainer.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/taskfilter/impl/TaskAnalysisTaskFilterContainer.java new file mode 100644 index 00000000000..77f57ad6ea2 --- /dev/null +++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/taskfilter/impl/TaskAnalysisTaskFilterContainer.java @@ -0,0 +1,31 @@ +package ch.ivy.addon.portalkit.taskfilter.impl; + +import java.util.Collections; + +import ch.ivy.addon.portalkit.comparator.TaskFilterComparator; + +public class TaskAnalysisTaskFilterContainer extends DefaultTaskFilterContainer { + + private TaskWorkerFilter workerFilter = new TaskWorkerFilter(); + + public TaskAnalysisTaskFilterContainer() { + super(); + filters.add(workerFilter); + Collections.sort(filters, new TaskFilterComparator()); + } + + public TaskAnalysisTaskFilterContainer(boolean filterForUnavailableActivator) { + super(filterForUnavailableActivator); + filters.add(workerFilter); + Collections.sort(filters, new TaskFilterComparator()); + } + + public TaskWorkerFilter getWorkerFilter() { + return workerFilter; + } + + public void setWorkerFilter(TaskWorkerFilter workerFilter) { + this.workerFilter = workerFilter; + } + +} diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/util/CategoryUtils.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/util/CategoryUtils.java index f503fb1796b..df92fdd93c0 100644 --- a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/util/CategoryUtils.java +++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/util/CategoryUtils.java @@ -21,8 +21,6 @@ public class CategoryUtils { public static final String NO_CATEGORY_CMS = "/ch.ivy.addon.portalkit.ui.jsf/common/noCategory"; public static final String CATEGORY_SEPARATOR = ", "; public static final String CATEGORY_PATH_DELIMITER = "/"; - public static final String PARENT_CATEGORY_DELIMITER = "\\\\"; - public static final String CHILD_CATEGORY_DELIMITER = "\\"; private CategoryUtils() {} diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/util/CronByGlobalVariableTriggerStartEventBean.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/util/CronByGlobalVariableTriggerStartEventBean.java new file mode 100644 index 00000000000..c1aa8e91fe6 --- /dev/null +++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/util/CronByGlobalVariableTriggerStartEventBean.java @@ -0,0 +1,65 @@ +package ch.ivy.addon.portalkit.util; + +import java.util.Optional; + +import org.apache.commons.lang3.StringUtils; + +import ch.ivyteam.ivy.process.eventstart.AbstractProcessStartEventBean; +import ch.ivyteam.ivy.process.eventstart.IProcessStartEventBeanRuntime; +import ch.ivyteam.ivy.process.extension.ProgramConfig; +import ch.ivyteam.ivy.process.extension.ui.ExtensionUiBuilder; +import ch.ivyteam.ivy.process.extension.ui.UiEditorExtension; +import ch.ivyteam.ivy.request.RequestException; +import ch.ivyteam.ivy.vars.Variable; +import ch.ivyteam.ivy.vars.Variables; +import ch.ivyteam.util.IvyRuntimeException; + +public class CronByGlobalVariableTriggerStartEventBean extends AbstractProcessStartEventBean { + + private static final String PORTAL_DELETE_ALL_FINISHED_HIDDEN_CASE = "PortalDeleteAllFinishedHiddenCases"; + private static final String VARIABLE = "variable"; + public CronByGlobalVariableTriggerStartEventBean() { + super("Portal Clean Obsolete Data", "This is a scheduled process of Portal"); + } + + @Override + public void initialize(IProcessStartEventBeanRuntime eventRuntime, ProgramConfig configuration) { + super.initialize(eventRuntime, configuration); + try { + Variable var = + Variables.of(eventRuntime.getProcessModelVersion().getApplication()).variable(configuration.get(VARIABLE)); + Variable deleteAllFinishedHiddenCasesVar = Variables.of(eventRuntime.getProcessModelVersion().getApplication()) + .variable(PORTAL_DELETE_ALL_FINISHED_HIDDEN_CASE); + if (var != null) { + String pattern = var.value(); + Boolean isJobTrigger = Optional.of(deleteAllFinishedHiddenCasesVar).map(Variable::value).map(Boolean::parseBoolean).orElse(false); + if (StringUtils.isNotBlank(pattern) && isJobTrigger) { + eventRuntime.poll().asDefinedByExpression(pattern); + } else { + eventRuntime.poll().disable(); + } + } + } catch (Exception ex) { + throw new IvyRuntimeException("Cannot evaluate the ivyScript configuration ", ex); + } + } + + + @Override + public void poll() { + try { + getEventBeanRuntime().processStarter() + .withReason("Time elapsed or reached cron pattern " + getConfig().get(VARIABLE)).start(); + } catch (RequestException ex) { + throw new IvyRuntimeException("Cannot start process", ex); + } + } + + public static class Editor extends UiEditorExtension { + + @Override + public void initUiFields(ExtensionUiBuilder ui) { + ui.textField(VARIABLE).create(); + } + } +} diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/util/DashboardWidgetUtils.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/util/DashboardWidgetUtils.java index b9d6e4f2a4a..32025dc24f4 100644 --- a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/util/DashboardWidgetUtils.java +++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/util/DashboardWidgetUtils.java @@ -35,6 +35,7 @@ import ch.ivy.addon.portalkit.dto.dashboard.DashboardWidget; import ch.ivy.addon.portalkit.dto.dashboard.ProcessDashboardWidget; import ch.ivy.addon.portalkit.dto.dashboard.SingleProcessDashboardWidget; +import ch.ivy.addon.portalkit.dto.dashboard.StatisticDashboardWidget; import ch.ivy.addon.portalkit.dto.dashboard.TaskDashboardWidget; import ch.ivy.addon.portalkit.dto.dashboard.casecolumn.CaseColumnModel; import ch.ivy.addon.portalkit.dto.dashboard.process.DashboardProcess; @@ -384,7 +385,8 @@ public static DashboardWidget buildDefaultWidget(String id, String name, Dashboa case TASK -> buildDefaultTaskWidget(id, name); case CASE -> buildDefaultCaseWidget(id, name); case PROCESS -> buildDefaultProcessWidget(id, name); - case CLIENT_STATISTIC -> buildDefaultStatisticWidget(id, name, type); + case STATISTIC, + CLIENT_STATISTIC -> buildDefaultStatisticWidget(id, name, type); default -> null; }; } @@ -392,7 +394,12 @@ public static DashboardWidget buildDefaultWidget(String id, String name, Dashboa private static DashboardWidget buildDefaultStatisticWidget(String id, String name, DashboardWidgetType widgetType) { DashboardWidget widget = null; - widget = new ClientStatisticDashboardWidget(); + if (widgetType == DashboardWidgetType.CLIENT_STATISTIC) { + widget = new ClientStatisticDashboardWidget(); + } else { + widget = new StatisticDashboardWidget(); + widget.setName(name); + } widget.setId(id); var layout = new WidgetLayout(); layout.setWidth(5); diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/util/PermissionUtils.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/util/PermissionUtils.java index 6e50ed8ce4a..f83bcea6a8b 100644 --- a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/util/PermissionUtils.java +++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/util/PermissionUtils.java @@ -123,6 +123,15 @@ public static boolean checkAccessFullCaseListPermission() { return hasPortalPermission(PortalPermission.ACCESS_FULL_CASE_LIST); } + /** + * Check if current user has permission to see full statistic list + * + * @return true if current user has permission to see full statistic list + */ + public static boolean checkAccessFullStatisticsListPermission() { + return hasPortalPermission(PortalPermission.ACCESS_FULL_STATISTICS_LIST); + } + /** * Check if current user has permission to create public external link * diff --git a/AxonIvyPortal/portal/src/com/axonivy/portal/service/ClientStatisticService.java b/AxonIvyPortal/portal/src/com/axonivy/portal/service/ClientStatisticService.java index 3e89b6d197d..e15bee40a9d 100644 --- a/AxonIvyPortal/portal/src/com/axonivy/portal/service/ClientStatisticService.java +++ b/AxonIvyPortal/portal/src/com/axonivy/portal/service/ClientStatisticService.java @@ -62,7 +62,7 @@ public ClientStatisticResponse getStatisticData(ClientStatisticDto payload) private void validateChart(String chartId, ClientStatistic chart) throws NotFoundException, NoPermissionException { if (chart == null) { - throw new NotFoundException(Ivy.cms().co("/Dialogs/com/axonivy/portal/dashboard/component/ClientStatisticWidget/IdNotFound", + throw new NotFoundException(Ivy.cms().co("/ch.ivy.addon.portalkit.ui.jsf/statistic/chart/exception/idNotFound", Arrays.asList(chartId))); } diff --git a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/TaskAnalysis/TaskAnalysis.xhtml b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/TaskAnalysis/TaskAnalysis.xhtml new file mode 100644 index 00000000000..c52dc911e72 --- /dev/null +++ b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/TaskAnalysis/TaskAnalysis.xhtml @@ -0,0 +1,24 @@ + + + + + + + + + + #{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/statistic/taskAnalysis/taskAnalysis')} + + + + + + + + \ No newline at end of file diff --git a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/TaskAnalysis/TaskAnalysisData.d.json b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/TaskAnalysis/TaskAnalysisData.d.json new file mode 100644 index 00000000000..855185f003f --- /dev/null +++ b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/TaskAnalysis/TaskAnalysisData.d.json @@ -0,0 +1,11 @@ +{ + "$schema" : "https://json-schema.axonivy.com/data-class/11.4.0/data-class.json", + "simpleName" : "TaskAnalysisData", + "namespace" : "ch.ivy.addon.portal.generic.TaskAnalysis", + "isBusinessCaseData" : false, + "fields" : [ { + "name" : "taskView", + "type" : "ch.ivy.addon.portal.generic.view.TaskAnalysisView", + "modifiers" : [ "PERSISTENT" ] + } ] +} \ No newline at end of file diff --git a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/TaskAnalysis/TaskAnalysisProcess.p.json b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/TaskAnalysis/TaskAnalysisProcess.p.json new file mode 100644 index 00000000000..e5bc186c778 --- /dev/null +++ b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/TaskAnalysis/TaskAnalysisProcess.p.json @@ -0,0 +1,77 @@ +{ + "$schema" : "https://json-schema.axonivy.com/process/11.3.0/process.json", + "id" : "163DD37A38FA2BC8", + "kind" : "HTML_DIALOG", + "config" : { + "data" : "ch.ivy.addon.portal.generic.TaskAnalysis.TaskAnalysisData" + }, + "elements" : [ { + "id" : "f0", + "type" : "HtmlDialogStart", + "name" : "start()", + "config" : { + "signature" : "start", + "guid" : "163DD37A3BC5BFD2" + }, + "visual" : { + "at" : { "x" : 96, "y" : 64 } + }, + "connect" : [ + { "id" : "f7", "to" : "f6" } + ] + }, { + "id" : "f1", + "type" : "HtmlDialogEnd", + "visual" : { + "at" : { "x" : 352, "y" : 64 } + } + }, { + "id" : "f3", + "type" : "HtmlDialogEventStart", + "name" : "close", + "config" : { + "guid" : "163DD37A3E43A70E" + }, + "visual" : { + "at" : { "x" : 96, "y" : 160 }, + "labelOffset" : { "x" : 8, "y" : 32 } + }, + "connect" : [ + { "id" : "f5", "to" : "f4" } + ] + }, { + "id" : "f4", + "type" : "HtmlDialogExit", + "visual" : { + "at" : { "x" : 224, "y" : 160 } + } + }, { + "id" : "f6", + "type" : "Script", + "name" : "init", + "config" : { + "output" : { + "code" : [ + "import ch.ivy.addon.portal.generic.view.TaskAnalysisView;", + "import ch.ivy.addon.portalkit.enums.TaskSortField;", + "import ch.ivy.addon.portalkit.datamodel.internal.TaskAnalysisLazyDataModel;", + "", + "TaskAnalysisLazyDataModel dataModel = new TaskAnalysisLazyDataModel();", + "dataModel.getCriteria().setNewQueryCreated(true);", + "dataModel.setAdminQuery(true);", + "dataModel.setSortField(TaskSortField.PRIORITY.toString(), false);", + " ", + "String pageTitle = ivy.cms.co(\"/Labels/Task\"); ", + "String noTaskMessage = ivy.cms.co(\"/ch.ivy.addon.portalkit.ui.jsf/taskWarning/taskNotFound\");", + "out.taskView = TaskAnalysisView.create().dataModel(dataModel).pageTitle(pageTitle).hideTaskFilter(false).showHeaderToolbar(false).noTaskFoundMessage(noTaskMessage).chunkSize(20).createNewTaskView();" + ] + } + }, + "visual" : { + "at" : { "x" : 224, "y" : 64 } + }, + "connect" : [ + { "id" : "f2", "to" : "f1" } + ] + } ] +} \ No newline at end of file diff --git a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/admin/PortalDashBoard/PortalDashBoard.xhtml b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/admin/PortalDashBoard/PortalDashBoard.xhtml new file mode 100644 index 00000000000..b3f00019c0c --- /dev/null +++ b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/admin/PortalDashBoard/PortalDashBoard.xhtml @@ -0,0 +1,20 @@ + + + + + + + + #{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/statistic/chart/statistics')} + + + + + + + \ No newline at end of file diff --git a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/admin/PortalDashBoard/PortalDashBoardData.d.json b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/admin/PortalDashBoard/PortalDashBoardData.d.json new file mode 100644 index 00000000000..aa69526050c --- /dev/null +++ b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/admin/PortalDashBoard/PortalDashBoardData.d.json @@ -0,0 +1,16 @@ +{ + "$schema" : "https://json-schema.axonivy.com/data-class/11.4.0/data-class.json", + "simpleName" : "PortalDashBoardData", + "namespace" : "ch.ivy.addon.portal.generic.admin.PortalDashBoard", + "isBusinessCaseData" : false, + "fields" : [ { + "name" : "statisticChartList", + "type" : "java.util.List", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "taskQuery", + "type" : "ch.ivyteam.ivy.workflow.query.TaskQuery", + "comment" : "Customized TaskQuery", + "modifiers" : [ "PERSISTENT" ] + } ] +} \ No newline at end of file diff --git a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/admin/PortalDashBoard/PortalDashBoardProcess.p.json b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/admin/PortalDashBoard/PortalDashBoardProcess.p.json new file mode 100644 index 00000000000..6590334f977 --- /dev/null +++ b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/admin/PortalDashBoard/PortalDashBoardProcess.p.json @@ -0,0 +1,56 @@ +{ + "$schema" : "https://json-schema.axonivy.com/process/11.3.0/process.json", + "id" : "14EB4D799BBF04C8", + "kind" : "HTML_DIALOG", + "config" : { + "data" : "ch.ivy.addon.portal.generic.admin.PortalDashBoard.PortalDashBoardData" + }, + "elements" : [ { + "id" : "f0", + "type" : "HtmlDialogStart", + "name" : "start()", + "config" : { + "signature" : "start", + "guid" : "14EB4D799DA15883" + }, + "visual" : { + "at" : { "x" : 112, "y" : 64 }, + "labelOffset" : { "x" : 8, "y" : 32 } + }, + "connect" : [ + { "id" : "f7", "to" : "f2" } + ] + }, { + "id" : "f1", + "type" : "HtmlDialogEnd", + "visual" : { + "at" : { "x" : 320, "y" : 64 } + } + }, { + "id" : "f2", + "type" : "Script", + "name" : "get statistic charts", + "config" : { + "output" : { + "code" : [ + "import ch.ivy.addon.portalkit.service.StatisticService;", + "", + "StatisticService service = StatisticService.getInstance();", + "in.statisticChartList = service.findStatisticCharts();" + ] + } + }, + "visual" : { + "at" : { "x" : 227, "y" : 64 } + }, + "connect" : [ + { "id" : "f9", "to" : "f1" } + ] + } ], + "layout" : { + "lanes" : [ { + "name" : "Start method", + "size" : 192 + } ] + } +} \ No newline at end of file diff --git a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/dashboard/PortalDashboardDetailModification/PortalDashboardAddNewWidgets.xhtml b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/dashboard/PortalDashboardDetailModification/PortalDashboardAddNewWidgets.xhtml index 1cb61172a8f..b8f320cbb34 100644 --- a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/dashboard/PortalDashboardDetailModification/PortalDashboardAddNewWidgets.xhtml +++ b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/dashboard/PortalDashboardDetailModification/PortalDashboardAddNewWidgets.xhtml @@ -168,6 +168,11 @@ managedBean="#{dashboardDetailModificationBean}"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

    #{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/dashboard/StatisticWidget/PreviewText')}

    +     + + + + + + + + + + + + +

    #{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/dashboard/StatisticWidget/EmptyChartDataMessage')}

    +     + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +     +     +     +     +     + + \ No newline at end of file diff --git a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/dashboard/component/StatisticChartWidget/StatisticChartWidgetData.d.json b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/dashboard/component/StatisticChartWidget/StatisticChartWidgetData.d.json new file mode 100644 index 00000000000..68490a8668f --- /dev/null +++ b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/dashboard/component/StatisticChartWidget/StatisticChartWidgetData.d.json @@ -0,0 +1,55 @@ +{ + "$schema" : "https://json-schema.axonivy.com/data-class/11.4.0/data-class.json", + "simpleName" : "StatisticChartWidgetData", + "namespace" : "ch.ivy.addon.portal.generic.dashboard.component.StatisticChartWidget", + "isBusinessCaseData" : false, + "fields" : [ { + "name" : "taskListName", + "type" : "String", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "taskQuery", + "type" : "ch.ivyteam.ivy.workflow.query.TaskQuery", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "isDrilldownToTaskList", + "type" : "Boolean", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "selectedItemOfDrilldown", + "type" : "String", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "selectedStatisticChart", + "type" : "ch.ivy.addon.portalkit.statistics.StatisticChart", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "showTaskListImmediately", + "type" : "Boolean", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "caseQuery", + "type" : "ch.ivyteam.ivy.workflow.query.CaseQuery", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "selectedCaseCategory", + "type" : "String", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "chartNameOfCurrentLanguage", + "type" : "String", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "previousSelectedMonth", + "type" : "String", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "previousSelectedWeek", + "type" : "String", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "previousSelectedDay", + "type" : "String", + "modifiers" : [ "PERSISTENT" ] + } ] +} \ No newline at end of file diff --git a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/dashboard/component/StatisticChartWidget/StatisticChartWidgetProcess.p.json b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/dashboard/component/StatisticChartWidget/StatisticChartWidgetProcess.p.json new file mode 100644 index 00000000000..7a5b4f7c46e --- /dev/null +++ b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/dashboard/component/StatisticChartWidget/StatisticChartWidgetProcess.p.json @@ -0,0 +1,290 @@ +{ + "$schema" : "https://json-schema.axonivy.com/process/11.3.0/process.json", + "id" : "17FF80435B6470D3", + "kind" : "HTML_DIALOG", + "config" : { + "data" : "ch.ivy.addon.portal.generic.dashboard.component.StatisticChartWidget.StatisticChartWidgetData" + }, + "elements" : [ { + "id" : "f0", + "type" : "HtmlDialogStart", + "name" : "start()", + "config" : { + "signature" : "start", + "guid" : "17FF8043641EBB62" + }, + "visual" : { + "at" : { "x" : 96, "y" : 64 } + }, + "connect" : [ + { "id" : "f2", "to" : "f1" } + ] + }, { + "id" : "f1", + "type" : "HtmlDialogEnd", + "visual" : { + "at" : { "x" : 224, "y" : 64 } + } + }, { + "id" : "f6", + "type" : "HtmlDialogMethodStart", + "name" : "drilldownCaseByState(StatisticChart,CaseQuery)", + "config" : { + "signature" : "drilldownCaseByState", + "input" : { + "params" : [ + { "name" : "selectedStatisticChart", "type" : "ch.ivy.addon.portalkit.statistics.StatisticChart", "desc" : "" }, + { "name" : "caseQuery", "type" : "ch.ivyteam.ivy.workflow.query.CaseQuery", "desc" : "" } + ], + "map" : { + "out.caseQuery" : "param.caseQuery", + "out.selectedStatisticChart" : "param.selectedStatisticChart" + } + }, + "guid" : "17FFE85588CFA06E" + }, + "visual" : { + "at" : { "x" : 96, "y" : 416 }, + "labelOffset" : { "x" : 77, "y" : 34 } + }, + "connect" : [ + { "id" : "f8", "to" : "f42" } + ] + }, { + "id" : "f39", + "type" : "Alternative", + "config" : { + "conditions" : { + "f37" : "in.showTaskListImmediately || in.isDrilldownToTaskList" + } + }, + "visual" : { + "at" : { "x" : 200, "y" : 192 } + }, + "connect" : [ + { "id" : "f37", "to" : "f36" }, + { "id" : "f47", "to" : "f46", "via" : [ { "x" : 200, "y" : 128 } ] } + ] + }, { + "id" : "f7", + "type" : "SubProcessCall", + "name" : "Navigator", + "config" : { + "processCall" : "Functional Processes/Navigator:viewTaskForAnalytic(String,ch.ivyteam.ivy.workflow.query.TaskQuery)", + "call" : { + "map" : { + "param.chartName" : "in.taskListName", + "param.taskQuery" : "in.taskQuery" + } + } + }, + "visual" : { + "at" : { "x" : 483, "y" : 344 } + } + }, { + "id" : "f83", + "type" : "HtmlDialogMethodStart", + "name" : "drilldownTaskByPriority(String,TaskQuery)", + "config" : { + "signature" : "drilldownTaskByPriority", + "input" : { + "params" : [ + { "name" : "taskListName", "type" : "String", "desc" : "" }, + { "name" : "taskQuery", "type" : "ch.ivyteam.ivy.workflow.query.TaskQuery", "desc" : "" } + ], + "map" : { + "out.taskListName" : "param.taskListName", + "out.taskQuery" : "param.taskQuery" + } + }, + "guid" : "17FFE85588DA0A15" + }, + "visual" : { + "at" : { "x" : 96, "y" : 344 }, + "labelOffset" : { "x" : 58, "y" : 32 } + }, + "connect" : [ + { "id" : "f84", "to" : "f7" } + ] + }, { + "id" : "f46", + "type" : "HtmlDialogEnd", + "visual" : { + "at" : { "x" : 483, "y" : 128 } + } + }, { + "id" : "f42", + "type" : "SubProcessCall", + "name" : "Navigator", + "config" : { + "processCall" : "Functional Processes/Navigator:viewCaseForAnalytic(String,ch.ivyteam.ivy.workflow.query.CaseQuery)", + "call" : { + "map" : { + "param.chartName" : "in.chartNameOfCurrentLanguage", + "param.caseQuery" : "in.caseQuery" + } + } + }, + "visual" : { + "at" : { "x" : 320, "y" : 416 } + } + }, { + "id" : "f36", + "type" : "Script", + "name" : "Build task query", + "config" : { + "output" : { + "code" : [ + "import ch.ivy.addon.portalkit.service.StatisticService;", + "import ch.ivy.addon.portalkit.ivydata.service.impl.LanguageService;", + "import ch.ivy.addon.portalkit.ivydata.service.impl.LanguageService;", + "import org.apache.commons.lang3.StringUtils;", + "import ch.ivy.addon.portalkit.datamodel.TaskLazyDataModel;", + "import ch.ivy.addon.portalkit.service.StatisticService;", + "import ch.ivy.addon.portalkit.statistics.StatisticChartQueryUtils;", + "import ch.ivy.addon.portalkit.statistics.StatisticChart;", + "", + "if (StatisticService.selectMonthOfYear(in.selectedItemOfDrilldown)) {", + " in.previousSelectedMonth = in.selectedItemOfDrilldown;", + "} else if (StatisticService.selectWeekOfMonth(in.selectedItemOfDrilldown)) {", + " in.previousSelectedWeek = in.selectedItemOfDrilldown;", + "} else if (StatisticService.selectDayOfWeek(in.selectedItemOfDrilldown)) {", + " in.previousSelectedDay = in.selectedItemOfDrilldown;", + "}", + "", + "StatisticService service = StatisticService.getInstance();", + "in.chartNameOfCurrentLanguage = service.getDisplayNameInUserLanguageForChart(in.selectedStatisticChart).getValue();", + "", + "in.taskListName = in.chartNameOfCurrentLanguage + \" - \" + in.selectedItemOfDrilldown;", + "if (StatisticService.selectHourOfDay(in.selectedItemOfDrilldown)) {", + " in.taskListName += \" \" + ivy.cms.co(\"/ch.ivy.addon.portalkit.ui.jsf/statistic/chart/taskByExpiry/hour\");", + "}", + "in.selectedItemOfDrilldown = StringUtils.EMPTY;" + ] + } + }, + "visual" : { + "at" : { "x" : 320, "y" : 192 } + }, + "connect" : [ + { "id" : "f38", "to" : "f7", "via" : [ { "x" : 483, "y" : 192 } ] } + ] + }, { + "id" : "f41", + "type" : "HtmlDialogMethodStart", + "name" : "toTaskByExpiryTaskList(String,StatisticChart,TaskQuery)", + "config" : { + "signature" : "toTaskByExpiryTaskList", + "input" : { + "params" : [ + { "name" : "selectedItemOfDrilldown", "type" : "String", "desc" : "" }, + { "name" : "selectedStatisticChart", "type" : "ch.ivy.addon.portalkit.statistics.StatisticChart", "desc" : "" }, + { "name" : "taskQuery", "type" : "ch.ivyteam.ivy.workflow.query.TaskQuery", "desc" : "" } + ], + "map" : { + "out.selectedItemOfDrilldown" : "param.selectedItemOfDrilldown", + "out.selectedStatisticChart" : "param.selectedStatisticChart", + "out.taskQuery" : "param.taskQuery" + } + }, + "guid" : "17FFE85588D604E1" + }, + "visual" : { + "at" : { "x" : 96, "y" : 272 }, + "labelOffset" : { "x" : 95, "y" : 31 } + }, + "connect" : [ + { "id" : "f43", "to" : "f36", "via" : [ { "x" : 320, "y" : 272 } ] } + ] + }, { + "id" : "f35", + "type" : "HtmlDialogMethodStart", + "name" : "onSelectDrilldownTaskByExpiry(Boolean,String,StatisticChart,TaskQuery)", + "config" : { + "signature" : "onSelectDrilldownTaskByExpiry", + "input" : { + "params" : [ + { "name" : "isDrilldownToTaskList", "type" : "Boolean", "desc" : "" }, + { "name" : "selectedItemOfDrilldown", "type" : "String", "desc" : "" }, + { "name" : "selectedStatisticChart", "type" : "ch.ivy.addon.portalkit.statistics.StatisticChart", "desc" : "" }, + { "name" : "taskQuery", "type" : "ch.ivyteam.ivy.workflow.query.TaskQuery", "desc" : "" } + ], + "map" : { + "out.isDrilldownToTaskList" : "param.isDrilldownToTaskList", + "out.selectedItemOfDrilldown" : "param.selectedItemOfDrilldown", + "out.selectedStatisticChart" : "param.selectedStatisticChart", + "out.taskQuery" : "param.taskQuery" + } + }, + "guid" : "17FFE85588DC1FA9" + }, + "visual" : { + "at" : { "x" : 96, "y" : 192 }, + "labelOffset" : { "x" : 144, "y" : 48 } + }, + "connect" : [ + { "id" : "f40", "to" : "f39" } + ] + }, { + "id" : "f94", + "type" : "Script", + "name" : "Get chart name", + "config" : { + "output" : { + "code" : [ + "import ch.ivy.addon.portalkit.service.StatisticService;", + "", + "StatisticService service = StatisticService.getInstance();", + "in.chartNameOfCurrentLanguage = service.getDisplayNameInUserLanguageForChart(in.selectedStatisticChart).getValue();" + ] + } + }, + "visual" : { + "at" : { "x" : 360, "y" : 512 } + }, + "connect" : [ + { "id" : "f14", "to" : "f11" } + ] + }, { + "id" : "f11", + "type" : "SubProcessCall", + "name" : "Navigator", + "config" : { + "processCall" : "Functional Processes/Navigator:viewCaseForAnalytic(String,ch.ivyteam.ivy.workflow.query.CaseQuery)", + "call" : { + "map" : { + "param.chartName" : "in.chartNameOfCurrentLanguage", + "param.caseQuery" : "in.caseQuery" + } + } + }, + "visual" : { + "at" : { "x" : 512, "y" : 512 } + } + }, { + "id" : "f12", + "type" : "HtmlDialogMethodStart", + "name" : "goToCasesByCategoryList(StatisticChart,CaseQuery)", + "config" : { + "signature" : "goToCasesByCategoryList", + "input" : { + "params" : [ + { "name" : "selectedStatisticChart", "type" : "ch.ivy.addon.portalkit.statistics.StatisticChart", "desc" : "" }, + { "name" : "caseQuery", "type" : "ch.ivyteam.ivy.workflow.query.CaseQuery", "desc" : "" } + ], + "map" : { + "out.caseQuery" : "param.caseQuery", + "out.selectedStatisticChart" : "param.selectedStatisticChart" + } + }, + "guid" : "18214957424B6AC8" + }, + "visual" : { + "at" : { "x" : 96, "y" : 512 }, + "labelOffset" : { "x" : 90, "y" : 34 } + }, + "connect" : [ + { "id" : "f13", "to" : "f94" } + ] + } ] +} \ No newline at end of file diff --git a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/dashboard/component/StatisticChartWidgetConfiguration/StatisticChartWidgetConfiguration.xhtml b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/dashboard/component/StatisticChartWidgetConfiguration/StatisticChartWidgetConfiguration.xhtml new file mode 100644 index 00000000000..b10c0e507e2 --- /dev/null +++ b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/dashboard/component/StatisticChartWidgetConfiguration/StatisticChartWidgetConfiguration.xhtml @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + + + + +
    +
    +

    #{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/dashboard/configuration/configuration')}

    +

    #{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/dashboard/StatisticWidget/ConfigurationDescription')}

    +
    + + + +
    +
    + #{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/dashboard/StatisticWidget/AvailableCharts')} +
    +
    + +
    +
    + + + +
    + +
    +
    + + + + + +
    +
    + +
    +     +
    +     + + + +
    +
    +

    #{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/dashboard/preview')}

    +
    + + + + + +
    +     +     + \ No newline at end of file diff --git a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/dashboard/component/StatisticChartWidgetConfiguration/StatisticChartWidgetConfigurationData.d.json b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/dashboard/component/StatisticChartWidgetConfiguration/StatisticChartWidgetConfigurationData.d.json new file mode 100644 index 00000000000..bcafbab81a5 --- /dev/null +++ b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/dashboard/component/StatisticChartWidgetConfiguration/StatisticChartWidgetConfigurationData.d.json @@ -0,0 +1,6 @@ +{ + "$schema" : "https://json-schema.axonivy.com/data-class/11.4.0/data-class.json", + "simpleName" : "StatisticChartWidgetConfigurationData", + "namespace" : "ch.ivy.addon.portal.generic.dashboard.component.StatisticChartWidgetConfiguration", + "isBusinessCaseData" : false +} \ No newline at end of file diff --git a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/dashboard/component/StatisticChartWidgetConfiguration/StatisticChartWidgetConfigurationProcess.p.json b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/dashboard/component/StatisticChartWidgetConfiguration/StatisticChartWidgetConfigurationProcess.p.json new file mode 100644 index 00000000000..ef097692319 --- /dev/null +++ b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/dashboard/component/StatisticChartWidgetConfiguration/StatisticChartWidgetConfigurationProcess.p.json @@ -0,0 +1,48 @@ +{ + "$schema" : "https://json-schema.axonivy.com/process/11.3.0/process.json", + "id" : "17FE498A0B4F9B30", + "kind" : "HTML_DIALOG", + "config" : { + "data" : "ch.ivy.addon.portal.generic.dashboard.component.StatisticChartWidgetConfiguration.StatisticChartWidgetConfigurationData" + }, + "elements" : [ { + "id" : "f0", + "type" : "HtmlDialogStart", + "name" : "start()", + "config" : { + "signature" : "start", + "guid" : "17B382D89473A921" + }, + "visual" : { + "at" : { "x" : 96, "y" : 64 } + }, + "connect" : [ + { "id" : "f2", "to" : "f1" } + ] + }, { + "id" : "f1", + "type" : "HtmlDialogEnd", + "visual" : { + "at" : { "x" : 224, "y" : 64 } + } + }, { + "id" : "f3", + "type" : "HtmlDialogEventStart", + "name" : "close", + "config" : { + "guid" : "17B382D895DC8AB8" + }, + "visual" : { + "at" : { "x" : 96, "y" : 160 } + }, + "connect" : [ + { "id" : "f5", "to" : "f4" } + ] + }, { + "id" : "f4", + "type" : "HtmlDialogExit", + "visual" : { + "at" : { "x" : 224, "y" : 160 } + } + } ] +} \ No newline at end of file diff --git a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/admin/AdminSettings/AdminSettingsProcess.p.json b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/admin/AdminSettings/AdminSettingsProcess.p.json index a7b27c54ecb..45d0838a3e9 100644 --- a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/admin/AdminSettings/AdminSettingsProcess.p.json +++ b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/admin/AdminSettings/AdminSettingsProcess.p.json @@ -211,6 +211,7 @@ "import ch.addon.portal.generic.userprofile.homepage.HomepageUtils;", "import ch.ivy.addon.portalkit.enums.GlobalVariable;", "import ch.ivy.addon.portalkit.enums.GlobalVariableType;", + "import ch.ivy.addon.portalkit.statistics.StatisticChartConstants;", "import java.util.Arrays;", "import ch.ivy.addon.portalkit.enums.GlobalVariable;", "", diff --git a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/StatisticWidget/StatisticWidget.xhtml b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/StatisticWidget/StatisticWidget.xhtml new file mode 100644 index 00000000000..0bb2b7a8978 --- /dev/null +++ b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/StatisticWidget/StatisticWidget.xhtml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + +
    + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +
    +     +     +
    +     + + + + + + + + + + + +
    + + + + + + + + + + + + + + + +     + \ No newline at end of file diff --git a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/StatisticWidget/StatisticWidgetData.d.json b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/StatisticWidget/StatisticWidgetData.d.json new file mode 100644 index 00000000000..e16e5c5b342 --- /dev/null +++ b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/StatisticWidget/StatisticWidgetData.d.json @@ -0,0 +1,67 @@ +{ + "$schema" : "https://json-schema.axonivy.com/data-class/11.4.0/data-class.json", + "simpleName" : "StatisticWidgetData", + "namespace" : "ch.ivy.addon.portalkit.component.StatisticWidget", + "isBusinessCaseData" : false, + "fields" : [ { + "name" : "compactMode", + "type" : "Boolean", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "username", + "type" : "String", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "jsonQuery", + "type" : "String", + "comment" : "Customized TaskQuery", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "createMode", + "type" : "Boolean", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "statisticChartList", + "type" : "java.util.List", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "isDrilldownElapsedTime", + "type" : "Boolean", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "isDrilldownExpiryChart", + "type" : "Boolean", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "isBackFromDrilldown", + "type" : "Boolean", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "defaultCharts", + "type" : "java.util.List", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "canCreateNewCharts", + "type" : "Boolean", + "comment" : "Check user has permission to creating new charts", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "hasDefaultChart", + "type" : "Boolean", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "canAnalyzeTask", + "type" : "Boolean", + "comment" : "Check user has permission to analyzing task", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "isDisplayShowAllChartLink", + "type" : "Boolean", + "comment" : "Is show all chart link at home page", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "isDrilldownCasesByCategory", + "type" : "Boolean", + "modifiers" : [ "PERSISTENT" ] + } ] +} \ No newline at end of file diff --git a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/StatisticWidget/StatisticWidgetProcess.p.json b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/StatisticWidget/StatisticWidgetProcess.p.json new file mode 100644 index 00000000000..233f222f5d7 --- /dev/null +++ b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/StatisticWidget/StatisticWidgetProcess.p.json @@ -0,0 +1,477 @@ +{ + "$schema" : "https://json-schema.axonivy.com/process/11.3.0/process.json", + "id" : "1521B28EE98E8444", + "kind" : "HTML_DIALOG", + "config" : { + "data" : "ch.ivy.addon.portalkit.component.StatisticWidget.StatisticWidgetData" + }, + "elements" : [ { + "id" : "f0", + "type" : "HtmlDialogStart", + "name" : "start(List)", + "config" : { + "signature" : "start", + "input" : { + "params" : [ + { "name" : "statisticChartList", "type" : "java.util.List", "desc" : "" } + ], + "map" : { + "out.createMode" : "false" + }, + "code" : [ + "import ch.ivy.addon.portalkit.service.StatisticService;", + "", + "if(!param.#statisticChartList is initialized) {", + " StatisticService service = StatisticService.getInstance();", + " out.statisticChartList = service.findStatisticCharts();", + "} else { ", + " out.statisticChartList = param.statisticChartList;", + "}" + ] + }, + "guid" : "16034D800DC77D9C" + }, + "visual" : { + "at" : { "x" : 94, "y" : 64 } + }, + "connect" : [ + { "id" : "f49", "to" : "f47" } + ] + }, { + "id" : "f1", + "type" : "HtmlDialogMethodStart", + "name" : "switchMode()", + "config" : { + "signature" : "switchMode", + "input" : { + "map" : { }, + "code" : "out.compactMode = !out.compactMode;" + }, + "guid" : "16034D80ACC379F5" + }, + "visual" : { + "at" : { "x" : 94, "y" : 256 } + }, + "connect" : [ + { "id" : "f3", "to" : "f2" } + ] + }, { + "id" : "f2", + "type" : "HtmlDialogEnd", + "visual" : { + "at" : { "x" : 264, "y" : 256 } + } + }, { + "id" : "f4", + "type" : "HtmlDialogMethodStart", + "name" : "setCompactMode(Boolean)", + "config" : { + "signature" : "setCompactMode", + "input" : { + "params" : [ + { "name" : "compactMode", "type" : "Boolean", "desc" : "" } + ], + "map" : { + "out.compactMode" : "param.compactMode" + } + }, + "guid" : "16034D8582DD119E" + }, + "visual" : { + "at" : { "x" : 94, "y" : 384 } + }, + "connect" : [ + { "id" : "f35", "to" : "f34" } + ] + }, { + "id" : "f5", + "type" : "HtmlDialogEnd", + "visual" : { + "at" : { "x" : 736, "y" : 384 } + } + }, { + "id" : "f7", + "type" : "HtmlDialogEnd", + "visual" : { + "at" : { "x" : 976, "y" : 160 } + } + }, { + "id" : "f10", + "type" : "HtmlDialogEnd", + "visual" : { + "at" : { "x" : 264, "y" : 448 } + } + }, { + "id" : "f12", + "type" : "HtmlDialogEventStart", + "name" : "switchCreateMode", + "config" : { + "guid" : "16048C1223A5C53A", + "output" : { + "code" : "out.createMode = !out.createMode;" + } + }, + "visual" : { + "at" : { "x" : 94, "y" : 448 } + }, + "connect" : [ + { "id" : "f13", "to" : "f10" } + ] + }, { + "id" : "f15", + "type" : "HtmlDialogEnd", + "visual" : { + "at" : { "x" : 264, "y" : 513 } + } + }, { + "id" : "f16", + "type" : "HtmlDialogEventStart", + "name" : "switchDrilldownMode", + "config" : { + "guid" : "161BBCEDA1C24D09", + "output" : { + "map" : { + "out" : "in", + "out.isDrilldownElapsedTime" : "false" + } + } + }, + "visual" : { + "at" : { "x" : 94, "y" : 513 } + }, + "connect" : [ + { "id" : "f17", "to" : "f15" } + ] + }, { + "id" : "f18", + "type" : "HtmlDialogEnd", + "visual" : { + "at" : { "x" : 264, "y" : 577 } + } + }, { + "id" : "f19", + "type" : "HtmlDialogEventStart", + "name" : "drilldownElapsedTimeListener", + "config" : { + "guid" : "161BBD78F902AFC2", + "output" : { + "map" : { + "out" : "in", + "out.isDrilldownElapsedTime" : "true" + } + } + }, + "visual" : { + "at" : { "x" : 94, "y" : 577 } + }, + "connect" : [ + { "id" : "f20", "to" : "f18" } + ] + }, { + "id" : "f9", + "type" : "HtmlDialogEventStart", + "name" : "switchDrilldownExpiryChartMode", + "config" : { + "guid" : "16250B3D0BF56AEB", + "output" : { + "map" : { + "out" : "in", + "out.isBackFromDrilldown" : "true", + "out.isDrilldownExpiryChart" : "false" + } + } + }, + "visual" : { + "at" : { "x" : 96, "y" : 640 } + }, + "connect" : [ + { "id" : "f14", "to" : "f11" } + ] + }, { + "id" : "f11", + "type" : "HtmlDialogEnd", + "visual" : { + "at" : { "x" : 264, "y" : 639 } + } + }, { + "id" : "f21", + "type" : "HtmlDialogMethodStart", + "name" : "drillDownExpiryListener()", + "config" : { + "signature" : "drillDownExpiryListener", + "input" : { + "map" : { + "out.isBackFromDrilldown" : "false", + "out.isDrilldownExpiryChart" : "true" + } + }, + "guid" : "1625100B1C7D96D2" + }, + "visual" : { + "at" : { "x" : 96, "y" : 704 } + }, + "connect" : [ + { "id" : "f23", "to" : "f22" } + ] + }, { + "id" : "f22", + "type" : "HtmlDialogEnd", + "visual" : { + "at" : { "x" : 264, "y" : 704 } + } + }, { + "id" : "f26", + "type" : "Script", + "name" : "add to chart list", + "config" : { + "output" : { + "code" : [ + "import ch.ivy.addon.portalkit.service.StatisticService;", + "", + "in.statisticChartList.addAll(StatisticService.getInstance().getPublicConfig());" + ] + } + }, + "visual" : { + "at" : { "x" : 824, "y" : 160 } + }, + "connect" : [ + { "id" : "f25", "to" : "f7" } + ] + }, { + "id" : "f28", + "type" : "HtmlDialogEventStart", + "name" : "restoreDefault", + "config" : { + "guid" : "163AF4A8A1BFD729" + }, + "visual" : { + "at" : { "x" : 94, "y" : 160 }, + "labelOffset" : { "x" : 8, "y" : 32 } + }, + "connect" : [ + { "id" : "f32", "to" : "f31" } + ] + }, { + "id" : "f31", + "type" : "Script", + "name" : "restore default charts", + "config" : { + "output" : { + "code" : [ + "import ch.ivy.addon.portalkit.statistics.StatisticChart;", + "import ch.ivy.addon.portalkit.service.StatisticService;", + "", + "in.statisticChartList.clear();", + "", + "StatisticService service = StatisticService.getInstance();", + "service.deletePrivateConfig();" + ] + } + }, + "visual" : { + "at" : { "x" : 256, "y" : 160 }, + "size" : { "width" : 120, "height" : 48 } + }, + "connect" : [ + { "id" : "f43", "to" : "f26" } + ] + }, { + "id" : "f30", + "type" : "Script", + "name" : [ + "Check permission", + "to creating new charts" + ], + "config" : { + "output" : { + "code" : [ + "import ch.ivy.addon.portalkit.enums.PortalPermission;", + "import ch.ivy.addon.portalkit.util.PermissionUtils;", + "", + "in.canCreateNewCharts = PermissionUtils.hasPortalPermission(PortalPermission.STATISTIC_ADD_DASHBOARD_CHART);", + "in.canAnalyzeTask = PermissionUtils.hasPortalPermission(PortalPermission.STATISTIC_ANALYZE_TASK);" + ] + }, + "sudo" : true + }, + "visual" : { + "at" : { "x" : 560, "y" : 320 }, + "size" : { "width" : 144 } + }, + "connect" : [ + { "id" : "f39", "to" : "f5", "via" : [ { "x" : 736, "y" : 320 } ] } + ] + }, { + "id" : "f34", + "type" : "Alternative", + "name" : "is compact mode?", + "config" : { + "conditions" : { + "f45" : "in.compactMode" + } + }, + "visual" : { + "at" : { "x" : 264, "y" : 384 }, + "labelOffset" : { "x" : 13, "y" : 34 } + }, + "connect" : [ + { "id" : "f45", "to" : "f44", "label" : { + "name" : "yes", + "segment" : 0.47, + "offset" : { "y" : 12 } + } }, + { "id" : "f38", "to" : "f36", "via" : [ { "x" : 264, "y" : 320 } ] } + ] + }, { + "id" : "f36", + "type" : "Script", + "name" : "check default chart", + "config" : { + "output" : { + "code" : [ + "import ch.ivy.addon.portalkit.service.StatisticService;", + "", + "StatisticService service = StatisticService.getInstance();", + "if(!in.#statisticChartList is initialized || in.statisticChartList.isEmpty()) {", + " in.statisticChartList = service.findStatisticCharts();", + " in.hasDefaultChart = service.isDefaultChart(in.statisticChartList);", + "} else {", + " in.hasDefaultChart = service.isDefaultChart(in.statisticChartList);", + "}" + ] + } + }, + "visual" : { + "at" : { "x" : 384, "y" : 320 } + }, + "connect" : [ + { "id" : "f33", "to" : "f30" } + ] + }, { + "id" : "f29", + "type" : "HtmlDialogEventStart", + "name" : "navigateToTaskAnalysisPage", + "config" : { + "guid" : "16411B8894BC5C90" + }, + "visual" : { + "at" : { "x" : 96, "y" : 784 } + }, + "connect" : [ + { "id" : "f42", "to" : "f41" } + ] + }, { + "id" : "f37", + "type" : "HtmlDialogEnd", + "visual" : { + "at" : { "x" : 480, "y" : 784 } + } + }, { + "id" : "f41", + "type" : "Script", + "name" : "Redirect to analysis page", + "config" : { + "output" : { + "code" : [ + "import java.util.HashMap;", + "import ch.ivy.addon.portal.generic.navigation.PortalNavigator;", + "import javax.faces.context.FacesContext;", + "", + "String taskAnalysisUrl = PortalNavigator.buildUrlByKeyword(\"showTaskAnalysis.ivp\", \"Start Processes/PortalStart/showTaskAnalysis.ivp\", new HashMap());", + "FacesContext.getCurrentInstance().getExternalContext().redirect(taskAnalysisUrl);" + ] + }, + "sudo" : true + }, + "visual" : { + "at" : { "x" : 288, "y" : 784 }, + "size" : { "width" : 144 } + }, + "connect" : [ + { "id" : "f40", "to" : "f37" } + ] + }, { + "id" : "f44", + "type" : "Script", + "name" : [ + "Check permission ", + "to see show all chart link" + ], + "config" : { + "output" : { + "code" : [ + "import ch.ivy.addon.portalkit.util.PermissionUtils;", + "in.isDisplayShowAllChartLink = PermissionUtils.checkAccessFullStatisticsListPermission();" + ] + } + }, + "visual" : { + "at" : { "x" : 480, "y" : 384 }, + "size" : { "width" : 160 } + }, + "connect" : [ + { "id" : "f6", "to" : "f5" } + ] + }, { + "id" : "f47", + "type" : "HtmlDialogEnd", + "visual" : { + "at" : { "x" : 264, "y" : 64 } + } + }, { + "id" : "f8", + "type" : "HtmlDialogMethodStart", + "name" : "drillDownCasesByCategoryListener()", + "config" : { + "signature" : "drillDownCasesByCategoryListener", + "input" : { + "map" : { + "out.isBackFromDrilldown" : "false", + "out.isDrilldownCasesByCategory" : "true" + } + }, + "guid" : "181FBB8B75EBFFDC" + }, + "visual" : { + "at" : { "x" : 376, "y" : 448 }, + "labelOffset" : { "x" : 42, "y" : 35 } + }, + "connect" : [ + { "id" : "f27", "to" : "f24" } + ] + }, { + "id" : "f24", + "type" : "HtmlDialogEnd", + "visual" : { + "at" : { "x" : 544, "y" : 448 } + } + }, { + "id" : "f50", + "type" : "HtmlDialogEventStart", + "name" : "switchDrilldownCasesByCategoryMode", + "config" : { + "guid" : "181FBD8405DADDB5", + "output" : { + "map" : { + "out" : "in", + "out.isBackFromDrilldown" : "true", + "out.isDrilldownCasesByCategory" : "false" + } + } + }, + "visual" : { + "at" : { "x" : 376, "y" : 520 }, + "labelOffset" : { "x" : 27, "y" : 35 } + }, + "connect" : [ + { "id" : "f52", "to" : "f51" } + ] + }, { + "id" : "f51", + "type" : "HtmlDialogEnd", + "visual" : { + "at" : { "x" : 544, "y" : 520 } + } + } ] +} \ No newline at end of file diff --git a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/TaskAnalysisWidget/StatisticResult.xhtml b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/TaskAnalysisWidget/StatisticResult.xhtml new file mode 100644 index 00000000000..38ef98efa05 --- /dev/null +++ b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/TaskAnalysisWidget/StatisticResult.xhtml @@ -0,0 +1,185 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    #{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/statistic/taskAnalysis/waitingDownloadMessage')}
    + #{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/statistic/taskAnalysis/downloadZipFileExplanation')} +     + +     + \ No newline at end of file diff --git a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/TaskAnalysisWidget/TaskAnalysisWidget.xhtml b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/TaskAnalysisWidget/TaskAnalysisWidget.xhtml new file mode 100644 index 00000000000..5a050443748 --- /dev/null +++ b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/TaskAnalysisWidget/TaskAnalysisWidget.xhtml @@ -0,0 +1,321 @@ + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + #{ivy.cms.co(data.dataModel.isSelectedDefaultFilter() or data.dataModel.selectedTaskAnalysisFilterData == null ? '/ch.ivy.addon.portalkit.ui.jsf/components/taskView/filter' : '/ch.ivy.addon.portalkit.ui.jsf/components/taskView/savedFilters')} + #{data.dataModel.isSelectedDefaultFilter() ? data.dataModel.defaultTaskAnalysisFilterData.filterName : data.dataModel.selectedTaskAnalysisFilterData == null ? ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/NoSelection') : data.dataModel.selectedTaskAnalysisFilterData.filterName} + + + + +
    + +
    + + + + + + + +     + + +
    + +
    + + + + + + + +     +     +     +     +     + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +     + \ No newline at end of file diff --git a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/TaskAnalysisWidget/TaskAnalysisWidgetData.d.json b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/TaskAnalysisWidget/TaskAnalysisWidgetData.d.json new file mode 100644 index 00000000000..e8be002b697 --- /dev/null +++ b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/TaskAnalysisWidget/TaskAnalysisWidgetData.d.json @@ -0,0 +1,80 @@ +{ + "$schema" : "https://json-schema.axonivy.com/data-class/11.4.0/data-class.json", + "simpleName" : "TaskAnalysisWidgetData", + "namespace" : "ch.ivy.addon.portalkit.component.TaskAnalysisWidget", + "isBusinessCaseData" : false, + "fields" : [ { + "name" : "count", + "type" : "Integer", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "dataModel", + "type" : "ch.ivy.addon.portalkit.datamodel.internal.TaskAnalysisLazyDataModel", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "startIndex", + "type" : "Integer", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "totalTasks", + "type" : "Long", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "tasks", + "type" : "java.util.List", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "taskSearchCriteria", + "type" : "ch.ivy.addon.portalkit.ivydata.searchcriteria.TaskSearchCriteria", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "filterSetName", + "type" : "String", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "filterType", + "type" : "ch.ivy.addon.portalkit.enums.FilterType", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "taskFilterDataToBeRemoved", + "type" : "ch.ivy.addon.portalkit.taskfilter.impl.TaskAnalysisFilterData", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "isFilterExisted", + "type" : "Boolean", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "taskFilterGroupId", + "type" : "Long", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "taskPublicFilters", + "type" : "List", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "taskPrivateFilters", + "type" : "List", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "exportedFile", + "type" : "org.primefaces.model.StreamedContent", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "columnsVisibility", + "type" : "java.util.Map", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "collectedTasksForExporting", + "type" : "java.util.List", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "loopCounter", + "type" : "Integer", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "maxResultNumberPerQuery", + "type" : "Integer", + "comment" : "max number of records when querying task for exporting", + "modifiers" : [ "PERSISTENT" ] + } ] +} \ No newline at end of file diff --git a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/TaskAnalysisWidget/TaskAnalysisWidgetProcess.p.json b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/TaskAnalysisWidget/TaskAnalysisWidgetProcess.p.json new file mode 100644 index 00000000000..e5ef8e5ce7b --- /dev/null +++ b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/TaskAnalysisWidget/TaskAnalysisWidgetProcess.p.json @@ -0,0 +1,706 @@ +{ + "$schema" : "https://json-schema.axonivy.com/process/11.3.0/process.json", + "id" : "163DD68942416255", + "kind" : "HTML_DIALOG", + "config" : { + "data" : "ch.ivy.addon.portalkit.component.TaskAnalysisWidget.TaskAnalysisWidgetData" + }, + "elements" : [ { + "id" : "f0", + "type" : "HtmlDialogStart", + "name" : "start(TaskAnalysisLazyDataModel,Long)", + "config" : { + "signature" : "start", + "input" : { + "params" : [ + { "name" : "dataModel", "type" : "ch.ivy.addon.portalkit.datamodel.internal.TaskAnalysisLazyDataModel", "desc" : "" }, + { "name" : "filterGroupId", "type" : "Long", "desc" : "" } + ], + "map" : { + "out.taskFilterGroupId" : "param.filterGroupId" + }, + "code" : [ + "if (param.#dataModel is initialized){", + " out.dataModel = param.dataModel;", + "}" + ] + }, + "guid" : "14FDF92006C61D35" + }, + "visual" : { + "at" : { "x" : 96, "y" : 64 }, + "labelOffset" : { "x" : 34, "y" : 40 } + }, + "connect" : [ + { "id" : "f10", "to" : "f8" } + ] + }, { + "id" : "f94", + "type" : "HtmlDialogMethodStart", + "name" : "findTasks(TaskSearchCriteria,Integer,Integer)", + "config" : { + "signature" : "findTasks", + "input" : { + "params" : [ + { "name" : "criteria", "type" : "ch.ivy.addon.portalkit.ivydata.searchcriteria.TaskSearchCriteria", "desc" : "" }, + { "name" : "startIndex", "type" : "Integer", "desc" : "" }, + { "name" : "count", "type" : "Integer", "desc" : "" } + ], + "map" : { + "out.count" : "param.count", + "out.startIndex" : "param.startIndex", + "out.taskSearchCriteria" : "param.criteria" + } + }, + "result" : { + "params" : [ + { "name" : "tasks", "type" : "java.util.List", "desc" : "" } + ], + "map" : { + "result.tasks" : "in.tasks" + } + }, + "guid" : "153EF14248ECB35E" + }, + "visual" : { + "at" : { "x" : 96, "y" : 160 }, + "labelOffset" : { "x" : 57, "y" : 30 } + }, + "connect" : [ + { "id" : "f19", "to" : "f9" } + ] + }, { + "id" : "f23", + "type" : "HtmlDialogEventStart", + "name" : "saveFilter", + "config" : { + "guid" : "15F5844AD96F4A4C" + }, + "visual" : { + "at" : { "x" : 80, "y" : 384 } + }, + "connect" : [ + { "id" : "f46", "to" : "f45" } + ] + }, { + "id" : "f24", + "type" : "Script", + "name" : "save filter set", + "config" : { + "output" : { + "code" : [ + "import ch.ivy.addon.portalkit.service.TaskAnalysisFilterService;", + "import ch.ivy.addon.portalkit.taskfilter.impl.TaskAnalysisFilterData;", + "import ch.ivy.addon.portalkit.enums.FilterType;", + "TaskAnalysisFilterService taskFilterService = new TaskAnalysisFilterService();", + "TaskAnalysisFilterData taskFilterData = in.dataModel.saveTaskAnalysisFilter(in.filterSetName, in.filterType, in.taskFilterGroupId);", + "if(FilterType.ONLY_ME == taskFilterData.type) {", + " in.taskPrivateFilters.add(taskFilterData);", + " in.taskPrivateFilters = taskFilterService.sortFilters(in.taskPrivateFilters) as List;", + "} else {", + " in.taskPublicFilters.add(taskFilterData);", + " in.taskPublicFilters = taskFilterService.sortFilters(in.taskPublicFilters) as List;", + "}", + "in.dataModel.selectedTaskAnalysisFilterData = taskFilterData;" + ] + }, + "sudo" : true + }, + "visual" : { + "at" : { "x" : 464, "y" : 384 } + }, + "connect" : [ + { "id" : "f26", "to" : "f31" } + ] + }, { + "id" : "f28", + "type" : "HtmlDialogEventStart", + "name" : "clearSaveFilterDialog", + "config" : { + "guid" : "15F5BFFC0DEF027B" + }, + "visual" : { + "at" : { "x" : 80, "y" : 480 } + }, + "connect" : [ + { "id" : "f32", "to" : "f31" } + ] + }, { + "id" : "f29", + "type" : "HtmlDialogEnd", + "visual" : { + "at" : { "x" : 600, "y" : 480 } + } + }, { + "id" : "f31", + "type" : "Script", + "name" : "Clear filter", + "config" : { + "output" : { + "code" : [ + "import ch.ivy.addon.portalkit.enums.FilterType;", + "in.filterType = FilterType.ONLY_ME;", + "in.filterSetName = \"\";" + ] + } + }, + "visual" : { + "at" : { "x" : 464, "y" : 480 } + }, + "connect" : [ + { "id" : "f30", "to" : "f29" } + ] + }, { + "id" : "f27", + "type" : "Script", + "name" : "load filter set", + "config" : { + "output" : { + "code" : [ + "import ch.ivy.addon.portalkit.bean.PermissionBean;", + "import ch.ivy.addon.portalkit.enums.FilterType;", + "import ch.ivy.addon.portalkit.service.TaskAnalysisFilterService;", + "TaskAnalysisFilterService taskFilterService = new TaskAnalysisFilterService();", + "in.taskPrivateFilters = taskFilterService.getPrivateFilterForCurrentUser(in.taskFilterGroupId) as List;", + "in.taskPublicFilters = taskFilterService.getPublicFilter(in.taskFilterGroupId) as List;", + "in.taskPublicFilters.add(in.dataModel.buildDefaultTaskAnalysisFilterData());", + "in.filterType = FilterType.ONLY_ME;" + ] + }, + "sudo" : true + }, + "visual" : { + "at" : { "x" : 384, "y" : 64 }, + "size" : { "width" : 96, "height" : 48 } + }, + "connect" : [ + { "id" : "f57", "to" : "f3" } + ] + }, { + "id" : "f3", + "type" : "HtmlDialogEnd", + "visual" : { + "at" : { "x" : 480, "y" : 64 } + } + }, { + "id" : "f34", + "type" : "HtmlDialogMethodStart", + "name" : "deleteFilter()", + "config" : { + "signature" : "deleteFilter", + "guid" : "15F5C0F9B77406B4" + }, + "visual" : { + "at" : { "x" : 80, "y" : 576 } + }, + "connect" : [ + { "id" : "f39", "to" : "f35" } + ] + }, { + "id" : "f35", + "type" : "Script", + "name" : "remove filter", + "config" : { + "output" : { + "code" : [ + "import ch.ivy.addon.portalkit.enums.FilterType;", + "import ch.ivy.addon.portalkit.taskfilter.impl.TaskAnalysisFilterData;", + "import ch.ivy.addon.portalkit.service.TaskAnalysisFilterService;", + "TaskAnalysisFilterService service = new TaskAnalysisFilterService();", + "service.delete(in.taskFilterDataToBeRemoved.id);", + "if(in.taskFilterDataToBeRemoved.type == FilterType.ONLY_ME) {", + " in.taskPrivateFilters.remove(in.taskFilterDataToBeRemoved);", + "} else {", + " in.taskPublicFilters.remove(in.taskFilterDataToBeRemoved);", + "}", + "if (in.dataModel.isSameTaskFilterData(in.taskFilterDataToBeRemoved)) {", + " in.dataModel.resetFilters();", + "}" + ] + }, + "sudo" : true + }, + "visual" : { + "at" : { "x" : 232, "y" : 576 } + }, + "connect" : [ + { "id" : "f40", "to" : "f36" } + ] + }, { + "id" : "f36", + "type" : "HtmlDialogEnd", + "visual" : { + "at" : { "x" : 400, "y" : 576 } + } + }, { + "id" : "f41", + "type" : "HtmlDialogMethodStart", + "name" : "setFilterToBeDeleted", + "config" : { + "signature" : "setFilterToBeDeleted", + "input" : { + "params" : [ + { "name" : "taskFilterData", "type" : "ch.ivy.addon.portalkit.taskfilter.impl.TaskAnalysisFilterData", "desc" : "" } + ], + "map" : { + "out.taskFilterDataToBeRemoved" : "param.taskFilterData" + } + }, + "guid" : "15F5C9F2AA5C9BA1" + }, + "visual" : { + "at" : { "x" : 80, "y" : 672 }, + "labelOffset" : { "x" : 15, "y" : 34 } + }, + "connect" : [ + { "id" : "f43", "to" : "f42" } + ] + }, { + "id" : "f42", + "type" : "HtmlDialogEnd", + "visual" : { + "at" : { "x" : 400, "y" : 672 } + } + }, { + "id" : "f45", + "type" : "Script", + "name" : "validate", + "config" : { + "output" : { + "code" : [ + "import com.axonivy.portal.components.util.FacesMessageUtils;", + "import javax.faces.application.FacesMessage;", + "import javax.faces.context.FacesContext;", + "import ch.ivy.addon.portalkit.service.TaskAnalysisFilterService;", + "TaskAnalysisFilterService service = new TaskAnalysisFilterService();", + "in.isFilterExisted = false;", + "if (service.isFilterExisted(in.filterSetName, in.filterType, in.taskFilterGroupId)) {", + " FacesMessage message = FacesMessageUtils.sanitizedMessage( FacesMessage.SEVERITY_ERROR, ivy.cms.co(\"/ch.ivy.addon.portalkit.ui.jsf/components/taskView/filterExistedValidationError\"), \"\");", + " FacesContext.getCurrentInstance().addMessage(\"\", message);", + " FacesContext.getCurrentInstance().validationFailed();", + " in.isFilterExisted = true;", + "}" + ] + } + }, + "visual" : { + "at" : { "x" : 208, "y" : 384 } + }, + "connect" : [ + { "id" : "f48", "to" : "f47" } + ] + }, { + "id" : "f47", + "type" : "Alternative", + "name" : [ + "is filter", + "existed?" + ], + "config" : { + "conditions" : { + "f25" : "in.isFilterExisted == false" + } + }, + "visual" : { + "at" : { "x" : 336, "y" : 384 } + }, + "connect" : [ + { "id" : "f25", "to" : "f24", "label" : { + "name" : "no" + } }, + { "id" : "f51", "to" : "f50", "via" : [ { "x" : 336, "y" : 336 } ], "label" : { + "name" : "yes", + "segment" : 1.3 + } } + ] + }, { + "id" : "f50", + "type" : "HtmlDialogEnd", + "visual" : { + "at" : { "x" : 592, "y" : 336 } + } + }, { + "id" : "f16", + "type" : "HtmlDialogMethodStart", + "name" : "applyFilter", + "config" : { + "signature" : "applyFilter", + "input" : { + "params" : [ + { "name" : "taskFilterData", "type" : "ch.ivy.addon.portalkit.taskfilter.impl.TaskAnalysisFilterData", "desc" : "" } + ], + "map" : { }, + "code" : "out.dataModel.applyFilter(param.taskFilterData);" + }, + "guid" : "15F772190BB92384" + }, + "visual" : { + "at" : { "x" : 80, "y" : 768 } + }, + "connect" : [ + { "id" : "f20", "to" : "f17" } + ] + }, { + "id" : "f17", + "type" : "HtmlDialogEnd", + "visual" : { + "at" : { "x" : 400, "y" : 768 } + } + }, { + "id" : "f8", + "type" : "Script", + "name" : "init data model", + "config" : { + "output" : { + "code" : [ + "import ch.ivy.addon.portalkit.datamodel.internal.TaskAnalysisLazyDataModel;", + "import ch.ivy.addon.portalkit.bean.TaskAnalysisWidgetBean;", + "import javax.faces.context.FacesContext;", + "", + "FacesContext context = FacesContext.getCurrentInstance();", + "TaskAnalysisWidgetBean taskAnalysisWidgetBean = context.getApplication().evaluateExpressionGet(context, \"#{taskAnalysisWidgetBean}\", TaskAnalysisWidgetBean.class) as TaskAnalysisWidgetBean;", + "if (!in.#dataModel is initialized) {", + " TaskAnalysisLazyDataModel dataModel = new TaskAnalysisLazyDataModel();", + " taskAnalysisWidgetBean.setDataModel(dataModel);", + " in.dataModel = taskAnalysisWidgetBean.dataModel;", + "} else {", + " taskAnalysisWidgetBean.setDataModel(in.dataModel);", + "}" + ] + }, + "sudo" : true + }, + "visual" : { + "at" : { "x" : 240, "y" : 64 } + }, + "connect" : [ + { "id" : "f1", "to" : "f27" } + ] + }, { + "id" : "f11", + "type" : "HtmlDialogEventStart", + "name" : "redirectToStatisticPage", + "config" : { + "guid" : "1645924828285975" + }, + "visual" : { + "at" : { "x" : 80, "y" : 880 } + }, + "connect" : [ + { "id" : "f6", "to" : "f5" } + ] + }, { + "id" : "f4", + "type" : "HtmlDialogEnd", + "visual" : { + "at" : { "x" : 400, "y" : 880 } + } + }, { + "id" : "f5", + "type" : "Script", + "name" : "Redirect to Statistic page", + "config" : { + "output" : { + "code" : [ + "import com.axonivy.portal.components.publicapi.ProcessStartAPI;", + "import javax.faces.context.FacesContext;", + "", + "String statisticPageUrl = ProcessStartAPI.findRelativeUrlByProcessStartFriendlyRequestPath(\"Start Processes/PortalStart/StatisticPage.ivp\");", + "FacesContext.getCurrentInstance().getExternalContext().redirect(statisticPageUrl);" + ] + }, + "sudo" : true + }, + "visual" : { + "at" : { "x" : 232, "y" : 880 }, + "size" : { "width" : 144 } + }, + "connect" : [ + { "id" : "f12", "to" : "f4" } + ] + }, { + "id" : "f13", + "type" : "HtmlDialogMethodStart", + "name" : "getExportedFile()", + "config" : { + "signature" : "getExportedFile", + "input" : { + "params" : [ + { "name" : "columnsVisibility", "type" : "java.util.Map", "desc" : "" } + ], + "map" : { + "out.columnsVisibility" : "param.columnsVisibility" + } + }, + "result" : { + "params" : [ + { "name" : "exportedFile", "type" : "org.primefaces.model.StreamedContent", "desc" : "" } + ], + "map" : { + "result.exportedFile" : "in.exportedFile" + } + }, + "guid" : "1646EC49808E6672" + }, + "visual" : { + "at" : { "x" : 80, "y" : 992 } + }, + "connect" : [ + { "id" : "f65", "to" : "f52" } + ] + }, { + "id" : "f14", + "type" : "HtmlDialogEnd", + "visual" : { + "at" : { "x" : 776, "y" : 992 } + } + }, { + "id" : "f37", + "type" : "Script", + "name" : "export excel", + "config" : { + "output" : { + "code" : [ + "import ch.ivy.addon.portalkit.exporter.internal.TaskAnalysisExporter;", + "TaskAnalysisExporter exporter = new TaskAnalysisExporter(in.columnsVisibility);", + "in.exportedFile = exporter.getStreamedContent(in.collectedTasksForExporting);" + ] + }, + "sudo" : true + }, + "visual" : { + "at" : { "x" : 616, "y" : 992 } + }, + "connect" : [ + { "id" : "f56", "to" : "f14" } + ] + }, { + "id" : "f15", + "type" : "SubProcessCall", + "name" : "find tasks", + "config" : { + "processCall" : "Ivy Data Processes/TaskService:findTasksByCriteria(ch.ivy.addon.portalkit.ivydata.searchcriteria.TaskSearchCriteria,Integer,Integer)", + "call" : { + "map" : { + "param.taskSearchCriteria" : "in.taskSearchCriteria", + "param.startIndex" : "in.loopCounter * in.maxResultNumberPerQuery", + "param.count" : "in.maxResultNumberPerQuery" + } + }, + "output" : { + "code" : "in.collectedTasksForExporting.addAll(result.tasks);" + } + }, + "visual" : { + "at" : { "x" : 464, "y" : 1120 } + }, + "connect" : [ + { "id" : "f54", "to" : "f53" } + ] + }, { + "id" : "f9", + "type" : "SubProcessCall", + "name" : "TaskService", + "config" : { + "processCall" : "Ivy Data Processes/TaskService:findTasksByCriteria(ch.ivy.addon.portalkit.ivydata.searchcriteria.TaskSearchCriteria,Integer,Integer)", + "call" : { + "map" : { + "param.taskSearchCriteria" : "in.taskSearchCriteria", + "param.startIndex" : "in.startIndex", + "param.count" : "in.count" + } + }, + "output" : { + "map" : { + "out" : "in", + "out.tasks" : "result.tasks" + } + } + }, + "visual" : { + "at" : { "x" : 272, "y" : 160 } + }, + "connect" : [ + { "id" : "f33", "to" : "f22" } + ] + }, { + "id" : "f22", + "type" : "HtmlDialogEnd", + "visual" : { + "at" : { "x" : 416, "y" : 160 } + } + }, { + "id" : "f2", + "type" : "HtmlDialogMethodStart", + "name" : "countTasks(TaskSearchCriteria)", + "config" : { + "signature" : "countTasks", + "input" : { + "params" : [ + { "name" : "criteria", "type" : "ch.ivy.addon.portalkit.ivydata.searchcriteria.TaskSearchCriteria", "desc" : "" } + ], + "map" : { + "out.taskSearchCriteria" : "param.criteria" + } + }, + "result" : { + "params" : [ + { "name" : "totalTasks", "type" : "Long", "desc" : "" } + ], + "map" : { + "result.totalTasks" : "in.totalTasks" + } + }, + "guid" : "1682C611F21483D7" + }, + "visual" : { + "at" : { "x" : 96, "y" : 256 } + }, + "connect" : [ + { "id" : "f44", "to" : "f7" } + ] + }, { + "id" : "f7", + "type" : "SubProcessCall", + "name" : "TaskService", + "config" : { + "processCall" : "Ivy Data Processes/TaskService:countTasksByCriteria(ch.ivy.addon.portalkit.ivydata.searchcriteria.TaskSearchCriteria)", + "call" : { + "map" : { + "param.taskSearchCriteria" : "in.taskSearchCriteria" + } + }, + "output" : { + "map" : { + "out" : "in", + "out.totalTasks" : "result.totalTasks" + } + } + }, + "visual" : { + "at" : { "x" : 272, "y" : 256 } + }, + "connect" : [ + { "id" : "f49", "to" : "f38" } + ] + }, { + "id" : "f38", + "type" : "HtmlDialogEnd", + "visual" : { + "at" : { "x" : 416, "y" : 256 } + } + }, { + "id" : "f52", + "type" : "SubProcessCall", + "name" : "count tasks", + "config" : { + "processCall" : "Ivy Data Processes/TaskService:countTasksByCriteria(ch.ivy.addon.portalkit.ivydata.searchcriteria.TaskSearchCriteria)", + "call" : { + "map" : { + "param.taskSearchCriteria" : "in.taskSearchCriteria" + } + }, + "output" : { + "map" : { + "out" : "in", + "out.totalTasks" : "result.totalTasks" + } + } + }, + "visual" : { + "at" : { "x" : 216, "y" : 992 } + }, + "connect" : [ + { "id" : "f60", "to" : "f59" } + ] + }, { + "id" : "f53", + "type" : "Script", + "name" : "counter++", + "config" : { + "output" : { + "code" : "in.loopCounter++;" + } + }, + "visual" : { + "at" : { "x" : 616, "y" : 1120 } + }, + "connect" : [ + { "id" : "f21", "to" : "f18" } + ] + }, { + "id" : "f18", + "type" : "Alternative", + "config" : { + "conditions" : { + "f61" : "in.loopCounter <= in.totalTasks / in.maxResultNumberPerQuery" + } + }, + "visual" : { + "at" : { "x" : 464, "y" : 992 } + }, + "connect" : [ + { "id" : "f61", "to" : "f15" }, + { "id" : "f62", "to" : "f37" } + ] + }, { + "id" : "f59", + "type" : "Script", + "name" : "init data", + "config" : { + "output" : { + "code" : [ + "import java.util.ArrayList;", + "in.loopCounter = 0;", + "in.maxResultNumberPerQuery = 100000;", + "in.collectedTasksForExporting = new ArrayList();" + ] + } + }, + "visual" : { + "at" : { "x" : 360, "y" : 992 } + }, + "connect" : [ + { "id" : "f58", "to" : "f18" } + ] + }, { + "id" : "f55", + "type" : "HtmlDialogMethodStart", + "name" : "restoreDefaultFilterSet()", + "config" : { + "signature" : "restoreDefaultFilterSet", + "guid" : "17055DF5174D824A" + }, + "visual" : { + "at" : { "x" : 80, "y" : 1248 }, + "labelOffset" : { "x" : 26, "y" : 35 } + }, + "connect" : [ + { "id" : "f66", "to" : "f64" } + ] + }, { + "id" : "f63", + "type" : "HtmlDialogEnd", + "visual" : { + "at" : { "x" : 384, "y" : 1248 } + } + }, { + "id" : "f64", + "type" : "Script", + "name" : "Apply default filter", + "config" : { + "output" : { + "code" : [ + "out.dataModel.selectedTaskAnalysisFilterData = null;", + "out.dataModel.applyFilter(out.dataModel.defaultTaskAnalysisFilterData);" + ] + } + }, + "visual" : { + "at" : { "x" : 248, "y" : 1248 } + }, + "connect" : [ + { "id" : "f67", "to" : "f63" } + ] + } ] +} \ No newline at end of file diff --git a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/statistic/ChartCreationWidget/ChartCreationWidget.xhtml b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/statistic/ChartCreationWidget/ChartCreationWidget.xhtml new file mode 100644 index 00000000000..f2121c3cf30 --- /dev/null +++ b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/statistic/ChartCreationWidget/ChartCreationWidget.xhtml @@ -0,0 +1,250 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    +
    + +
    + + + + + + + + + +
    +     + + + +
    +
    + +
    + + + + + + + + + +
    +     + + + +
    +
    + +
    + + + + + + + + + +
    +     + + + +
    +
    + +
    + + + + + + + + + +
    +     + + + +
    +
    + +
    + + + + + + + + + +
    +     + + + +
    +
    + +
    + + + + + + + + + +
    +     + + + +
    +
    + +
    + + + + + + + + + +
    +     +     +     + + + + +     + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +     + \ No newline at end of file diff --git a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/statistic/ChartCreationWidget/ChartCreationWidgetData.d.json b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/statistic/ChartCreationWidget/ChartCreationWidgetData.d.json new file mode 100644 index 00000000000..ac63d83ceae --- /dev/null +++ b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/statistic/ChartCreationWidget/ChartCreationWidgetData.d.json @@ -0,0 +1,47 @@ +{ + "$schema" : "https://json-schema.axonivy.com/data-class/11.4.0/data-class.json", + "simpleName" : "ChartCreationWidgetData", + "namespace" : "ch.ivy.addon.portalkit.component.statistic.ChartCreationWidget", + "isBusinessCaseData" : false, + "fields" : [ { + "name" : "statisticFilter", + "type" : "ch.ivy.addon.portalkit.statistics.StatisticFilter", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "chartType", + "type" : "ch.ivy.addon.portalkit.enums.StatisticChartType", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "isChartNameExisted", + "type" : "Boolean", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "statisticChartList", + "type" : "java.util.List", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "isAllowedToCreateChart", + "type" : "Boolean", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "oldStatisticFilter", + "type" : "ch.ivy.addon.portalkit.statistics.StatisticFilter", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "customFields", + "type" : "java.util.List", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "chartNames", + "type" : "java.util.List", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "isDefaultApplicationLanguage", + "type" : "Boolean", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "language", + "type" : "String", + "modifiers" : [ "PERSISTENT" ] + } ] +} \ No newline at end of file diff --git a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/statistic/ChartCreationWidget/ChartCreationWidgetProcess.p.json b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/statistic/ChartCreationWidget/ChartCreationWidgetProcess.p.json new file mode 100644 index 00000000000..580fadd3e46 --- /dev/null +++ b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/statistic/ChartCreationWidget/ChartCreationWidgetProcess.p.json @@ -0,0 +1,615 @@ +{ + "$schema" : "https://json-schema.axonivy.com/process/11.3.0/process.json", + "id" : "15FFC669C88F7E0B", + "kind" : "HTML_DIALOG", + "config" : { + "data" : "ch.ivy.addon.portalkit.component.statistic.ChartCreationWidget.ChartCreationWidgetData" + }, + "elements" : [ { + "id" : "f0", + "type" : "HtmlDialogStart", + "name" : "start()", + "config" : { + "signature" : "start", + "input" : { + "map" : { + "out.isAllowedToCreateChart" : "true" + } + }, + "guid" : "15FFC669CAD8BE32" + }, + "visual" : { + "at" : { "x" : 112, "y" : 64 } + }, + "connect" : [ + { "id" : "f47", "to" : "f39" } + ] + }, { + "id" : "f1", + "type" : "HtmlDialogEnd", + "visual" : { + "at" : { "x" : 1336, "y" : 88 } + } + }, { + "id" : "f3", + "type" : "HtmlDialogEventStart", + "name" : "close", + "config" : { + "guid" : "15FFC669CBAE4804" + }, + "visual" : { + "at" : { "x" : 112, "y" : 160 }, + "labelOffset" : { "x" : 8, "y" : 32 } + }, + "connect" : [ + { "id" : "f5", "to" : "f4" } + ] + }, { + "id" : "f4", + "type" : "HtmlDialogExit", + "visual" : { + "at" : { "x" : 448, "y" : 160 } + } + }, { + "id" : "f35", + "type" : "HtmlDialogMethodStart", + "name" : "createStatisticChart(List)", + "config" : { + "signature" : "createStatisticChart", + "input" : { + "params" : [ + { "name" : "statisticChartList", "type" : "java.util.List", "desc" : "" } + ], + "map" : { + "out.statisticChartList" : "param.statisticChartList" + } + }, + "guid" : "1601F664C9C78C71" + }, + "visual" : { + "at" : { "x" : 88, "y" : 976 }, + "labelOffset" : { "x" : 21, "y" : 49 } + }, + "connect" : [ + { "id" : "f30", "to" : "f26" } + ] + }, { + "id" : "f40", + "type" : "HtmlDialogMethodStart", + "name" : "updateBeforeAddCaseByState()", + "config" : { + "signature" : "updateBeforeAddCaseByState", + "input" : { + "map" : { }, + "code" : [ + "import ch.ivy.addon.portalkit.bean.StatisticChartCreationBean;", + "import javax.faces.context.FacesContext;", + "import ch.ivy.addon.portalkit.enums.StatisticChartType;", + "", + "FacesContext context = FacesContext.getCurrentInstance();", + "StatisticChartCreationBean chartCreationBean = context.getApplication().evaluateExpressionGet(context, \"#{statisticChartCreationBean}\", StatisticChartCreationBean.class) as StatisticChartCreationBean;", + "out.isAllowedToCreateChart = !chartCreationBean.checkIfAnyFilterChanges(out.statisticFilter, out.oldStatisticFilter);", + "", + "if (out.isAllowedToCreateChart) {", + " out.chartType = StatisticChartType.CASES_BY_STATE;", + "}" + ] + }, + "guid" : "1601F9BADD2EC1C0" + }, + "visual" : { + "at" : { "x" : 112, "y" : 448 } + }, + "connect" : [ + { "id" : "f45", "to" : "f43", "via" : [ { "x" : 448, "y" : 448 } ] } + ] + }, { + "id" : "f42", + "type" : "HtmlDialogMethodStart", + "name" : "updateBeforeAddTaskByExpiry()", + "config" : { + "signature" : "updateBeforeAddTaskByExpiry", + "input" : { + "map" : { }, + "code" : [ + "import ch.ivy.addon.portalkit.bean.StatisticChartCreationBean;", + "import javax.faces.context.FacesContext;", + "import ch.ivy.addon.portalkit.enums.StatisticChartType;", + "", + "FacesContext context = FacesContext.getCurrentInstance();", + "StatisticChartCreationBean chartCreationBean = context.getApplication().evaluateExpressionGet(context, \"#{statisticChartCreationBean}\", StatisticChartCreationBean.class) as StatisticChartCreationBean;", + "out.isAllowedToCreateChart = !chartCreationBean.checkIfAnyFilterChanges(out.statisticFilter, out.oldStatisticFilter);", + "", + "if (out.isAllowedToCreateChart) {", + " out.chartType = StatisticChartType.TASK_BY_EXPIRY;", + "}" + ] + }, + "guid" : "1601F9BBC3E25AD8" + }, + "visual" : { + "at" : { "x" : 112, "y" : 544 } + }, + "connect" : [ + { "id" : "f46", "to" : "f43", "via" : [ { "x" : 448, "y" : 544 } ] } + ] + }, { + "id" : "f43", + "type" : "HtmlDialogEnd", + "visual" : { + "at" : { "x" : 448, "y" : 496 } + } + }, { + "id" : "f6", + "type" : "HtmlDialogMethodStart", + "name" : "initialize()", + "config" : { + "signature" : "initialize", + "guid" : "160358C7FBCD2AE2" + }, + "visual" : { + "at" : { "x" : 112, "y" : 256 } + }, + "connect" : [ + { "id" : "f8", "to" : "f7" } + ] + }, { + "id" : "f15", + "type" : "Script", + "name" : "Initialize", + "config" : { + "output" : { + "code" : [ + "import java.util.Locale;", + "import ch.ivy.addon.portalkit.dto.DisplayName;", + "import java.util.ArrayList;", + "import ch.ivy.addon.portalkit.ivydata.service.impl.LanguageService;", + "import org.apache.commons.lang3.ObjectUtils;", + "import ch.ivy.addon.portalkit.statistics.StatisticFilter;", + "import java.util.ArrayList;", + "", + "if (!(in.statisticChartList is initialized)) {", + " in.statisticChartList = new ArrayList();", + "}", + "", + "in.statisticFilter = new StatisticFilter();", + "in.statisticFilter.init();", + "in.oldStatisticFilter = ObjectUtils.clone(in.statisticFilter) as StatisticFilter;", + "", + "in.chartNames = new ArrayList();", + "for(String lang : LanguageService.getInstance().getIvyLanguageOfUser().supportedLanguages) {", + " DisplayName displayName = new DisplayName();", + " displayName.locale = Locale.forLanguageTag(lang);", + " displayName.value = \"\";", + " in.chartNames.add(displayName);", + "}" + ] + }, + "sudo" : true + }, + "visual" : { + "at" : { "x" : 776, "y" : 88 } + }, + "connect" : [ + { "id" : "f27", "to" : "f28" } + ] + }, { + "id" : "f7", + "type" : "HtmlDialogEnd", + "visual" : { + "at" : { "x" : 448, "y" : 256 } + } + }, { + "id" : "f11", + "type" : "HtmlDialogEnd", + "visual" : { + "at" : { "x" : 648, "y" : 1168 } + } + }, { + "id" : "f41", + "type" : "HtmlDialogMethodStart", + "name" : "updateBeforeAddTaskByPriority()", + "config" : { + "signature" : "updateBeforeAddTaskByPriority", + "input" : { + "map" : { }, + "code" : [ + "import ch.ivy.addon.portalkit.bean.StatisticChartCreationBean;", + "import javax.faces.context.FacesContext;", + "import ch.ivy.addon.portalkit.enums.StatisticChartType;", + "", + "FacesContext context = FacesContext.getCurrentInstance();", + "StatisticChartCreationBean chartCreationBean = context.getApplication().evaluateExpressionGet(context, \"#{statisticChartCreationBean}\", StatisticChartCreationBean.class) as StatisticChartCreationBean;", + "out.isAllowedToCreateChart = !chartCreationBean.checkIfAnyFilterChanges(out.statisticFilter, out.oldStatisticFilter);", + "", + "if (out.isAllowedToCreateChart) {", + " out.chartType = StatisticChartType.TASK_BY_PRIORITY;", + "}" + ] + }, + "guid" : "1601F9BB6832261A" + }, + "visual" : { + "at" : { "x" : 112, "y" : 352 } + }, + "connect" : [ + { "id" : "f44", "to" : "f43", "via" : [ { "x" : 448, "y" : 352 } ] } + ] + }, { + "id" : "f13", + "type" : "Script", + "name" : "Clear chart name", + "config" : { + "output" : { + "code" : [ + "import java.util.ArrayList;", + "import java.util.Locale;", + "import ch.ivy.addon.portalkit.dto.DisplayName;", + "import ch.ivy.addon.portalkit.ivydata.service.impl.LanguageService;", + "", + "in.chartNames = new ArrayList();", + "", + "for(String lang : LanguageService.getInstance().getIvyLanguageOfUser().supportedLanguages) {", + " DisplayName displayName = new DisplayName();", + " displayName.locale = Locale.forLanguageTag(lang);", + " displayName.value = \"\";", + " in.chartNames.add(displayName);", + "}" + ] + } + }, + "visual" : { + "at" : { "x" : 392, "y" : 1168 } + }, + "connect" : [ + { "id" : "f12", "to" : "f11" } + ] + }, { + "id" : "f17", + "type" : "HtmlDialogMethodStart", + "name" : "updateBeforeAddElapsedTime()", + "config" : { + "signature" : "updateBeforeAddElapsedTime", + "input" : { + "map" : { }, + "code" : [ + "import ch.ivy.addon.portalkit.bean.StatisticChartCreationBean;", + "import javax.faces.context.FacesContext;", + "import ch.ivy.addon.portalkit.enums.StatisticChartType;", + "", + "FacesContext context = FacesContext.getCurrentInstance();", + "StatisticChartCreationBean chartCreationBean = context.getApplication().evaluateExpressionGet(context, \"#{statisticChartCreationBean}\", StatisticChartCreationBean.class) as StatisticChartCreationBean;", + "out.isAllowedToCreateChart = !chartCreationBean.checkIfAnyFilterChanges(out.statisticFilter, out.oldStatisticFilter);", + "", + "if (out.isAllowedToCreateChart) {", + " out.chartType = StatisticChartType.ELAPSED_TIME_BY_CASE_CATEGORY;", + "}" + ] + }, + "guid" : "160485D2143D0001" + }, + "visual" : { + "at" : { "x" : 112, "y" : 640 } + }, + "connect" : [ + { "id" : "f18", "to" : "f43", "via" : [ { "x" : 448, "y" : 640 } ] } + ] + }, { + "id" : "f21", + "type" : "Alternative", + "config" : { + "conditions" : { + "f32" : "!in.isChartNameExisted" + } + }, + "visual" : { + "at" : { "x" : 392, "y" : 976 } + }, + "connect" : [ + { "id" : "f32", "to" : "f31" }, + { "id" : "f20", "to" : "f11", "via" : [ { "x" : 648, "y" : 976 } ] } + ] + }, { + "id" : "f10", + "type" : "HtmlDialogEventStart", + "name" : "clearChartInput", + "config" : { + "guid" : "160911F3882D9937" + }, + "visual" : { + "at" : { "x" : 88, "y" : 1168 } + }, + "connect" : [ + { "id" : "f14", "to" : "f13" } + ] + }, { + "id" : "f22", + "type" : "HtmlDialogMethodStart", + "name" : "updateBeforeAddCaseByFinishedTask()", + "config" : { + "signature" : "updateBeforeAddCaseByFinishedTask", + "input" : { + "map" : { }, + "code" : [ + "import ch.ivy.addon.portalkit.bean.StatisticChartCreationBean;", + "import javax.faces.context.FacesContext;", + "import ch.ivy.addon.portalkit.enums.StatisticChartType;", + "", + "FacesContext context = FacesContext.getCurrentInstance();", + "StatisticChartCreationBean chartCreationBean = context.getApplication().evaluateExpressionGet(context, \"#{statisticChartCreationBean}\", StatisticChartCreationBean.class) as StatisticChartCreationBean;", + "out.isAllowedToCreateChart = !chartCreationBean.checkIfAnyFilterChanges(out.statisticFilter, out.oldStatisticFilter);", + "", + "if (out.isAllowedToCreateChart) {", + " out.chartType = StatisticChartType.CASES_BY_FINISHED_TASK;", + "}" + ] + }, + "guid" : "1621EDBADBEB0978" + }, + "visual" : { + "at" : { "x" : 112, "y" : 736 }, + "labelOffset" : { "x" : 23, "y" : 36 } + }, + "connect" : [ + { "id" : "f23", "to" : "f43", "via" : [ { "x" : 448, "y" : 736 } ] } + ] + }, { + "id" : "f24", + "type" : "HtmlDialogMethodStart", + "name" : "updateBeforeAddCaseByFinishedTime()", + "config" : { + "signature" : "updateBeforeAddCaseByFinishedTime", + "input" : { + "map" : { }, + "code" : [ + "import ch.ivy.addon.portalkit.bean.StatisticChartCreationBean;", + "import javax.faces.context.FacesContext;", + "import ch.ivy.addon.portalkit.enums.StatisticChartType;", + "", + "FacesContext context = FacesContext.getCurrentInstance();", + "StatisticChartCreationBean chartCreationBean = context.getApplication().evaluateExpressionGet(context, \"#{statisticChartCreationBean}\", StatisticChartCreationBean.class) as StatisticChartCreationBean;", + "out.isAllowedToCreateChart = !chartCreationBean.checkIfAnyFilterChanges(out.statisticFilter, out.oldStatisticFilter);", + "", + "if (out.isAllowedToCreateChart) {", + " out.chartType = StatisticChartType.CASES_BY_FINISHED_TIME;", + "}" + ] + }, + "guid" : "162233637AE65F94" + }, + "visual" : { + "at" : { "x" : 112, "y" : 832 } + }, + "connect" : [ + { "id" : "f25", "to" : "f43", "via" : [ { "x" : 448, "y" : 832 } ] } + ] + }, { + "id" : "f28", + "type" : "Script", + "name" : "init custom fields", + "config" : { + "output" : { + "code" : [ + "import java.util.ArrayList;", + "for (String field : in.customFields){", + " in.statisticFilter.customFieldFilters.put(field, new ArrayList()); ", + "}" + ] + } + }, + "visual" : { + "at" : { "x" : 1192, "y" : 88 } + }, + "connect" : [ + { "id" : "f2", "to" : "f1" } + ] + }, { + "id" : "f87", + "type" : "HtmlDialogMethodStart", + "name" : "isApplicationDefaultEmailLanguage(String)", + "config" : { + "signature" : "isApplicationDefaultEmailLanguage", + "input" : { + "params" : [ + { "name" : "language", "type" : "String", "desc" : "" } + ], + "map" : { + "out.language" : "param.language" + } + }, + "result" : { + "params" : [ + { "name" : "result", "type" : "Boolean", "desc" : "" } + ], + "map" : { + "result.result" : "in.isDefaultApplicationLanguage" + } + }, + "guid" : "17597ECF890D0A64" + }, + "visual" : { + "at" : { "x" : 112, "y" : 1256 }, + "labelOffset" : { "x" : 29, "y" : 36 } + }, + "connect" : [ + { "id" : "f36", "to" : "f34" } + ] + }, { + "id" : "f89", + "type" : "HtmlDialogEnd", + "visual" : { + "at" : { "x" : 448, "y" : 1256 } + } + }, { + "id" : "f26", + "type" : "Script", + "name" : "Check chart name is existed", + "config" : { + "output" : { + "code" : [ + "import com.axonivy.portal.components.util.FacesMessageUtils;", + "import ch.ivy.addon.portalkit.dto.DisplayName;", + "import ch.ivy.addon.portalkit.ivydata.service.impl.LanguageService;", + "import javax.faces.context.FacesContext;", + "import javax.faces.application.FacesMessage;", + "import ch.ivy.addon.portalkit.service.StatisticService;", + "", + "", + "in.isChartNameExisted = false;", + "", + "StatisticService service = StatisticService.getInstance();", + "for (DisplayName name : out.chartNames) {", + " String chartName = name.value;", + " if (service.checkStatisticChartNameExisted(chartName.trim(), name.getLocale().toLanguageTag())) {", + " FacesMessage message = FacesMessageUtils.sanitizedMessage( FacesMessage.SEVERITY_ERROR, ivy.cms.co(\"/ch.ivy.addon.portalkit.ui.jsf/statistic/validationErrors/nameIsExisted\"), \"\");", + " FacesContext.getCurrentInstance().addMessage(\"chart-name-input\", message);", + " FacesContext.getCurrentInstance().validationFailed();", + " in.isChartNameExisted = true;", + " break;", + " }", + "}" + ] + } + }, + "visual" : { + "at" : { "x" : 256, "y" : 976 }, + "size" : { "width" : 160 } + }, + "connect" : [ + { "id" : "f16", "to" : "f21" } + ] + }, { + "id" : "f31", + "type" : "Script", + "name" : [ + "Save and", + "show growl message" + ], + "config" : { + "output" : { + "code" : [ + "import com.axonivy.portal.components.util.FacesMessageUtils;", + "import ch.ivyteam.ivy.language.LanguageConfigurator;", + "import ch.ivyteam.ivy.security.ISecurityContext;", + "import org.apache.commons.lang3.StringUtils;", + "import java.util.HashMap;", + "import java.util.Map;", + "import ch.ivy.addon.portalkit.dto.DisplayName;", + "import java.util.Arrays;", + "import javax.faces.context.FacesContext;", + "import javax.faces.application.FacesMessage;", + "import ch.ivy.addon.portalkit.service.StatisticService;", + "import ch.ivy.addon.portalkit.statistics.StatisticChart;", + "", + "// Update empty chart name", + "String defaultEmailLanguage = new LanguageConfigurator(ISecurityContext.current()).content().toLanguageTag();", + "String defaultChartName = \"\";", + "for (DisplayName name : in.chartNames) {", + " if (defaultEmailLanguage.equalsIgnoreCase(name.locale.toLanguageTag())) {", + " defaultChartName = name.value;", + " }", + "}", + "", + "for (DisplayName name : in.chartNames) {", + " if (!defaultEmailLanguage.equalsIgnoreCase(name.locale.toLanguageTag()) && StringUtils.isBlank(name.value)) {", + " name.value = defaultChartName;", + " }", + "}", + "", + "StatisticService service = StatisticService.getInstance();", + "StatisticChart newChart = service.createStatisticChart(in.statisticFilter, in.chartNames, in.chartType, false);", + "in.statisticChartList.add(newChart);", + "", + "String growlTitle = ivy.cms.co(\"/ch.ivy.addon.portalkit.ui.jsf/statistic/chart/chartCreationSuccessTitle\");", + "String growlDetail = ivy.cms.co(\"/ch.ivy.addon.portalkit.ui.jsf/statistic/chart/chartCreationSuccessDetailMsg\", Arrays.asList(service.getDisplayNameInUserLanguageForChart(newChart).value));", + "FacesMessage message = FacesMessageUtils.sanitizedMessage( FacesMessage.SEVERITY_INFO, growlTitle, growlDetail);", + "FacesContext.getCurrentInstance().addMessage(\"chart-creation-growl\", message);" + ] + }, + "sudo" : true + }, + "visual" : { + "at" : { "x" : 392, "y" : 1072 }, + "size" : { "width" : 144 } + }, + "connect" : [ + { "id" : "f19", "to" : "f13" } + ] + }, { + "id" : "f34", + "type" : "Script", + "name" : "Check language", + "config" : { + "output" : { + "code" : [ + "import ch.ivyteam.ivy.security.ISecurityContext;", + "import ch.ivyteam.ivy.language.LanguageConfigurator;", + "import java.util.Locale;", + "import ch.ivyteam.ivy.application.IApplication;", + "", + "Locale defaultLocale = new LanguageConfigurator(ISecurityContext.current()).content();", + "in.isDefaultApplicationLanguage = defaultLocale.toLanguageTag().equalsIgnoreCase(in.language);" + ] + }, + "sudo" : true + }, + "visual" : { + "at" : { "x" : 304, "y" : 1256 } + }, + "connect" : [ + { "id" : "f37", "to" : "f89" } + ] + }, { + "id" : "f38", + "type" : "HtmlDialogMethodStart", + "name" : "initializeRoleAndCustomField()", + "config" : { + "signature" : "initializeRoleAndCustomField", + "guid" : "181229E2D2BA036C" + }, + "visual" : { + "at" : { "x" : 544, "y" : 88 }, + "labelOffset" : { "x" : 70, "y" : 35 } + }, + "connect" : [ + { "id" : "f33", "to" : "f15" } + ] + }, { + "id" : "f39", + "type" : "HtmlDialogEnd", + "visual" : { + "at" : { "x" : 448, "y" : 64 } + } + }, { + "id" : "f48", + "type" : "HtmlDialogMethodStart", + "name" : "updateBeforeAddCasesByCategory()", + "config" : { + "signature" : "updateBeforeAddCasesByCategory", + "input" : { + "map" : { }, + "code" : [ + "import ch.ivy.addon.portalkit.bean.StatisticChartCreationBean;", + "import javax.faces.context.FacesContext;", + "import ch.ivy.addon.portalkit.enums.StatisticChartType;", + "", + "FacesContext context = FacesContext.getCurrentInstance();", + "StatisticChartCreationBean chartCreationBean = context.getApplication().evaluateExpressionGet(context, \"#{statisticChartCreationBean}\", StatisticChartCreationBean.class) as StatisticChartCreationBean;", + "out.isAllowedToCreateChart = !chartCreationBean.checkIfAnyFilterChanges(out.statisticFilter, out.oldStatisticFilter);", + "", + "if (out.isAllowedToCreateChart) {", + " out.chartType = StatisticChartType.CASES_BY_CATEGORY;", + "}" + ] + }, + "guid" : "182142F4128BCDB9" + }, + "visual" : { + "at" : { "x" : 112, "y" : 904 }, + "labelOffset" : { "x" : -2, "y" : 35 } + }, + "connect" : [ + { "id" : "f49", "to" : "f43", "via" : [ { "x" : 448, "y" : 904 } ] } + ] + } ] +} \ No newline at end of file diff --git a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/statistic/ChartInformationDialog/ChartInformationDialog.xhtml b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/statistic/ChartInformationDialog/ChartInformationDialog.xhtml new file mode 100644 index 00000000000..bed51c33fe0 --- /dev/null +++ b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/statistic/ChartInformationDialog/ChartInformationDialog.xhtml @@ -0,0 +1,138 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    +     + \ No newline at end of file diff --git a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/statistic/ChartInformationDialog/ChartInformationDialogData.d.json b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/statistic/ChartInformationDialog/ChartInformationDialogData.d.json new file mode 100644 index 00000000000..0c6d30a7acb --- /dev/null +++ b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/statistic/ChartInformationDialog/ChartInformationDialogData.d.json @@ -0,0 +1,6 @@ +{ + "$schema" : "https://json-schema.axonivy.com/data-class/11.4.0/data-class.json", + "simpleName" : "ChartInformationDialogData", + "namespace" : "ch.ivy.addon.portalkit.component.statistic.ChartInformationDialog", + "isBusinessCaseData" : false +} \ No newline at end of file diff --git a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/statistic/ChartInformationDialog/ChartInformationDialogProcess.p.json b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/statistic/ChartInformationDialog/ChartInformationDialogProcess.p.json new file mode 100644 index 00000000000..3f4a6efcb91 --- /dev/null +++ b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/statistic/ChartInformationDialog/ChartInformationDialogProcess.p.json @@ -0,0 +1,49 @@ +{ + "$schema" : "https://json-schema.axonivy.com/process/11.3.0/process.json", + "id" : "16247D906B46FE52", + "kind" : "HTML_DIALOG", + "config" : { + "data" : "ch.ivy.addon.portalkit.component.statistic.ChartInformationDialog.ChartInformationDialogData" + }, + "elements" : [ { + "id" : "f0", + "type" : "HtmlDialogStart", + "name" : "start()", + "config" : { + "signature" : "start", + "guid" : "16247D9083290EA2" + }, + "visual" : { + "at" : { "x" : 96, "y" : 64 } + }, + "connect" : [ + { "id" : "f2", "to" : "f1" } + ] + }, { + "id" : "f1", + "type" : "HtmlDialogEnd", + "visual" : { + "at" : { "x" : 224, "y" : 64 } + } + }, { + "id" : "f3", + "type" : "HtmlDialogEventStart", + "name" : "close", + "config" : { + "guid" : "16247D9084A4636A" + }, + "visual" : { + "at" : { "x" : 96, "y" : 160 }, + "labelOffset" : { "x" : 8, "y" : 32 } + }, + "connect" : [ + { "id" : "f5", "to" : "f4" } + ] + }, { + "id" : "f4", + "type" : "HtmlDialogExit", + "visual" : { + "at" : { "x" : 224, "y" : 160 } + } + } ] +} \ No newline at end of file diff --git a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/statistic/CustomField/CustomField.xhtml b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/statistic/CustomField/CustomField.xhtml new file mode 100644 index 00000000000..cafb78ee6ce --- /dev/null +++ b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/statistic/CustomField/CustomField.xhtml @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/statistic/CustomField/CustomFieldData.d.json b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/statistic/CustomField/CustomFieldData.d.json new file mode 100644 index 00000000000..5685fd498b0 --- /dev/null +++ b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/statistic/CustomField/CustomFieldData.d.json @@ -0,0 +1,19 @@ +{ + "$schema" : "https://json-schema.axonivy.com/data-class/11.4.0/data-class.json", + "simpleName" : "CustomFieldData", + "namespace" : "ch.ivy.addon.portalkit.component.statistic.CustomField", + "isBusinessCaseData" : false, + "fields" : [ { + "name" : "selectedCustomValue", + "type" : "String", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "tempSelectedCustomValues", + "type" : "java.util.List", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "selectedCustomValues", + "type" : "java.util.List", + "modifiers" : [ "PERSISTENT" ] + } ] +} \ No newline at end of file diff --git a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/statistic/CustomField/CustomFieldProcess.p.json b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/statistic/CustomField/CustomFieldProcess.p.json new file mode 100644 index 00000000000..97389c457f4 --- /dev/null +++ b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/statistic/CustomField/CustomFieldProcess.p.json @@ -0,0 +1,114 @@ +{ + "$schema" : "https://json-schema.axonivy.com/process/11.3.0/process.json", + "id" : "16A76A01ED2FA2D0", + "kind" : "HTML_DIALOG", + "config" : { + "data" : "ch.ivy.addon.portalkit.component.statistic.CustomField.CustomFieldData" + }, + "elements" : [ { + "id" : "f0", + "type" : "HtmlDialogStart", + "name" : "start()", + "config" : { + "signature" : "start", + "guid" : "16A76A01F08609A3" + }, + "visual" : { + "at" : { "x" : 96, "y" : 64 } + }, + "connect" : [ + { "id" : "f2", "to" : "f1" } + ] + }, { + "id" : "f1", + "type" : "HtmlDialogEnd", + "visual" : { + "at" : { "x" : 224, "y" : 64 } + } + }, { + "id" : "f3", + "type" : "HtmlDialogEventStart", + "name" : "close", + "config" : { + "guid" : "16A76A01F317AB59" + }, + "visual" : { + "at" : { "x" : 96, "y" : 160 }, + "labelOffset" : { "x" : 8, "y" : 32 } + }, + "connect" : [ + { "id" : "f5", "to" : "f4" } + ] + }, { + "id" : "f4", + "type" : "HtmlDialogExit", + "visual" : { + "at" : { "x" : 224, "y" : 160 } + } + }, { + "id" : "f12", + "type" : "Script", + "config" : { + "output" : { + "code" : [ + "if(!in.tempSelectedCustomValues.contains(in.selectedCustomValue)) {", + " in.tempSelectedCustomValues.add(in.selectedCustomValue);", + " in.selectedCustomValue = null;", + "}" + ] + } + }, + "visual" : { + "at" : { "x" : 225, "y" : 258 } + }, + "connect" : [ + { "id" : "f11", "to" : "f10" } + ] + }, { + "id" : "f10", + "type" : "HtmlDialogEnd", + "visual" : { + "at" : { "x" : 353, "y" : 258 } + } + }, { + "id" : "f9", + "type" : "HtmlDialogMethodStart", + "name" : "addCustomVal()", + "config" : { + "signature" : "addCustomVal", + "guid" : "16A76A3527AC714D" + }, + "visual" : { + "at" : { "x" : 97, "y" : 258 } + }, + "connect" : [ + { "id" : "f13", "to" : "f12" } + ] + }, { + "id" : "f7", + "type" : "HtmlDialogEnd", + "visual" : { + "at" : { "x" : 224, "y" : 352 } + } + }, { + "id" : "f14", + "type" : "HtmlDialogMethodStart", + "name" : "cleanUp()", + "config" : { + "signature" : "cleanUp", + "input" : { + "map" : { + "out.selectedCustomValues" : "new java.util.ArrayList()", + "out.tempSelectedCustomValues" : "new java.util.ArrayList()" + } + }, + "guid" : "16ADE4E91DC3CB1F" + }, + "visual" : { + "at" : { "x" : 96, "y" : 352 } + }, + "connect" : [ + { "id" : "f15", "to" : "f7" } + ] + } ] +} \ No newline at end of file diff --git a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/statistic/CustomVarField/CustomVarField.xhtml b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/statistic/CustomVarField/CustomVarField.xhtml new file mode 100644 index 00000000000..f72c517d67a --- /dev/null +++ b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/statistic/CustomVarField/CustomVarField.xhtml @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/statistic/CustomVarField/CustomVarFieldData.d.json b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/statistic/CustomVarField/CustomVarFieldData.d.json new file mode 100644 index 00000000000..df0da298592 --- /dev/null +++ b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/statistic/CustomVarField/CustomVarFieldData.d.json @@ -0,0 +1,15 @@ +{ + "$schema" : "https://json-schema.axonivy.com/data-class/11.4.0/data-class.json", + "simpleName" : "CustomVarFieldData", + "namespace" : "ch.ivy.addon.portalkit.component.statistic.CustomVarField", + "isBusinessCaseData" : false, + "fields" : [ { + "name" : "selectedCustomValue", + "type" : "String", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "tempSelectedCustomValues", + "type" : "List", + "modifiers" : [ "PERSISTENT" ] + } ] +} \ No newline at end of file diff --git a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/statistic/CustomVarField/CustomVarFieldProcess.p.json b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/statistic/CustomVarField/CustomVarFieldProcess.p.json new file mode 100644 index 00000000000..3dc98c433ff --- /dev/null +++ b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/statistic/CustomVarField/CustomVarFieldProcess.p.json @@ -0,0 +1,88 @@ +{ + "$schema" : "https://json-schema.axonivy.com/process/11.3.0/process.json", + "id" : "163B018AA65AA403", + "kind" : "HTML_DIALOG", + "config" : { + "data" : "ch.ivy.addon.portalkit.component.statistic.CustomVarField.CustomVarFieldData" + }, + "elements" : [ { + "id" : "f0", + "type" : "HtmlDialogStart", + "name" : "start()", + "config" : { + "signature" : "start", + "guid" : "163B018AAA51EB1F" + }, + "visual" : { + "at" : { "x" : 96, "y" : 64 } + }, + "connect" : [ + { "id" : "f2", "to" : "f1" } + ] + }, { + "id" : "f1", + "type" : "HtmlDialogEnd", + "visual" : { + "at" : { "x" : 224, "y" : 64 } + } + }, { + "id" : "f3", + "type" : "HtmlDialogEventStart", + "name" : "close", + "config" : { + "guid" : "163B018AAC28212E" + }, + "visual" : { + "at" : { "x" : 96, "y" : 160 }, + "labelOffset" : { "x" : 8, "y" : 32 } + }, + "connect" : [ + { "id" : "f5", "to" : "f4" } + ] + }, { + "id" : "f4", + "type" : "HtmlDialogExit", + "visual" : { + "at" : { "x" : 224, "y" : 160 } + } + }, { + "id" : "f10", + "type" : "HtmlDialogEnd", + "visual" : { + "at" : { "x" : 353, "y" : 258 } + } + }, { + "id" : "f9", + "type" : "HtmlDialogMethodStart", + "name" : "addCustomVal()", + "config" : { + "signature" : "addCustomVal", + "guid" : "163B02A2C957AD5F" + }, + "visual" : { + "at" : { "x" : 97, "y" : 258 } + }, + "connect" : [ + { "id" : "f13", "to" : "f12" } + ] + }, { + "id" : "f12", + "type" : "Script", + "config" : { + "output" : { + "code" : [ + "if(!in.tempSelectedCustomValues.contains(in.selectedCustomValue)) {", + " in.tempSelectedCustomValues.add(in.selectedCustomValue);", + " in.selectedCustomValue = null;", + "}" + ] + } + }, + "visual" : { + "at" : { "x" : 225, "y" : 258 } + }, + "connect" : [ + { "id" : "f11", "to" : "f10" } + ] + } ] +} \ No newline at end of file diff --git a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/statistic/ElapsedTimeChartDetails/ElapsedTimeChartDetails.xhtml b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/statistic/ElapsedTimeChartDetails/ElapsedTimeChartDetails.xhtml new file mode 100644 index 00000000000..3191c830be4 --- /dev/null +++ b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/statistic/ElapsedTimeChartDetails/ElapsedTimeChartDetails.xhtml @@ -0,0 +1,109 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/statistic/ElapsedTimeChartDetails/ElapsedTimeChartDetailsData.d.json b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/statistic/ElapsedTimeChartDetails/ElapsedTimeChartDetailsData.d.json new file mode 100644 index 00000000000..5b1c02a928a --- /dev/null +++ b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/statistic/ElapsedTimeChartDetails/ElapsedTimeChartDetailsData.d.json @@ -0,0 +1,39 @@ +{ + "$schema" : "https://json-schema.axonivy.com/data-class/11.4.0/data-class.json", + "simpleName" : "ElapsedTimeChartDetailsData", + "namespace" : "ch.ivy.addon.portalkit.component.statistic.ElapsedTimeChartDetails", + "isBusinessCaseData" : false, + "fields" : [ { + "name" : "dataModel", + "type" : "ch.ivy.addon.portalkit.datamodel.internal.ElapsedTimeLazyDataModel", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "cases", + "type" : "List", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "totalCases", + "type" : "Long", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "startIndex", + "type" : "Integer", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "count", + "type" : "Integer", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "caseSearchCriteria", + "type" : "ch.ivy.addon.portalkit.ivydata.searchcriteria.CaseSearchCriteria", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "filterGroupId", + "type" : "Long", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "category", + "type" : "String", + "modifiers" : [ "PERSISTENT" ] + } ] +} \ No newline at end of file diff --git a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/statistic/ElapsedTimeChartDetails/ElapsedTimeChartDetailsProcess.p.json b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/statistic/ElapsedTimeChartDetails/ElapsedTimeChartDetailsProcess.p.json new file mode 100644 index 00000000000..1f7626cd7a4 --- /dev/null +++ b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/statistic/ElapsedTimeChartDetails/ElapsedTimeChartDetailsProcess.p.json @@ -0,0 +1,230 @@ +{ + "$schema" : "https://json-schema.axonivy.com/process/11.3.0/process.json", + "id" : "161504784DDFCFC7", + "kind" : "HTML_DIALOG", + "config" : { + "data" : "ch.ivy.addon.portalkit.component.statistic.ElapsedTimeChartDetails.ElapsedTimeChartDetailsData" + }, + "elements" : [ { + "id" : "f3", + "type" : "HtmlDialogEventStart", + "name" : "close", + "config" : { + "guid" : "161504785367B2A4" + }, + "visual" : { + "at" : { "x" : 96, "y" : 160 }, + "labelOffset" : { "x" : 8, "y" : 32 } + }, + "connect" : [ + { "id" : "f5", "to" : "f4" } + ] + }, { + "id" : "f4", + "type" : "HtmlDialogExit", + "visual" : { + "at" : { "x" : 224, "y" : 160 } + } + }, { + "id" : "f15", + "type" : "HtmlDialogMethodStart", + "name" : "countCases(CaseSearchCriteria)", + "config" : { + "signature" : "countCases", + "input" : { + "params" : [ + { "name" : "caseSearchCriteria", "type" : "ch.ivy.addon.portalkit.ivydata.searchcriteria.CaseSearchCriteria", "desc" : "" } + ], + "map" : { + "out.caseSearchCriteria" : "param.caseSearchCriteria" + } + }, + "result" : { + "params" : [ + { "name" : "totalCases", "type" : "Long", "desc" : "" } + ], + "map" : { + "result.totalCases" : "in.totalCases" + } + }, + "guid" : "16AD339444C2C97E" + }, + "visual" : { + "at" : { "x" : 96, "y" : 352 }, + "labelOffset" : { "x" : 55, "y" : 34 } + }, + "connect" : [ + { "id" : "f19", "to" : "f18" } + ] + }, { + "id" : "f20", + "type" : "HtmlDialogEnd", + "visual" : { + "at" : { "x" : 576, "y" : 352 } + } + }, { + "id" : "f6", + "type" : "HtmlDialogMethodStart", + "name" : "findCases(CaseSearchCriteria,Integer,Integer)", + "config" : { + "signature" : "findCases", + "input" : { + "params" : [ + { "name" : "caseSearchCriteria", "type" : "ch.ivy.addon.portalkit.ivydata.searchcriteria.CaseSearchCriteria", "desc" : "" }, + { "name" : "startIndex", "type" : "Integer", "desc" : "" }, + { "name" : "count", "type" : "Integer", "desc" : "" } + ], + "map" : { + "out.caseSearchCriteria" : "param.caseSearchCriteria", + "out.count" : "param.count", + "out.startIndex" : "param.startIndex" + } + }, + "result" : { + "params" : [ + { "name" : "cases", "type" : "List", "desc" : "" } + ], + "map" : { + "result.cases" : "in.cases" + } + }, + "guid" : "16AD339444E6AFE5" + }, + "visual" : { + "at" : { "x" : 96, "y" : 256 }, + "size" : { "width" : 24, "height" : 24 }, + "labelOffset" : { "x" : 62, "y" : 34 } + }, + "connect" : [ + { "id" : "f8", "to" : "f7" } + ] + }, { + "id" : "f7", + "type" : "SubProcessCall", + "name" : "CaseService", + "config" : { + "processCall" : "Ivy Data Processes/CaseService:findCasesByCriteria(ch.ivy.addon.portalkit.ivydata.searchcriteria.CaseSearchCriteria,Integer,Integer)", + "call" : { + "map" : { + "param.caseSearchCriteria" : "in.caseSearchCriteria", + "param.startIndex" : "in.startIndex", + "param.count" : "in.count" + } + }, + "output" : { + "map" : { + "out" : "in", + "out.cases" : "result.cases" + } + } + }, + "visual" : { + "at" : { "x" : 360, "y" : 256 } + }, + "connect" : [ + { "id" : "f10", "to" : "f9" } + ] + }, { + "id" : "f9", + "type" : "HtmlDialogEnd", + "visual" : { + "at" : { "x" : 576, "y" : 256 } + } + }, { + "id" : "f18", + "type" : "SubProcessCall", + "name" : "CaseService", + "config" : { + "processCall" : "Ivy Data Processes/CaseService:countCasesByCriteria(ch.ivy.addon.portalkit.ivydata.searchcriteria.CaseSearchCriteria)", + "call" : { + "map" : { + "param.caseSearchCriteria" : "in.caseSearchCriteria" + } + }, + "output" : { + "map" : { + "out" : "in", + "out.totalCases" : "result.totalCases" + } + } + }, + "visual" : { + "at" : { "x" : 360, "y" : 352 } + }, + "connect" : [ + { "id" : "f11", "to" : "f20" } + ] + }, { + "id" : "f1", + "type" : "HtmlDialogEnd", + "visual" : { + "at" : { "x" : 576, "y" : 96 } + } + }, { + "id" : "f0", + "type" : "HtmlDialogStart", + "name" : "start", + "config" : { + "signature" : "start", + "guid" : "16AD3D99ECE5523E" + }, + "visual" : { + "at" : { "x" : 96, "y" : 96 }, + "labelOffset" : { "x" : 34, "y" : 20 } + }, + "connect" : [ + { "id" : "f2", "to" : "f1" } + ] + }, { + "id" : "f12", + "type" : "HtmlDialogMethodStart", + "name" : "initialize(String)", + "config" : { + "signature" : "initialize", + "input" : { + "params" : [ + { "name" : "caseCategory", "type" : "String", "desc" : "" } + ], + "map" : { + "out.category" : "param.caseCategory" + } + }, + "guid" : "16AD87286B4BA607" + }, + "visual" : { + "at" : { "x" : 96, "y" : 448 } + }, + "connect" : [ + { "id" : "f17", "to" : "f16" } + ] + }, { + "id" : "f13", + "type" : "HtmlDialogEnd", + "visual" : { + "at" : { "x" : 576, "y" : 448 } + } + }, { + "id" : "f16", + "type" : "Script", + "name" : "Set CaseCatgory", + "config" : { + "output" : { + "code" : [ + "import ch.ivy.addon.portalkit.datamodel.internal.ElapsedTimeLazyDataModel;", + "import ch.ivy.addon.portalkit.statistics.StatisticChartConstants;", + "", + "in.dataModel = new ElapsedTimeLazyDataModel();", + "if(!ivy.cms.co(StatisticChartConstants.NO_CATEGORY_CMS).equalsIgnoreCase(in.category)) {", + " in.dataModel.setCategory(in.category);", + "}" + ] + } + }, + "visual" : { + "at" : { "x" : 256, "y" : 448 } + }, + "connect" : [ + { "id" : "f14", "to" : "f13" } + ] + } ] +} \ No newline at end of file diff --git a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/statistic/StatisticDashboardWidget/StatisticCarousel.xhtml b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/statistic/StatisticDashboardWidget/StatisticCarousel.xhtml new file mode 100644 index 00000000000..357e8fdc9d3 --- /dev/null +++ b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/statistic/StatisticDashboardWidget/StatisticCarousel.xhtml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/statistic/StatisticDashboardWidget/StatisticDashboardWidget.xhtml b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/statistic/StatisticDashboardWidget/StatisticDashboardWidget.xhtml new file mode 100644 index 00000000000..2c6f256a551 --- /dev/null +++ b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/statistic/StatisticDashboardWidget/StatisticDashboardWidget.xhtml @@ -0,0 +1,199 @@ + + + + + + + + + + + + + + + + + + + + + + + +
    +
    + + + + +
    + +
    + + + +

    #{chart.name}

    + +     + + + + + + + + + +     + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    +
    + +     +
    +     +     +
    +
    +     + + + + + + + + + +     + + + + + + + + + + +
    + +
    + + +
    +
    +     + + + + + + + + + + + + + + + +     + \ No newline at end of file diff --git a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/statistic/StatisticDashboardWidget/StatisticDashboardWidgetData.d.json b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/statistic/StatisticDashboardWidget/StatisticDashboardWidgetData.d.json new file mode 100644 index 00000000000..b954777b944 --- /dev/null +++ b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/statistic/StatisticDashboardWidget/StatisticDashboardWidgetData.d.json @@ -0,0 +1,107 @@ +{ + "$schema" : "https://json-schema.axonivy.com/data-class/11.4.0/data-class.json", + "simpleName" : "StatisticDashboardWidgetData", + "namespace" : "ch.ivy.addon.portalkit.component.statistic.StatisticDashboardWidget", + "isBusinessCaseData" : false, + "fields" : [ { + "name" : "selectedStatisticChart", + "type" : "ch.ivy.addon.portalkit.statistics.StatisticChart", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "statisticChartList", + "type" : "java.util.List", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "taskQuery", + "type" : "ch.ivyteam.ivy.workflow.query.TaskQuery", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "caseQuery", + "type" : "ch.ivyteam.ivy.workflow.query.CaseQuery", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "hasStatistic", + "type" : "Boolean", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "selectedItemOfDrilldown", + "type" : "String", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "isDrilldownToTaskList", + "type" : "Boolean", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "selectedCaseCategory", + "type" : "String", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "previousSelectedMonth", + "type" : "String", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "previousSelectedWeek", + "type" : "String", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "previousSelectedDay", + "type" : "String", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "showTaskListImmediately", + "type" : "Boolean", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "taskListName", + "type" : "String", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "isBackFromDrilldown", + "type" : "Boolean", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "isFinishLoadCharts", + "type" : "Boolean", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "isCompactMode", + "type" : "Boolean", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "defaultCharts", + "type" : "java.util.List", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "isDrilldownExpiryChart", + "type" : "Boolean", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "isReloadChartContent", + "type" : "Boolean", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "prevStatisticList", + "type" : "java.util.List", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "chartNameOfCurrentLanguage", + "type" : "String", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "numberOfDefaultCharts", + "type" : "Integer", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "selectedCategoryOfDrilldown", + "type" : "String", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "isDrilldownToCaseList", + "type" : "Boolean", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "selectedCategories", + "type" : "java.util.List", + "modifiers" : [ "PERSISTENT" ] + } ] +} \ No newline at end of file diff --git a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/statistic/StatisticDashboardWidget/StatisticDashboardWidgetProcess.p.json b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/statistic/StatisticDashboardWidget/StatisticDashboardWidgetProcess.p.json new file mode 100644 index 00000000000..f3d32dfc460 --- /dev/null +++ b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/statistic/StatisticDashboardWidget/StatisticDashboardWidgetProcess.p.json @@ -0,0 +1,1121 @@ +{ + "$schema" : "https://json-schema.axonivy.com/process/11.3.0/process.json", + "id" : "1600AC95D2CA7CEA", + "kind" : "HTML_DIALOG", + "config" : { + "data" : "ch.ivy.addon.portalkit.component.statistic.StatisticDashboardWidget.StatisticDashboardWidgetData" + }, + "elements" : [ { + "id" : "S10", + "type" : "EmbeddedProcess", + "name" : "Fetch Default Charts", + "elements" : [ { + "id" : "S10-f73", + "type" : "Script", + "name" : "add to chart list", + "config" : { + "output" : { + "code" : [ + "import ch.ivy.addon.portalkit.service.StatisticService;", + "import ch.ivy.addon.portalkit.statistics.StatisticChart;", + "import java.util.ArrayList;", + "", + "StatisticService service = StatisticService.getInstance();", + "in.statisticChartList = service.updateExistedChartsWithNewCharts(in.statisticChartList);" + ] + } + }, + "visual" : { + "at" : { "x" : 624, "y" : 160 } + }, + "connect" : [ + { "id" : "S10-f2", "to" : "S10-g2" } + ] + }, { + "id" : "S10-g2", + "type" : "EmbeddedEnd", + "visual" : { + "at" : { "x" : 792, "y" : 160 } + }, + "parentConnector" : "f1" + }, { + "id" : "S10-g1", + "type" : "EmbeddedStart", + "visual" : { + "at" : { "x" : 88, "y" : 160 } + }, + "parentConnector" : "f67", + "connect" : [ + { "id" : "S10-f0", "to" : "S10-f73" } + ] + }, { + "id" : "S10-g0", + "type" : "EmbeddedStart", + "visual" : { + "at" : { "x" : 336, "y" : 272 } + } + } ], + "visual" : { + "at" : { "x" : 936, "y" : 288 }, + "size" : { "width" : 128 } + }, + "connect" : [ + { "id" : "f1", "to" : "f3" } + ] + }, { + "id" : "f11", + "type" : "HtmlDialogStart", + "name" : "start()", + "config" : { + "signature" : "start", + "input" : { + "map" : { + "out.isFinishLoadCharts" : "false" + } + }, + "guid" : "1604F11B5BA97CC5" + }, + "visual" : { + "at" : { "x" : 136, "y" : 64 } + }, + "connect" : [ + { "id" : "f0", "to" : "f14" } + ] + }, { + "id" : "f14", + "type" : "HtmlDialogEnd", + "visual" : { + "at" : { "x" : 288, "y" : 64 } + } + }, { + "id" : "f2", + "type" : "HtmlDialogEnd", + "visual" : { + "at" : { "x" : 1480, "y" : 288 } + } + }, { + "id" : "f16", + "type" : "HtmlDialogMethodStart", + "name" : "moveLeft(StatisticChart)", + "config" : { + "signature" : "moveLeft", + "input" : { + "params" : [ + { "name" : "statisticChart", "type" : "ch.ivy.addon.portalkit.statistics.StatisticChart", "desc" : "" } + ], + "map" : { + "out.selectedStatisticChart" : "param.statisticChart" + } + }, + "guid" : "16052B0B212D3060" + }, + "visual" : { + "at" : { "x" : 704, "y" : 672 } + }, + "connect" : [ + { "id" : "f15", "to" : "f13" } + ] + }, { + "id" : "f17", + "type" : "HtmlDialogMethodStart", + "name" : "moveRight(StatisticChart)", + "config" : { + "signature" : "moveRight", + "input" : { + "params" : [ + { "name" : "statisticChart", "type" : "ch.ivy.addon.portalkit.statistics.StatisticChart", "desc" : "" } + ], + "map" : { + "out.selectedStatisticChart" : "param.statisticChart" + } + }, + "guid" : "16052B0B70AD24B1" + }, + "visual" : { + "at" : { "x" : 704, "y" : 768 } + }, + "connect" : [ + { "id" : "f23", "to" : "f22" } + ] + }, { + "id" : "f18", + "type" : "HtmlDialogEnd", + "visual" : { + "at" : { "x" : 1136, "y" : 672 } + } + }, { + "id" : "f19", + "type" : "Script", + "name" : "Update charts position", + "config" : { + "output" : { + "code" : [ + "import ch.ivy.addon.portalkit.service.StatisticService;", + "import ch.ivy.addon.portalkit.statistics.StatisticChart;", + "", + "StatisticService service = StatisticService.getInstance();", + "", + "for(StatisticChart chart : in.statisticChartList) {", + " int newPosition = in.statisticChartList.indexOf(chart);", + " if (chart.position != newPosition) {", + " chart.setPosition(newPosition);", + " service.save(chart);", + " }", + "}" + ] + } + }, + "visual" : { + "at" : { "x" : 992, "y" : 672 }, + "size" : { "width" : 128 } + }, + "connect" : [ + { "id" : "f20", "to" : "f18" } + ] + }, { + "id" : "f25", + "type" : "HtmlDialogMethodStart", + "name" : "deleteChart(StatisticChart)", + "config" : { + "signature" : "deleteChart", + "guid" : "16052B8CCBF953C6" + }, + "visual" : { + "at" : { "x" : 128, "y" : 672 } + }, + "connect" : [ + { "id" : "f27", "to" : "f26" } + ] + }, { + "id" : "f26", + "type" : "Script", + "name" : "Delete chart", + "config" : { + "output" : { + "code" : [ + "import ch.ivy.addon.portalkit.statistics.StatisticChart;", + "import ch.ivy.addon.portalkit.service.StatisticService;", + "", + "StatisticService service = StatisticService.getInstance();", + "", + "in.statisticChartList.remove(in.selectedStatisticChart);", + "service.delete(in.selectedStatisticChart.id);", + "", + "for(StatisticChart chart : in.statisticChartList) {", + " chart.setPosition(in.statisticChartList.indexOf(chart));", + " service.save(chart);", + "}" + ] + } + }, + "visual" : { + "at" : { "x" : 312, "y" : 672 } + }, + "connect" : [ + { "id" : "f29", "to" : "f28" } + ] + }, { + "id" : "f28", + "type" : "HtmlDialogEnd", + "visual" : { + "at" : { "x" : 488, "y" : 672 } + } + }, { + "id" : "f30", + "type" : "Script", + "name" : "Generate dashboard chart", + "config" : { + "output" : { + "code" : [ + "import java.util.ArrayList;", + "import ch.ivy.addon.portalkit.service.StatisticService;", + "", + "StatisticService service = StatisticService.getInstance();", + "if (in.statisticChartList.size() != 0) {", + " in.hasStatistic = true;", + " if(in.selectedItemOfDrilldown.isEmpty() || in.selectedCategoryOfDrilldown.isEmpty()){", + " service.generateChartModelForStatisticCharts(in.statisticChartList);", + " }", + "} else {", + " in.hasStatistic = false;", + "}", + "", + "in.isFinishLoadCharts = true;", + "in.prevStatisticList = new ArrayList(in.statisticChartList);", + "in.defaultCharts.clear();" + ] + }, + "sudo" : true + }, + "visual" : { + "at" : { "x" : 1280, "y" : 288 }, + "size" : { "width" : 144, "height" : 48 } + }, + "connect" : [ + { "id" : "f80", "to" : "f2" } + ] + }, { + "id" : "f7", + "type" : "SubProcessCall", + "name" : "Navigator", + "config" : { + "processCall" : "Functional Processes/Navigator:viewTaskForAnalytic(String,ch.ivyteam.ivy.workflow.query.TaskQuery)", + "call" : { + "map" : { + "param.chartName" : "in.taskListName", + "param.taskQuery" : "in.taskQuery" + } + } + }, + "visual" : { + "at" : { "x" : 544, "y" : 424 } + } + }, { + "id" : "f36", + "type" : "Script", + "name" : "Build task query", + "config" : { + "output" : { + "code" : [ + "import ch.ivy.addon.portalkit.service.StatisticService;", + "import ch.ivy.addon.portalkit.ivydata.service.impl.LanguageService;", + "import ch.ivy.addon.portalkit.ivydata.service.impl.LanguageService;", + "import org.apache.commons.lang3.StringUtils;", + "import ch.ivy.addon.portalkit.datamodel.TaskLazyDataModel;", + "import ch.ivy.addon.portalkit.service.StatisticService;", + "import ch.ivy.addon.portalkit.statistics.StatisticChartQueryUtils;", + "import ch.ivy.addon.portalkit.statistics.StatisticChart;", + "", + "if (StatisticService.selectMonthOfYear(in.selectedItemOfDrilldown)) {", + " in.previousSelectedMonth = in.selectedItemOfDrilldown;", + "} else if (StatisticService.selectWeekOfMonth(in.selectedItemOfDrilldown)) {", + " in.previousSelectedWeek = in.selectedItemOfDrilldown;", + "} else if (StatisticService.selectDayOfWeek(in.selectedItemOfDrilldown)) {", + " in.previousSelectedDay = in.selectedItemOfDrilldown;", + "}", + "", + "StatisticService service = StatisticService.getInstance();", + "in.chartNameOfCurrentLanguage = service.getDisplayNameInUserLanguageForChart(in.selectedStatisticChart).getValue();", + "", + "in.taskListName = in.chartNameOfCurrentLanguage + \" - \" + in.selectedItemOfDrilldown;", + "if (StatisticService.selectHourOfDay(in.selectedItemOfDrilldown)) {", + " in.taskListName += \" \" + ivy.cms.co(\"/ch.ivy.addon.portalkit.ui.jsf/statistic/chart/taskByExpiry/hour\");", + "}", + "in.selectedItemOfDrilldown = StringUtils.EMPTY;" + ] + } + }, + "visual" : { + "at" : { "x" : 352, "y" : 272 } + }, + "connect" : [ + { "id" : "f38", "to" : "f7", "via" : [ { "x" : 544, "y" : 272 } ] } + ] + }, { + "id" : "f42", + "type" : "SubProcessCall", + "name" : "Navigator", + "config" : { + "processCall" : "Functional Processes/Navigator:viewCaseForAnalytic(String,ch.ivyteam.ivy.workflow.query.CaseQuery)", + "call" : { + "map" : { + "param.chartName" : "in.chartNameOfCurrentLanguage", + "param.caseQuery" : "in.caseQuery" + } + } + }, + "visual" : { + "at" : { "x" : 400, "y" : 496 } + } + }, { + "id" : "f32", + "type" : "HtmlDialogMethodStart", + "name" : "selectChart(StatisticChart)", + "config" : { + "signature" : "selectChart", + "input" : { + "params" : [ + { "name" : "chart", "type" : "ch.ivy.addon.portalkit.statistics.StatisticChart", "desc" : "" } + ], + "map" : { + "out.selectedStatisticChart" : "param.chart" + } + }, + "guid" : "160E2C0243084AFE" + }, + "visual" : { + "at" : { "x" : 128, "y" : 768 } + }, + "connect" : [ + { "id" : "f34", "to" : "f33" } + ] + }, { + "id" : "f33", + "type" : "HtmlDialogEnd", + "visual" : { + "at" : { "x" : 488, "y" : 768 } + } + }, { + "id" : "f39", + "type" : "Alternative", + "config" : { + "conditions" : { + "f37" : "in.showTaskListImmediately || in.isDrilldownToTaskList" + } + }, + "visual" : { + "at" : { "x" : 232, "y" : 272 } + }, + "connect" : [ + { "id" : "f37", "to" : "f36" }, + { "id" : "f99", "to" : "f98", "via" : [ { "x" : 232, "y" : 208 } ] } + ] + }, { + "id" : "f46", + "type" : "HtmlDialogEnd", + "visual" : { + "at" : { "x" : 552, "y" : 208 } + } + }, { + "id" : "f48", + "type" : "HtmlDialogEnd", + "visual" : { + "at" : { "x" : 499, "y" : 576 } + } + }, { + "id" : "f52", + "type" : "HtmlDialogEnd", + "visual" : { + "at" : { "x" : 1120, "y" : 544 } + } + }, { + "id" : "f53", + "type" : "Script", + "name" : "Set data", + "config" : { + "output" : { + "code" : [ + "import ch.ivy.addon.portalkit.service.StatisticService;", + "", + "in.isFinishLoadCharts = false;", + "", + "if (StatisticService.selectMonthOfYear(in.selectedItemOfDrilldown)) {", + " in.previousSelectedMonth = in.selectedItemOfDrilldown;", + "} else if (StatisticService.selectWeekOfMonth(in.selectedItemOfDrilldown)) {", + " in.previousSelectedWeek = in.selectedItemOfDrilldown;", + "} else if (StatisticService.selectDayOfWeek(in.selectedItemOfDrilldown)) {", + " in.previousSelectedDay = in.selectedItemOfDrilldown;", + "}" + ] + } + }, + "visual" : { + "at" : { "x" : 888, "y" : 544 } + }, + "connect" : [ + { "id" : "f55", "to" : "f52" } + ] + }, { + "id" : "f63", + "type" : "HtmlDialogMethodStart", + "name" : "generateChartModel", + "config" : { + "signature" : "generateChartModel", + "guid" : "168FFD6C153F13B5" + }, + "visual" : { + "at" : { "x" : 712, "y" : 288 }, + "labelOffset" : { "x" : 6, "y" : 41 } + }, + "connect" : [ + { "id" : "f60", "to" : "f59" } + ] + }, { + "id" : "f65", + "type" : "Script", + "name" : "Generate compact chart", + "config" : { + "output" : { + "code" : [ + "import java.util.ArrayList;", + "import org.apache.commons.collections.CollectionUtils;", + "import ch.ivy.addon.portalkit.statistics.StatisticChart;", + "import ch.ivy.addon.portalkit.service.StatisticService;", + "", + "if (in.statisticChartList.size() != 0) {", + " StatisticService service = StatisticService.getInstance();", + " service.generateChartModelForStatisticCharts(in.statisticChartList);", + " in.hasStatistic = true;", + "} else {", + " in.hasStatistic = false;", + "}", + "", + "in.prevStatisticList = new ArrayList(in.statisticChartList);", + "in.isFinishLoadCharts = true;", + "in.defaultCharts.clear();" + ] + } + }, + "visual" : { + "at" : { "x" : 1280, "y" : 224 }, + "size" : { "width" : 144, "height" : 48 } + }, + "connect" : [ + { "id" : "f77", "to" : "f2", "via" : [ { "x" : 1480, "y" : 224 } ] } + ] + }, { + "id" : "f66", + "type" : "HtmlDialogEnd", + "visual" : { + "at" : { "x" : 1232, "y" : 64 } + } + }, { + "id" : "f70", + "type" : "HtmlDialogMethodStart", + "name" : "initialize", + "config" : { + "signature" : "initialize", + "input" : { + "params" : [ + { "name" : "statisticChartList", "type" : "java.util.List", "desc" : "" }, + { "name" : "showTaskListImmediately", "type" : "Boolean", "desc" : "" }, + { "name" : "isBackFromDrilldown", "type" : "Boolean", "desc" : "" }, + { "name" : "isCompactMode", "type" : "Boolean", "desc" : "" }, + { "name" : "isDrilldownExpiryChart", "type" : "Boolean", "desc" : "" } + ], + "map" : { + "out.isBackFromDrilldown" : "param.isBackFromDrilldown", + "out.isCompactMode" : "param.isCompactMode", + "out.showTaskListImmediately" : "param.showTaskListImmediately", + "out.statisticChartList" : "param.statisticChartList" + } + }, + "guid" : "16F16B7D136FCEC1" + }, + "visual" : { + "at" : { "x" : 712, "y" : 64 }, + "labelOffset" : { "x" : 3, "y" : 36 } + }, + "connect" : [ + { "id" : "f69", "to" : "f62" } + ] + }, { + "id" : "f62", + "type" : "Alternative", + "config" : { + "conditions" : { + "f79" : "in.isCompactMode" + } + }, + "visual" : { + "at" : { "x" : 800, "y" : 64 } + }, + "connect" : [ + { "id" : "f79", "to" : "f72", "via" : [ { "x" : 800, "y" : 136 } ], "label" : { + "name" : "compact mode", + "segment" : 1.0, + "offset" : { "x" : 35, "y" : 17 } + } }, + { "id" : "f31", "to" : "f5" } + ] + }, { + "id" : "f3", + "type" : "Alternative", + "config" : { + "conditions" : { + "f50" : "in.statisticChartList.isEmpty()", + "f54" : "in.isFinishLoadCharts && ch.ivy.addon.portalkit.service.StatisticService.getInstance().isSame(in.prevStatisticList, in.statisticChartList)", + "f56" : "in.isCompactMode" + } + }, + "visual" : { + "at" : { "x" : 1080, "y" : 288 } + }, + "connect" : [ + { "id" : "f50", "to" : "f4", "via" : [ { "x" : 1096, "y" : 384 } ] }, + { "id" : "f54", "to" : "f2", "via" : [ { "x" : 1096, "y" : 336 }, { "x" : 1480, "y" : 336 } ], "label" : { + "name" : "haven't data changed in Statistics" + } }, + { "id" : "f56", "to" : "f65", "via" : [ { "x" : 1096, "y" : 224 } ] }, + { "id" : "f57", "to" : "f30" } + ] + }, { + "id" : "f5", + "type" : "Script", + "name" : "Create a placeholder for dashboard", + "config" : { + "output" : { + "code" : [ + "import java.util.ArrayList;", + "import org.apache.commons.lang3.StringUtils;", + "import ch.ivy.addon.portalkit.jsf.ManagedBeans;", + "import ch.ivy.addon.portalkit.bean.StatisticDashboardBean;", + "import ch.ivy.addon.portalkit.statistics.StatisticChart;", + "import ch.ivy.addon.portalkit.service.StatisticService;", + "", + "StatisticService service = StatisticService.getInstance();", + " ", + "if (in.isBackFromDrilldown) {", + " in.selectedItemOfDrilldown = null;", + " in.selectedCategoryOfDrilldown = null;", + " in.isFinishLoadCharts = false;", + " ", + " in.statisticChartList = service.findStatisticCharts();", + "}", + "", + "if (!in.isDrilldownExpiryChart) {", + " in.hasStatistic = false;", + "}", + "", + "/* isReloadChartContent is a flag to reload the ChartJS canvas on UI ", + " If isFinishLoadCharts is true, we will reload the ChartJS canvas to draw new canva based on new data", + " If statisticChartList is changed, we need to reload ChartJS canvas due to we have to rebuild chart", + " Always set new value for isReloadChartContent when re-rendering component", + "*/", + "StatisticDashboardBean statisticDashboardBean = ManagedBeans.get(\"statisticDashboardBean\") as StatisticDashboardBean;", + "in.isReloadChartContent = statisticDashboardBean.isChartModelNotInitialized(in.statisticChartList) || !in.isFinishLoadCharts || !service.isSame(in.prevStatisticList, in.statisticChartList);", + "", + "if (in.isReloadChartContent && StringUtils.isEmpty(in.selectedItemOfDrilldown) && StringUtils.isEmpty(in.selectedCategoryOfDrilldown)) {", + " // In case, isReloadChartContent indicator is true and not drilldown to expiry chart, we need to generate a placeholder chart to show on UI", + " // It will make comfortable when user is waiting for drawing canvas", + " service.generatePlaceholderForChart(in.statisticChartList);", + " in.isFinishLoadCharts = false;", + "} else if (StringUtils.isNotEmpty(in.selectedItemOfDrilldown)) {", + " // Drilldown to expiry chart, no need to build placeholder chart because we don't call database", + " // Directly generate ChartJS canva, so we dont need to reload page", + " StatisticChart newChart = service.drilldownExpiryChart(in.selectedItemOfDrilldown,in.selectedStatisticChart,in.previousSelectedMonth, in.previousSelectedWeek);", + " service.drilldownExpiryChart(in.selectedItemOfDrilldown,in.selectedStatisticChart,in.previousSelectedMonth, in.previousSelectedWeek);", + " in.statisticChartList.clear();", + " in.statisticChartList.add(in.selectedStatisticChart);", + " in.statisticChartList.add(newChart);", + "", + " in.isFinishLoadCharts = true;", + " in.prevStatisticList = new ArrayList(in.statisticChartList);", + " in.isReloadChartContent = false;", + "} else if (StringUtils.isNotEmpty(in.selectedCategoryOfDrilldown)) {", + " StatisticChart newChart = service.drilldownCasesByCategory(in.selectedCategoryOfDrilldown, in.selectedStatisticChart);", + " in.statisticChartList.clear();", + " in.statisticChartList.add(in.selectedStatisticChart);", + " in.statisticChartList.add(newChart);", + " ", + " in.isFinishLoadCharts = true;", + " in.prevStatisticList = new ArrayList(in.statisticChartList);", + " in.isReloadChartContent = false;", + "}", + "", + "in.numberOfDefaultCharts = service.getNumberOfDefaultCharts();" + ] + } + }, + "visual" : { + "at" : { "x" : 992, "y" : 64 }, + "size" : { "width" : 208 } + }, + "connect" : [ + { "id" : "f61", "to" : "f66" } + ] + }, { + "id" : "f4", + "type" : "Script", + "name" : "Check user has charts", + "config" : { + "output" : { + "code" : [ + "import javax.faces.context.FacesContext;", + "import ch.ivy.addon.portalkit.bean.StatisticDashboardBean;", + "import ch.ivy.addon.portalkit.statistics.StatisticChart;", + "import java.util.ArrayList;", + "", + "if (in.statisticChartList.isEmpty()) {", + " FacesContext context = FacesContext.getCurrentInstance();", + " StatisticDashboardBean statisticDashboardBean = context.getApplication()", + " .evaluateExpressionGet(context, \"#{statisticDashboardBean}\", StatisticDashboardBean.class) as StatisticDashboardBean;", + " StatisticChart emptyChart = statisticDashboardBean.createDefaultEmptyChart();", + " in.statisticChartList = new ArrayList();", + " in.statisticChartList.add(emptyChart);", + "}" + ] + } + }, + "visual" : { + "at" : { "x" : 1280, "y" : 384 }, + "size" : { "width" : 144, "height" : 48 } + }, + "connect" : [ + { "id" : "f64", "to" : "f2", "via" : [ { "x" : 1480, "y" : 384 } ] } + ] + }, { + "id" : "f72", + "type" : "Script", + "name" : "Create a placeholder for carousel", + "config" : { + "output" : { + "code" : [ + "import ch.ivy.addon.portalkit.service.StatisticService;", + "import java.util.ArrayList;", + "", + "StatisticService service = StatisticService.getInstance();", + "", + "/* isReloadChartContent is a flag to reload the ChartJS canvas on UI ", + " If isFinishLoadCharts is true, we will reload the ChartJS canvas to draw new canva based on new data", + " If statisticChartList is changed, we need to reload ChartJS canvas due to we have to rebuild chart", + " Always set new value for isReloadChartContent when re-rendering component", + "*/", + "in.isReloadChartContent = !in.isFinishLoadCharts || !service.isSame(in.prevStatisticList, in.statisticChartList);", + "", + "if (in.isReloadChartContent) {", + " // In case, isReloadChartContent indicator is true and not drilldown to expiry chart, we need to generate a placeholder chart to show on UI", + " // It will make comfortable when user is waiting for drawing canvas", + " service.generatePlaceholderForChart(in.statisticChartList);", + " in.isFinishLoadCharts = false;", + "}" + ] + } + }, + "visual" : { + "at" : { "x" : 992, "y" : 136 }, + "size" : { "width" : 208, "height" : 48 } + }, + "connect" : [ + { "id" : "f81", "to" : "f66", "via" : [ { "x" : 1232, "y" : 136 } ] } + ] + }, { + "id" : "f83", + "type" : "HtmlDialogMethodStart", + "name" : "drilldownTaskByPriority(String,TaskQuery)", + "config" : { + "signature" : "drilldownTaskByPriority", + "input" : { + "params" : [ + { "name" : "taskListName", "type" : "String", "desc" : "" }, + { "name" : "taskQuery", "type" : "ch.ivyteam.ivy.workflow.query.TaskQuery", "desc" : "" } + ], + "map" : { + "out.taskListName" : "param.taskListName", + "out.taskQuery" : "param.taskQuery" + } + }, + "guid" : "172118B5A5BCDFA3" + }, + "visual" : { + "at" : { "x" : 128, "y" : 424 }, + "labelOffset" : { "x" : 58, "y" : 32 } + }, + "connect" : [ + { "id" : "f84", "to" : "f7" } + ] + }, { + "id" : "f6", + "type" : "HtmlDialogMethodStart", + "name" : "drilldownCaseByState(StatisticChart,CaseQuery)", + "config" : { + "signature" : "drilldownCaseByState", + "input" : { + "params" : [ + { "name" : "selectedStatisticChart", "type" : "ch.ivy.addon.portalkit.statistics.StatisticChart", "desc" : "" }, + { "name" : "caseQuery", "type" : "ch.ivyteam.ivy.workflow.query.CaseQuery", "desc" : "" } + ], + "map" : { + "out.caseQuery" : "param.caseQuery", + "out.selectedStatisticChart" : "param.selectedStatisticChart" + } + }, + "guid" : "17211FB704E994CF" + }, + "visual" : { + "at" : { "x" : 128, "y" : 496 }, + "labelOffset" : { "x" : 77, "y" : 34 } + }, + "connect" : [ + { "id" : "f8", "to" : "f42" } + ] + }, { + "id" : "f9", + "type" : "HtmlDialogMethodStart", + "name" : "drilldownElapsedTime(StatisticChart,String)", + "config" : { + "signature" : "drilldownElapsedTime", + "input" : { + "params" : [ + { "name" : "selectedStatisticChart", "type" : "ch.ivy.addon.portalkit.statistics.StatisticChart", "desc" : "" }, + { "name" : "selectedCaseCategory", "type" : "String", "desc" : "" } + ], + "map" : { + "out.selectedCaseCategory" : "param.selectedCaseCategory", + "out.selectedStatisticChart" : "param.selectedStatisticChart" + } + }, + "guid" : "172122396A7D2B17" + }, + "visual" : { + "at" : { "x" : 128, "y" : 576 }, + "labelOffset" : { "x" : 64, "y" : 38 } + }, + "connect" : [ + { "id" : "f10", "to" : "f48" } + ] + }, { + "id" : "f35", + "type" : "HtmlDialogMethodStart", + "name" : "onSelectDrilldownTaskByExpiry(Boolean,String,StatisticChart,TaskQuery)", + "config" : { + "signature" : "onSelectDrilldownTaskByExpiry", + "input" : { + "params" : [ + { "name" : "isDrilldownToTaskList", "type" : "Boolean", "desc" : "" }, + { "name" : "selectedItemOfDrilldown", "type" : "String", "desc" : "" }, + { "name" : "selectedStatisticChart", "type" : "ch.ivy.addon.portalkit.statistics.StatisticChart", "desc" : "" }, + { "name" : "taskQuery", "type" : "ch.ivyteam.ivy.workflow.query.TaskQuery", "desc" : "" } + ], + "map" : { + "out.isDrilldownToTaskList" : "param.isDrilldownToTaskList", + "out.selectedItemOfDrilldown" : "param.selectedItemOfDrilldown", + "out.selectedStatisticChart" : "param.selectedStatisticChart", + "out.taskQuery" : "param.taskQuery" + } + }, + "guid" : "172124FE5841FB53" + }, + "visual" : { + "at" : { "x" : 128, "y" : 272 }, + "labelOffset" : { "x" : 144, "y" : 48 } + }, + "connect" : [ + { "id" : "f40", "to" : "f39" } + ] + }, { + "id" : "f41", + "type" : "HtmlDialogMethodStart", + "name" : "toTaskByExpiryTaskList(String,StatisticChart,TaskQuery)", + "config" : { + "signature" : "toTaskByExpiryTaskList", + "input" : { + "params" : [ + { "name" : "selectedItemOfDrilldown", "type" : "String", "desc" : "" }, + { "name" : "selectedStatisticChart", "type" : "ch.ivy.addon.portalkit.statistics.StatisticChart", "desc" : "" }, + { "name" : "taskQuery", "type" : "ch.ivyteam.ivy.workflow.query.TaskQuery", "desc" : "" } + ], + "map" : { + "out.selectedItemOfDrilldown" : "param.selectedItemOfDrilldown", + "out.selectedStatisticChart" : "param.selectedStatisticChart", + "out.taskQuery" : "param.taskQuery" + } + }, + "guid" : "1721265AF851FB22" + }, + "visual" : { + "at" : { "x" : 128, "y" : 352 }, + "labelOffset" : { "x" : 95, "y" : 31 } + }, + "connect" : [ + { "id" : "f43", "to" : "f36", "via" : [ { "x" : 352, "y" : 352 } ] } + ] + }, { + "id" : "f44", + "type" : "HtmlDialogMethodStart", + "name" : "drilldownTaskByExpiry(StatisticChart,String)", + "config" : { + "signature" : "drilldownTaskByExpiry", + "input" : { + "params" : [ + { "name" : "selectedStatisticChart", "type" : "ch.ivy.addon.portalkit.statistics.StatisticChart", "desc" : "" }, + { "name" : "selectedItemOfDrilldown", "type" : "String", "desc" : "" } + ], + "map" : { + "out.selectedItemOfDrilldown" : "param.selectedItemOfDrilldown", + "out.selectedStatisticChart" : "param.selectedStatisticChart" + } + }, + "guid" : "1721272BDEB5A469" + }, + "visual" : { + "at" : { "x" : 704, "y" : 544 }, + "labelOffset" : { "x" : 72, "y" : 40 } + }, + "connect" : [ + { "id" : "f45", "to" : "f53" } + ] + }, { + "id" : "f13", + "type" : "Script", + "name" : "Move left", + "config" : { + "output" : { + "code" : [ + "import java.util.Collections;", + "", + "int currentIndex = out.statisticChartList.indexOf(out.selectedStatisticChart);", + "if (currentIndex > 0) {", + " Collections.swap(out.statisticChartList, currentIndex, currentIndex - 1);", + "}" + ] + } + }, + "visual" : { + "at" : { "x" : 832, "y" : 672 } + }, + "connect" : [ + { "id" : "f21", "to" : "f19" } + ] + }, { + "id" : "f22", + "type" : "Script", + "name" : "Move right", + "config" : { + "output" : { + "code" : [ + "import java.util.Collections;", + "", + "int currentIndex = in.statisticChartList.indexOf(in.selectedStatisticChart);", + "if (currentIndex < in.statisticChartList.size()) {", + " Collections.swap(in.statisticChartList, currentIndex, currentIndex + 1);", + "}" + ] + } + }, + "visual" : { + "at" : { "x" : 832, "y" : 768 } + }, + "connect" : [ + { "id" : "f24", "to" : "f19", "via" : [ { "x" : 992, "y" : 768 } ] } + ] + }, { + "id" : "f59", + "type" : "Alternative", + "config" : { + "conditions" : { + "f68" : "in.isFinishLoadCharts" + } + }, + "visual" : { + "at" : { "x" : 808, "y" : 288 } + }, + "connect" : [ + { "id" : "f68", "to" : "f3", "via" : [ { "x" : 808, "y" : 232 }, { "x" : 1080, "y" : 232 } ] }, + { "id" : "f67", "to" : "S10" } + ] + }, { + "id" : "f58", + "type" : "HtmlDialogMethodStart", + "name" : "regenerateChartModel", + "config" : { + "signature" : "regenerateChartModel", + "input" : { + "params" : [ + { "name" : "statisticChartList", "type" : "java.util.List", "desc" : "" } + ], + "map" : { + "out.statisticChartList" : "param.statisticChartList" + } + }, + "guid" : "18142119F2A1776C" + }, + "visual" : { + "at" : { "x" : 88, "y" : 872 }, + "labelOffset" : { "x" : 44, "y" : 35 } + }, + "connect" : [ + { "id" : "f74", "to" : "f71" } + ] + }, { + "id" : "f71", + "type" : "Script", + "name" : "Generate chart", + "config" : { + "output" : { + "code" : [ + "import ch.ivy.addon.portalkit.service.StatisticService;", + "", + "StatisticService service = StatisticService.getInstance();", + "service.generateChartModelForStatisticCharts(in.statisticChartList);" + ] + } + }, + "visual" : { + "at" : { "x" : 312, "y" : 872 } + }, + "connect" : [ + { "id" : "f75", "to" : "f73" } + ] + }, { + "id" : "f73", + "type" : "HtmlDialogEnd", + "visual" : { + "at" : { "x" : 464, "y" : 872 } + } + }, { + "id" : "f76", + "type" : "HtmlDialogMethodStart", + "name" : "drilldownCasesByCategory(StatisticChart,String)", + "config" : { + "signature" : "drilldownCasesByCategory", + "input" : { + "params" : [ + { "name" : "selectedStatisticChart", "type" : "ch.ivy.addon.portalkit.statistics.StatisticChart", "desc" : "" }, + { "name" : "selectedCategoryOfDrilldown", "type" : "String", "desc" : "" } + ], + "map" : { + "out.selectedCategoryOfDrilldown" : "param.selectedCategoryOfDrilldown", + "out.selectedStatisticChart" : "param.selectedStatisticChart" + } + }, + "guid" : "181FB91910DEB007" + }, + "visual" : { + "at" : { "x" : 704, "y" : 864 }, + "labelOffset" : { "x" : 85, "y" : 40 } + }, + "connect" : [ + { "id" : "f85", "to" : "f78" } + ] + }, { + "id" : "f78", + "type" : "Script", + "name" : "Set data", + "config" : { + "output" : { + "code" : [ + "in.isFinishLoadCharts = false;", + "in.selectedItemOfDrilldown = null; // clear value drilldown expiry chart" + ] + } + }, + "visual" : { + "at" : { "x" : 888, "y" : 864 } + }, + "connect" : [ + { "id" : "f86", "to" : "f82" } + ] + }, { + "id" : "f82", + "type" : "HtmlDialogEnd", + "visual" : { + "at" : { "x" : 1120, "y" : 864 } + } + }, { + "id" : "f87", + "type" : "HtmlDialogMethodStart", + "name" : "goToCasesByCategoryList(StatisticChart,CaseQuery)", + "config" : { + "signature" : "goToCasesByCategoryList", + "input" : { + "params" : [ + { "name" : "selectedStatisticChart", "type" : "ch.ivy.addon.portalkit.statistics.StatisticChart", "desc" : "" }, + { "name" : "caseQuery", "type" : "ch.ivyteam.ivy.workflow.query.CaseQuery", "desc" : "" } + ], + "map" : { + "out.caseQuery" : "param.caseQuery", + "out.selectedStatisticChart" : "param.selectedStatisticChart" + } + }, + "guid" : "181FBEB9A544AC80" + }, + "visual" : { + "at" : { "x" : 704, "y" : 952 }, + "labelOffset" : { "x" : 90, "y" : 34 } + }, + "connect" : [ + { "id" : "f89", "to" : "f94" } + ] + }, { + "id" : "f88", + "type" : "SubProcessCall", + "name" : "Navigator", + "config" : { + "processCall" : "Functional Processes/Navigator:viewCaseForAnalytic(String,ch.ivyteam.ivy.workflow.query.CaseQuery)", + "call" : { + "map" : { + "param.chartName" : "in.chartNameOfCurrentLanguage", + "param.caseQuery" : "in.caseQuery" + } + } + }, + "visual" : { + "at" : { "x" : 1128, "y" : 952 } + } + }, { + "id" : "f90", + "type" : "Alternative", + "config" : { + "conditions" : { + "f93" : "in.isDrilldownToCaseList" + } + }, + "visual" : { + "at" : { "x" : 968, "y" : 1072 } + }, + "connect" : [ + { "id" : "f93", "to" : "f94" }, + { "id" : "f95", "to" : "f92" } + ] + }, { + "id" : "f91", + "type" : "HtmlDialogMethodStart", + "name" : "onSelectDrilldownCasesByCategory(Boolean,StatisticChart,CaseQuery)", + "config" : { + "signature" : "onSelectDrilldownCasesByCategory", + "input" : { + "params" : [ + { "name" : "isDrilldownToCaseList", "type" : "Boolean", "desc" : "" }, + { "name" : "selectedStatisticChart", "type" : "ch.ivy.addon.portalkit.statistics.StatisticChart", "desc" : "" }, + { "name" : "caseQuery", "type" : "ch.ivyteam.ivy.workflow.query.CaseQuery", "desc" : "" } + ], + "map" : { + "out.caseQuery" : "param.caseQuery", + "out.isDrilldownToCaseList" : "param.isDrilldownToCaseList", + "out.selectedStatisticChart" : "param.selectedStatisticChart" + } + }, + "guid" : "182010C71CA41ADF" + }, + "visual" : { + "at" : { "x" : 704, "y" : 1072 }, + "labelOffset" : { "x" : 142, "y" : 48 } + }, + "connect" : [ + { "id" : "f97", "to" : "f90" } + ] + }, { + "id" : "f92", + "type" : "HtmlDialogEnd", + "visual" : { + "at" : { "x" : 1176, "y" : 1072 } + } + }, { + "id" : "f94", + "type" : "Script", + "name" : "Get chart name", + "config" : { + "output" : { + "code" : [ + "import ch.ivy.addon.portalkit.service.StatisticService;", + "", + "StatisticService service = StatisticService.getInstance();", + "in.chartNameOfCurrentLanguage = service.getDisplayNameInUserLanguageForChart(in.selectedStatisticChart).getValue();" + ] + } + }, + "visual" : { + "at" : { "x" : 968, "y" : 952 } + }, + "connect" : [ + { "id" : "f96", "to" : "f88" } + ] + }, { + "id" : "f98", + "type" : "Script", + "name" : "clear selected item drill down", + "config" : { + "output" : { + "code" : "in.selectedItemOfDrilldown = null;" + } + }, + "visual" : { + "at" : { "x" : 408, "y" : 208 }, + "size" : { "width" : 176 } + }, + "connect" : [ + { "id" : "f47", "to" : "f46" } + ] + } ] +} \ No newline at end of file diff --git a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/statistic/StatisticFilters/StatisticFilters.xhtml b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/statistic/StatisticFilters/StatisticFilters.xhtml new file mode 100644 index 00000000000..c598dd92ac0 --- /dev/null +++ b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/statistic/StatisticFilters/StatisticFilters.xhtml @@ -0,0 +1,196 @@ + + + + + + + + + + + + + +
    +
    + + +
    + + + + + + + + + + #{ivy.cms.co("/ch.ivy.addon.portalkit.ui.jsf/statistic/filter/affectedCharts")}: #{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/statistic/chartType/taskByPriority')}, #{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/statistic/chartType/caseByState')}, + #{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/statistic/chartType/taskByExpiry')}, #{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/statistic/chartType/elapsedTimeByCaseCategory')}, + #{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/statistic/chartType/caseByFinishedTask')}, #{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/statistic/chartType/caseByFinishedTime')}
    + #{ivy.cms.co("/ch.ivy.addon.portalkit.ui.jsf/common/description")}: #{ivy.cms.co("/ch.ivy.addon.portalkit.ui.jsf/statistic/filter/timePeriodFilterDescription")} +     +     + + + + + + + + + + + + + + + + + + + + + + +     + + + + + + + + + #{ivy.cms.co("/ch.ivy.addon.portalkit.ui.jsf/statistic/filter/affectedCharts")}: #{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/statistic/chartType/taskByPriority')}, #{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/statistic/chartType/caseByState')}, + #{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/statistic/chartType/taskByExpiry')}, #{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/statistic/chartType/caseByFinishedTask')}
    + #{ivy.cms.co("/ch.ivy.addon.portalkit.ui.jsf/common/description")}: #{ivy.cms.co("/ch.ivy.addon.portalkit.ui.jsf/statistic/filter/roleFilterDescription")} +     +     + + + + + + + + + + +     + + + + + + + + + #{ivy.cms.co("/ch.ivy.addon.portalkit.ui.jsf/statistic/filter/affectedCharts")}: #{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/statistic/chartType/taskByPriority')}, #{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/statistic/chartType/caseByState')}, + #{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/statistic/chartType/taskByExpiry')}, #{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/statistic/chartType/elapsedTimeByCaseCategory')}, + #{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/statistic/chartType/caseByFinishedTask')}, #{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/statistic/chartType/caseByFinishedTime')}
    + #{ivy.cms.co("/ch.ivy.addon.portalkit.ui.jsf/common/description")}: #{ivy.cms.co("/ch.ivy.addon.portalkit.ui.jsf/statistic/filter/caseCategoryFilterDescription")} +     +     + + + + + + +     + + + + + + + + + #{ivy.cms.co("/ch.ivy.addon.portalkit.ui.jsf/statistic/filter/affectedCharts")}: #{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/statistic/chartType/taskByPriority')}, #{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/statistic/chartType/caseByState')}, + #{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/statistic/chartType/taskByExpiry')}, #{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/statistic/chartType/elapsedTimeByCaseCategory')}, + #{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/statistic/chartType/caseByFinishedTask')}, #{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/statistic/chartType/caseByFinishedTime')}
    + #{ivy.cms.co("/ch.ivy.addon.portalkit.ui.jsf/common/description")}: #{ivy.cms.co("/ch.ivy.addon.portalkit.ui.jsf/statistic/filter/caseStateFilterDescription")} +     +     + + + + + + + + + + +     + + + + + + + + + #{ivy.cms.co("/ch.ivy.addon.portalkit.ui.jsf/statistic/filter/affectedCharts")}: #{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/statistic/chartType/taskByPriority')}, + #{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/statistic/chartType/taskByExpiry')}, #{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/statistic/chartType/caseByFinishedTask')}
    + #{ivy.cms.co("/ch.ivy.addon.portalkit.ui.jsf/common/description")}: #{ivy.cms.co("/ch.ivy.addon.portalkit.ui.jsf/statistic/filter/taskPriorityFilterDescription")} +     +     + + + + + + + + + + +     + + + + + + + + + + + #{ivy.cms.co("/ch.ivy.addon.portalkit.ui.jsf/statistic/filter/affectedCharts")}: #{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/statistic/chartType/taskByPriority')}, #{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/statistic/chartType/caseByState')}, + #{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/statistic/chartType/taskByExpiry')}, #{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/statistic/chartType/elapsedTimeByCaseCategory')}, + #{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/statistic/chartType/caseByFinishedTask')}, #{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/statistic/chartType/caseByFinishedTime')} + + + + + + +     +
    + +     + \ No newline at end of file diff --git a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/statistic/StatisticFilters/StatisticFiltersData.d.json b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/statistic/StatisticFilters/StatisticFiltersData.d.json new file mode 100644 index 00000000000..c8aedc1e7df --- /dev/null +++ b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/statistic/StatisticFilters/StatisticFiltersData.d.json @@ -0,0 +1,6 @@ +{ + "$schema" : "https://json-schema.axonivy.com/data-class/11.4.0/data-class.json", + "simpleName" : "StatisticFiltersData", + "namespace" : "ch.ivy.addon.portalkit.component.statistic.StatisticFilters", + "isBusinessCaseData" : false +} \ No newline at end of file diff --git a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/statistic/StatisticFilters/StatisticFiltersProcess.p.json b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/statistic/StatisticFilters/StatisticFiltersProcess.p.json new file mode 100644 index 00000000000..bdb5b3487d6 --- /dev/null +++ b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/statistic/StatisticFilters/StatisticFiltersProcess.p.json @@ -0,0 +1,49 @@ +{ + "$schema" : "https://json-schema.axonivy.com/process/11.3.0/process.json", + "id" : "15FFC75C94B7465F", + "kind" : "HTML_DIALOG", + "config" : { + "data" : "ch.ivy.addon.portalkit.component.statistic.StatisticFilters.StatisticFiltersData" + }, + "elements" : [ { + "id" : "f0", + "type" : "HtmlDialogStart", + "name" : "start()", + "config" : { + "signature" : "start", + "guid" : "15FFC75C96565ED7" + }, + "visual" : { + "at" : { "x" : 96, "y" : 64 } + }, + "connect" : [ + { "id" : "f2", "to" : "f1" } + ] + }, { + "id" : "f1", + "type" : "HtmlDialogEnd", + "visual" : { + "at" : { "x" : 224, "y" : 64 } + } + }, { + "id" : "f3", + "type" : "HtmlDialogEventStart", + "name" : "close", + "config" : { + "guid" : "15FFC75C97151669" + }, + "visual" : { + "at" : { "x" : 96, "y" : 160 }, + "labelOffset" : { "x" : 8, "y" : 32 } + }, + "connect" : [ + { "id" : "f5", "to" : "f4" } + ] + }, { + "id" : "f4", + "type" : "HtmlDialogExit", + "visual" : { + "at" : { "x" : 224, "y" : 160 } + } + } ] +} \ No newline at end of file diff --git a/AxonIvyPortal/portal/src_hd/com/axonivy/portal/dashboard/component/ClientStatisticWidget/ClientStatisticWidget.xhtml b/AxonIvyPortal/portal/src_hd/com/axonivy/portal/dashboard/component/ClientStatisticWidget/ClientStatisticWidget.xhtml index 1fda363f276..8b9fa35b6bb 100644 --- a/AxonIvyPortal/portal/src_hd/com/axonivy/portal/dashboard/component/ClientStatisticWidget/ClientStatisticWidget.xhtml +++ b/AxonIvyPortal/portal/src_hd/com/axonivy/portal/dashboard/component/ClientStatisticWidget/ClientStatisticWidget.xhtml @@ -12,6 +12,7 @@ + diff --git a/AxonIvyPortal/portal/webContent/layouts/includes/topbar.xhtml b/AxonIvyPortal/portal/webContent/layouts/includes/topbar.xhtml index 9ef1cbad408..2c9093ef2fa 100644 --- a/AxonIvyPortal/portal/webContent/layouts/includes/topbar.xhtml +++ b/AxonIvyPortal/portal/webContent/layouts/includes/topbar.xhtml @@ -46,7 +46,7 @@ - diff --git a/AxonIvyPortal/portal/webContent/layouts/restricted/DashboardTemplate.xhtml b/AxonIvyPortal/portal/webContent/layouts/restricted/DashboardTemplate.xhtml index b84e551c5d0..8dc9f6adce0 100644 --- a/AxonIvyPortal/portal/webContent/layouts/restricted/DashboardTemplate.xhtml +++ b/AxonIvyPortal/portal/webContent/layouts/restricted/DashboardTemplate.xhtml @@ -99,6 +99,15 @@ isInConfiguration="#{isInConfiguration}" />     + + + + +