Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop

web/app/assets/javascripts/scheduled_session.js

@@ -51,6 +51,9 @@
     var $createTypes = null;
     var $createTypeHelpers = null;
     var $scheduledSessions = null;
+    var $fetchingSpinner = null;
+    var $fetchingSpinnerLabel = null;
+    var $noSessionFound = null;
     var scheduledSessions = {};
 
     // Step4 layout
@@ -87,7 +90,6 @@
     function afterLoadScheduledSessions(sessionList) {
       $scheduledSessions.empty();
 
-      var $noSessionFound = $("#scheduled-session-not-found");
       createSessionSettings.session_count = sessionList.length;
 
       if (createSessionSettings.session_count == 0) {
@@ -167,9 +169,17 @@
     }
 
     function beforeShowStep1() {
+      $noSessionFound.hide();
+      $fetchingSpinner.show();
+      $fetchingSpinnerLabel.show();
+
       rest.findScheduledSessions({})
         .done(afterLoadScheduledSessions)
-        .fail(app.ajaxError);
+        .fail(app.ajaxError)
+        .always(function(response) {
+          $fetchingSpinner.hide();
+          $fetchingSpinnerLabel.hide();
+        });
 
       rest.getUserDetail()
         .done(afterLoadUserDetail)
@@ -1185,8 +1195,11 @@
       $editScheduledSessions = $screen.find('#edit_scheduled_sessions');
       $btnSelectFiles = $screen.find('.btn-select-files');
       $selectedFilenames = $screen.find('#selected-filenames');
-      $uploadSpinner = $screen.find($('.upload-spinner'));
+      $uploadSpinner = $screen.find('#file-upload-spinner');
       $policyTypes = $screen.find('input[name="session-policy-type"]');
+      $fetchingSpinner = $screen.find('#fetching-spinner');
+      $fetchingSpinnerLabel = $screen.find('#fetching-spinner-label');
+      $noSessionFound = $screen.find("#scheduled-session-not-found");
 
       initializeControls();
       events();

web/app/assets/stylesheets/client/createSession.css.scss

@@ -114,6 +114,7 @@
       .session-list {
         height: 250px;
         overflow: auto;
+        text-align: center;
 
         ul#scheduled-session-list {
           margin-left: 0px;
@@ -125,6 +126,16 @@
       }
     }
 
+    #fetching-spinner {
+      position: relative;
+      margin-top: 30px;
+      margin-left: 45%;
+    }
+
+    #fetching-spinner-label {
+      font-size: 13px;
+    }
+
     ul#scheduled-session-list {
       li {
         padding: 3px 0px;

web/app/views/clients/_scheduledSession.html.erb

@@ -112,6 +112,9 @@
                       <div id="scheduled-session-not-found">
                         You currently have no scheduled sessions.
                       </div>
+                      <div class="spinner-small upload-spinner" id="fetching-spinner">
+                      </div>
+                      <span id="fetching-spinner-label">Fetching your scheduled sessions...</span>
                       <ul id="scheduled-session-list">
                       </ul>
                     </div>
@@ -199,7 +202,7 @@
                   <div class="w50 left">
                     <h3 class="hb3">Upload music notation for your session (optional):</h3>
                     <div>
-                      <div class="spinner-small upload-spinner"></div>
+                      <div class="spinner-small upload-spinner" id="file-upload-spinner"></div>
                       <div class="select-files-section">
                         <a class="button-orange btn-select-files" href="#">SELECT FILES...</a>
                         <input type="file" class="hidden" id="session-select-files" value="Select Files..."