diff --git a/application/core/MY_Controller.php b/application/core/MY_Controller.php index 958087b..ef8f016 100644 --- a/application/core/MY_Controller.php +++ b/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.06';// drag and drop zichtbaar na switchen +// public $version = '1.18.05';// fout schoolgegevens compactsop +// public $version = '1.18.08';// kleurenfout + public $version = '1.18.09';// zoek gebruikers sneller diff --git a/application/models/shared/Users_model.php b/application/models/shared/Users_model.php index 5ff1264..0dbcb08 100644 --- a/application/models/shared/Users_model.php +++ b/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}) = 0 - 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}) +// 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 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 diff --git a/public/js/monpas/models/gebruikersmodel.js b/public/js/monpas/models/gebruikersmodel.js index 1891bc9..422d394 100644 --- a/public/js/monpas/models/gebruikersmodel.js +++ b/public/js/monpas/models/gebruikersmodel.js @@ -1,6 +1,7 @@ $(function(){ ls.initGebruikersModel = function(){ + var timer; function fAddOrgs(p){ var dit =this; @@ -91,7 +92,7 @@ ls.initGebruikersModel = function(){ } function fAddOtherUser(p){ - this.id = p.id ; //userid + this.id = p.id ; //userid this.fullname = p.fullname; this.autorisatienivoid = ko.observable(10); } @@ -342,18 +343,41 @@ ls.initGebruikersModel = function(){ self.selectedOrg(this); self.fGetGebruikers(); }, + + fPopCopy : function(){ var self= ls.GebruikersModel; - $.post("index.php/shared/users/getotherusers/" + self.selectedOrg().id, function(data){ + 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){ - $.each(data, function(i,p){ + if (data) { + $.each(data, function (i, p) { self.otherUsers.push(new fAddOtherUser(p)); }); // each } - },'json'); - $("#modCopyUser").modal('show'); + + if (typeof callback == "function") callback() + hideAjaxLoader(); + }, 'json'); + + + }, + + fOpenPopUp: function(){ + var self= ls.GebruikersModel; + $("#modCopyUser").modal('show'); + + }, + fSaveCopyUser :function(){ var self= ls.GebruikersModel; var submitData={ userid : self.copyUser().id,