display DOD ID on user update page
This commit is contained in:
parent
f3c3332127
commit
ab42245797
@ -1,4 +1,11 @@
|
|||||||
from flask import Blueprint, render_template, g, redirect, url_for, request as http_request
|
from flask import (
|
||||||
|
Blueprint,
|
||||||
|
render_template,
|
||||||
|
g,
|
||||||
|
redirect,
|
||||||
|
url_for,
|
||||||
|
request as http_request,
|
||||||
|
)
|
||||||
from atst.forms.edit_user import EditUserForm
|
from atst.forms.edit_user import EditUserForm
|
||||||
from atst.domain.users import Users
|
from atst.domain.users import Users
|
||||||
|
|
||||||
@ -22,4 +29,3 @@ def update_user():
|
|||||||
return redirect(url_for("atst.home"))
|
return redirect(url_for("atst.home"))
|
||||||
else:
|
else:
|
||||||
return render_template("user/edit.html", form=form, user=user)
|
return render_template("user/edit.html", form=form, user=user)
|
||||||
|
|
||||||
|
@ -7,6 +7,7 @@
|
|||||||
<div class='panel__heading'>
|
<div class='panel__heading'>
|
||||||
<h1>
|
<h1>
|
||||||
<div class='h2'>{{ user.first_name }} {{ user.last_name }}</div>
|
<div class='h2'>{{ user.first_name }} {{ user.last_name }}</div>
|
||||||
|
<div class='h3'>DOD ID: {{ user.dod_id }}</div>
|
||||||
<div class='subtitle h3'>Edit user details</div>
|
<div class='subtitle h3'>Edit user details</div>
|
||||||
</h1>
|
</h1>
|
||||||
</div>
|
</div>
|
||||||
|
@ -57,7 +57,8 @@ class UserFactory(Base):
|
|||||||
citizenship = "United States"
|
citizenship = "United States"
|
||||||
designation = "military"
|
designation = "military"
|
||||||
date_latest_training = factory.LazyFunction(
|
date_latest_training = factory.LazyFunction(
|
||||||
lambda: datetime.date.today() + datetime.timedelta(days=-(random.randrange(1,365)))
|
lambda: datetime.date.today()
|
||||||
|
+ datetime.timedelta(days=-(random.randrange(1, 365)))
|
||||||
)
|
)
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
|
@ -4,6 +4,7 @@ from atst.domain.users import Users
|
|||||||
|
|
||||||
from tests.factories import UserFactory
|
from tests.factories import UserFactory
|
||||||
|
|
||||||
|
|
||||||
def test_user_can_view_profile(user_session, client):
|
def test_user_can_view_profile(user_session, client):
|
||||||
user = UserFactory.create()
|
user = UserFactory.create()
|
||||||
user_session(user)
|
user_session(user)
|
||||||
@ -15,7 +16,9 @@ def test_user_can_update_profile(user_session, client):
|
|||||||
user = UserFactory.create()
|
user = UserFactory.create()
|
||||||
user_session(user)
|
user_session(user)
|
||||||
new_data = {**user.to_dictionary(), "first_name": "chad", "last_name": "vader"}
|
new_data = {**user.to_dictionary(), "first_name": "chad", "last_name": "vader"}
|
||||||
new_data["date_latest_training"] = new_data["date_latest_training"].strftime("%m/%d/%Y")
|
new_data["date_latest_training"] = new_data["date_latest_training"].strftime(
|
||||||
|
"%m/%d/%Y"
|
||||||
|
)
|
||||||
client.post(url_for("users.user"), data=new_data)
|
client.post(url_for("users.user"), data=new_data)
|
||||||
updated_user = Users.get_by_dod_id(user.dod_id)
|
updated_user = Users.get_by_dod_id(user.dod_id)
|
||||||
assert updated_user.first_name == "chad"
|
assert updated_user.first_name == "chad"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user