Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
120 commits
Select commit Hold shift + click to select a range
9efc239
alte Dateien Löschen
ZLeh33 Jun 3, 2024
d6c49ba
update alle Datein
ZLeh33 Jun 3, 2024
8e6e773
Ferment.json : Änderung für Slider , Tabelle, DropDown menür
ZLeh33 Jun 8, 2024
97d4df8
umbennat
ZLeh33 Jun 8, 2024
6f66153
new
ZLeh33 Jun 8, 2024
bea524c
neue Änderungen
ZLeh33 Jun 24, 2024
d8a40f3
chore: Add cluster analysis functionality and wrapper function for Py…
MoBenhaddia Jul 20, 2024
c413807
Kopplung
MoBenhaddia Aug 12, 2024
2afaf39
Ferment-Datei neue Änderungen
ZLeh33 Aug 13, 2024
015c02a
Merge branch 'master' of https://github.com/ZLeh33/ALADIN
ZLeh33 Aug 13, 2024
e3b6287
Richtige Merge
ZLeh33 Aug 13, 2024
f1f5281
Diagramm bearbeiten
MoBenhaddia Aug 15, 2024
680a5ef
* Neue Funktion in wrapperFunctionCallPythom
ZLeh33 Aug 15, 2024
d2f73a0
Merge branch 'master' of https://github.com/ZLeh33/ALADIN
ZLeh33 Aug 15, 2024
6129fde
Neue Änderungen
ZLeh33 Aug 19, 2024
496e5ca
Neue Änderungen in Ferment
ZLeh33 Aug 26, 2024
989e22f
Kommentare hinzugefügt
ZLeh33 Aug 28, 2024
0be5f05
Ferment.json : Änderung für Slider , Tabelle, DropDown menür
ZLeh33 Jun 8, 2024
10227e1
fixed minor errors
plc-dev Sep 5, 2024
19d9048
small fixes for presentation demo
plc-dev Sep 17, 2024
fb0d158
Merge remote-tracking branch 'upstream/master' into tempBranch
ZLeh33 Oct 14, 2024
cc347b5
Merge
ZLeh33 Oct 19, 2024
5b012aa
Merge
ZLeh33 Oct 19, 2024
a556f5a
Placeholder für Bild in Ferment bearbeitet
ZLeh33 Oct 19, 2024
3a37fed
Actions in Component 0 bearbeitet
ZLeh33 Oct 21, 2024
c02ce48
json_to_excel Export
MoBenhaddia Oct 21, 2024
9297906
Merge branch 'master' of https://github.com/ZLeh33/ALADIN
MoBenhaddia Oct 21, 2024
83e9c22
Neue Task
ZLeh33 Dec 3, 2024
ff5bd08
Speichere Änderungen für tmpBranch
ZLeh33 Dec 8, 2024
1251a3f
Merge branch 'master' of https://github.com/ZLeh33/ALADIN
MoBenhaddia Dec 9, 2024
7105274
Speichere Änderungen für tmpBranch
ZLeh33 Dec 9, 2024
e665a8c
Neue nodes in FermentExcercises erstellt
ZLeh33 Dec 11, 2024
206ffb6
Merge branch 'master' of https://github.com/ZLeh33/ALADIN
MoBenhaddia Dec 15, 2024
e55f307
Node 0 gebuildet zur Generierung der Aufgabe
ZLeh33 Dec 16, 2024
3527160
Verbindung zwischen Node 0 und NOde 1 gebaut
ZLeh33 Dec 23, 2024
6266fb1
Neue Funktionen gebaut um verschiedene Tsks zu bearbeiten
ZLeh33 Dec 26, 2024
1ae436e
values bearbeitet
ZLeh33 Dec 26, 2024
1513e20
Add new files and data structures for FermentExercises functionality
MoBenhaddia Jan 5, 2025
35dfd3f
Merge branch 'master' of https://github.com/ZLeh33/ALADIN
MoBenhaddia Jan 5, 2025
b312ea0
Refactor FermentExercises: replace phasen_eingaben.json with nutzer_e…
MoBenhaddia Jan 6, 2025
c7ef5d1
Tasj geändert
ZLeh33 Jan 6, 2025
24fdcdb
Neue Funktionen gebaut
ZLeh33 Jan 6, 2025
d6221d2
Merge branch 'master' of https://github.com/ZLeh33/ALADIN
ZLeh33 Jan 6, 2025
b1c1e17
Worker erweitert
ZLeh33 Jan 6, 2025
894e044
Add feedback_schaetzung function for comparing user estimates with so…
MoBenhaddia Jan 12, 2025
5ec1056
Merge branch 'master' of https://github.com/ZLeh33/ALADIN
MoBenhaddia Jan 12, 2025
e84f7b1
wrapper-function Fehler behoben
ZLeh33 Jan 13, 2025
7d090ab
Pfade zu lesenden Datei geändert.
ZLeh33 Jan 13, 2025
286c10e
Refactor feedback_schatzung function to improve feedback handling and…
MoBenhaddia Jan 13, 2025
375753b
Merge branch 'master' of https://github.com/ZLeh33/ALADIN
MoBenhaddia Jan 13, 2025
6c815e8
Neue Funktion "checkIsFieldReadOnly" gebaut.
ZLeh33 Jan 15, 2025
689f1cd
Anwenderdokumentation
ZLeh33 Mar 3, 2025
354ab02
Funktion get_value angepasst, um verschachtelte Dictionaries korrekt …
ZLeh33 Mar 16, 2025
3f489d4
Updates Ferment task details and descriptions
ZLeh33 Apr 7, 2025
1e2c591
Updates FermentExercises layout and labels
ZLeh33 Apr 7, 2025
3d1a248
Refactors feedback estimation logic
ZLeh33 Apr 7, 2025
bcc2e6f
Comments out plot visualization function
ZLeh33 Apr 7, 2025
b84daf3
Updates JSON key handling and file writing logic
ZLeh33 Apr 7, 2025
2d011cf
Updates fermentation calculation parameters
ZLeh33 Apr 7, 2025
8f6c8ac
Refactors parameter optimization logic
ZLeh33 Apr 7, 2025
12867f5
Adds comment for oxygen solubility unit
ZLeh33 Apr 7, 2025
4f4a4d0
Adds parameter handling and ODE solution improvements
ZLeh33 Apr 7, 2025
be49f6f
Removes outdated documentation files
ZLeh33 Apr 7, 2025
3805f12
Replaces generic input types with specific configurations for better …
ZLeh33 Apr 28, 2025
da2991e
Increases max value for "BolusC in g/L" from 50 to 200.
ZLeh33 Apr 28, 2025
778a702
Ensures integer type for loop iteration
ZLeh33 Apr 28, 2025
229ab81
Add reaction data generation in Task and new task
MoBenhaddia May 4, 2025
8c63bea
Merge branch 'master' of https://github.com/ZLeh33/ALADIN
MoBenhaddia May 4, 2025
5c20b65
Removes compiled Python cache files
ZLeh33 May 4, 2025
dce0e99
Update .gitignore, modify JSON task configurations, and replace images
ZLeh33 May 4, 2025
65a08f5
Merge branch 'master' of https://github.com/ZLeh33/ALADIN
ZLeh33 May 4, 2025
5b7158d
ADD : added JSON input handling for frontend data
ZLeh33 May 4, 2025
e2acf44
RM: Removed unused reaction data file
ZLeh33 May 4, 2025
7797962
Add. added abstract input base class and JSON input implementation fo…
ZLeh33 May 4, 2025
a77850a
CHG : Refactors parameter handling and file operations
ZLeh33 May 4, 2025
bbf0091
CHG: updates front-end configuration
ZLeh33 May 4, 2025
bd0ce29
Add: added `__init__.py` to recognize directory as a package
ZLeh33 May 4, 2025
d9aca81
Update environment configuration and Dockerfile comments for clarity
MoBenhaddia May 5, 2025
85f3dec
Merge branch 'master' of https://github.com/ZLeh33/ALADIN
MoBenhaddia May 5, 2025
f8d6dd8
reaction data structure and update Reakt.json
MoBenhaddia May 6, 2025
3ea26d6
update layout positions and component names in Reakt.json for improve…
MoBenhaddia May 6, 2025
1c5c5d0
CHG: renamed and refined task form fields. Adjusted default values, o…
ZLeh33 May 14, 2025
7fe961c
CHG : refactored input handling and reaction system logic
ZLeh33 May 14, 2025
8c85295
CHG : renamed variables. Streamlined input parsing and cleaning funct…
ZLeh33 May 14, 2025
13bf835
nicht wichtig
MoBenhaddia May 21, 2025
3cef769
Merge branch 'master' of https://github.com/ZLeh33/ALADIN
MoBenhaddia May 21, 2025
1e494cd
ADD: added in-memory file generation for Excel export
ZLeh33 Jun 22, 2025
fc055e4
ADD: added Base64 encoding for Excel export data
ZLeh33 Jun 22, 2025
db9a499
ADD: added support for Excel data in chart components
ZLeh33 Jun 29, 2025
5a227d4
Fix : Corrects the input indices used in two key calculations to ensu…
ZLeh33 Jul 20, 2025
982da74
CHG: Adjusts layout dimensions and positions in fermentation tasks
ZLeh33 Jul 20, 2025
eb8fccd
Reakt_Experiment
ZLeh33 Aug 1, 2025
74f5c7e
Merge branch 'master' of https://github.com/ZLeh33/ALADIN
MoBenhaddia Aug 1, 2025
d0b37f9
ADD: committed new state
ZLeh33 Sep 3, 2025
1002775
testCase
MoBenhaddia Sep 3, 2025
34cc47c
Merge branch 'master' of https://github.com/ZLeh33/ALADIN
MoBenhaddia Sep 3, 2025
599cca7
RM: removed unused ReaktTest task configuration-file
ZLeh33 Sep 22, 2025
36cc8f0
REMOVE: delete unused files and commented code from Ferment and Ferme…
MoBenhaddia Sep 23, 2025
13b85be
UPDATE: modify layout configuration and change component type
MoBenhaddia Sep 23, 2025
4c3fc88
Merge branch 'master' of https://github.com/ZLeh33/ALADIN
MoBenhaddia Sep 23, 2025
e6a6026
REMOVE: delete commented-out code and unused functions from berechnun…
MoBenhaddia Sep 23, 2025
0cbd69f
Zum Testen
MoBenhaddia Oct 1, 2025
e9e1d6d
UPDATE: added 'ast'
MoBenhaddia Oct 1, 2025
9207576
AST aus Component entfernt
MoBenhaddia Oct 3, 2025
acce417
ADD: created generateExperimientierenDataMain
ZLeh33 Oct 13, 2025
09a5427
Merge remote-tracking branch 'refs/remotes/origin/master'
ZLeh33 Oct 17, 2025
1f17eed
CHG: renamed function name
ZLeh33 Oct 17, 2025
9cac821
CHG: renamed task
ZLeh33 Oct 17, 2025
a301b0e
ADD: new JSON file for Experimentieren-Task
ZLeh33 Oct 17, 2025
e5f7c09
Stop tracking feedback.json
ZLeh33 Oct 17, 2025
dc8c16c
uncomment function feed_back....
MoBenhaddia Oct 19, 2025
a4efe32
RM : removed unnecessary files
ZLeh33 Nov 2, 2025
f97f1ab
CHG: Enabled call to feedback_schatzung() in feedback_schaetzung.py
ZLeh33 Nov 2, 2025
0377508
CHG: Passed taskDescription to generateExperimentierenDataMain in Exp…
ZLeh33 Nov 2, 2025
05f2030
CHG: Corrected path in find_pfad() in json_Input.py
ZLeh33 Nov 2, 2025
f32328b
CHG: Enabled import and call of feedback_schatzung() in generateFerme…
ZLeh33 Nov 2, 2025
3e6f461
CHG: Refactored wrapper function generateExperimentierenDataMain and …
ZLeh33 Nov 2, 2025
2a1c490
CHG: Changed title to ALADIN and updated script/style references in i…
ZLeh33 Nov 2, 2025
e85b725
ADD: Added new stackdump file bash.exe.stackdump
ZLeh33 Nov 2, 2025
c5b2d64
Merge branch 'master' of https://github.com/ZLeh33/ALADIN
ZLeh33 Nov 2, 2025
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
21 changes: 21 additions & 0 deletions .env
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
ALADIN_HOST=localhost
ALADIN_PORT=3000

