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

implement QR code scanning function for creating entities #208

Open
wants to merge 33 commits into
base: development
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
e9c8389
style: updated pre commit to latest versions
sbanoeon Feb 7, 2024
1000cf0
feat: first migration to pydantic V2, using pydjantic for settings
djs0109 Feb 21, 2024
3f2b273
Merge remote-tracking branch 'origin/158-pre-commit-is-not-used-any-m…
djs0109 Feb 27, 2024
2a8990f
chore: remove unused setup in wsgi/asgi
djs0109 Feb 28, 2024
46ef7c8
feat: use custom mapping for settings
djs0109 Feb 28, 2024
dbd6133
fix: pydjantic base_dir
djs0109 Feb 28, 2024
e3c6b58
Merge remote-tracking branch 'origin/152-migrate-to-pydantic-v2' into…
djs0109 Feb 28, 2024
ba60c2a
fix: rework pydjantic
djs0109 Feb 28, 2024
0493cf4
fix: adding prefix to use same database env
sbanoeon Mar 6, 2024
d9748c7
fix: change env to alias for pydantic v2
djs0109 Apr 3, 2024
c8eaa18
test: test logging settings
sbanoeon Apr 17, 2024
e22ef8a
fix: include media folder
sbanoeon Jun 4, 2024
2ae15d5
fix: fixed dependency conflict
sbanoeon Jul 24, 2024
011bd35
fix: fixed error for class variable
sbanoeon Jul 24, 2024
ab224ab
Merge remote-tracking branch 'origin/development' into development
sbanoeon Jul 24, 2024
3f04ed3
merged development into 152-migrate-to-pydantic-v2
sbanoeon Jul 24, 2024
be1bc30
chore: adapt pydantic changes in jsonschem parser
sbanoeon Jul 31, 2024
f76af9f
chore(entirety): update requirements
djs0109 Sep 3, 2024
324a719
fix(entirety): error after updating filip
djs0109 Sep 3, 2024
e5a7964
docs(sdm): examples for tested smart data models with new parser
sbanoeon Sep 19, 2024
d5d43cc
chore(entities): qr code work in progress
sbanoeon Oct 9, 2024
a61752f
Merged development into 152-migrate-to-pydantic-v2
sbanoeon Oct 9, 2024
b6ad310
fix(entity): invoking of get_context_data
djs0109 Oct 9, 2024
d500362
chore(entity): remove ' from example json schema model
djs0109 Oct 9, 2024
67b04df
chore(entirety): update default login_url
djs0109 Oct 9, 2024
e564a31
fix(entirety): add work around for conflict of jsonschemaparser
djs0109 Oct 9, 2024
6d057fe
chore(entity): use default as value while parsing data models
djs0109 Oct 9, 2024
d9cbcbb
chore(entirety): update login url
djs0109 Oct 9, 2024
9f411be
fix(entirety): default attr value and datetime type
djs0109 Oct 9, 2024
45b697b
fix(semantic): migration error
djs0109 Oct 9, 2024
bbfe1ef
chore(entities): qr code work in progress
sbanoeon Oct 9, 2024
17fa1e9
Merge remote-tracking branch 'origin/152-migrate-to-pydantic-v2-and-q…
djs0109 Oct 9, 2024
ed92a79
fix(entities): stop camera on successful qr code scan
sbanoeon Oct 10, 2024
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
14 changes: 9 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,12 @@ pip

```bash
cd ./app/Entirety
pip install -e git+https://jugit.fz-juelich.de/iek-10/public/ict-platform/fiware-applications/[email protected]#egg=jsonschemaparser
pip install -r requirements.txt
```
> **Note:** The jsonschemaparser is a package from a repository.
> It might cause conflicts with other libs. Therefore, we install it separately.
> Please ignore the relevant ERROR message.

pre-commit

Expand Down Expand Up @@ -94,7 +98,7 @@ provide following settings in your env file.

For a full list of settings see [settings](./docs/SETTINGS.md).

## User and permissions model
## User and permissions model

The user and permissions model of _Entirety_ is described in the [user model documentation](./docs/USERMODEL.md).

Expand All @@ -118,14 +122,14 @@ See [changelog](./docs/CHANGELOG.md) for detailed overview of changes.

## Further project information

<a href="https://n5geh.de/"> <img alt="National 5G Energy Hub"
<a href="https://n5geh.de/"> <img alt="National 5G Energy Hub"
src="https://raw.githubusercontent.com/N5GEH/n5geh.platform/master/docs/logos/n5geh-logo.png" height="100"></a>

## Acknowledgments

We gratefully acknowledge the financial support of the Federal Ministry <br />
for Economic Affairs and Climate Action (BMWK), promotional references
We gratefully acknowledge the financial support of the Federal Ministry <br />
for Economic Affairs and Climate Action (BMWK), promotional references
03EN1030B and 03ET1561B.

<a href="https://www.bmwi.de/Navigation/EN/Home/home.html"> <img alt="BMWK"
<a href="https://www.bmwi.de/Navigation/EN/Home/home.html"> <img alt="BMWK"
src="https://raw.githubusercontent.com/N5GEH/n5geh.platform/master/docs/logos/BMWK-logo_en.png" height="100"> </a>
2 changes: 1 addition & 1 deletion app/Entirety/.env.EXAMPLE
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ LOKI_SRC_HOST=entirety
LOKI_TIMEZONE=Europe/Berlin

LOCAL_AUTH=True
LOGIN_URL=/
LOGIN_URL=/accounts/login
LOGIN_REDIRECT_URL=/
LOGOUT_REDIRECT_URL=/
# OIDC
Expand Down
4 changes: 1 addition & 3 deletions app/Entirety/entirety/asgi.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@
import os

from django.core.asgi import get_asgi_application
from pydantic_settings import SetUp

os.environ.setdefault("DJANGO_SETTINGS_MODULE", "entirety.settings.Settings")
SetUp().configure()
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "entirety.settings")
application = get_asgi_application()
Loading