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

Iss 527 QGIS plugin - project history/changes viewer #538

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 6 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions REDIRECTS
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ https://help.cloudmergin.com/plugin-new-project https://merginmaps.com/docs/mana
https://help.cloudmergin.com/plugin-sync-project https://merginmaps.com/docs/manage/plugin/
https://help.cloudmergin.com/plugin-variables https://merginmaps.com/docs/layer/plugin-variables/
https://help.cloudmergin.com/project-advanced https://merginmaps.com/docs/manage/project-advanced/
https://help.cloudmergin.com/project-details https://merginmaps.com/docs/manage/project-details/
https://help.cloudmergin.com/project-details https://merginmaps.com/docs/manage/project-history/
https://help.cloudmergin.com/quick-start https://merginmaps.com/docs/tutorials/capturing-first-data/
https://help.cloudmergin.com/quick-start.html N/A - covered by non-html version
https://help.cloudmergin.com/registration https://merginmaps.com/docs/setup/sign-up-to-mergin-maps/
Expand Down Expand Up @@ -144,7 +144,7 @@ https://merginmaps.com/docs/howto/manage/plugin/plugin-variables/ https://mergin
https://merginmaps.com/docs/howto/manage/troubleshoot/ https://merginmaps.com/docs/misc/troubleshoot/
https://merginmaps.com/docs/howto/manage/web/dashboard/ https://merginmaps.com/docs/manage/dashboard/
https://merginmaps.com/docs/howto/manage/web/project-advanced/ https://merginmaps.com/docs/manage/project-advanced/
https://merginmaps.com/docs/howto/manage/web/project-details/ https://merginmaps.com/docs/manage/project-details/
https://merginmaps.com/docs/howto/manage/web/project-details/ https://merginmaps.com/docs/manage/project-history/
https://merginmaps.com/docs/howto/manage/web/register/ https://merginmaps.com/docs/setup/sign-up-to-mergin-maps/
https://merginmaps.com/docs/howto/manage/web/subscriptions/ https://merginmaps.com/docs/manage/subscriptions/
https://merginmaps.com/docs/howto/manage/web/web-create-project/ https://merginmaps.com/docs/manage/create-project/
Expand Down Expand Up @@ -174,6 +174,7 @@ https://merginmaps.com/docs/layer/settingup_forms/ https://merginmaps.com/docs/l
https://merginmaps.com/docs/layer/settingup_forms_photo/ https://merginmaps.com/docs/layer/photos/
https://merginmaps.com/docs/layer/settingup_forms_settings/ https://merginmaps.com/docs/layer/form-configuration/
https://merginmaps.com/docs/manage/data_sync/ https://merginmaps.com/docs/manage/plugin/
https://merginmaps.com/docs/manage/project-details/ https://merginmaps.com/docs/manage/project-history/
https://merginmaps.com/docs/manage/plugin-sync-project/ https://merginmaps.com/docs/manage/plugin/
https://merginmaps.com/docs/misc/privacy/ N/A -- handled by https://merginmaps.com/privacy-policy/
https://merginmaps.com/docs/reference/licensing/ https://merginmaps.com/docs/misc/licensing/
Expand Down
2 changes: 1 addition & 1 deletion src/.vuepress/sidebar/en.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ module.exports = {
'/manage/plugin/',
'/manage/dashboard/',
'/manage/dashboard-maps/',
'/manage/project-details',
'/manage/project-history/',
'/manage/selective_sync/'
]
},
Expand Down
2 changes: 1 addition & 1 deletion src/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ The ecosystem consist of various components:
- [<QGISPluginName /> Overview](./manage/plugin/)
- [Home Page and Dashboard](./manage/dashboard/)
- [Maps in Dashboard](./manage/dashboard-maps/)
- [Project History and Versions](./manage/project-details/)
- [Project History and Versions](./manage/project-history/)
- [Selective Synchronisation](./manage/selective_sync/)

## Setup GIS Project
Expand Down
2 changes: 1 addition & 1 deletion src/manage/dashboard/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ The **History** tab contains an overview of available project versions that can
You can click on a specific version to see more details.
![Project version details in Mergin Maps dashboard](./mergin-maps-dashboard-project-history-version.jpg "Project version details in Mergin Maps dashboard")

You can learn more about project history and how to revert to an older version in [Project History and Versions](../project-details/).
You can learn more about project history and how to revert to an older version in [Project History and Versions](../project-history/).