LTI_KEY=SOME_KEY

MONGO_HOST=localhost
MONGO_PORT=27017
MONGO_USER=aladin
MONGO_PW=aladin
MONGO_DB=aladin

REVERSE_PROXY_HOST=localhost
REVERSE_PROXY_PORT=80

HUGGINGFACE_TOKEN=YOUR_TOKEN

POSTGRES_HOST=localhost
POSTGRES_DB=db
POSTGRES_USER=testUser
POSTGRES_PW=abc124
POSTGRES_PORT=5432
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,8 @@ node_modules
/dist
coverage
coverage/*
.env
.env
*.pyc
*.cpython-*


3,304 changes: 0 additions & 3,304 deletions .ipynb_checkpoints/Clusteranalyse-checkpoint.ipynb

This file was deleted.

22 changes: 22 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"workbench.colorCustomizations": {
"activityBar.activeBackground": "#93e6fc",
"activityBar.background": "#93e6fc",
"activityBar.foreground": "#15202b",
"activityBar.inactiveForeground": "#15202b99",
"activityBarBadge.background": "#fa45d4",
"activityBarBadge.foreground": "#15202b",
"commandCenter.border": "#15202b99",
"sash.hoverBorder": "#93e6fc",
"statusBar.background": "#61dafb",
"statusBar.foreground": "#15202b",
"statusBarItem.hoverBackground": "#2fcefa",
"statusBarItem.remoteBackground": "#61dafb",
"statusBarItem.remoteForeground": "#15202b",
"titleBar.activeBackground": "#61dafb",
"titleBar.activeForeground": "#15202b",
"titleBar.inactiveBackground": "#61dafb99",
"titleBar.inactiveForeground": "#15202b99"
},
"peacock.color": "#61dafb"
}
1 change: 0 additions & 1 deletion Antwort.json

This file was deleted.

3,304 changes: 0 additions & 3,304 deletions Clusteranalyse.ipynb

This file was deleted.

29 changes: 29 additions & 0 deletions bash.exe.stackdump
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
Stack trace:
Frame Function Args
0007FFFF9F80 00021006118E (00021028DEE8, 000210272B3E, 000000000000, 0007FFFF8E80) msys-2.0.dll+0x2118E
0007FFFF9F80 0002100469BA (000000000000, 000000000000, 000000000000, 000000000004) msys-2.0.dll+0x69BA
0007FFFF9F80 0002100469F2 (00021028DF99, 0007FFFF9E38, 000000000000, 000000000000) msys-2.0.dll+0x69F2
0007FFFF9F80 00021006A41E (000000000000, 000000000000, 000000000000, 000000000000) msys-2.0.dll+0x2A41E
0007FFFF9F80 00021006A545 (0007FFFF9F90, 000000000000, 000000000000, 000000000000) msys-2.0.dll+0x2A545
0001004F94B7 00021006B9A5 (0007FFFF9F90, 000000000000, 000000000000, 000000000000) msys-2.0.dll+0x2B9A5
End of stack trace
Loaded modules:
000100400000 bash.exe
7FFB27F60000 ntdll.dll
7FFAF1890000 aswhook.dll
7FFB267E0000 KERNEL32.DLL
7FFB251B0000 KERNELBASE.dll
7FFB26500000 USER32.dll
7FFB25D00000 win32u.dll
7FFB279A0000 GDI32.dll
7FFB255B0000 gdi32full.dll
7FFB256E0000 msvcp_win.dll
7FFB25BB0000 ucrtbase.dll
000210040000 msys-2.0.dll
7FFB273F0000 advapi32.dll
7FFB277B0000 msvcrt.dll
7FFB27E70000 sechost.dll
7FFB25DB0000 RPCRT4.dll
7FFB246F0000 CRYPTBASE.DLL
7FFB25910000 bcryptPrimitives.dll
7FFB27950000 IMM32.DLL
1 change: 0 additions & 1 deletion data.json

This file was deleted.

Binary file removed directed_graph.png
Binary file not shown.
14 changes: 7 additions & 7 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ services:
- ./:/server
ports:
- ${ALADIN_PORT}:${ALADIN_PORT}

reverse-proxy:
build:
context: services/nginx
Expand All @@ -25,13 +25,13 @@ services:
- ${REVERSE_PROXY_PORT}:${REVERSE_PROXY_PORT}
- ${ALADIN_PORT}:${ALADIN_PORT}
- 3000:3000

postgres_2:
build:
context: services/postgres
dockerfile: postgres.Dockerfile
container_name: postgres_2
user: 999:999
user: 999:999
environment:
POSTGRES_USER: ${POSTGRES_USER}
POSTGRES_PASSWORD: ${POSTGRES_PW}
Expand All @@ -40,7 +40,7 @@ services:
- ${POSTGRES_PORT}:${POSTGRES_PORT}
volumes:
- postgres-data:/var/lib/postgresql/data

mongodb:
build:
context: services/mongodb
Expand All @@ -55,15 +55,15 @@ services:
volumes:
- "mongodb_data:/bitnami/mongodb"
restart: unless-stopped

# maxima:
# build:
# context: services/maxima
# dockerfile: maxima.Dockerfile
# container_name: maxima
# volumes:
# - ./services/maxima/:/worker/

volumes:
mongodb_data:
postgres-data:
postgres-data:
Binary file added model_result.xlsx
Binary file not shown.
Loading