[New] User search records page (#349)

CDH-Studio · Nov 26, 2019 · ba3475c · ba3475c
1 parent f4e9888
commit ba3475c
Show file tree

Hide file tree

Showing 10 changed files with 287 additions and 2 deletions.
diff --git a/app/Controllers/Http/RoomController.js b/app/Controllers/Http/RoomController.js
@@ -12,6 +12,7 @@ const Review = use('App/Models/Review');
 const Helpers = use('Helpers');
 const Event = use('Event');
 const Outlook = new (use('App/Outlook'))();
+const SearchRecord = use('App/Models/SearchRecord');
 
 // Used for time related calcuklations and formatting
 const moment = require('moment');
@@ -609,9 +610,11 @@ class RoomController {
 		}
 	}
 
-	async flexibleSearchRooms ({ request, view, response, antl }) {
+	async flexibleSearchRooms ({ request, view, response, antl, auth }) {
 		const options = request.all();
 
+		this.saveSearchRecord({ userId: auth.user.id, type: 'flexible' });
+
 		let timeSlots = [];
 		// Generate randome code for pusher
 		const code = random(4);
@@ -654,10 +657,12 @@ class RoomController {
 	 *
 	 * @param {Object} Context The context object.
 	 */
-	async fixedSearchRooms ({ request, view, antl }) {
+	async fixedSearchRooms ({ request, view, antl, auth }) {
 		// importing forms from search form
 		const options = request.all();
 
+		this.saveSearchRecord({ userId: auth.user.id, type: 'fixed' });
+
 		let rooms = (await Room.filterRooms(options.fixedSearchFloor, options.fixedSearchSeats, options.fixedSearchCapacity, options.fixedSearchFeatures)).toJSON();
 
 		// calculate duration of meeting
@@ -679,6 +684,13 @@ class RoomController {
 		return view.render('userPages.fixedSearchResults', { code: code, roomsLength: rooms.length, floors: floors });
 	}
 
+	async saveSearchRecord ({ userId, type }) {
+		const record = new SearchRecord();
+		record.user_id = userId;
+		record.type = type;
+		record.save();
+	}
+
 	/**
 	*
 	* Retrieve currently available rooms and returns and array of size 2 with results

diff --git a/app/Controllers/Http/SearchRecordController.js b/app/Controllers/Http/SearchRecordController.js
@@ -0,0 +1,19 @@
+'use strict';
+const SearchRecord = use('App/Models/SearchRecord');
+const moment = require('moment');
+
+class SearchRecordController {
+	async viewSearchRecords ({ view }) {
+		const records = (await SearchRecord
+			.query()
+			.with('user')
+			.fetch()).toJSON();
+
+		return view.render('adminPages.viewSearchRecords', {
+			records,
+			moment
+		});
+	}
+}
+
+module.exports = SearchRecordController;
diff --git a/app/Models/SearchRecord.js b/app/Models/SearchRecord.js
@@ -0,0 +1,12 @@
+'use strict';
+
+/** @type {typeof import('@adonisjs/lucid/src/Lucid/Model')} */
+const Model = use('Model');
+
+class SearchRecord extends Model {
+	user () {
+		return this.belongsTo('App/Models/User');
+	}
+}
+
+module.exports = SearchRecord;
diff --git a/app/Models/User.js b/app/Models/User.js
@@ -66,6 +66,10 @@ class User extends Model {
 		return this.belongsTo('App/Models/UserRole', 'role_id');
 	}
 
+	searchRecords () {
+		return this.hasMany('App/Models/SearchRecord');
+	}
+
 	async getUserRole () {
 		try {
 			var role = await UserRole.findOrFail(this.role_id);

diff --git a/database/migrations/1574453600440_search_record_schema.js b/database/migrations/1574453600440_search_record_schema.js
@@ -0,0 +1,21 @@
+'use strict';
+
+/** @type {import('@adonisjs/lucid/src/Schema')} */
+const Schema = use('Schema');
+
+class SearchRecordSchema extends Schema {
+	up () {
+		this.create('search_records', (table) => {
+			table.increments();
+			table.integer('user_id').unsigned().references('id').inTable('users');
+			table.string('type', 20).notNullable();
+			table.timestamps();
+		});
+	}
+
+	down () {
+		this.drop('search_records');
+	}
+}
+
+module.exports = SearchRecordSchema;
diff --git a/public/css/viewSearchRecords.css b/public/css/viewSearchRecords.css
@@ -0,0 +1,3 @@
+.dataTables_filter { 
+    display: none; 
+}
diff --git a/public/js/searchRecords.js b/public/js/searchRecords.js
@@ -0,0 +1,115 @@
+(function() {
+    function setTotal() {
+        $('#total').text(total);
+    }
+
+    function resetTotal() {
+        total = 0;
+    }
+
+    function setStartDate(interval) {
+        return moment().subtract(interval, 'days').format('YYYY-MM-DD');
+    }
+
+    function drawTable() {
+        resetTotal();
+        table.draw();
+        setTotal();
+    }
+
+    var startDate = setStartDate(7);
+    var typeFilter = '';
+    var table;
+    var total = 0;
+    var username = '';
+
+    $(document).ready(function() {
+        $.fn.dataTable.ext.search.push(
+            function( settings, data, dataIndex ) {
+                var date = data[2];
+                var type = data[1];
+                var user = data[0];
+
+                var condition = date > startDate && 
+                    (typeFilter === ''? true : (type === typeFilter)) && 
+                    (user.toLowerCase().includes(username.toLowerCase()));
+
+                if (condition) {
+                    total++;  
+                }
+
+                return condition;
+            }
+        ); 
+
+        table = $('#searchRecordsTable').DataTable({
+            "paging":   true,
+            "order": [[ 2, "desc" ]],
+            "bLengthChange": false,
+            "bInfo": false
+        });
+    });
+
+    //= ========================================================================
+    // Search type filter
+    //= ========================================================================
+    $('#dropdownType-All').on('click', function() {
+        $('#dropdownType').text('All');
+
+        typeFilter = '';
+        drawTable();
+    })
+
+    $('#dropdownType-Fixed').on('click', function() {
+        $('#dropdownType').text('Fixed');
+
+        typeFilter = 'fixed';
+        drawTable();
+    })
+
+    $('#dropdownType-Flexible').on('click', function() {
+        $('#dropdownType').text('Flexible');
+
+        typeFilter = 'flexible';
+        drawTable();
+    })
+
+    //= ========================================================================
+    // Time filter
+    //= ========================================================================
+    $('#dropdownTime-7d').on('click', function() {
+        $('#dropdownTime').text('7 days');
+
+        startDate = setStartDate(7);
+        drawTable();
+    })
+
+    $('#dropdownTime-30d').on('click', function() {
+        $('#dropdownTime').text('30 days');
+
+        startDate = setStartDate(30);
+        drawTable();
+    })
+
+    $('#dropdownTime-60d').on('click', function() {
+        $('#dropdownTime').text('60 days');
+
+        startDate = setStartDate(60);
+        drawTable();
+    })
+
+    $('#dropdownTime-360d').on('click', function() {
+        $('#dropdownTime').text('360 days');
+
+        startDate = setStartDate(360);
+        drawTable();
+    })
+
+    //= ========================================================================
+    // User filter
+    //= ========================================================================
+    $('#user').keyup(function() {
+        username = $('#user').val();
+        drawTable();
+    })
+})();
diff --git a/resources/views/adminPages/viewSearchRecords.edge b/resources/views/adminPages/viewSearchRecords.edge
@@ -0,0 +1,95 @@
+@layout('layouts.mainLayout')
+
+@section('title')
+    User search records {{-- french --}}
+@endsection
+
+@section('extracss')
+    {{ style('css/manageBookings') }}
+    {{ style('css/viewSearchRecords') }}
+	{{--  Bootstrap link needed for the table formating  --}}
+	<link href='https://cdn.datatables.net/1.10.19/css/dataTables.bootstrap4.min.css' rel='stylesheet'>
+@endsection
+
+{{--  Manage bookings page content  --}}
+@section('content')
+    {{--  Loading page header  --}}
+    @component('components.pageHeader', title='User search records')
+	@endcomponent
+	<div class="row mb-4 mt-0">
+        <div class="col-12 text-left">
+            <div class="row mb-2 mt-0">
+                <div class="col-6 col-lg-2 text-left">
+                    <strong>Type:</strong></br>
+                    <div class="dropdown d-inline">
+                        <button class="btn btn-secondary dropdown-toggle text-center shadow" type="button" id="dropdownType" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" style="width:100%">
+                            All
+                        </button>
+                        <div class="dropdown-menu text-center" id='menu1' aria-labelledby="dropdownType" style="width:100%">
+                            <a class="dropdown-item" id='dropdownType-All' href="#" selected='selected'>All</a>
+                            <a class="dropdown-item" id='dropdownType-Fixed' href="#">Fixed</a>
+                            <a class="dropdown-item" id='dropdownType-Flexible' href="#">Flexible</a>
+                        </div>
+                    </div>
+                </div>
+
+                <div class="col-6 col-lg-2 text-left">
+                    <strong>Past:</strong></br>
+                    <div class="dropdown d-inline">
+                        <button class="btn btn-secondary dropdown-toggle text-center shadow" type="button" id="dropdownTime" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" style="width:100%">
+                            7 days
+                        </button>
+                        <div class="dropdown-menu text-center" id='menu2' aria-labelledby="dropdownTime" style="width:100%">
+                            <a class="dropdown-item" id='dropdownTime-7d' href="#" value=7>7 days</a>
+                            <a class="dropdown-item" id='dropdownTime-30d' href="#">30 days</a>
+                            <a class="dropdown-item" id='dropdownTime-60d' href="#">60 days</a>
+                            <a class="dropdown-item" id='dropdownTime-360d' href="#">360 days</a>
+                        </div>
+                    </div>
+                </div>
+
+                <div class="col-8 col-lg-2 text-left">
+                        <strong>User:</strong></br>
+                        <input type="text" class="form-control" aria-label="Username" aria-describedby="basic-addon1" width="100%" id='user'>
+                    </div>
+            </div>
+        </div>
+	</div>
+
+    @component('components.generalCard', title='Search records')
+		@slot('body')
+			<strong>Total: </strong><strong id='total'>{{records.length}}</strong>
+			<div class="table table-responsive">
+				<table id='searchRecordsTable' class='table table-hover' style='width:100%;'>
+					<thead>
+						<tr>
+							<th scope='col' aria-label='Room column' class='text-center'>{{antl.formatMessage('manageBookings.tableName')}}</th>
+							<th scope='col' aria-label='Room column' class='text-center'>Type</th>
+							<th scope='col' aria-label='Meeting name column'  class='text-center'>{{antl.formatMessage('manageBookings.tableDate')}}</th>
+							<th scope='col' aria-label='Date column' class='text-center'>{{antl.formatMessage('manageBookings.tableTime')}}</th>
+						</tr>
+					</thead>
+					<tbody>
+						@each(record in records) 
+							{{--  <tr aria-label='{{booking.subject}} row'>  --}}
+								<td class='text-center'><a href='{{ route('viewProfile', {id: record.user_id}) }}'>{{ truncate(record.user.firstname, 5, '.') }} {{ truncate(record.user.lastname, 5, '.') }}</a></td>
+								<td class='text-center'>{{ record.type }}</td>
+								<td class='text-center'>{{ moment(record.created_at).format("YYYY-MM-DD"); }}</td>
+								<td class='text-center'>{{ moment(record.created_at).format("HH:mm");  }}</td>
+							</tr>
+						@endeach
+					</tbody>
+				</table>
+			</div>
+		@endslot
+	@endcomponent
+
+@endsection
+
+{{--  Deals with the search functionality of the table above- searches all fields   --}}
+@section('extrajs') 
+    <script src='https://cdn.datatables.net/1.10.20/js/jquery.dataTables.min.js'></script>
+    <script src='https://cdn.datatables.net/1.10.20/js/dataTables.bootstrap4.min.js'></script>
+    <script src='https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.20.1/moment.min.js'></script>
+    <script src='js/searchRecords.js'></script>
+@endsection
diff --git a/resources/views/layouts/adminSidebarOptions.edge b/resources/views/layouts/adminSidebarOptions.edge
@@ -31,6 +31,7 @@
         <div class="bg-white py-2 collapse-inner rounded">
           <a id="view-users-dropdown" class="dropdown-item" href='{{ route('allUsers') }}'><i class="fas fa-fw fa-list text-grey"></i> {{ antl.formatMessage('adminSidebarOptions.viewUsers') }}</a>
           <a id="view-users-dropdown" class="dropdown-item" href='{{ route('allAdmins') }}'><i class="fas fa-fw fa-list text-grey"></i> View Admins</a>
+          <a id="view-records-dropdown" class="dropdown-item" href='{{ route('records') }}'><i class="fas fa-fw fa-list text-grey"></i> View Search Records</a>
         </div>
       </div>
     </li>

diff --git a/start/routes.js b/start/routes.js
@@ -119,6 +119,9 @@ Route.get('/event', 'BookingController.createEvent');
 Route.get('/calendars', 'RoomController.getCalendars');
 Route.get('/calendar', 'RoomController.getCalendar');
 
+// Search records
+Route.get('/records', 'SearchRecordController.viewSearchRecords').middleware(['isAdmin']).as('records');
+
 //= ========================================================================
 // Recurring
 //= ========================================================================