VRFS-1911 fixed date formatting in app / email notifications, added session name and start time to popup notification

ruby/lib/jam_ruby/app/mailers/user_mailer.rb

@@ -223,7 +223,7 @@
         unique_args = {:type => "scheduled_session_invitation"}
         @body = msg
         @session_name = session.name
-        @session_date = session.scheduled_start
+        @session_date = session.pretty_scheduled_start(true)
         @session_url = "#{APP_CONFIG.external_root_url}/sessions/#{session.id}/details"
         sendgrid_category "Notification"
         sendgrid_unique_args :type => unique_args[:type]
@@ -242,7 +242,7 @@
         unique_args = {:type => "scheduled_session_rsvp"}
         @body = msg
         @session_name = session.name
-        @session_date = session.scheduled_start
+        @session_date = session.pretty_scheduled_start(true)
         @session_url = "#{APP_CONFIG.external_root_url}/sessions/#{session.id}/details"
         sendgrid_category "Notification"
         sendgrid_unique_args :type => unique_args[:type]
@@ -261,7 +261,7 @@
         unique_args = {:type => "scheduled_session_rsvp_approved"}
         @body = msg
         @session_name = session.name
-        @session_date = session.scheduled_start
+        @session_date = session.pretty_scheduled_start(true)
         @session_url = "#{APP_CONFIG.external_root_url}/sessions/#{session.id}/details"
         sendgrid_category "Notification"
         sendgrid_unique_args :type => unique_args[:type]
@@ -280,7 +280,7 @@
         unique_args = {:type => "scheduled_session_rsvp_cancelled"}
         @body = msg
         @session_name = session.name
-        @session_date = session.scheduled_start
+        @session_date = session.pretty_scheduled_start(true)
         @session_url = "#{APP_CONFIG.external_root_url}/sessions/#{session.id}/details"
         sendgrid_category "Notification"
         sendgrid_unique_args :type => unique_args[:type]
@@ -299,7 +299,7 @@
         unique_args = {:type => "scheduled_session_rsvp_cancelled_org"}
         @body = msg
         @session_name = session.name
-        @session_date = session.scheduled_start
+        @session_date = session.pretty_scheduled_start(true)
         @session_url = "#{APP_CONFIG.external_root_url}/sessions/#{session.id}/details"
         sendgrid_category "Notification"
         sendgrid_unique_args :type => unique_args[:type]
@@ -318,7 +318,7 @@
         unique_args = {:type => "scheduled_session_cancelled"}
         @body = msg
         @session_name = session.name
-        @session_date = session.scheduled_start
+        @session_date = session.pretty_scheduled_start(true)
         @session_url = "#{APP_CONFIG.external_root_url}/sessions/#{session.id}/details"
         sendgrid_category "Notification"
         sendgrid_unique_args :type => unique_args[:type]
@@ -337,7 +337,7 @@
         unique_args = {:type => "scheduled_session_rescheduled"}
         @body = msg
         @session_name = session.name
-        @session_date = session.scheduled_start
+        @session_date = session.pretty_scheduled_start(true)
         @session_url = "#{APP_CONFIG.external_root_url}/sessions/#{session.id}/details"
         sendgrid_category "Notification"
         sendgrid_unique_args :type => unique_args[:type]
@@ -356,7 +356,7 @@
         unique_args = {:type => "scheduled_session_reminder"}
         @body = msg
         @session_name = session.name
-        @session_date = session.scheduled_start
+        @session_date = session.pretty_scheduled_start(true)
         @session_url = "#{APP_CONFIG.external_root_url}/sessions/#{session.id}/details"
         sendgrid_category "Notification"
         sendgrid_unique_args :type => unique_args[:type]
@@ -375,7 +375,7 @@
         unique_args = {:type => "scheduled_session_comment"}
         @body = msg
         @session_name = session.name
-        @session_date = session.scheduled_start
+        @session_date = session.pretty_scheduled_start(true)
         @comment = comment
         @session_url = "#{APP_CONFIG.external_root_url}/sessions/#{session.id}/details"
         sendgrid_category "Notification"

ruby/lib/jam_ruby/models/music_session.rb

@@ -808,9 +808,9 @@ module JamRuby
         end
         end_time = start_time + duration
         if with_timezone
-        "#{start_time.strftime("%A, %B %e")}, #{start_time.strftime("%l:%M").strip}-#{end_time.strftime("%l:%M %p").strip} #{timezone_display}"
+          "#{start_time.strftime("%A, %B %e")}, #{start_time.strftime("%l:%M").strip}-#{end_time.strftime("%l:%M %p").strip} #{timezone_display}"
         else
-        "#{start_time.strftime("%A, %B %e")} - #{start_time.strftime("%l:%M%P").strip}"
+          "#{start_time.strftime("%A, %B %e")} - #{start_time.strftime("%l:%M%P").strip}"
         end
 
       else

ruby/lib/jam_ruby/models/notification.rb

@@ -597,8 +597,8 @@ module JamRuby
           music_session.id,
           source_user.photo_url,
           notification_msg,
-          music_session.description,
-          music_session.scheduled_start_time,
+          music_session.name,
+          music_session.pretty_scheduled_start(true),
           notification.id,
           notification.created_date
         )
@@ -637,8 +637,8 @@ module JamRuby
           notification_msg,
           source_user.id,
           instruments.join('|'),
-          music_session.description,
-          music_session.scheduled_start_time,
+          music_session.name,
+          music_session.pretty_scheduled_start(true),
           notification.id,
           notification.created_date
         )
@@ -671,8 +671,8 @@ module JamRuby
           target_user.id,
           music_session.id,
           notification_msg,
-          music_session.description,
-          music_session.scheduled_start_time,
+          music_session.name,
+          music_session.pretty_scheduled_start(true),
           notification.id,
           notification.created_date
         )
@@ -705,8 +705,8 @@ module JamRuby
           target_user.id,
           music_session.id,
           notification_msg,
-          music_session.description,
-          music_session.scheduled_start_time,
+          music_session.name,
+          music_session.pretty_scheduled_start(true),
           notification.id,
           notification.created_date
         )
@@ -740,8 +740,8 @@ module JamRuby
           target_user.id,
           music_session.id,
           notification_msg,
-          music_session.description,
-          music_session.scheduled_start_time,
+          music_session.name,
+          music_session.pretty_scheduled_start(true),
           notification.id,
           notification.created_date
         )
@@ -781,8 +781,8 @@ module JamRuby
             target_user.id,
             music_session.id,
             notification_msg,
-            music_session.description,
-            music_session.scheduled_start_time,
+            music_session.name,
+            music_session.pretty_scheduled_start(true),
             notification.id,
             notification.created_date
           )
@@ -824,8 +824,8 @@ module JamRuby
             target_user.id,
             music_session.id,
             notification_msg,
-            music_session.description,
-            music_session.scheduled_start_time,
+            music_session.name,
+            music_session.pretty_scheduled_start(true),
             notification.id,
             notification.created_date
           )
@@ -866,8 +866,8 @@ module JamRuby
             target_user.id,
             music_session.id,
             notification_msg,
-            music_session.description,
-            music_session.scheduled_start_time,
+            music_session.name,
+            music_session.pretty_scheduled_start(true),
             notification.id,
             notification.created_date
           )
@@ -912,8 +912,8 @@ module JamRuby
             target_user.photo_url,
             notification_msg,
             comment,
-            music_session.description,
-            music_session.scheduled_start_time,
+            music_session.name,
+            music_session.pretty_scheduled_start(true),
             notification.id,
             notification.created_date
           )

web/app/assets/javascripts/notificationPanel.js

@@ -804,15 +804,15 @@
 
         app.notify({
           "title": "Session Invitation",
-          "text": payload.msg,
+          "text": payload.msg + "<br/><br/>" + payload.session_name + "<br/>" + payload.session_date,
           "icon_url": context.JK.resolveAvatarUrl(payload.photo_url)
         }, [{
-                id: "btn-more-info",
-                text: "More Info",
-                "layout-action": "close",
-                href: JK.root_url + "/sessions/" + payload.session_id + "/details",
-                rel: "external",
-                "class": "button-orange"
+              id: "btn-more-info",
+              text: "More Info",
+              "layout-action": "close",
+              href: JK.root_url + "/sessions/" + payload.session_id + "/details",
+              rel: "external",
+              "class": "button-orange"
             }]
         );
       });
@@ -827,14 +827,14 @@
 
         app.notify({
           "title": "Session RSVP",
-          "text": payload.msg,
+          "text": payload.msg + "<br/><br/>" + payload.session_name + "<br/>" + payload.session_date,
           "icon_url": context.JK.resolveAvatarUrl(payload.photo_url)
         }, [{
-                id: "btn-manage-rsvp",
-                text: "Manage RSVP",
-                "layout-action": "close",
-                href: "/client#/account/sessionDetail/" + payload.session_id,
-                "class": "button-orange"
+              id: "btn-manage-rsvp",
+              text: "Manage RSVP",
+              "layout-action": "close",
+              href: "/client#/account/sessionDetail/" + payload.session_id,
+              "class": "button-orange"
             }]
         );
       });
@@ -848,15 +848,15 @@
 
         app.notify({
           "title": "Session RSVP Approved!",
-          "text": payload.msg,
+          "text": payload.msg + "<br/><br/>" + payload.session_name + "<br/>" + payload.session_date,
           "icon_url": context.JK.resolveAvatarUrl(payload.photo_url)
         }, [{
-                id: "btn-session-details",
-                text: "Session Details",
-                "layout-action": "close",
-                href: JK.root_url + "/sessions/" + payload.session_id + "/details",
-                rel: "external",
-                "class": "button-orange"
+              id: "btn-session-details",
+              text: "Session Details",
+              "layout-action": "close",
+              href: JK.root_url + "/sessions/" + payload.session_id + "/details",
+              rel: "external",
+              "class": "button-orange"
             }]
         );
       });
