-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' of https://github.com/axonivy-market/portal int…
…o feature/IVYPORTAL-17422-Remove-Full-Case-List-and-Replace-it-with-the-Case-Widget-ver1 # Conflicts: # AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/util/DefaultTaskListDashboardUtils.java
- Loading branch information
Showing
76 changed files
with
1,063 additions
and
684 deletions.
There are no files selected for viewing
56 changes: 34 additions & 22 deletions
56
...al/PortalKitTestHelper/src_hd/ch/ivy/addon/portalkit/test/DataCreation/DataCreation.xhtml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,25 +1,37 @@ | ||
| <html xmlns="http://www.w3.org/1999/xhtml" xmlns:f="http://xmlns.jcp.org/jsf/core" | ||
| xmlns:h="http://xmlns.jcp.org/jsf/html" xmlns:ui="http://xmlns.jcp.org/jsf/facelets" | ||
| xmlns:ic="http://ivyteam.ch/jsf/component" xmlns:p="http://primefaces.org/ui" | ||
| <html xmlns="http://www.w3.org/1999/xhtml" | ||
| xmlns:f="http://xmlns.jcp.org/jsf/core" | ||
| xmlns:h="http://xmlns.jcp.org/jsf/html" | ||
| xmlns:ui="http://xmlns.jcp.org/jsf/facelets" | ||
| xmlns:ic="http://ivyteam.ch/jsf/component" | ||
| xmlns:p="http://primefaces.org/ui" | ||
| xmlns:pe="http://primefaces.org/ui/extensions"> | ||
| <h:body> | ||
| <h1>Create tasks</h1> | ||
| <h:form> | ||
| <p:panelGrid columns="2" layout="tabular"> | ||
| <p:outputLabel value="Number of categories" /> | ||
| <p:inputText value="#{data.numOfCats}" /> | ||
| <p:outputLabel value="Number of sub categories" /> | ||
| <p:inputText value="#{data.numOfSubCats}" /> | ||
| <p:outputLabel value="Number of cases per sub catetory" /> | ||
| <p:inputText value="#{data.numOfCasesPerSubCat}" /> | ||
| <p:outputLabel value="Attach to one business case" /> | ||
| <p:selectBooleanCheckbox value="#{data.attachToBusinessCase}"/> | ||
| </p:panelGrid> | ||
| <p:panelGrid columns="1" layout="tabular"> | ||
| <h:outputText | ||
| value="*** Note that each case has 4 tasks (1 done task and 3 open task). So the number of tasks will be created = number of categories * number of sub categories * number of cases per sub category * 4" /> | ||
| <p:commandButton value="Create tasks" actionListener="#{logic.close}" /> | ||
| </p:panelGrid> | ||
| </h:form> | ||
| <ui:composition template="/layouts/frame-10.xhtml"> | ||
| <ui:define name="title">Create tasks</ui:define> | ||
| <ui:define name="content"> | ||
| <h:form> | ||
| <div class="card"> | ||
| <p:panelGrid columns="2" layout="grid" style="width: 50%;"> | ||
| <p:outputLabel value="Number of categories" /> | ||
| <p:inputText value="#{data.numOfCats}" /> | ||
| <p:outputLabel value="Number of sub categories" /> | ||
| <p:inputText value="#{data.numOfSubCats}" /> | ||
| <p:outputLabel value="Number of cases per sub catetory" /> | ||
| <p:inputText value="#{data.numOfCasesPerSubCat}" /> | ||
| <p:outputLabel value="Attach to one business case" /> | ||
| <p:selectBooleanCheckbox value="#{data.attachToBusinessCase}" /> | ||
| </p:panelGrid> | ||
| <p:panelGrid columns="1"> | ||
| <h:outputText | ||
| value="*** Note that each case has 4 tasks (1 done task and 3 open task). So the number of tasks will be created = number of categories * number of sub categories * number of cases per sub category * 4" /> | ||
| <p:commandButton value="Create tasks" | ||
| actionListener="#{logic.close}" /> | ||
| </p:panelGrid> | ||
| </div> | ||
| </h:form> | ||
| <ic:com.axonivy.portal.components.IFrameTaskConfig isHideCaseInfo="true" isHideTaskAction="true" isWorkingOnATask="false" /> | ||
| </ui:define> | ||
| </ui:composition> | ||
| </h:body> | ||
| </html> | ||
|
|
||
| </html> |
60 changes: 60 additions & 0 deletions
60
AxonIvyPortal/PortalKitTestHelper/webContent/layouts/frame-10.xhtml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| <!DOCTYPE html> | ||
| <html xmlns="http://www.w3.org/1999/xhtml" | ||
| xmlns:f="http://xmlns.jcp.org/jsf/core" | ||
| xmlns:h="http://xmlns.jcp.org/jsf/html" | ||
| xmlns:ui="http://xmlns.jcp.org/jsf/facelets" | ||
| xmlns:ic="http://ivyteam.ch/jsf/component" | ||
| xmlns:p="http://primefaces.org/ui" | ||
| xmlns:pe="http://primefaces.org/ui/extensions"> | ||
|
|
||
| <!-- | ||
| DESCRIPTION: | ||
| This is the default template to use the freya-ivy theme as well as iFrames approach. | ||
| PORTAL: | ||
| If you are using the Axon Ivy Portal, you can pass several parameters to it to use some features (e.g. process chain). | ||
| You'll find the list of parameters here: https://developer.axonivy.com/portal/12.0/doc/portal-developer-guide/components/layout-templates.html#components-layout-templates-iframe-task-template | ||
| For further information about iframes and usage in Portal please refer to: https://developer.axonivy.com/portal/12.0/doc/portal-developer-guide/iframe/index.html | ||
| BRANDING: | ||
| If you want to brand your dialogs, please take a look at our documentation: https://developer.axonivy.com/doc/12.0/designer-guide/user-interface/branding/index.html | ||
| STYLING: | ||
| If you want to add custom styles, you can simply add your own .css file (e.g. at the location: "webContent/layouts/styles/style.css") | ||
| and refence it below in the head part. | ||
| --> | ||
|
|
||
| <h:head> | ||
| <f:attribute name="primefaces.THEME" value="#{ivyFreyaTheme.theme}" /> | ||
| <meta charset="utf-8" /> | ||
| <meta name="viewport" content="width=device-width, initial-scale=1.0" /> | ||
| <title><ui:insert name="title">Ivy Html Dialog</ui:insert></title> | ||
| <link rel="shortcut icon" href="#{resource['ivy-branding:favicon']}" /> | ||
| <h:outputScript name="js/layout.js" library="#{ivyFreyaTheme.library}" /> | ||
| <h:outputStylesheet name="#{ivyFreyaTheme.layout}" library="#{ivyFreyaTheme.library}" /> | ||
| <h:outputStylesheet name="primeflex-3.min.css" library="primeflex" /> | ||
| <h:outputStylesheet name="custom.css" library="ivy-branding" /> | ||
| <!-- Optional Style or Script files: | ||
| <h:outputStylesheet name="layouts/styles/style.css" /> | ||
| --> | ||
| </h:head> | ||
| <h:body class="body-hd #{ivyFreyaTheme.mode}"> | ||
| <ui:include src="/layouts/includes/progress-loader.xhtml" /> | ||
| <div id="content" class="shortcuts-container"> | ||
| <ui:insert name="content"> | ||
| default content | ||
| </ui:insert> | ||
| </div> | ||
|
|
||
| <ui:insert name="exception"> | ||
| <ui:include src="/layouts/includes/portalException.xhtml" /> | ||
| </ui:insert> | ||
|
|
||
| <!-- optional Portal parameters: | ||
| <script> | ||
| window. | ||
| </script> | ||
| --> | ||
|
|
||
| </h:body> | ||
| </html> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.