isearch
This commit is contained in:
parent
675bc39bf0
commit
adf05c8a06
|
@ -34,7 +34,5 @@ class AppController extends Controller {
|
||||||
|
|
||||||
public $components = array('Security','MiconwareSession');
|
public $components = array('Security','MiconwareSession');
|
||||||
|
|
||||||
function beforeFilter(){
|
|
||||||
parent::beforeFilter();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -21,6 +21,13 @@ class UserController extends AppController {
|
||||||
* @throws NotFoundException When the view file could not be found
|
* @throws NotFoundException When the view file could not be found
|
||||||
* or MissingViewException in debug mode.
|
* or MissingViewException in debug mode.
|
||||||
*/
|
*/
|
||||||
|
function beforeFilter(){
|
||||||
|
$this->Security->unlockedActions[]="settings_isearch";
|
||||||
|
/*if($this->request->action=="settings_isearch")
|
||||||
|
$this->Security->=false;*/
|
||||||
|
parent::beforeFilter();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
public function profil() {
|
public function profil() {
|
||||||
$this->MiconwareSession->init($this);
|
$this->MiconwareSession->init($this);
|
||||||
|
@ -412,11 +419,13 @@ class UserController extends AppController {
|
||||||
$this->render('/Home/error');
|
$this->render('/Home/error');
|
||||||
}else{
|
}else{
|
||||||
if($this->request->is('post')){
|
if($this->request->is('post')){
|
||||||
$tosave = array();
|
$tosave = $this->request->data['DreamjobISearch'];
|
||||||
$tosave['DreamjobISerach'] = $this->data['DreamjobISerach'];
|
foreach($tosave as $i => $a)
|
||||||
var_dump($tosave);
|
$tosave[$i]['worker_id']=$profil['AppUser']['id'];
|
||||||
$result = $this->DreamjobISearch->saveMany($tosave);
|
$result = $this->DreamjobISearch->saveAndDelete($tosave,$profil['DreamjobISearch']);
|
||||||
if($result){
|
if($result){
|
||||||
|
$this->MiconwareSession->refreshCache();
|
||||||
|
$profil = $this->MiconwareSession->getWorker();
|
||||||
$this->MiconwareSession->setFlash('dreamjob.settings.save','flash',array('alert'=>'success'));
|
$this->MiconwareSession->setFlash('dreamjob.settings.save','flash',array('alert'=>'success'));
|
||||||
}else{
|
}else{
|
||||||
$this->MiconwareSession->setFlash('dreamjob.settings.save.error','flash',array('alert'=>'danger'));
|
$this->MiconwareSession->setFlash('dreamjob.settings.save.error','flash',array('alert'=>'danger'));
|
||||||
|
|
|
@ -34,6 +34,33 @@ class DreamjobISearch extends AppModel {
|
||||||
*
|
*
|
||||||
* @var array
|
* @var array
|
||||||
*/
|
*/
|
||||||
|
public function saveAndDelete($data,$old){
|
||||||
|
$dataSource = $this->getDataSource();
|
||||||
|
$dataSource->begin();
|
||||||
|
|
||||||
|
$result = $this->saveMany($data);
|
||||||
|
if($result){
|
||||||
|
$array1 = array();
|
||||||
|
$array2 = array();
|
||||||
|
foreach($data as $a)
|
||||||
|
if(isset($a['id']))
|
||||||
|
$array1[]=$a['id'];
|
||||||
|
foreach($old as $a)
|
||||||
|
if(isset($a['id']))
|
||||||
|
$array2[]=$a['id'];
|
||||||
|
$diff=array_diff($array2, $array1);
|
||||||
|
if(count($diff)>0)
|
||||||
|
$result = $this->delete($diff);
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($result) {
|
||||||
|
$dataSource->commit();
|
||||||
|
return true;
|
||||||
|
} else {
|
||||||
|
$dataSource->rollback();
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
public $validate = array(
|
public $validate = array(
|
||||||
'worker_id' => array(
|
'worker_id' => array(
|
||||||
'numeric' => array(
|
'numeric' => array(
|
||||||
|
|
|
@ -52,16 +52,12 @@
|
||||||
that = this;
|
that = this;
|
||||||
newRow = $(".new").html();
|
newRow = $(".new").html();
|
||||||
$(this).change(function(){
|
$(this).change(function(){
|
||||||
|
tosave = true;
|
||||||
$("tr",that).each(function(){
|
$("tr",that).each(function(){
|
||||||
see = true;
|
see = true;
|
||||||
save = true;
|
|
||||||
$("select",this).each(function(){
|
$("select",this).each(function(){
|
||||||
if(see)
|
if(see)
|
||||||
see = $(this).val()=='';
|
see = $(this).val()=='';
|
||||||
if(save){
|
|
||||||
save = $(this).val()!='';
|
|
||||||
console.log($(this).val()!='');
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
if(see && $(this).attr("data")=="set"){
|
if(see && $(this).attr("data")=="set"){
|
||||||
$(this).attr("data","");
|
$(this).attr("data","");
|
||||||
|
@ -73,9 +69,20 @@
|
||||||
$(that).append("<tr class=\"new\">"+newRow+"</tr>");
|
$(that).append("<tr class=\"new\">"+newRow+"</tr>");
|
||||||
evet();
|
evet();
|
||||||
}
|
}
|
||||||
if(save && !$("tr",that).hasClass("new"))
|
|
||||||
saveForm();
|
save = true;
|
||||||
|
that2=this;
|
||||||
|
$("select",this).each(function(){
|
||||||
|
if(save && !$(that2).hasClass("new")){
|
||||||
|
save = $(this).val()!='';
|
||||||
|
}
|
||||||
|
});
|
||||||
|
if(tosave && !$(that2).hasClass("new")){
|
||||||
|
tosave = save;
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
if(tosave)
|
||||||
|
saveForm();
|
||||||
});
|
});
|
||||||
//ZUOFT WIRD GESPEICHERT
|
//ZUOFT WIRD GESPEICHERT
|
||||||
|
|
||||||
|
@ -90,8 +97,16 @@
|
||||||
}
|
}
|
||||||
evet();
|
evet();
|
||||||
function saveForm(){
|
function saveForm(){
|
||||||
load($(this).attr("action"),{data:$(this).serialize(), type:'GET'},false);
|
i = 0;
|
||||||
console.log("save");
|
$("tr.new",that).remove();
|
||||||
|
$("tr",that).each(function(){
|
||||||
|
$("select,input",this).each(function(){
|
||||||
|
str = $(this).attr("name").replace(/data\[(.*)\]\[.*\]\[(.*)\]/g,'data[$1]['+i+'][$2]');
|
||||||
|
$(this).attr("name",str);
|
||||||
|
});
|
||||||
|
i++;
|
||||||
|
});
|
||||||
|
load($(that).attr("action"),{data:$(that).parents("form").serialize(), type:'POST'},false);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
$(where+" form.hide-form").each(function(evt){
|
$(where+" form.hide-form").each(function(evt){
|
||||||
|
|
10
update.sql
10
update.sql
|
@ -47,6 +47,14 @@ ALTER TABLE `mic_dj_jobs_opening_worker`
|
||||||
ALTER TABLE `mic_dj_account_cmpy` CHANGE `branch` `branch_id` INT(11) NOT NULL;
|
ALTER TABLE `mic_dj_account_cmpy` CHANGE `branch` `branch_id` INT(11) NOT NULL;
|
||||||
ALTER TABLE `mic_dj_jobs_opening` CHANGE `branch` `branch_id` INT(11) NOT NULL;
|
ALTER TABLE `mic_dj_jobs_opening` CHANGE `branch` `branch_id` INT(11) NOT NULL;
|
||||||
-- LOLA
|
-- LOLA
|
||||||
ALTER TABLE `ic_dj_account_isearch` CHANGE `branch` `branch_id` INT(11) NOT NULL;
|
update `mic_dj_account_isearch` left join `mic_dj_list_job` on `name`=`job` set `job`=`mic_dj_list_job`.`id`
|
||||||
|
update `mic_dj_account_isearch` left join `mic_dj_list_branch` on `name`=`branch` set `job`=`mic_dj_list_branch`.`id`
|
||||||
|
|
||||||
|
ALTER TABLE `mic_dj_account_isearch` CHANGE `branch` `branch_id` INT(11) NOT NULL;
|
||||||
|
ALTER TABLE `mic_dj_account_isearch` CHANGE `job` `job_id` INT(11) NOT NULL;
|
||||||
|
|
||||||
|
ALTER TABLE `mic_dj_account_isearch`
|
||||||
|
ADD CONSTRAINT `mic_dj_account_isearch_branch` FOREIGN KEY (`branch_id`) REFERENCES `mic_dj_list_branch` (`id`),
|
||||||
|
ADD CONSTRAINT `mic_dj_account_isearch_job` FOREIGN KEY (`job_id`) REFERENCES `mic_dj_list_job` (`id`);
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue