Bumped version to 0.0.47

VERSION

@@ -1 +1 @@
-v0.0.46
+v0.0.47

VERSIONLOG

@@ -45,3 +45,4 @@ v0.0.43
 v0.0.44
 v0.0.45
 v0.0.46
+v0.0.47

package.json

@@ -1,6 +1,6 @@
 {
   "name": "dagsplug",
-  "version": "0.0.46",
+  "version": "0.0.47",
   "description": "",
   "main": "script_backend.js",
   "scripts": {

plug_adminusers.php

@@ -48,7 +48,8 @@ if (!class_exists("plug_adminusers")) {
 			$defaults['lastview'] = __('Seneste Side', 'lastlogin-column');
 			$defaults['imel-login-userfield'] = __('Ældste Session', 'login-column');
 			$defaults['imel-login2-userfield'] = __('Nyeste Session', 'login2-column');
-			$defaults['imel-usercolumn-userfield'] = __('Pro/Select', 'user-column');
+			$defaults['proselect'] = __('Pro/Select', 'user-column');
+			$defaults['gruppe'] = __('Gruppe', 'id-column');
 			$defaults['imel-navn-userfield'] = __('Navn', 'navn-column');
 			$defaults['session'] = __('sessions', 'session-column');
 			$defaults['id'] = __('id', 'id-column');
@@ -60,6 +61,8 @@ if (!class_exists("plug_adminusers")) {
 		function user_sortable_columns($columns) {
 			$columns['session'] = 'session';
 			$columns['id'] = 'id';
+			$columns['gruppe'] = 'gruppe';
+			$columns['proselect'] = 'proselect';
 			$columns['lastlogin'] = 'lastlogin';
 			$columns['lastview'] = 'lastview';
 			return $columns;
@@ -73,6 +76,19 @@ if (!class_exists("plug_adminusers")) {
 				$userquery->query_orderby = " ORDER BY length(alias.meta_value) " . ($userquery->query_vars["order"] == "ASC" ? "asc " : "desc "); //set sort order
 			}
 
+			if ('proselect' == $userquery->query_vars['orderby']) {
+				global $wpdb;
+				$userquery->query_from .= " LEFT OUTER JOIN $wpdb->usermeta AS alias ON ($wpdb->users.ID = alias.user_id) "; //note use of alias
+				$userquery->query_where .= " AND alias.meta_key = 'Proselect' "; //which meta are we sorting with?
+				$userquery->query_orderby = " ORDER BY alias.meta_value " . ($userquery->query_vars["order"] == "ASC" ? "asc " : "desc "); //set sort order
+			}
+			if ('gruppe' == $userquery->query_vars['orderby']) {
+				global $wpdb;
+				$userquery->query_from .= " LEFT OUTER JOIN $wpdb->usermeta AS alias ON ($wpdb->users.ID = alias.user_id) "; //note use of alias
+				$userquery->query_where .= " AND alias.meta_key = 'Gruppe' "; //which meta are we sorting with?
+				$userquery->query_orderby = " ORDER BY alias.meta_value " . ($userquery->query_vars["order"] == "ASC" ? "asc " : "desc "); //set sort order
+			}
+
 			if ('lastlogin' == $userquery->query_vars['orderby']) {
 				global $wpdb;
 				$userquery->query_from .= " LEFT OUTER JOIN $wpdb->usermeta AS alias ON ($wpdb->users.ID = alias.user_id) "; //note use of alias
@@ -120,9 +136,14 @@ if (!class_exists("plug_adminusers")) {
 				}
 			}
 
-			if ($column_name == 'imel-usercolumn-userfield') {
+			if ($column_name == 'proselect') {
+				$s = get_user_meta($id, 'Proselect', true);
+				return $s;
 
-				return get_user_meta($id, 'Proselect', true);
+			}
+			if ($column_name == 'gruppe') {
+				$s = get_user_meta($id, 'Gruppe', true);
+				return $s;
 
 			}
 			if ($column_name == 'id') {

plugin.php

@@ -4,7 +4,7 @@ Plugin Name: dagsopt
 Plugin URI: https://git.tum.dk/tum.dk/dagsplug/
 Description: Tools
 Author: iskedk
-Version: 0.0.46
+Version: 0.0.47
 Date: 2021-01-14
 Author URI: https://iske.dk/
 Text Domain: dagsopt
@@ -17,7 +17,7 @@ function wppluginspage() {
 $wp_dagsopt = new dagsopt();
 
 class dagsopt {
-	var $version = "0.0.46";
+	var $version = "0.0.47";
 	var $publish_date = "2021-01-14";
 	var $pluginname;
 	var $plugintitle;