pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

associate ccpo user to request review

Browse Source
This commit is contained in:
dandds
2018-09-10 16:42:42 -04:00
parent 041cfe878f
commit d38261f439
6 changed files with 26 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
atst/domain/requests.py
View File

@@ -272,8 +272,8 @@ WHERE requests_with_status.status = :status
return request
@classmethod
def _add_review(cls, request, review_data):
request.latest_status.review = RequestReview(**review_data)
def _add_review(cls, user, request, review_data):
request.latest_status.review = RequestReview(reviewer=user, **review_data)
db.session.add(request)
db.session.commit()
@@ -281,13 +281,13 @@ WHERE requests_with_status.status = :status
return request
@classmethod
def accept_for_financial_verification(cls, request, review_data):
def accept_for_financial_verification(cls, user, request, review_data):
Requests.set_status(request, RequestStatus.PENDING_FINANCIAL_VERIFICATION)
return Requests._add_review(request, review_data)
return Requests._add_review(user, request, review_data)
@classmethod
def request_changes(cls, request, review_data):
def request_changes(cls, user, request, review_data):
Requests.set_status(request, RequestStatus.CHANGES_REQUESTED)
return Requests._add_review(request, review_data)
return Requests._add_review(user, request, review_data)

5
atst/models/request_review.py
View File

@@ -1,4 +1,4 @@
from sqlalchemy import Column, BigInteger, String
from sqlalchemy import Column, BigInteger, String, ForeignKey
from sqlalchemy.orm import relationship
from atst.models import Base
@@ -10,6 +10,9 @@ class RequestReview(Base):
id = Column(BigInteger, primary_key=True)
status = relationship("RequestStatusEvent", back_populates="review")
user_id = Column(ForeignKey("users.id"), nullable=False)
reviewer = relationship("User")
comment = Column(String)
fname_mao = Column(String)
lname_mao = Column(String)

6
atst/routes/requests/approval.py
View File

@@ -60,9 +60,11 @@ def submit_approval(request_id):
form = CCPOReviewForm(http_request.form)
if form.validate():
if http_request.form.get("approved"):
Requests.accept_for_financial_verification(request, form.data)
Requests.accept_for_financial_verification(
g.current_user, request, form.data
)
else:
Requests.request_changes(request, form.data)
Requests.request_changes(g.current_user, request, form.data)
return redirect(url_for("requests.requests_index"))
else: