darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-02-06 11:23:48 -05:00
Code Issues Packages Projects Releases Wiki Activity

Work in progress.

Browse Source
This commit is contained in:
Nicholas Staples
2016-01-20 11:46:39 +00:00
parent 9266c14f46
commit 2cc9dc6995
3 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/main/forms.py
View File

@@ -61,8 +61,10 @@ class UKMobileNumber(StringField):
if len(self.data) != 9:
return
self.data = '+44 7{} {} {}'.format(*re.findall('...', self.data))
# TODO implement in the render field method.
# API's require no spaces in the number
#self.data = '+44 7{} {} {}'.format(*re.findall('...', self.data))
self.data = '+447{}{}{}'.format(*re.findall('...', self.data))
def mobile_number():

2
app/main/views/add_service.py
View File

@@ -16,7 +16,7 @@ def add_service():
heading = 'Add a new service'
if form.validate_on_submit():
user = users_dao.get_user_by_id(session['user_id'])
service_id = services_dao.insert_new_service(form.name.data, user)
service_id = services_dao.insert_new_service(form.name.data, user.id)
return redirect(url_for('main.service_dashboard', service_id=service_id))
else:
return render_template(

9
app/notify_client/api_client.py
View File

@@ -13,8 +13,8 @@ class NotificationsAdminAPIClient(NotificationsAPIClient):
def init_app(self, application):
self.base_url = application.config['API_HOST_NAME']
self.client_id = application.config['NOTIFY_API_CLIENT']
self.secret = application.config['NOTIFY_API_SECRET']
self.client_id = application.config['ADMIN_CLIENT_USER_NAME']
self.secret = application.config['ADMIN_CLIENT_SECRET']
def create_service(self, service_name, active, limit, restricted, user_id):
"""
@@ -128,6 +128,8 @@ class NotificationsAdminAPIClient(NotificationsAPIClient):
message,
job_id=None,
description=None):
print("{0} {1} {2} {3}".format(
mobile_number, message, job_id, description))
self.send_sms_notification(mobile_number, message)
def send_email(self,
@@ -137,4 +139,5 @@ class NotificationsAdminAPIClient(NotificationsAPIClient):
subject,
job_id=None,
description=None):
pass
print("{0} {1} {2} {3} {4} {5}".format(
email_address, message, from_address, subject, job_id, description))