Merge pull request #181 from codeRIT/issue_128

feat: Display sign-in info on the admin detail & admin table list

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: [
@@ -25,6 +25,11 @@ var setupDataTables = function() {
       { orderable: true, data: 'active' },
       { 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', 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,6 +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", 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", searchable: false },
     }
   end
 
@@ -23,6 +28,11 @@ def data
         active: record.is_active ? '<span class="badge badge-secondary">Active</span>'.html_safe : '<span class="badge badge-danger">Inactive<span>'.html_safe,
         receive_weekly_report: yes_no_display(record.receive_weekly_report),
         created_at: display_datetime(record.created_at),
+        current_sign_in_at: display_datetime(record.current_sign_in_at),
+        last_sign_in_at: display_datetime(record.last_sign_in_at),
+        current_sign_in_ip: record.current_sign_in_ip == "::1" ? "127.0.0.1" : record.current_sign_in_ip,
+        last_sign_in_ip: record.last_sign_in_ip == "::1" ? "127.0.0.1" : record.last_sign_in_ip,
+        sign_in_count: record.sign_in_count,
       }
     end
   end

app/helpers/hackathon_manager_helper.rb

@@ -92,6 +92,9 @@ def acc_status_class(acc_status)
   end
 
   def display_datetime(datetime, opts = {})
+    if datetime.blank?
+      return ""
+    end
     opts[:relative] = true if opts[:relative].nil?
 
     formatted = ""

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

@@ -11,4 +11,9 @@
         %th Login access
         %th Weekly report
         %th Registered on
+        %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

@@ -36,6 +36,26 @@
       %b Registered:
       = display_datetime(@user.created_at)
 
+    %p
+      %b Signed-in on:
+      = display_datetime(@user.current_sign_in_at)
+
+    %p
+      %b Previous signed-in on:
+      = display_datetime(@user.last_sign_in_at)
+
+    %p
+      %b Signed-in IP:
+      = @user.current_sign_in_ip == "::1" ? "127.0.0.1" : @user.current_sign_in_ip
+
+    %p
+      %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:
+      = @user.sign_in_count
+
   .col-lg-6
     %h4.border-bottom.pb-2.mb-3 Change History
     = render "model_history", model: @user