Skip to content

Commit

Permalink
resolve confilcts
Browse files Browse the repository at this point in the history
  • Loading branch information
@ananya173147
ananya173147 committed Nov 25, 2023
2 parents d6a7121 + cc69bc0 commit 1a84b6d
Show file tree
Hide file tree
Showing 9 changed files with 629 additions and 559 deletions.
108 changes: 58 additions & 50 deletions application.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -184,42 +184,33 @@ def user_profile():
Output: Value update in database and redirected to home login page
"""
if session.get('email'):
curr_profile = list(mongo.db.user.find({'email':session.get('email')}))
print(curr_profile)
form = UserProfileForm()
if form.validate_on_submit():
if request.method == 'POST':
email = session.get('email')
weight = request.form.get('weight')
height = request.form.get('height')
goal = request.form.get('goal')
target_weight = request.form.get('target_weight')
temp = mongo.db.profile.find_one(
{'email': email},
{'height', 'weight', 'goal', 'target_weight'})
if temp is not None:
mongo.db.profile.update_one({'email': email}, {
'$set': {
'weight': temp['weight'],
'height': temp['height'],
'goal': temp['goal'],
'target_weight': temp['target_weight']
}
})
else:
mongo.db.profile.insert_one({
'email': email,
'height': height,
'weight': weight,
'goal': goal,
'target_weight': target_weight
})
new_weight = request.form.get('weight')
new_height = request.form.get('height')
new_goal = request.form.get('goal')
new_target_weight = request.form.get('target_weight')
mongo.db.user.update_one({'email': email}, {
'$set': {
'weight': new_weight,
'height': new_height,
'goal': new_goal,
'target_weight': new_target_weight
}
})


flash(f'User Profile Updated', 'success')
return render_template('display_profile.html',
status=True,
form=form)
else:
return redirect(url_for('login'))
return render_template('user_profile.html', status=True, form=form)
return render_template('user_profile.html', status=True, form=form, curr_profile=curr_profile)


@app.route("/calories", methods=['GET', 'POST'])
Expand All @@ -232,7 +223,7 @@ def calories():
Output: Value update in database and redirected to the home page
"""
get_session = session.get('email')
print(get_session)
# print(get_session)
if get_session is not None:
form = CalorieForm()
if form.validate_on_submit():
Expand Down Expand Up @@ -267,7 +258,7 @@ def workout():
if form.validate_on_submit():
email = session.get('email')
burnout = form.burnout.data
print(burnout)
# print(burnout)
mongo.db.workout.insert_one({
'date': form.date.data.strftime('%Y-%m-%d'), # Get the selected date from the form
'email': email,
Expand Down Expand Up @@ -330,12 +321,12 @@ def history():
user_target_date = mongo.db.user.find({'email': email})[0]['target_date']
target_weight = mongo.db.user.find({'email': email})[0]['target_weight']
current_weight = mongo.db.user.find({'email': email})[0]['weight']
print(current_weight, target_weight, type(user_start_date), datetime.today().strftime('%Y-%m-%d'))
# print(current_weight, target_weight, type(user_start_date), datetime.today().strftime('%Y-%m-%d'))

# Find out the actual calories which user needed to burn/gain to achieve goal from the start day
target_calories_to_burn = u.total_calories_to_burn(
target_weight=int(target_weight), current_weight=int(current_weight))
print(f'########## {target_calories_to_burn}')
# print(f'########## {target_calories_to_burn}')

# Find out how many calories user has gained or burnt uptill now
query = {
Expand Down Expand Up @@ -383,7 +374,7 @@ def ajaxhistory():
# Output: date, email, calories, burnout
# ##########################
email = get_session = session.get('email')
print(email)
# print(email)
if get_session is not None:
if request.method == "POST":
date = request.form.get('date')
Expand Down Expand Up @@ -433,7 +424,7 @@ def friends():
for f in myFriends:
myFriendsList.append(f['receiver'])

print(myFriends)
# print(myFriends)
allUsers = list(mongo.db.user.find({}, {'name', 'email'}))

pendingRequests = list(
Expand All @@ -454,7 +445,7 @@ def friends():
for p in pendingApprovals:
pendingApproves.append(p['sender'])

print(pendingApproves)
# print(pendingApproves)

# print(pendingRequests)
return render_template('friends.html',
Expand All @@ -480,6 +471,14 @@ def bmi_calci():

return render_template("bmi_cal.html", bmi=bmi, bmi_category=bmi_category)

@app.route('/plans', methods=['GET', 'POST'])
def plans():

if(session.get('email')):
email = get_session = session.get('email')
enrolled_plans = list(mongo.db.plans.find({'Email': email}))
return render_template("plans.html",enrolled_plans=enrolled_plans)


@app.route('/chatbot', methods=['GET', 'POST'])
def chatbot():
Expand Down Expand Up @@ -757,10 +756,11 @@ def yoga():
if form.validate_on_submit():
if request.method == 'POST':
enroll = "yoga"
mongo.db.user.insert_one({'Email': email, 'Status': enroll})
mongo.db.plans.insert_one({'Email': email, 'Status': enroll})
enrolled_plans = list(mongo.db.plans.find({'Email':email}))
flash(f' You have succesfully enrolled in our {enroll} plan!',
'success')
return render_template('new_dashboard.html', form=form)
return render_template('new_dashboard.html', form=form, enrolled_plans=enrolled_plans)
# return redirect(url_for('dashboard'))
else:
return redirect(url_for('dashboard'))
Expand All @@ -782,10 +782,11 @@ def swim():
if form.validate_on_submit():
if request.method == 'POST':
enroll = "swimming"
mongo.db.user.insert_one({'Email': email, 'Status': enroll})
mongo.db.plans.insert_one({'Email': email, 'Status': enroll})
enrolled_plans = list(mongo.db.plans.find({'Email':email}))
flash(f' You have succesfully enrolled in our {enroll} plan!',
'success')
return render_template('new_dashboard.html', form=form)
return render_template('new_dashboard.html', form=form, enrolled_plans=enrolled_plans)
# return redirect(url_for('dashboard'))
else:
return redirect(url_for('dashboard'))
Expand All @@ -807,10 +808,11 @@ def abbs():
if form.validate_on_submit():
if request.method == 'POST':
enroll = "abbs"
mongo.db.user.insert_one({'Email': email, 'Status': enroll})
mongo.db.plans.insert_one({'Email': email, 'Status': enroll})
enrolled_plans = list(mongo.db.plans.find({'Email':email}))
flash(f' You have succesfully enrolled in our {enroll} plan!',
'success')
return render_template('new_dashboard.html', form=form)
return render_template('new_dashboard.html', form=form, enrolled_plans=enrolled_plans)
else:
return redirect(url_for('dashboard'))
return render_template('abbs.html', title='Abbs Smash!', form=form)
Expand All @@ -831,10 +833,11 @@ def belly():
if form.validate_on_submit():
if request.method == 'POST':
enroll = "belly"
mongo.db.user.insertOne({'Email': email, 'Status': enroll})
mongo.db.plans.insert_one({'Email': email, 'Status': enroll})
enrolled_plans = list(mongo.db.plans.find({'Email':email}))
flash(f' You have succesfully enrolled in our {enroll} plan!',
'success')
return render_template('new_dashboard.html', form=form)
return render_template('new_dashboard.html', form=form, enrolled_plans=enrolled_plans)
# return redirect(url_for('dashboard'))
else:
return redirect(url_for('dashboard'))
Expand All @@ -856,10 +859,11 @@ def core():
if form.validate_on_submit():
if request.method == 'POST':
enroll = "core"
mongo.db.user.insert_one({'Email': email, 'Status': enroll})
mongo.db.plans.insert_one({'Email': email, 'Status': enroll})
enrolled_plans = list(mongo.db.plans.find({'Email':email}))
flash(f' You have succesfully enrolled in our {enroll} plan!',
'success')
return render_template('new_dashboard.html', form=form)
return render_template('new_dashboard.html', form=form, enrolled_plans=enrolled_plans)
else:
return redirect(url_for('dashboard'))
return render_template('core.html', title='Core Conditioning', form=form)
Expand All @@ -880,10 +884,11 @@ def gym():
if form.validate_on_submit():
if request.method == 'POST':
enroll = "gym"
mongo.db.user.insert_one({'Email': email, 'Status': enroll})
mongo.db.plans.insert_one({'Email': email, 'Status': enroll})
enrolled_plans = list(mongo.db.plans.find({'Email':email}))
flash(f' You have succesfully enrolled in our {enroll} plan!',
'success')
return render_template('new_dashboard.html', form=form)
return render_template('new_dashboard.html', form=form, enrolled_plans=enrolled_plans)
# return redirect(url_for('dashboard'))
else:
return redirect(url_for('dashboard'))
Expand All @@ -905,10 +910,11 @@ def walk():
if form.validate_on_submit():
if request.method == 'POST':
enroll = "walk"
mongo.db.user.insert_one({'Email': email, 'Status': enroll})
mongo.db.plans.insert_one({'Email': email, 'Status': enroll})
enrolled_plans = list(mongo.db.plans.find({'Email':email}))
flash(f' You have succesfully enrolled in our {enroll} plan!',
'success')
return render_template('new_dashboard.html', form=form)
return render_template('new_dashboard.html', form=form, enrolled_plans=enrolled_plans)
# return redirect(url_for('dashboard'))
else:
return redirect(url_for('dashboard'))
Expand All @@ -930,10 +936,11 @@ def dance():
if form.validate_on_submit():
if request.method == 'POST':
enroll = "dance"
mongo.db.user.insert_one({'Email': email, 'Status': enroll})
mongo.db.plans.insert_one({'Email': email, 'Status': enroll})
enrolled_plans = list(mongo.db.plans.find({'Email':email}))
flash(f' You have succesfully enrolled in our {enroll} plan!',
'success')
return render_template('new_dashboard.html', form=form)
return render_template('new_dashboard.html', form=form, enrolled_plans=enrolled_plans)
# return redirect(url_for('dashboard'))
else:
return redirect(url_for('dashboard'))
Expand All @@ -955,10 +962,11 @@ def hrx():
if form.validate_on_submit():
if request.method == 'POST':
enroll = "hrx"
mongo.db.user.insert_one({'Email': email, 'Status': enroll})
mongo.db.plans.insert_one({'Email': email, 'Status': enroll})
enrolled_plans = list(mongo.db.plans.find({'Email':email}))
flash(f' You have succesfully enrolled in our {enroll} plan!',
'success')
return render_template('new_dashboard.html', form=form)
return render_template('new_dashboard.html', form=form, enrolled_plans=enrolled_plans)
# return redirect(url_for('dashboard'))
else:
return redirect(url_for('dashboard'))
Expand Down
1 change: 0 additions & 1 deletion service/history.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ def get_calories_per_day_pipeline(days: int):
end_date = datetime.today()
bucket_boundaries = [(start_date + timedelta(days=i)).strftime('%Y-%m-%d')
for i in range(days + 1)]
print(bucket_boundaries)
date_range_filter = {
'$match': {
'date': {
Expand Down
Loading

0 comments on commit 1a84b6d

Please sign in to comment.