From bccf7f2fd202a5fdeb66b5fdfcc19461b51682a1 Mon Sep 17 00:00:00 2001
From: Jordan Wright <jmwright798@gmail.com>
Date: Tue, 16 Aug 2016 19:27:01 -0500
Subject: [PATCH] Fixing issue where AM/PM are not handled correctly in
 campaign scheduling

---
 static/js/app/campaign_results.js | 4 ++--
 static/js/app/campaigns.js        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/static/js/app/campaign_results.js b/static/js/app/campaign_results.js
index 63d8a6ea..90403b6b 100644
--- a/static/js/app/campaign_results.js
+++ b/static/js/app/campaign_results.js
@@ -258,7 +258,7 @@ function renderTimeline(data) {
                 '    <div class="timeline-icon ' + statuses[event.message].label + '">' +
                 '    <i class="fa ' + statuses[event.message].icon + '"></i></div>' +
                 '    <div class="timeline-message">' + escapeHtml(event.message) +
-                '    <span class="timeline-date">' + moment(event.time).format('MMMM Do YYYY h:mm') + '</span>'
+                '    <span class="timeline-date">' + moment(event.time).format('MMMM Do YYYY h:mm a') + '</span>'
             if (event.details && event.message == "Submitted Data") {
                 results += '<div class="timeline-replay-button"><button onclick="replay(' + i + ')" class="btn btn-success">'
                 results += '<i class="fa fa-refresh"></i> Replay Credentials</button></div>'
@@ -449,7 +449,7 @@ function load() {
                         type: Chartist.FixedScaleAxis,
                         divisor: 5,
                         labelInterpolationFnc: function(value) {
-                            return moment(value).format('MMMM Do YYYY h:mm')
+                            return moment(value).format('MMMM Do YYYY h:mm a')
                         }
                     },
                     axisY: {
diff --git a/static/js/app/campaigns.js b/static/js/app/campaigns.js
index 868fa7bf..559da966 100644
--- a/static/js/app/campaigns.js
+++ b/static/js/app/campaigns.js
@@ -44,7 +44,7 @@ function launch() {
                         smtp: {
                             name: $("#profile").val()
                         },
-                        launch_date: moment($("#launch_date").val(), "MM/DD/YYYY HH:mm").format(),
+                        launch_date: moment($("#launch_date").val(), "MM/DD/YYYY hh:mm a").format(),
                         groups: groups
                     }
                     // Submit the campaign