Merge branch 'master' of https://repo.cimeyclust.com/CimeyClust/HabitTracker

some changes i had on my local folder

app.py

@@ -780,8 +780,7 @@ def password_change():
     current_user.update()
 
     # Back to profile
-    return render_template(
-        "profile.html",
+    return render_template("profile.html",
         name=current_user.name,
         email=current_user.email,
         profile_image_url=current_user.profile_image,
@@ -831,7 +830,7 @@ def save_profile_image(image_file):
         # Save the modified frames as a new GIF
         output_gif_path = os.path.join(app.config['UPLOAD_FOLDER'], filename.replace(".jpg", ".gif"))
         processed_frames[0].save(output_gif_path, save_all=True, append_images=processed_frames[1:], loop=0)
-        current_user.profile_image = output_gif_path
+        return output_gif_path
     else:
         # Process single image
         processed_image = process_frame(image, size=(256, 256))
@@ -840,10 +839,7 @@ def save_profile_image(image_file):
         # Save the processed image
         image_path = os.path.join(app.config['UPLOAD_FOLDER'], filename.replace(".gif", ".jpg"))
         processed_image.save(image_path, 'JPEG', quality=100)
-        current_user.profile_image = image_path
-
-    # Update user profile
-    current_user.update()
+        return image_path
 
 @app.route('/upload', methods=['POST'])
 @login_required
@@ -852,7 +848,11 @@ def upload_profile_image():
         return 'No file part'
 
     file = request.files['file']
-    save_profile_image(file)
+    image_path = save_profile_image(file)
+
+    # Update the User
+    current_user.profile_image = image_path
+    current_user.update()
 
     # Back to profile
     return redirect(url_for('profile'))

models/User.py

@@ -77,18 +77,18 @@ class User(UserMixin):
     # Returns all heatmap-values from the last 28 days
     def get_heatmap(self) -> tuple:
         # get current day of week as integer. monday is 0 and sunday is 6
-        weekday = datetime.today().weekday()
+        weekday =  6 - datetime.today().weekday()
         heatmap = [100]
 
         # append the heatmap values of the current week
-        for day in range(0, 6-weekday):
+        for day in range(0, weekday):
             heatmap.append(0)
 
-        for day in range (0, 28-(6-weekday)):
+        for day in range (0, 28-weekday):
             value = get_heatmap_value(self.id, day)
             heatmap.append(value)
         heatmap.reverse()
-        day = 27-(6-weekday)
+        day = 27-weekday
         return heatmap, day
 
     def accept_List(self, HabitList_id):

static/script/script-profile.js

@@ -50,7 +50,6 @@ document.addEventListener("DOMContentLoaded", function() {
         validateForm()
             .then(isValid => {
                 if (isValid) {
-                    console.log("Validated 2");
                     editForm.submit();
                 }
             })