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

Display phone number properly

Browse Source
This commit is contained in:
leigh-mil 2019-01-15 15:27:05 -05:00
parent 03e56d6efc
commit 75e831beb6
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
atst/models/task_order.py
View File

@ -8,6 +8,7 @@ import re
from atst.models import Base, types, mixins from atst.models import Base, types, mixins
from atst.utils.localization import translate from atst.utils.localization import translate
from atst.filters import usPhone
class Status(Enum): class Status(Enum):
@ -148,6 +149,17 @@ class TaskOrder(Base, mixins.TimestampsMixin):
else: else:
return None return None
@property
def ko_phone(self):
return usPhone(self.ko_phone_number)
@property
def cor_phone(self):
return usPhone(self.cor_phone_number)
@property
def so_phone(self):
return usPhone(self.so_phone_number)
def to_dictionary(self): def to_dictionary(self):
return { return {

6
templates/task_orders/new/review.html
View File

@ -154,7 +154,7 @@
<h4>{{ "task_orders.new.review.ko"| translate }}</h4> <h4>{{ "task_orders.new.review.ko"| translate }}</h4>
{{ task_order.ko_first_name }} {{ task_order.ko_last_name }}<br> {{ task_order.ko_first_name }} {{ task_order.ko_last_name }}<br>
{{ task_order.ko_email }}<br> {{ task_order.ko_email }}<br>
{{ task_order.ko_phone_number }}<br> {{ task_order.ko_phone }}<br>
{{ "task_orders.new.review.dod_id"| translate }} {{ task_order.ko_dod_id}}<br> {{ "task_orders.new.review.dod_id"| translate }} {{ task_order.ko_dod_id}}<br>
{% if task_order.ko_invite %} {% if task_order.ko_invite %}
<span class="ok">{{ Icon('ok', classes='icon--ok') }} {{ "task_orders.new.review.invited"| translate }}</span> <span class="ok">{{ Icon('ok', classes='icon--ok') }} {{ "task_orders.new.review.invited"| translate }}</span>
@ -167,7 +167,7 @@
<h4>{{ "task_orders.new.review.cor"| translate }}</h4> <h4>{{ "task_orders.new.review.cor"| translate }}</h4>
{{ task_order.cor_first_name }} {{ task_order.cor_last_name }}<br> {{ task_order.cor_first_name }} {{ task_order.cor_last_name }}<br>
{{ task_order.cor_email }}<br> {{ task_order.cor_email }}<br>
{{ task_order.cor_phone_number }}<br> {{ task_order.cor_phone }}<br>
{{ "task_orders.new.review.dod_id"| translate }} {{ task_order.cor_dod_id}}<br> {{ "task_orders.new.review.dod_id"| translate }} {{ task_order.cor_dod_id}}<br>
{% if task_order.cor_invite %} {% if task_order.cor_invite %}
<span class="ok">{{ Icon('ok', classes='icon--ok') }} {{ "task_orders.new.review.invited"| translate }}</span> <span class="ok">{{ Icon('ok', classes='icon--ok') }} {{ "task_orders.new.review.invited"| translate }}</span>
@ -181,7 +181,7 @@
<h4>{{ "task_orders.new.review.so"| translate }}</h4> <h4>{{ "task_orders.new.review.so"| translate }}</h4>
{{ task_order.so_first_name }} {{ task_order.so_last_name }}<br> {{ task_order.so_first_name }} {{ task_order.so_last_name }}<br>
{{ task_order.so_email }}<br> {{ task_order.so_email }}<br>
{{ task_order.so_phone_number }}<br> {{ task_order.so_phone }}<br>
{{ "task_orders.new.review.dod_id"| translate }} {{ task_order.so_dod_id}}<br> {{ "task_orders.new.review.dod_id"| translate }} {{ task_order.so_dod_id}}<br>
{% if task_order.so_invite %} {% if task_order.so_invite %}
<span class="ok">{{ Icon('ok', classes='icon--ok') }} {{ "task_orders.new.review.invited"| translate }}</span> <span class="ok">{{ Icon('ok', classes='icon--ok') }} {{ "task_orders.new.review.invited"| translate }}</span>