Conservancy/reimbursinator
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into review_error_msg

Browse source
This commit is contained in:
Rupika 2019-03-06 20:24:41 -08:00
commit edece4092f
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
back/backend/policy.py
View file

@ -101,6 +101,7 @@ planning_section = Section(
"preferred_flight_fare": {"number": 6, "label": "Fare of your preferred flight", "field_type": "decimal"},
"preferred_flight_duration": {"number": 7, "label": "Flight duration of your preferred flight (hours)", "field_type": "decimal"},
"international_flight": {"number": 8, "label": "Is this an international flight?", "field_type": "boolean"},
"economy_class": {"number": 9, "label": "Is your ticket in economy/coach?", "field_type": "boolean"},
}
)
@ -146,6 +147,12 @@ def departure_date_limit_rule(report, fields):
return None
planning_section.add_rule(title="Departure date limit", rule=departure_date_limit_rule)
def economy_class_rule(report, fields):
if not fields['economy_class']:
return "Only economy or coach class tickets are within policy."
planning_section.add_rule(title="Economy class check", rule=economy_class_rule)
pol.add_section(planning_section)
#### Flight Info

4
back/backend/test_report.py
View file

@ -23,8 +23,8 @@ class ReportTests(TestCase):
return r
def setUp(self):
self.test_user = self.create_test_user('one@one.com', 'One', 'Mr. One', '1password')
self.test_user.save()
self.test_user_1 = self.create_test_user('one@one.com', 'One', 'Mr. One', '1password')
self.test_user_1.save()
def test_create_report_logged_in(self):
factory = APIRequestFactory()