- 'dataTables']);?>
+ 'dataTables']);?>
diff --git a/core/module/course/view/users/users.js.php b/core/module/course/view/users/users.js.php
index 128ae98..be7188e 100644
--- a/core/module/course/view/users/users.js.php
+++ b/core/module/course/view/users/users.js.php
@@ -21,17 +21,14 @@ $(document).ready((function () {
$(location).attr("href", _this.attr("href"))
}))
}));
-
+ $.fn.dataTable.moment( 'DD/MM/YYYY' );
$('#dataTables').DataTable({
language: {
url: "core/vendor/datatables/french.json"
},
+ order: [[3, 'desc']],
locale: 'fr',
"columnDefs": [
- {
- target: 3,
- render: DataTable.render.moment( 'YYYY/MM/DD', 'Do MMM YY', 'fr' )
- },
{
target: 6,
orderable: false,
diff --git a/core/module/course/view/users/users.php b/core/module/course/view/users/users.php
index f9ab55c..2b5db59 100644
--- a/core/module/course/view/users/users.php
+++ b/core/module/course/view/users/users.php
@@ -53,7 +53,7 @@
- 'dataTables']); ?>
+ 'dataTables']); ?>
\ No newline at end of file
diff --git a/core/vendor/datatables/datetime.js b/core/vendor/datatables/datetime.js
deleted file mode 100644
index 6643863..0000000
--- a/core/vendor/datatables/datetime.js
+++ /dev/null
@@ -1,133 +0,0 @@
-/*! © SpryMedia Ltd - datatables.net/license */
-
-(function( factory ){
- if ( typeof define === 'function' && define.amd ) {
- // AMD
- define( ['jquery', 'datatables.net'], function ( $ ) {
- return factory( $, window, document );
- } );
- }
- else if ( typeof exports === 'object' ) {
- // CommonJS
- var jq = require('jquery');
- var cjsRequires = function (root, $) {
- if ( ! $.fn.dataTable ) {
- require('datatables.net')(root, $);
- }
- };
-
- if (typeof window === 'undefined') {
- module.exports = function (root, $) {
- if ( ! root ) {
- // CommonJS environments without a window global must pass a
- // root. This will give an error otherwise
- root = window;
- }
-
- if ( ! $ ) {
- $ = jq( root );
- }
-
- cjsRequires( root, $ );
- return factory( $, root, root.document );
- };
- }
- else {
- cjsRequires( window, jq );
- module.exports = factory( jq, window, window.document );
- }
- }
- else {
- // Browser
- factory( jQuery, window, document );
- }
-}(function( $, window, document, undefined ) {
-'use strict';
-var DataTable = $.fn.dataTable;
-
-
-/**
- * NOTE - As of DataTables 1.12, DataTables has a built in date / time renderer
- * which should be used in place of this renderer. See
- * [the manual](https://datatables.net/manual/data/renderers#Date-and-time-helpers)
- * for details.
- *
- * Date / time formats often from back from server APIs in a format that you
- * don't wish to display to your end users (ISO8601 for example). This rendering
- * helper can be used to transform any source date / time format into something
- * which can be easily understood by your users when reading the table, and also
- * by DataTables for sorting the table.
- *
- * The [MomentJS library](http://momentjs.com/) is used to accomplish this and
- * you simply need to tell it which format to transfer from, to and specify a
- * locale if required.
- *
- * This function should be used with the `dt-init columns.render` configuration
- * option of DataTables.
- *
- * It accepts one, two or three parameters:
- *
- * * `DataTable.render.moment( to );`
- * * `DataTable.render.moment( from, to );`
- * * `DataTable.render.moment( from, to, locale );`
- *
- * Where:
- *
- * * `to` - the format that will be displayed to the end user
- * * `from` - the format that is supplied in the data (the default is ISO8601 -
- * `YYYY-MM-DD`)
- * * `locale` - the locale which MomentJS should use - the default is `en`
- * (English).
- *
- * @name datetime
- * @summary Convert date / time source data into one suitable for display
- * @author [Allan Jardine](http://datatables.net)
- * @requires DataTables 1.10+, Moment.js 1.7+
- *
- * @example
- * // Convert ISO8601 dates into a simple human readable format
- * $('#example').DataTable( {
- * columnDefs: [ {
- * targets: 1,
- * render: DataTable.render.moment( 'Do MMM YYYY' )
- * } ]
- * } );
- *
- * @example
- * // Specify a source format - in this case a unix timestamp
- * $('#example').DataTable( {
- * columnDefs: [ {
- * targets: 2,
- * render: DataTable.render.moment( 'X', 'Do MMM YY' )
- * } ]
- * } );
- *
- * @example
- * // Specify a source format and locale
- * $('#example').DataTable( {
- * columnDefs: [ {
- * targets: 2,
- * render: DataTable.render.moment( 'YYYY/MM/DD', 'Do MMM YY', 'fr' )
- * } ]
- * } );
- */
-DataTable.render.moment = function (from, to, locale) {
- // Argument shifting
- if (arguments.length === 1) {
- to = from;
- from = 'YYYY-MM-DD';
- }
- return function (d, type, row) {
- if (!d) {
- return type === 'sort' || type === 'type' ? 0 : d;
- }
- var m = window.moment(d, from, locale, true);
- // Order and type get a number value from Moment, everything else
- // sees the rendered value
- return m.format(type === 'sort' || type === 'type' ? 'x' : to);
- };
-};
-
-
-return DateTime;
-}));
\ No newline at end of file
diff --git a/core/vendor/datatables/datetime.min.js b/core/vendor/datatables/datetime.min.js
new file mode 100644
index 0000000..4604d95
--- /dev/null
+++ b/core/vendor/datatables/datetime.min.js
@@ -0,0 +1,71 @@
+/**
+ * This plug-in for DataTables represents the ultimate option in extensibility
+ * for sorting date / time strings correctly. It uses
+ * [Moment.js](http://momentjs.com) to create automatic type detection and
+ * sorting plug-ins for DataTables based on a given format. This way, DataTables
+ * will automatically detect your temporal information and sort it correctly.
+ *
+ * For usage instructions, please see the DataTables blog
+ * post that [introduces it](//datatables.net/blog/2014-12-18).
+ *
+ * @name Ultimate Date / Time sorting
+ * @summary Sort date and time in any format using Moment.js
+ * @author [Allan Jardine](//datatables.net)
+ * @depends DataTables 1.10+, Moment.js 1.7+
+ * @deprecated
+ *
+ * @example
+ * $.fn.dataTable.moment( 'HH:mm MMM D, YY' );
+ * $.fn.dataTable.moment( 'dddd, MMMM Do, YYYY' );
+ *
+ * $('#example').DataTable();
+ */
+
+(function (factory) {
+ if (typeof define === "function" && define.amd) {
+ define(["jquery", "moment", "datatables.net"], factory);
+ } else {
+ factory(jQuery, moment);
+ }
+}(function ($, moment) {
+
+function strip (d) {
+ if ( typeof d === 'string' ) {
+ // Strip HTML tags and newline characters if possible
+ d = d.replace(/(<.*?>)|(\r?\n|\r)/g, '');
+
+ // Strip out surrounding white space
+ d = d.trim();
+ }
+
+ return d;
+}
+
+$.fn.dataTable.moment = function ( format, locale, reverseEmpties ) {
+ var types = $.fn.dataTable.ext.type;
+
+ // Add type detection
+ types.detect.unshift( function ( d ) {
+ d = strip(d);
+
+ // Null and empty values are acceptable
+ if ( d === '' || d === null ) {
+ return 'moment-'+format;
+ }
+
+ return moment( d, format, locale, true ).isValid() ?
+ 'moment-'+format :
+ null;
+ } );
+
+ // Add sorting method - use an integer for the sorting
+ types.order[ 'moment-'+format+'-pre' ] = function ( d ) {
+ d = strip(d);
+
+ return !moment(d, format, locale, true).isValid() ?
+ (reverseEmpties ? -Infinity : Infinity) :
+ parseInt( moment( d, format, locale, true ).format( 'x' ), 10 );
+ };
+};
+
+}));
\ No newline at end of file
diff --git a/core/vendor/datatables/inc.json b/core/vendor/datatables/inc.json
index 5957fa1..c031754 100644
--- a/core/vendor/datatables/inc.json
+++ b/core/vendor/datatables/inc.json
@@ -1,5 +1,6 @@
[
"datatables.min.js",
- "datatime.js",
+ "moment.min.js",
+ "datetime.min.js",
"datatables.min.css"
]
\ No newline at end of file
diff --git a/core/vendor/datatables/moment.min.js b/core/vendor/datatables/moment.min.js
new file mode 100644
index 0000000..9fb34ee
--- /dev/null
+++ b/core/vendor/datatables/moment.min.js
@@ -0,0 +1,7 @@
+//! moment.js
+//! version : 2.8.4
+//! authors : Tim Wood, Iskren Chernev, Moment.js contributors
+//! license : MIT
+//! momentjs.com
+(function(a){function b(a,b,c){switch(arguments.length){case 2:return null!=a?a:b;case 3:return null!=a?a:null!=b?b:c;default:throw new Error("Implement me")}}function c(a,b){return zb.call(a,b)}function d(){return{empty:!1,unusedTokens:[],unusedInput:[],overflow:-2,charsLeftOver:0,nullInput:!1,invalidMonth:null,invalidFormat:!1,userInvalidated:!1,iso:!1}}function e(a){tb.suppressDeprecationWarnings===!1&&"undefined"!=typeof console&&console.warn&&console.warn("Deprecation warning: "+a)}function f(a,b){var c=!0;return m(function(){return c&&(e(a),c=!1),b.apply(this,arguments)},b)}function g(a,b){qc[a]||(e(b),qc[a]=!0)}function h(a,b){return function(c){return p(a.call(this,c),b)}}function i(a,b){return function(c){return this.localeData().ordinal(a.call(this,c),b)}}function j(){}function k(a,b){b!==!1&&F(a),n(this,a),this._d=new Date(+a._d)}function l(a){var b=y(a),c=b.year||0,d=b.quarter||0,e=b.month||0,f=b.week||0,g=b.day||0,h=b.hour||0,i=b.minute||0,j=b.second||0,k=b.millisecond||0;this._milliseconds=+k+1e3*j+6e4*i+36e5*h,this._days=+g+7*f,this._months=+e+3*d+12*c,this._data={},this._locale=tb.localeData(),this._bubble()}function m(a,b){for(var d in b)c(b,d)&&(a[d]=b[d]);return c(b,"toString")&&(a.toString=b.toString),c(b,"valueOf")&&(a.valueOf=b.valueOf),a}function n(a,b){var c,d,e;if("undefined"!=typeof b._isAMomentObject&&(a._isAMomentObject=b._isAMomentObject),"undefined"!=typeof b._i&&(a._i=b._i),"undefined"!=typeof b._f&&(a._f=b._f),"undefined"!=typeof b._l&&(a._l=b._l),"undefined"!=typeof b._strict&&(a._strict=b._strict),"undefined"!=typeof b._tzm&&(a._tzm=b._tzm),"undefined"!=typeof b._isUTC&&(a._isUTC=b._isUTC),"undefined"!=typeof b._offset&&(a._offset=b._offset),"undefined"!=typeof b._pf&&(a._pf=b._pf),"undefined"!=typeof b._locale&&(a._locale=b._locale),Ib.length>0)for(c in Ib)d=Ib[c],e=b[d],"undefined"!=typeof e&&(a[d]=e);return a}function o(a){return 0>a?Math.ceil(a):Math.floor(a)}function p(a,b,c){for(var d=""+Math.abs(a),e=a>=0;d.length