Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

V

VIPSLogic
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

2c7f28d0

Commit 2c7f28d0 authored 9 months ago by Lene Wasskog

Downloads
- Plain Diff

Merge feature/vipsutv-710-download-excel, fix conflicts

parents a283ec9c 5dacdfba

No related branches found

No related tags found

1 merge request!191Add map module and Open-Meteo support

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/no/nibio/vips/logic/entity/Observation.java 5 additions, 0 deletions

src/main/java/no/nibio/vips/logic/entity/Observation.java
src/main/java/no/nibio/vips/logic/entity/VipsLogicUser.java 6 additions, 0 deletions

src/main/java/no/nibio/vips/logic/entity/VipsLogicUser.java
src/main/java/no/nibio/vips/logic/entity/rest/ObservationListItem.java 74 additions, 2 deletions

.../no/nibio/vips/logic/entity/rest/ObservationListItem.java
src/main/java/no/nibio/vips/logic/service/ObservationService.java 2 additions, 2 deletions

.../java/no/nibio/vips/logic/service/ObservationService.java
src/main/java/no/nibio/vips/logic/util/ExcelFileGenerator.java 218 additions, 62 deletions

...ain/java/no/nibio/vips/logic/util/ExcelFileGenerator.java
src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts.properties 15 additions, 1 deletion

...ources/no/nibio/vips/logic/i18n/vipslogictexts.properties
src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_nb.properties 20 additions, 6 deletions

...ces/no/nibio/vips/logic/i18n/vipslogictexts_nb.properties
src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_zh_CN.properties 3 additions, 0 deletions

.../no/nibio/vips/logic/i18n/vipslogictexts_zh_CN.properties

with 343 additions and 73 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment