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

27163c3b

Commit 27163c3b authored 1 month ago by Lene Wasskog

Downloads
- Patches
- Plain Diff

feat: Return to time series form after editing time series observation

Use style alert-info for information panel
Refactor display of unselectable options in poi list
Add some missing texts to i18n

parent 9a9c021a

Branches

Tags

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/no/nibio/vips/logic/controller/servlet/ObservationController.java 47 additions, 31 deletions

.../vips/logic/controller/servlet/ObservationController.java
src/main/java/no/nibio/vips/logic/controller/servlet/ObservationTimeSeriesController.java 1 addition, 0 deletions

...c/controller/servlet/ObservationTimeSeriesController.java
src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts.properties 3 additions, 0 deletions

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

...ces/no/nibio/vips/logic/i18n/vipslogictexts_nb.properties
src/main/webapp/templates/observationForm.ftl 13 additions, 10 deletions

src/main/webapp/templates/observationForm.ftl
src/main/webapp/templates/observationTimeSeriesForm.ftl 9 additions, 6 deletions

src/main/webapp/templates/observationTimeSeriesForm.ftl
src/main/webapp/templates/observationTimeSeriesList.ftl 1 addition, 1 deletion

src/main/webapp/templates/observationTimeSeriesList.ftl

with 77 additions and 48 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