172 Commits

Author SHA1 Message Date
Yapollon
e20defa4e1 Merge branch 'master' of https://repo.cimeyclust.com/CimeyClust/HabitTracker 2024-03-01 08:14:20 +01:00
Yapollon
1b665b8be0 Improved user addition 2024-03-01 08:13:58 +01:00
Verox001
afb57ef077 Fixed minor bugs 2024-03-01 08:06:00 +01:00
Yapollon
a8a3382f15 Habit Streak Update++ 2024-03-01 07:53:47 +01:00
Yapollon
fc570208bf Habit Streak Update (2/2)+
Minor change
2024-02-28 14:28:31 +01:00
Yapollon
8f57c2d9e3 Merge branch 'master' of https://repo.cimeyclust.com/CimeyClust/HabitTracker 2024-02-28 14:14:20 +01:00
Yapollon
e2f1402d50 Habit Streak Update (2/2)
Yeah reworked the entire thing so that the checked, count and streak value is stored in the Habit Table
2024-02-28 14:14:10 +01:00
Verox001
2a6aa0b04f Added list_attribute addition 2024-02-28 11:18:14 +01:00
Verox001
7e9d445051 Fixed multiple list sorting 2024-02-28 10:57:48 +01:00
d0c5127c92 Merge remote-tracking branch 'origin/master' 2024-02-28 10:48:29 +01:00
ba8bc06d89 inprovements 2024-02-28 10:46:26 +01:00
Yapollon
2f7541aa55 Habit Streak Update (1/2)
first part works autonomous except the uncheck
2024-02-28 10:36:04 +01:00
9e1bd7b65e better looking html code and fixed a bug 2024-02-20 20:55:06 +01:00
0f35a67391 tabs layouts 2024-02-20 11:17:06 +01:00
Yapollon
bcfb7aaec6 Update Habit.py
Streak for Daylies was added.
2024-02-20 10:57:45 +01:00
Verox001
5138e6d25f Fixed some imports 2024-02-20 10:13:42 +01:00
Verox001
4711106653 Added get streak method again 2024-02-20 10:13:00 +01:00
Verox001
6a46104efa Fixed merge error 2024-02-20 10:12:20 +01:00
cb1991e2cc Merge remote-tracking branch 'origin/master'
# Conflicts:
#	models/Habit.py
2024-02-20 10:05:07 +01:00
7ed5dfbf58 Flammen und Namen 2024-02-20 10:02:52 +01:00
0e798adb89 Flammen und Namen 2024-02-20 10:02:26 +01:00
bbd6f27af1 Flammen und Namen 2024-02-20 10:01:36 +01:00
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
92b099b112 card Tabs
(cherry picked from commit 5c0a2b588644b4d8ad6148c2582a551d770f4261)
2024-02-20 09:49:12 +01:00
d3013a5982 card Tabs
# Conflicts:
#	templates/index.html
2024-02-20 09:48:14 +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