### Collaborators
The **Collaborators** tab provides the list of users who have access to the project as well as pending invitations. You can use the **Share** button to invite more people to contribute to your project.
Expand Down
2 changes: 1 addition & 1 deletion src/manage/permissions.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ You can find detailed steps on how to invite users to your workspace in [How to
## Workspace member roles and project permissions
Member roles and project permissions present similar options in terms of what a user can or cannot do. The difference is whether these options are defined on a workspace or on a project level. Compare the overview of [workspace member roles](#workspace-member-roles-overview) and of [project permissions](#project-permissions-overview) for more details.

- **Reader**: Users with **Read** permission are able to see projects, projects data and [history](../project-details), but can not make any changes.
- **Reader**: Users with **Read** permission are able to see projects, projects data and [history](./project-history/), but can not make any changes.
- **Editor** (available on <MainPlatformNameLink /> Cloud and <EnterprisePlatformNameLink />): In addition to the **Read** access, users can [add/remove/update features](../field/mobile-features/). They *cannot* make changes in the project properties, add/remove fields in GeoPackage layers or remove GeoPackage files from the project. Editors can:
- *add* files such as photos, shapefiles, GeoPackage files - any file except for `*.qgs`, `*.qgz`, `mergin-config.json`
- *edit* files except for `*.qgs`, `*.qgz`, `mergin-config.json` and non-diff based `*.gpkg` changes
Expand Down
5 changes: 4 additions & 1 deletion src/manage/plugin/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ The toolbar contains following buttons:
![Synchronise changes button](./plugin-toolbar-sync.jpg "Synchronise changes button")
![Mergin Maps project status with pending changes](./plugin-project-status.jpg "Mergin Maps project status with pending changes")

- **Project history** to inspect [project history and versions](../project-history/)
![Project history button](./plugin-toolbar-project-history.jpg "Project history button")
![Project history changes viewer](./plugin-history-viewer.jpg "Project history changes viewer")

## Mergin Maps plugin in QGIS Browser

Expand Down Expand Up @@ -113,7 +116,7 @@ Use the **Toolbox** icon in the toolbar panel to display **Processing Toolbox**

2. Double click the **Create report** tool.

Fill in the parameters in the dialog window. If you want to get the report for a specified range of [versions](../project-details/), define also the start and end version.
Fill in the parameters in the dialog window. If you want to get the report for a specified range of [versions](../project-history/), define also the start and end version.

Click **Run**.
![Create report tool dialog](./plugin-create-report.jpg "Create report tool dialog")
Expand Down
Binary file added src/manage/plugin/plugin-history-viewer.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/manage/plugin/plugin-history-viewer.xcf
Binary file not shown.
Binary file modified src/manage/plugin/plugin-toolbar-create-project.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/manage/plugin/plugin-toolbar-create-project.xcf
Binary file not shown.
Binary file modified src/manage/plugin/plugin-toolbar-logo.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/manage/plugin/plugin-toolbar-logo.xcf
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file modified src/manage/plugin/plugin-toolbar-sync.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/manage/plugin/plugin-toolbar-sync.xcf
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,34 @@

Each time someone synchronises the project from a mobile device or from QGIS through <QGISPluginName />, a new project version will be created. Thus, it is possible to see the details of the changes made in <MainPlatformNameLink /> project by different users or devices.

On <AppDomainNameLink />, you can view what files have been added or removed. If you use GeoPackage for your survey, you can also see the list of the features which have been added, deleted or updated.
Using the <QGISPluginNameShort /> or the <DashboardShortLink />, you can view what files have been added or removed. If you use GeoPackage for your survey, you can also see the list of the features which have been added, deleted or updated.


:::tip
:::tip Project history in QGIS
Great tools to inspect the project history and compare changes between project versions can be found in the <QGISPluginNameShort />:
- use [Create report](./plugin/#create-report-processing-toolbox) to get an overview of changes for a range of project versions.
- use [Create diff](./plugin/#create-diff-processing-toolbox) to extract changes made between two versions of a layer
- use [Project history](#project-history-in-qgis) to explore changes in the **Changes Viewer**
- use [Create report](../plugin/#create-report-processing-toolbox) to get an overview of changes for a range of project versions.
- use [Create diff](../plugin/#create-diff-processing-toolbox) to extract changes made between two versions of a layer
:::

## Project history and advanced changelog
## Project history in QGIS
Project history and version can be inspected using the <QGISPluginName /> by clicking the **Project history** button of the toolbar.
![Project history button](../plugin/plugin-toolbar-project-history.jpg "Project history button")

The button opens the **Changes Viewer** window. Here, all available project versions are listed in the left panel.

tomasMizera marked this conversation as resolved.
Show resolved Hide resolved
On the right, you can see some information about the currently selection version: the project size, date of creation and <MainPlatformName /> component that was used to create it. You can switch between the *Changed layers* and *Changed files* tabs.

![Project history changes viewer](../plugin/plugin-history-viewer.jpg)

Select a layer from the list in the *Changed layers* tab to display its changes on the map along with a colour-coded attributes table (green for insert, yellow for update, red for delete).

Changes layers can be added to the project to inspect them further or use them to restore deleted or modified data.

![Project history changes viewer](./plugin-changes-viewer-add-to-project.jpg)


## Project history and advanced changelog on the dashboard
To see the project history:
1. Log in <AppDomainNameLink /> and go to your project
2. Navigate to the **History** tab.
Expand Down Expand Up @@ -45,22 +63,22 @@ To see the project history:
### How to revert to an older version
You may find yourself in a situation where you want to revert to an older version of the project.

Local changes made in QGIS (changes that were not synchronised yet) can be reverted by using the **Reset changes** option in [Project status](./synchronisation/#synchronising-changes-in-qgis).
Local changes made in QGIS (changes that were not synchronised yet) can be reverted by using the **Reset changes** option in [Project status](../synchronisation/#synchronising-changes-in-qgis).

To revert to an older version of a project (already synchronised to the cloud), follow these steps:
1. Log in <AppDomainNameLink /> and go to your project
2. Navigate to the [**project history**](#project-history-and-advanced-changelog) and find the version you want to use
2. Navigate to the [**project history**](#project-history-and-advanced-changelog-on-the-dashboard) and find the version you want to use
3. **Download** the project version to your computer. Open the project in QGIS to make sure it is the version you want to restore.
:::tip
Our blog [Downloading a previous version of your project](https://merginmaps.com/blog/support-tip-downloading-a-previous-version-of-your-project) contains detailed steps on how to download projects that are too large to be downloaded from the <DashboardShortLink />.
:::

Now you have multiple options:
- [Package the downloaded project version](./project/#packaging-qgis-project) as a new <MainPlatformName /> project. You can keep both projects if needed or [delete](./project-advanced/#delete-a-project) the one you don't need anymore.
- [Package the downloaded project version](../project/#packaging-qgis-project) as a new <MainPlatformName /> project. You can keep both projects if needed or [delete](../project-advanced/#delete-a-project) the one you don't need anymore.

- Replace the specific files in your <MainPlatformName /> project folder:
1. Close QGIS
2. Copy the QGIS project (`.qgz`), the data (`.gpkg`) or both from the downloaded older version and paste them to your current [<MainPlatformName /> project folder](./project/#mergin-maps-project-folder).
2. Copy the QGIS project (`.qgz`), the data (`.gpkg`) or both from the downloaded older version and paste them to your current [<MainPlatformName /> project folder](../project/#mergin-maps-project-folder).


:::warning Be careful when doing this!
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
2 changes: 1 addition & 1 deletion src/manage/project/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ Layers that were **kept as is** are not stored in the project folder.
![Mergin Maps project folder content](./project-folder.jpg "Mergin Maps project folder content")

There are also some extra folders and files:
- **`.mergin`** folder contains the `Geodiff` files that are used to keep the [project history and versions](../project-details/) and [diagnostic log](../../misc/troubleshoot/#diagnostic-logs) in a file named `client-log.txt`
- **`.mergin`** folder contains the `Geodiff` files that are used to keep the [project history and versions](../project-history/) and [diagnostic log](../../misc/troubleshoot/#diagnostic-logs) in a file named `client-log.txt`
- **`proj`** folder contains, if needed, [custom projections](../../gis/proj/) files
- [conflict files](../missing-data/#there-are-conflict-files-in-the-folder) may appear if changes could not be properly synchronised
![Mergin Maps project folder history log projection conflict files](./folder-tech-files.jpg "Mergin Maps project folder content")
Expand Down
Binary file modified src/setup/install-mergin-maps-plugin-for-qgis/mergin-toolbar.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/setup/install-mergin-maps-plugin-for-qgis/mergin-toolbar.xcf
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
2 changes: 1 addition & 1 deletion src/tutorials/working-collaboratively/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ If you wish to share a project with more than a handful of users, this method ma
This tutorial introduced basic ways of sharing your project. Whether you use <MainPlatformNameLink /> to share project with a few friends or collaborate on it with a larger group of coworkers, we recommend to get familiar with the basics about permissions, synchronisation and project management:
- in [Permissions](../../manage/permissions/) you can learn more about the level of access you can provide to other users
- [Behind Data Synchronisation](../../manage/synchronisation/) explains the synchronisation process and what happens when multiple users do the field survey in the same time. There is also an option to exclude some files from syncing by using [Selective Synchronisation](../../manage/selective_sync/).
- [Project History and Versions](../../manage/project-details/) can help you see what was changed, by whom and when
- [Project History and Versions](../../manage/project-history/) can help you see what was changed, by whom and when
- useful guides:
- [How to Share, Transfer or Delete Projects](../../manage/project-advanced/#how-to-share-transfer-or-delete-projects)
- [How to Deploy Revised Projects](../../manage/deploy-new-project/)
Expand Down
Loading