update changes on per Stuart's request

Author: dquach217

app/assets/javascripts/manage/lib/setupDataTables.js

@@ -4,7 +4,7 @@
  * See app/views/manage/application/_questionnaire_datatable.html.haml for an example.
  */
 
-var setupDataTables = function() {
+var setupDataTables = function () {
   $('.datatable.checkins').DataTable({
     order: [1, 'asc'],
     columns: [
@@ -26,10 +26,10 @@ var setupDataTables = function() {
       { orderable: true, data: 'receive_weekly_report' },
       { orderable: true, data: 'created_at' },
       { orderable: true, data: 'current_sign_in_at' },
-      { orderable: true, data: 'last_sign_in_at' },
-      { orderable: true, data: 'current_sign_in_ip' },
-      { orderable: true, data: 'last_sign_in_ip' },
-      { orderable: true, data: 'sign_in_count' },
+      { orderable: true, data: 'last_sign_in_at', visible: false },
+      { orderable: true, data: 'current_sign_in_ip', visible: false },
+      { orderable: true, data: 'last_sign_in_ip', visible: false },
+      { orderable: true, data: 'sign_in_count', visible: false },
     ],
   });
 

app/datatables/admin_datatable.rb

@@ -9,11 +9,11 @@ def view_columns
       active: { source: "User.is_active", searchable: false },
       receive_weekly_report: { source: "User.receive_weekly_report", searchable: false },
       created_at: { source: "User.created_at", searchable: false },
-      current_sign_in_at: { source: "User.current_sign_in_at" },
-      last_sign_in_at: { source: "User.last_sign_in_at" },
+      current_sign_in_at: { source: "User.current_sign_in_at", searchable: false  },
+      last_sign_in_at: { source: "User.last_sign_in_at", searchable: false  },
       current_sign_in_ip: { source: "User.current_sign_in_ip" },
       last_sign_in_ip: { source: "User.last_sign_in_ip" },
-      sign_in_count: { source: "User.sign_in_count" },
+      sign_in_count: { source: "User.sign_in_count", searchable: false  },
     }
   end
 

app/views/manage/admins/index.html.haml

@@ -11,9 +11,9 @@
         %th Login access
         %th Weekly report
         %th Registered on
-        %th Signed-in
-        %th Previous Signed-in
-        %th IP
-        %th Last IP
-        %th Sign-in Count
+        %th Signed-in on
+        %th Previous signed-in on
+        %th Signed-in IP
+        %th Previous signed-in IP
+        %th Sign-in count
     %tbody

app/views/manage/admins/show.html.haml

@@ -37,23 +37,23 @@
       = display_datetime(@user.created_at)
 
     %p
-      %b Signed-in:
+      %b Signed-in on:
       = display_datetime(@user.current_sign_in_at)
 
     %p
-      %b Previous Signed-in:
+      %b Previous signed-in on:
       = display_datetime(@user.last_sign_in_at)
 
     %p
-      %b IP:
+      %b Signed-in IP:
       = @user.current_sign_in_ip == "::1" ? "127.0.0.1" : @user.current_sign_in_ip
 
     %p
-      %b Last IP:
+      %b Previous signed-in IP:
       = @user.last_sign_in_ip == "::1" ? "127.0.0.1" : @user.last_sign_in_ip
 
     %p
-      %b Sign-in Count:
+      %b Sign-in count:
       = @user.sign_in_count
 
   .col-lg-6