@@ -870,15 +870,15 @@
 
         app.notify({
           "title": "Session RSVP Cancelled",
-          "text": payload.msg,
+          "text": payload.msg + "<br/><br/>" + payload.session_name + "<br/>" + payload.session_date,
           "icon_url": context.JK.resolveAvatarUrl(payload.photo_url)
         }, [{
-                id: "btn-session-details",
-                text: "Session Details",
-                "layout-action": "close",
-                href: JK.root_url + "/sessions/" + payload.session_id + "/details",
-                rel: "external",
-                "class": "button-orange"
+              id: "btn-session-details",
+              text: "Session Details",
+              "layout-action": "close",
+              href: JK.root_url + "/sessions/" + payload.session_id + "/details",
+              rel: "external",
+              "class": "button-orange"
             }]
         );
       });
@@ -892,15 +892,15 @@
 
         app.notify({
           "title": "Session RSVP Cancelled",
-          "text": payload.msg,
+          "text": payload.msg + "<br/><br/>" + payload.session_name + "<br/>" + payload.session_date,
           "icon_url": context.JK.resolveAvatarUrl(payload.photo_url)
         }, [{
-                id: "btn-session-details",
-                text: "Session Details",
-                "layout-action": "close",
-                href: JK.root_url + "/sessions/" + payload.session_id + "/details",
-                rel: "external",
-                "class": "button-orange"
+              id: "btn-session-details",
+              text: "Session Details",
+              "layout-action": "close",
+              href: JK.root_url + "/sessions/" + payload.session_id + "/details",
+              rel: "external",
+              "class": "button-orange"
             }]
         );
       });
@@ -914,15 +914,15 @@
 
         app.notify({
           "title": "Session Cancelled",
-          "text": payload.msg,
+          "text": payload.msg + "<br/><br/>" + payload.session_name + "<br/>" + payload.session_date,
           "icon_url": context.JK.resolveAvatarUrl(payload.photo_url)
         }, [{
-                id: "btn-session-details",
-                text: "Session Details",
-                "layout-action": "close",
-                href: JK.root_url + "/sessions/" + payload.session_id + "/details",
-                rel: "external",
-                "class": "button-orange"
+              id: "btn-session-details",
+              text: "Session Details",
+              "layout-action": "close",
+              href: JK.root_url + "/sessions/" + payload.session_id + "/details",
+              rel: "external",
+              "class": "button-orange"
             }]
         );
       });
@@ -936,15 +936,15 @@
 
         app.notify({
           "title": "Session Rescheduled",
-          "text": payload.msg,
+          "text": payload.msg + "<br/><br/>" + payload.session_name + "<br/>" + payload.session_date,
           "icon_url": context.JK.resolveAvatarUrl(payload.photo_url)
         }, [{
-                id: "btn-session-details",
-                text: "Session Details",
-                "layout-action": "close",
-                href: JK.root_url + "/sessions/" + payload.session_id + "/details",
-                rel: "external",
-                "class": "button-orange"
+              id: "btn-session-details",
+              text: "Session Details",
+              "layout-action": "close",
+              href: JK.root_url + "/sessions/" + payload.session_id + "/details",
+              rel: "external",
+              "class": "button-orange"
             }]
         );
       });
@@ -958,15 +958,15 @@
 
         app.notify({
           "title": "Session Reminder",
-          "text": payload.msg,
+          "text": payload.msg + "<br/><br/>" + payload.session_name + "<br/>" + payload.session_date,
           "icon_url": context.JK.resolveAvatarUrl(payload.photo_url)
         }, [{
-                id: "btn-session-details",
-                text: "Session Details",
-                "layout-action": "close",
-                href: JK.root_url + "/sessions/" + payload.session_id + "/details",
-                rel: "external",
-                "class": "button-orange"
+              id: "btn-session-details",
+              text: "Session Details",
+              "layout-action": "close",
+              href: JK.root_url + "/sessions/" + payload.session_id + "/details",
+              rel: "external",
+              "class": "button-orange"
             }]
         );
       });
@@ -981,15 +981,15 @@
 
         app.notify({
           "title": "Session Comment",
-          "text": payload.msg,
+          "text": payload.msg + "<br/><br/>" + payload.session_name + "<br/>" + payload.session_date,
           "icon_url": context.JK.resolveAvatarUrl(payload.photo_url)
         }, [{
-                id: "btn-session-details",
-                text: "Session Details",
-                "layout-action": "close",
-                href: JK.root_url + "/sessions/" + payload.session_id + "/details",
-                rel: "external",
-                "class": "button-orange"
+              id: "btn-session-details",
+              text: "Session Details",
+              "layout-action": "close",
+              href: JK.root_url + "/sessions/" + payload.session_id + "/details",
+              rel: "external",
+              "class": "button-orange"
             }]
         );
       });

web/app/views/music_sessions/session_info.html.haml

@@ -28,7 +28,7 @@
       .clearall.left.w20.ib.mb10
         %strong Date/Time:
       .right.w75.ib.mb10.scheduled_start
-        = @music_session.scheduled_start
+        = @music_session.pretty_scheduled_start(true)
       .clearall.left.w20.ib.mb10
         %strong Genre:
       .right.w75.ib.mb10.genre