Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/847 support for common datatypes #884

Merged
merged 32 commits into from
Nov 11, 2021

Conversation

hitomin21
Copy link
Contributor

@hitomin21 hitomin21 commented Oct 21, 2021

FYI: The reason that I created one, instead of several, pull request to solve the issues below is that most of the changes (which I originally made in different branches) were in the same files and added new functionality which I wanted to test together (for example testing that the alias and descriptions on the new data types as well as re-submission with all new data types). Instead of creating individual pull requests and having to merge everything again I have therefore submitted this branch which is merged and bugs, caused by the new features interacting with each other, fixed.

Adds support for multi-(line, point and polygon). This does not allow a user to insert multiple geometries in the edit tool but allows us to use the edit tool where the backend expects a multi* object as input.

Adds support for showing non-editable fields to the user and also submits these (and hidden fields) with their default values.

Adds support for more data types such as date.

Adds support for giving aliases to fields so the database column names are not used so we can give better field names that are shown to the user. Also adds a description for each field.

Adds an option for a user to continue to edit a submission in case the submit fails.

Fixed bug where entering something in instructions for edit tool made admin crash

Closes issues:
#845 (black button)
#846 (alias)
#847 (Support for more datatypes)
#853 (Support for Multi-* types)

…gs as this causes incorrect responses from Geoserver
…to give better names for the fields the users input values to
…nto feature/847-support-for-common-datatypes
…ne feature

Made back button to be outlined so it is easier to see

Made initialrender work as intended.
Added support for showing non-editable and non-hidden fields.
Users are shown the values that they entered if the submission failed so it is possible to retry
…com:hajkmap/Hajk into feature/847-support-for-common-datatypes
…ap/Hajk into feature/847-support-for-common-datatypes
…nto feature/847-support-for-common-datatypes

# Conflicts:
#	new-client/src/plugins/Edit/components/AttributeEditor.js
…map/Hajk into feature/847-support-for-common-datatypes
@hitomin21 hitomin21 self-assigned this Oct 21, 2021
Copy link
Member

@jacobwod jacobwod left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changes needed, problems found in first tests include:

QGIS Server-related:
SERVICE=WFS has to be added to the url in order for the table of attributes to show up. However, when starting the editing tool in the client, an error comes up complaining about it since the service-parameter including "?" is added twice.

In the client:
When starting to write something into a text-field, the geometry on the map disappears.
DateTime attributes for instance are not shown in the editing form.

…in the url load data function since there are two question marks in the url
…:hajkmap/Hajk into feature/847-support-for-common-datatypes
@jacobwod
Copy link
Member

jacobwod commented Nov 3, 2021

@hitomin21 I've done some serious changes to how search works (to fix #882). Make sure to merge develop in this branch as soon as possible.

Copy link
Member

@jacobwod jacobwod left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've done two fixes to avoid crashes and merged develop. I'm not sure that we've got editing to work properly with layers from QGIS Server yet - more tests are needed and I think it's time for a RC so this can get more proper testing. Merging.

@jacobwod jacobwod merged commit 65ca528 into develop Nov 11, 2021
@jacobwod jacobwod deleted the feature/847-support-for-common-datatypes branch November 11, 2021 09:18
const searchParams = new URLSearchParams(mergedSearchParams);
// …and update our URL's search string with the new value
url.search = searchParams.toString();

hfetch(url)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Url needs to be a string, now hfetch gets an object. Edit plugin fails.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants