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

d72d37c7

Commit d72d37c7 authored 1 year ago by Lene Wasskog

Downloads
- Plain Diff

Merge branch 'develop' into feature/vipsutv-405-observation-time-series

parents 65d3ad81 585d6d89

Branches

No related tags found

1 merge request!173ObservationDataSchema for eplevikler and ObservationTimeSeries

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/no/nibio/vips/logic/entity/Observation.java 1 addition, 1 deletion

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

...main/java/no/nibio/vips/logic/entity/PointOfInterest.java
src/main/java/no/nibio/vips/logic/modules/barkbeetle/BarkbeetleBean.java 3 additions, 1 deletion

...o/nibio/vips/logic/modules/barkbeetle/BarkbeetleBean.java
src/main/java/no/nibio/vips/logic/modules/barkbeetle/BarkbeetleController.java 1 addition, 1 deletion

...o/vips/logic/modules/barkbeetle/BarkbeetleController.java
src/main/java/no/nibio/vips/logic/util/HierarchyCategoryLocaleNames.java 1 addition, 1 deletion

...o/nibio/vips/logic/util/HierarchyCategoryLocaleNames.java
src/main/webapp/images/modules/barkbeetle/Instruks_registranter_i_Barkbilleovervakingen_2024-04-03.pdf 0 additions, 0 deletions

...truks_registranter_i_Barkbilleovervakingen_2024-04-03.pdf
src/main/webapp/templates/observationForm.ftl 2 additions, 1 deletion

src/main/webapp/templates/observationForm.ftl

with 12 additions and 5 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