Merge branch 'develop' into feature/1899-opr-update-redgreen-progress-indicators-reviewed-fields-on-each-category

Author: jh-RLI

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.0.4
+current_version = 1.0.5
 
 [bumpversion:file:VERSION]
 

.gitignore

@@ -32,6 +32,8 @@ var/
 *.egg-info/
 .installed.cfg
 *.egg
+/oep-django-5
+oep-django-5/
 
 # PyInstaller
 #  Usually these files are written by a python script from a template
@@ -79,6 +81,11 @@ venv*/
 0_env/
 /envs
 /node_env
+.env*
+/fuseki
+apache*
+/oep-django-5
+
 
 .DS_Store
 

.pre-commit-config.yaml

@@ -1,4 +1,4 @@
-exclude: ^.*(.min.js|.min.css|.html|.js|.js.map)$
+exclude: ^.*(.min.js|.min.css|.html|.js|.js.map|docs/*|mkdocs.yml)$
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.4.0

.prettierignore

@@ -1,3 +1,5 @@
 # Ignore all HTML files, because they contain
 # django markup that will not be broken by prettier
 **/*.html
+
+docs/*

CITATION.cff

@@ -28,7 +28,7 @@ authors:
 title: "Open Energy Family - Open Energy Platform (OEP)"
 type: software
 license: AGPL-3.0-or-later
-version: 1.0.4
+version: 1.0.5
 doi:
-date-released: 2024-09-25
+date-released: 2024-11-19
 url: "https://github.com/OpenEnergyPlatform/oeplatform/"

README.md

@@ -3,19 +3,19 @@
 | Automated tests | [![Automated tests](https://github.com/OpenEnergyPlatform/oeplatform/actions/workflows/automated-testing.yaml/badge.svg)](https://github.com/OpenEnergyPlatform/oeplatform/actions/workflows/automated-testing.yaml) |
 | Docs            | [![Documentation Status](https://github.com/OpenEnergyPlatform/oeplatform/actions/workflows/deploy-docs.yaml/badge.svg)](https://openenergyplatform.github.io/oeplatform/)                                           |
 
-<a href="https://openenergy-platform.org/"><img align="right" width="200" height="200" src="https://avatars2.githubusercontent.com/u/37101913?s=400&u=9b593cfdb6048a05ea6e72d333169a65e7c922be&v=4" alt="OpenEnergyPlatform"></a>
+<a href="https://openenergyplatform.org/"><img align="right" width="200" height="200" src="https://avatars2.githubusercontent.com/u/37101913?s=400&u=9b593cfdb6048a05ea6e72d333169a65e7c922be&v=4" alt="OpenEnergyPlatform"></a>
 
 # Open Energy Family - Open Energy Platform (OEP)
 
-Repository for the code of the Open Energy Platform (OEP) website [https://openenergy-platform.org/](https://openenergy-platform.org/). This repository does not contain data, for data access please consult [this page](https://github.com/OpenEnergyPlatform/organisation/blob/master/README.md)
+Repository for the code of the Open Energy Platform (OEP) website [https://openenergyplatform.org/](https://openenergy-platform.org/). This repository does not contain data, for data access please consult [this page](https://github.com/OpenEnergyPlatform/organisation/blob/master/README.md)
 
 ## License / Copyright
 
 This repository is licensed under [GNU Affero General Public License v3.0 (AGPL-3.0)](https://www.gnu.org/licenses/agpl-3.0.en.html)
 
 # Installation & Setup
 
-Follow the detailed [installation guide](https://openenergyplatform.github.io/oeplatform/install-and-documentation/install/installation/).
+Follow the detailed [installation guide](https://openenergyplatform.github.io/oeplatform/installation/guides/installation/).
 
 ## Development & Code contribution
 

RELEASE_PROCEDURE.md

@@ -52,7 +52,7 @@ Before see How to [Contribute](https://github.com/OpenEnergyPlatform/oeplatform/
    - `versioneer` automatically updates the version number based on the tag
    - this is now the official tagged commit
    - Push the tag upstream: `git push upstream --tags`
-   - Alternatievely: tag on github platform while creating release
+   - Alternatively: tag on github platform while creating release
 1. Make a new release on Github
    - https://github.com/OpenEnergyPlatform/oeplatform/releases/new
    - make sure that you choose the tag name defined above

VERSION

@@ -1 +1 @@
-1.0.4
+1.0.5

api/actions.py

@@ -103,10 +103,10 @@ class ResponsiveException(Exception):
 def assert_permission(user, table, permission, schema=None):
     if schema is None:
         schema = DEFAULT_SCHEMA
-    if (
-        user.is_anonymous
-        or user.get_table_permission_level(DBTable.load(schema, table)) < permission
-    ):
+    if user.is_anonymous:
+        raise APIError('User is anonymous', 401)
+
+    if user.get_table_permission_level(DBTable.load(schema, table)) < permission:
         raise PermissionDenied
 
 
@@ -131,10 +131,10 @@ def assert_add_tag_permission(user, table, permission, schema):
     #         level = request.user.get_table_permission_level(table)
     #         can_add = level >= login_models.WRITE_PERM
 
-    if (
-        user.is_anonymous
-        or user.get_table_permission_level(DBTable.load(schema, table)) < permission
-    ):
+    if user.is_anonymous:
+        raise APIError('User is anonymous', 401)
+
+    if user.get_table_permission_level(DBTable.load(schema, table)) < permission:
         raise PermissionDenied
 
 

api/parser.py

@@ -671,29 +671,6 @@ def parse_scolumnd_from_columnd(schema, table, name, column_description):
     }
 
 
-def parse_sconstd_from_constd(schema, table, name_const, constraint_description):
-    defi = constraint_description.get("definition")
-    return {
-        "action": None,  # {ADD, DROP}
-        "constraint_type": constraint_description.get(
-            "constraint_typ"
-        ),  # {FOREIGN KEY, PRIMARY KEY, UNIQUE, CHECK}
-        "constraint_name": name_const,
-        "constraint_parameter": constraint_description.get("definition")
-        .split("(")[1]
-        .split(")")[0],
-        # Things in Brackets, e.g. name of column
-        "reference_table": defi.split("REFERENCES ")[1].split("(")[2]
-        if "REFERENCES" in defi
-        else None,
-        "reference_column": defi.split("(")[2].split(")")[1]
-        if "REFERENCES" in defi
-        else None,
-        "c_schema": schema,
-        "c_table": table,
-    }
-
-
 def replace_None_with_NULL(dictonary):
     # Replacing None with null for Database
     for key, value in dictonary.items():