Skip to content

Commit

Permalink
Merge pull request #6 from axonivy-market/minors
Browse files Browse the repository at this point in the history
Minors
  • Loading branch information
ivy-rew authored Oct 24, 2023
2 parents 104d857 + 87f8b0c commit 7fc5c8a
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 9 deletions.
1 change: 0 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ name: CI-Build

on:
push:
pull_request:
schedule:
- cron: '21 21 * * *'
workflow_dispatch:
Expand Down
6 changes: 3 additions & 3 deletions excel-importer-product/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,19 @@ Imports Excel sheets and transforms it into a full featured web application.
1. Initiate the Excel imported via menu `File` > `Import` > `Axon Ivy` > `App Dialog from Excel`.
![importer](doc/excel-import-entry.png)

2. Pick a project, where the Excel records should imported to as Entity with a Dialog.
2. Pick a project, where the Excel records should be imported to as Entity with a Dialog.
![wizard](doc/target-project-unit.png)

3. The importer will create the EntityClass, that represents entries in the Database.
![generated-entity](doc/generate-entity-from-excel.png)

4. A simple process will be creatd, leading to a Dialog to explore your imported Entities.
4. A simple process will be created, leading to a Dialog to explore your imported Entities.
![final-dialog](doc/entity-dialog.png)

## Setup

In the project, where the Excel data should be managed:

1. Create a persistence unit under `/config/persistence.xml`
2. Add the property, to allow schema changes `hibernate.hbm2ddl.auto=create`
2. Add the property, to allow schema changes `hibernate.hbm2ddl.auto=update`
3. Set the Data source to a valid database. If there is none, set it up under `/config/databases.yaml`
2 changes: 1 addition & 1 deletion excel-importer-test/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: excel-importer-test
Bundle-SymbolicName: excel-importer-test
Bundle-Version: 10.0.1.qualifier
Bundle-Version: 10.0.2.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-17
Automatic-Module-Name: excel.importer.test
Export-Package: com.axonivy.util.excel.test
Expand Down
2 changes: 1 addition & 1 deletion excel-importer-test/config/persistence.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<persistence-unit name="testing">
<non-jta-data-source>inMemory</non-jta-data-source>
<properties>
<property name="hibernate.hbm2ddl.auto" value="create"/>
<property name="hibernate.hbm2ddl.auto" value="create-drop"/>
<property name="hibernate.show-sql" value="true"/>
</properties>
</persistence-unit>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ void parseColumns_xlsx(@TempDir Path dir) throws IOException {
.contains("Firstname", "Lastname");
assertThat(columns).contains(
new Column("Firstname", String.class),
new Column("ZIP", Float.class),
new Column("Birthdate", Float.class) // should be a date
new Column("ZIP", Double.class),
new Column("Birthdate", Double.class) // should be a date
);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import ch.ivyteam.ivy.process.model.value.scripting.VariableDesc;
import ch.ivyteam.ivy.scripting.dataclass.IEntityClass;

@SuppressWarnings("restriction")
public class DialogProcess {

private final Process process;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ private static List<Column> createEntityFields(List<String> names, Iterator<Row>
private static Column toColumn(String name, CellType type) {
switch (type) {
case NUMERIC:
return new Column(name, Float.class);
return new Column(name, Double.class);
case STRING:
return new Column(name, String.class);
case BOOLEAN:
Expand Down

0 comments on commit 7fc5c8a

Please sign in to comment.