Merge branch 'fouten/koppelengebruikers' into develop

# Conflicts:
#	application/core/MY_Controller.php

application/core/MY_Controller.php

@@ -76,8 +76,9 @@ class MY_Controller extends CI_Controller{
 //    public $version = '1.18.00';// alle instrumenten in het compact sop
 //    public $version = '1.18.02';// fout in resultaatmatrix
 //    public $version = '1.18.04';// invul status
-//    public $version = '1.18.05';// drag and drop
+//    public $version = '1.18.05';// fout schoolgegevens compactsop
-    public $version = '1.18.06';// drag and drop zichtbaar na switchen
+//    public $version = '1.18.08';// kleurenfout
+    public $version = '1.18.09';// zoek gebruikers sneller
 
 
 

application/models/shared/Users_model.php

@@ -89,15 +89,34 @@ class Users_model extends MY_Model{
 					ORDER BY 	U.achternaam";
 		return $this->get_query_result();
 	}
+//	function otherusers($orgid, $orgids){
+//		$this->sql="SELECT DISTINCT(U.id), concat_ws(' ',voornaam, tussenvoegsel, achternaam) AS fullname
+//					FROM tb_users U
+//					JOIN tb_orgusers OU ON OU.user_id= U.id
+//					WHERE  (SELECT count(id) FROM tb_orgusers WHERE user_id = U.id AND organisatie_id = {$orgid})
+//					AND (OU.organisatie_id IN ({$orgids}) )
+//					ORDER BY achternaam";
+//		return $this->get_query_result();
+//	}
     function otherusers($orgid, $orgids){
         $this->sql="SELECT DISTINCT(U.id), concat_ws(' ',voornaam, tussenvoegsel, achternaam) AS fullname
 					FROM     tb_users U
 					JOIN     tb_orgusers OU ON OU.user_id= U.id 
-					WHERE  (SELECT count(id) FROM tb_orgusers WHERE user_id = U.id AND organisatie_id = {$orgid}) = 0
+					WHERE    OU.organisatie_id IN ({$orgids})
-					AND (OU.organisatie_id IN ({$orgids}) )  
+					AND      U.actief = 1
+					AND      U.voornaam <> ''
+					AND      U.achternaam <> ''
+					AND      OU.user_id NOT IN (
+					    SELECT OU2.user_id 
+					    FROM tb_orgusers OU2
+					    WHERE OU2.organisatie_id = {$orgid}
+					)
+					GROUP BY U.id
 					ORDER BY achternaam ";
         return $this->get_query_result();
     }
+
+
 	function get_users_by_organisatie($orgid){
 		// uit partituur users
 		$this->sql = "SELECT  U.id, U.gnaam as user_name, concat_ws(' ', voornaam, tussenvoegsel, achternaam) as fullname

public/js/monpas/models/gebruikersmodel.js

@@ -1,6 +1,7 @@
 $(function(){
 
 ls.initGebruikersModel = function(){
+	var timer;
 
 	function fAddOrgs(p){
 		var dit =this;
@@ -342,8 +343,19 @@ ls.initGebruikersModel = function(){
 				self.selectedOrg(this);
 				self.fGetGebruikers();
 			},
+
+
 			fPopCopy : function(){
 				var self= ls.GebruikersModel;
+				showAjaxLoader();
+					self.fGetOtherUsers(function(){self.fOpenPopUp()})
+
+			},
+
+
+			fGetOtherUsers: function(callback){
+				var self= ls.GebruikersModel;
+
 				$.post("index.php/shared/users/getotherusers/" + self.selectedOrg().id, function (data) {
 					self.otherUsers.removeAll();
 					if (data) {
@@ -351,9 +363,21 @@ ls.initGebruikersModel = function(){
 							self.otherUsers.push(new fAddOtherUser(p));
 						}); // each
 					}
+
+					if (typeof callback == "function") callback()
+					hideAjaxLoader();
 				}, 'json');
-				$("#modCopyUser").modal('show');
+
+
+
 			},
+
+			fOpenPopUp: function(){
+				var self= ls.GebruikersModel;
+				$("#modCopyUser").modal('show');
+
+			},
+
 			fSaveCopyUser :function(){
 				var self= ls.GebruikersModel;
 				var submitData={	userid 		: self.copyUser().id,