148 Commits

Author SHA1 Message Date
Verox001
f07456a95b Reduced weekday count by one 2024-02-20 10:01:08 +01:00
08ff2cfc16 Fixed bug 2024-02-20 10:00:31 +01:00
Verox001
94fa2f567f Reverted merge commit from model 2024-02-20 09:58:34 +01:00
Yapollon
f0275108a5 Merge branch 'model' 2024-02-20 09:52:31 +01:00
Yapollon
684beb372f Profil upgrade and MORE
Very cool isn't it, totally didn't take a lot of time
2024-02-20 04:16:28 +01:00
Verox
8b9340e867 Merge remote-tracking branch 'origin/model'
# Conflicts:
#	db/SQLiteClient.py
#	models/Habit.py
#	models/HabitList.py
#	models/HabitTrackings.py
#	models/User.py
2024-02-19 20:14:55 +01:00
Yapollon
6f363a104e Profile Pictures
YES YOU HEARD RIGHT!!

I ALSO DID THE HTML!

This is the most awesome most epic addition, i sold my kidney for this.
2024-02-18 04:53:15 +01:00
Yapollon
e5709775bb fixed renaming in app.py
he guess i missed some
2024-02-16 18:04:53 +01:00
Yapollon
759c7d277f Model Overhaul
I'm done, this is the now complete code for the models and all.

To make it short:
- made some renaming that was necessary, HabitTrackings -> HabitTracking because every goddamn class is singular and not plural
- made the deletion process everywhere the same (Habit Deletion now handles the HabitTracking deletion inside the model and not through Sqlite.py)
- Some much needed comments
- Some adjustments to the HabitLists, nothing big, plus addition of update

- Also as a question, why does the HabitList have a redundant habits attribute, for now i marked this issue in the code to not forget it
2024-02-16 17:57:49 +01:00
Yapollon
252c8825d1 updated URL
found a small issue
2024-02-16 17:30:27 +01:00
Yapollon
311d568525 New UML and ER
hope this is good, also i just lost all my changes from my previous work on this so I'm pretty depressed right now, anyway still got this,... great.
2024-02-16 17:10:55 +01:00
Verox001
219c080bf5 Merge remote-tracking branch 'origin/luis' 2024-02-16 09:41:08 +01:00
a74e8b0cf1 Flammen und Namen 2024-02-16 09:28:00 +01:00
5c0a2b5886 card Tabs 2024-02-16 09:25:31 +01:00
2e790d9cf8 Merge remote-tracking branch 'origin/master' 2024-02-16 08:31:27 +01:00
Verox001
d1a1f6fb0d Reverted merge commit from model 2024-02-16 08:28:47 +01:00
Yapollon
4fcc20c880 Merge branch 'model' of https://repo.cimeyclust.com/CimeyClust/HabitTracker into model 2024-02-16 08:18:51 +01:00
Yapollon
18b63ba9a5 Create UML.dia.autosave 2024-02-16 08:18:08 +01:00
Yapollon
7600bd8f2c Fixing 2024-02-16 08:18:08 +01:00
Yapollon
6b492c5d49 Merge branch 'master' into model 2024-02-16 08:13:52 +01:00
Yapollon
91252a598b Create UML.dia.autosave 2024-02-16 08:11:25 +01:00
Yapollon
bad718289e Fixing 2024-02-16 08:11:22 +01:00
ae0e0cf907 Merge pull request 'model' (#34) from model into master
Reviewed-on: #34
2024-02-14 21:54:03 +01:00
Yapollon
4e93a2473c User Deletion
Addition to the last commit.
Adds the improved user deletion.
2024-02-14 21:03:11 +01:00
Yapollon
869ead2077 Big adjustments to the models
These adjustments address a lot of the current problems with the models, mainly the deletion process but also the addition of a add_user and remove_user function for the HabitLists.

In addition a lot of inconsistencies over the whole code were fixed and readjusted.

Thx for reading
2024-02-14 12:55:00 +01:00
ce0a6b588b gap for spacing and heatmap but unfinished 2024-02-14 11:15:37 +01:00
6143f44442 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	templates/index.html
2024-02-14 10:59:24 +01:00
Yapollon
aaeb04d4ab Heatmap done?
yes
2024-02-14 10:52:25 +01:00
Verox001
0f060e81a4 Fixed animation and color change of habit progress bar 2024-02-14 10:50:23 +01:00
Verox001
1180893dd1 Fixed Yassins code removal 2024-02-14 10:41:03 +01:00
454ce33846 Merge remote-tracking branch 'origin/master' 2024-02-14 10:36:49 +01:00
Verox001
b446bb55aa Added checked attribute again 2024-02-14 10:36:02 +01:00
Verox001
4f5dd68098 Merge remote-tracking branch 'origin/master' 2024-02-14 10:33:28 +01:00
Verox001
da22468900 Revert "Fixed date comparision"
This reverts commit 0a475b9f9970ca7880533b81b1843e28b6dea9a6.
2024-02-14 10:33:12 +01:00
Yapollon
ae1ffd21fe hotfix habit 2024-02-13 11:17:06 +01:00
3a86eb3802 spacing udn cards 2024-02-13 11:15:19 +01:00
Verox001
0a475b9f99 Fixed date comparision 2024-02-13 11:14:34 +01:00
Yapollon
e2dd7c5fdf reformating 2024-02-13 11:13:50 +01:00
Yapollon
7ad54ffb30 fixed slots 2024-02-13 10:46:54 +01:00
Verox001
32b0d3017c Fixed habit creation for lists 2024-02-13 10:07:22 +01:00
Verox001
979bfc24f9 Fixed migrate synthax 2024-02-13 09:40:07 +01:00
Verox
05b5869be7 Small update with bug fixes 2024-02-12 22:31:51 +01:00
Verox
4764112296 Finished Multi-Habit-List feature and multiple habits for each habit_list 2024-02-12 22:06:27 +01:00
Verox
4dd997ce13 Added models and relations 2024-02-12 21:07:55 +01:00
Yapollon
6464c0538e fast fix 2024-02-02 09:28:36 +01:00
c710fe7a78 Merge remote-tracking branch 'origin/master' 2024-02-02 09:24:26 +01:00
e41bc6fe03 Flammen und Namen 2024-02-02 09:24:19 +01:00
Yapollon
292408c654 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	models/Habit.py
2024-02-02 09:23:24 +01:00
Yapollon
111d11002e Improved Habit delete()
Also added that updated_at gets changed in the table for every update function!
2024-02-02 09:20:19 +01:00
Verox001
f077367be5 Finished client-side dragndrop 2024-02-02 09:10:01 +01:00