This commit is contained in:
Martin Müller 2014-04-16 18:24:34 +02:00
parent 25de46c9f0
commit 465a411b90
16 changed files with 355 additions and 39 deletions

View File

@ -68,7 +68,13 @@
Router::connect('/favorite', array('controller' => 'job', 'action' => 'favorite'));
//Router::connect('/search', array('controller' => 'search', 'action' => 'listopening'));
Router::connect('/search', array('controller' => 'search', 'action' => 'openings'));
Router::connect('/search', array('controller' => 'search', 'action' => 'opening'));
Router::connect('/search/company', array('controller' => 'search', 'action' => 'company'));
Router::connect('/search/worker', array('controller' => 'search', 'action' => 'worker'));
Router::connect('/search/auto', array('controller' => 'search', 'action' => 'auto'));
Router::connect('/search/education', array('controller' => 'search', 'action' => 'education'));
Router::connect('/search/academy', array('controller' => 'search', 'action' => 'academy'));
Router::connect('/search/internship', array('controller' => 'search', 'action' => 'internship'));
Router::connect('/test/', array('controller' => 'user', 'action' => 'test'));

View File

@ -10,7 +10,7 @@ class SearchController extends AppController {
* @var array
*/
public $uses = array('DreamjobWorker','DreamjobJobOpening',
public $uses = array('DreamjobWorker','DreamjobJobOpening','DreamjobCompany',
'DreamjobListBranch','DreamjobListCity','DreamjobListKindofjob','DreamjobListGraducation');
public $components = array('MiconwareSession');
@ -23,10 +23,49 @@ class SearchController extends AppController {
* or MissingViewException in debug mode.
*/
public function beforeFilter(){
$this->Security->unlockedActions[]="openings";
$this->Security->unlockedActions[]="opening";
$this->Security->unlockedActions[]="company";
$this->Security->unlockedActions[]="auto";
$this->Security->unlockedActions[]="education";
$this->Security->unlockedActions[]="academy";
$this->Security->unlockedActions[]="internship";
parent::beforeFilter();
}
public function openings() {
public function choose() {
$this->MiconwareSession->init($this);
$profil = $this->MiconwareSession->getCompany();
if(!empty($profil) and count($profil) > 0){
$this->worker();
}else{
$this->opening();
}
}
private function spezial($type) {
$this->MiconwareSession->init($this);
$this->MiconwareSession->initWeb($this);
$profil = $this->MiconwareSession->getWorker();
if(!empty($profil) and count($profil) > 0){
$con = $this->MiconwareSession->getOpeningCondition();
$openings = $this->DreamjobJobOpening->find('all',array('conditions' => $con));
$this->set("branches",$this->DreamjobListBranch->find('list'));
$this->set("cities",$this->DreamjobListCity->find('list'));
$this->set("openings",$openings);
$this->render('/Search/'.$type);
}else{
$this->set('error', 'dreamjob.error.noPermision');
$this->render('/Home/error');
}
}
public function opening() {
$this->MiconwareSession->init($this);
$this->MiconwareSession->initWeb($this);
@ -40,11 +79,42 @@ class SearchController extends AppController {
$this->set("kindofjobs",$this->DreamjobListKindofjob->find('list'));
$this->set("openings",$openings);
$this->render('/Search/searchopenings');
$this->render('/Search/opening');
}
/*
public function listopening() {
public function company() {
$this->MiconwareSession->init($this);
$this->MiconwareSession->initWeb($this);
$companies = $this->DreamjobCompany->find('all');
$this->set("branches",$this->DreamjobListBranch->find('list'));
$this->set("cities",$this->DreamjobListCity->find('list'));
$this->set("companies",$companies);
$this->render('/Search/company');
}
public function auto() {
$this->MiconwareSession->init($this);
$this->MiconwareSession->initWeb($this);
$profil = $this->MiconwareSession->getWorker();
if(!empty($profil) and count($profil) > 0){
$con = $this->MiconwareSession->getOpeningCondition();
$openings = $this->DreamjobJobOpening->find('all',array('conditions' => $con));
$this->set("openings",$openings);
$this->render('/Search/auto');
}else{
$this->set('error', 'dreamjob.error.noPermision');
$this->render('/Home/error');
}
}
public function worker(){
$this->MiconwareSession->init($this);
$this->MiconwareSession->initWeb($this);
@ -52,12 +122,24 @@ class SearchController extends AppController {
if(!empty($profil) and count($profil) > 0){
$workers = $this->DreamjobWorker->find('all',array('conditions' => array('DreamjobWorker.searchhidden'=>false)));
$this->set("workers",$workers);
$this->render('/Search/listworkers');
$this->render('/Search/worker');
}else{
$con = $this->MiconwareSession->getOpeningCondition();
$openings = $this->DreamjobJobOpening->find('all',array('conditions' => $con));
$this->set("openings",$openings);
$this->render('/Search/listopenings');
$this->set('error', 'dreamjob.error.noPermision');
$this->render('/Home/error');
}
}*/
}
public function education() {
$this->spezial('education');
}
public function academy() {
$this->spezial('academy');
}
public function internship() {
$this->spezial('internship');
}
}

View File

@ -92,6 +92,7 @@ class UserController extends AppController {
}else
$hard_error = true;
//error
$this->set('edit', false);
if(!$company and $profil['AppUser']['id'] != $self['AppUser']['id'] or $hard_error){
if(($company == $self_company) and !($this->MiconwareSession->isStaff()) or $hard_error){
$hard_error = true;
@ -102,8 +103,6 @@ class UserController extends AppController {
}elseif($profil['AppUser']['id'] == $self['AppUser']['id']){
$this->set('edit', true);
$this->set('MENU_PROFIL',true);
}else{
$this->set('edit', false);
}
if(!empty($this->request->params['page']) and (!is_array($page) or count($page)<= 0))
$this->MiconwareSession->setFlash(__('dreamjob.error.page.notFound'),'flash',array('alert'=>'danger'));

View File

@ -0,0 +1,46 @@
<?php
/*
*
*/
$avatar = false;
$url = '';
if($company['AppUser']['take_systemwide']){
if($company['User']['avatar']){
$url = $MEDIA.DS.$company['User']['avatar'];
$avatar = true;
}
}else{
if($company['AppUser']['avatar']){
$url = $MEDIA.DS.$company['AppUser']['avatar'];
$avatar = true;
}
}
?>
<div class="openingitem">
<h3><?=$company['AppUser']['nickname']." ".$company['DreamjobCompany']['corporateform'];?></h3>
<div>
<?php if($avatar){ ?>
<div class="icon">
<div>
<img src="<?=$url;?>"/>
</div>
</div>
<?php
}else{
?>
<div class="noicon-title">
<span><?=$company['AppUser']['nickname']." ".$company['DreamjobCompany']['corporateform'];?></span>
</div>
<?php } ?>
<div class="left">
<span><?=__("dreamjob.branch");?>: <?=$company['DreamjobListBranch']['name'];?></span>
<span><?=__("dreamjob.city");?>: <?=$company['DreamjobUser']['city'];?></span>
</div>
<div class="right">
<div class="btn-group-vertical">
<?=$this->Html->link(__('dreamjob.company.detail'),array('controller'=>'user', 'action'=>'profil', 'id'=> $company['AppUser']['id']),array("class" => "btn btn-default"));?>
</div>
</div>
</div>
</div>

View File

@ -6,7 +6,11 @@ if(!empty($isLoggedin)){
<li<?php if(isset($MENU_ADMIN)){?> class="active"<?php } ?>><?=$this->Html->link(__('dreamjob.admin'),'/admin/');?></li>
<?php } ?>
<li<?php if(isset($MENU_START)){?> class="active"<?php } ?>><?=$this->Html->link(__('dreamjob.startpage'),array('controller'=>'home','action'=>'home'));?></li>
<li<?php if(isset($MENU_SEARCH)){?> class="active"<?php } ?>><?=$this->Html->link(__('dreamjob.search'),'/search/');?></li>
<?php if(!$COMPANY): ?>
<li<?php if(isset($MENU_SEARCH)){?> class="active"<?php } ?>><?=$this->Html->link(__('dreamjob.search'),array('controller'=>'search','action'=>'opening'));?></li>
<?php elseif($COMPANY): ?>
<li<?php if(isset($MENU_SEARCH)){?> class="active"<?php } ?>><?=$this->Html->link(__('dreamjob.search'),array('controller'=>'search','action'=>'worker'));?></li>
<?php endif; ?>
<li<?php if(isset($MENU_SERVICE)){?> class="active"<?php } ?>><?=$this->Html->link(__('dreamjob.service'),'/service/');?></li>
<li><?=$this->Html->link(__('dreamjob.logout'),array('controller'=>'home','action'=>'logout'));?></li>
</ul>

View File

@ -0,0 +1,12 @@
<div class="tabs-below">
<ul class="nav nav-tabs">
<li<?php if(isset($SEARCH_opening)){?> class="active"<?php } ?>><?=$this->Html->link(__("dreamjob.search.opening"),array('controller'=>'search','action'=>'opening'));?></li>
<li<?php if(isset($SEARCH_company)){?> class="active"<?php } ?>><?=$this->Html->link(__("dreamjob.search.company"),array('controller'=>'search','action'=>'company'));?></li>
<?php if(!empty($WORKER)): ?>
<li<?php if(isset($SEARCH_auto)){?> class="active"<?php } ?>><?=$this->Html->link(__("dreamjob.search.auto"),array('controller'=>'search','action'=>'auto'));?></li>
<li<?php if(isset($SEARCH_education)){?> class="active"<?php } ?>><?=$this->Html->link(__("dreamjob.search.education"),array('controller'=>'search','action'=>'education'));?></li>
<li<?php if(isset($SEARCH_academy)){?> class="active"<?php } ?>><?=$this->Html->link(__("dreamjob.search.academy"),array('controller'=>'search','action'=>'academy'));?></li>
<li<?php if(isset($SEARCH_internship)){?> class="active"<?php } ?>><?=$this->Html->link(__("dreamjob.search.internship"),array('controller'=>'search','action'=>'internship'));?></li>
<?php endif; ?>
</ul>
</div>

View File

@ -6,7 +6,7 @@
<div class="columns">
<div class="bar avatar">
<?php
$url='img/icon_user.png';
$url='/img/icon_user.png';
if($profil['AppUser']['take_systemwide'])
if($profil['User']['avatar'])
$url = $MEDIA.DS.$profil['User']['avatar'];

View File

@ -25,7 +25,7 @@
</h3>
<div class="icon">
<?php
$url='img/icon_user.png';
$url='/img/icon_user.png';
if($profil[$AppUser]['take_systemwide'])
if($profil[$User]['avatar'])
$url = $MEDIA.DS.$profil[$User]['avatar'];

View File

@ -8,7 +8,7 @@
<div class="box">
<h1><?=__('dreamjob.search');?></h1>
<div class="searchform">
<?php echo $this->Form->create(null,array('inputDefaults'=> array('div' => false,'label'=>false,'class' => 'form-control'),'url'=>array('controller'=>'search', 'action'=>'openings'),'type'=>'get')); ?>
<?php echo $this->Form->create(null,array('inputDefaults'=> array('div' => false,'label'=>false,'class' => 'form-control'),'url'=>array('controller'=>'search', 'action'=>'opening'),'type'=>'get')); ?>
<div class="input-group">
<?php echo $this->Form->input('DreamjobJobOpening.title');?>
<span class="input-group-btn">
@ -38,17 +38,3 @@
?>
</div>
</div>
<div class="box" style="margin-top:100px;">
Test Profile
<p><?php echo $this->Html->link("Miconware", '/user/24/'); ?>mail:imberg@miconware.de - PW:sebi</p>
<p><?php echo $this->Html->link("Martin", '/user/3/'); ?>mail:mueller@miconware.de - PW:sebi</p>
<p><?php echo $this->Html->link("sebi", '/user/4/'); ?>mail:mueller@mic-soft.com - PW:sebi</p>
<?php echo $this->Html->link(__('forget password'), '/password/forgot/'); ?>
<?php echo $this->Html->link(__('register'), '/register/'); ?>
Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
</div>

View File

@ -0,0 +1,41 @@
<?php
/*
*
*/
?>
<div class="box">
<?php
echo $this->element('search_navbar',array('SEARCH_academy'=>true));
$a = $default_Form;
$a['inputDefaults']['between'] = '<div class="col-sm-12">';
$a['novalidate'] = true;
echo $this->Form->create('DreamjobJobOpening',$a);
?>
<h1><?=__('dreamjob.search.academy');?></h1>
<?php
$a = $default_hForm['inputDefaults'];
$a['between'] = '<div class="col-sm-12">';
echo $this->Form->input('DreamjobJobOpening.title',$a);
?>
<fieldset class="search">
<?=$this->Form->input('DreamjobJobOpening.branch',array('label'=>__('dreamjob.branch')));?>
<?=$this->Form->input('DreamjobJobOpening.city',array('label'=>__('dreamjob.city')));?>
<div class="form-group submit">
<div>
<?=$this->Form->submit(__('dreamjob.search'),array('class'=>'btn btn-primary'));?>
</div>
</div>
</fieldset>
<?php
echo $this->end();
?>
</div>
<div class="box">
<div class="openinggroup">
<?php
foreach($openings as $opening){
echo $this->element('job_opening_item',array('opening' => $opening));
}
?>
</div>
</div>

21
app/View/Search/auto.ctp Normal file
View File

@ -0,0 +1,21 @@
<?php
/*
*
*/
?>
<div class="box">
<?php
echo $this->element('search_navbar',array('SEARCH_auto'=>true));
?>
<h1><?=__('dreamjob.search.auto');?></h1>
<?=__('dreamjob.search.auto.text');?>
</div>
<div class="box">
<div class="openinggroup">
<?php
foreach($openings as $opening){
echo $this->element('job_opening_item',array('opening' => $opening));
}
?>
</div>
</div>

View File

@ -0,0 +1,41 @@
<?php
/*
*
*/
?>
<div class="box">
<?php
echo $this->element('search_navbar',array('SEARCH_company'=>true));
$a = $default_Form;
$a['inputDefaults']['between'] = '<div class="col-sm-12">';
$a['novalidate'] = true;
echo $this->Form->create('DreamjobJobOpening',$a);
?>
<h1><?=__('dreamjob.search.company');?></h1>
<?php
$a = $default_hForm['inputDefaults'];
$a['between'] = '<div class="col-sm-12">';
echo $this->Form->input('DreamjobCompany.title',$a);
?>
<fieldset class="search">
<?=$this->Form->input('DreamjobJobOpening.branch',array('label'=>__('dreamjob.branch')));?>
<?=$this->Form->input('DreamjobJobOpening.city',array('label'=>__('dreamjob.city')));?>
<div class="form-group submit">
<div>
<?=$this->Form->submit(__('dreamjob.search'),array('class'=>'btn btn-primary'));?>
</div>
</div>
</fieldset>
<?php
echo $this->end();
?>
</div>
<div class="box">
<div class="openinggroup">
<?php
foreach($companies as $company){
echo $this->element('job_company_item',array('company' => $company));
}
?>
</div>
</div>

View File

@ -0,0 +1,41 @@
<?php
/*
*
*/
?>
<div class="box">
<?php
echo $this->element('search_navbar',array('SEARCH_education'=>true));
$a = $default_Form;
$a['inputDefaults']['between'] = '<div class="col-sm-12">';
$a['novalidate'] = true;
echo $this->Form->create('DreamjobJobOpening',$a);
?>
<h1><?=__('dreamjob.search.education');?></h1>
<?php
$a = $default_hForm['inputDefaults'];
$a['between'] = '<div class="col-sm-12">';
echo $this->Form->input('DreamjobJobOpening.title',$a);
?>
<fieldset class="search">
<?=$this->Form->input('DreamjobJobOpening.branch',array('label'=>__('dreamjob.branch')));?>
<?=$this->Form->input('DreamjobJobOpening.city',array('label'=>__('dreamjob.city')));?>
<div class="form-group submit">
<div>
<?=$this->Form->submit(__('dreamjob.search'),array('class'=>'btn btn-primary'));?>
</div>
</div>
</fieldset>
<?php
echo $this->end();
?>
</div>
<div class="box">
<div class="openinggroup">
<?php
foreach($openings as $opening){
echo $this->element('job_opening_item',array('opening' => $opening));
}
?>
</div>
</div>

View File

@ -0,0 +1,41 @@
<?php
/*
*
*/
?>
<div class="box">
<?php
echo $this->element('search_navbar',array('SEARCH_internship'=>true));
$a = $default_Form;
$a['inputDefaults']['between'] = '<div class="col-sm-12">';
$a['novalidate'] = true;
echo $this->Form->create('DreamjobJobOpening',$a);
?>
<h1><?=__('dreamjob.search.internship');?></h1>
<?php
$a = $default_hForm['inputDefaults'];
$a['between'] = '<div class="col-sm-12">';
echo $this->Form->input('DreamjobJobOpening.title',$a);
?>
<fieldset class="search">
<?=$this->Form->input('DreamjobJobOpening.branch',array('label'=>__('dreamjob.branch')));?>
<?=$this->Form->input('DreamjobJobOpening.city',array('label'=>__('dreamjob.city')));?>
<div class="form-group submit">
<div>
<?=$this->Form->submit(__('dreamjob.search'),array('class'=>'btn btn-primary'));?>
</div>
</div>
</fieldset>
<?php
echo $this->end();
?>
</div>
<div class="box">
<div class="openinggroup">
<?php
foreach($openings as $opening){
echo $this->element('job_opening_item',array('opening' => $opening));
}
?>
</div>
</div>

View File

@ -4,15 +4,11 @@
*/
?>
<div class="box">
<div class="tabs-below">
<ul class="nav nav-tabs">
<li class="active"><?=$this->Html->link(__("dreamjob.search.opening"),array('controller'=>'search','action'=>'openings'));?></li>
<li><a>Other</a></li>
</ul>
</div>
<?php
echo $this->element('search_navbar',array('SEARCH_opening'=>true));
$a = $default_Form;
$a['inputDefaults']['between'] = '<div class="col-sm-12">';
$a['novalidate'] = true;
echo $this->Form->create('DreamjobJobOpening',$a);
?>
<h1><?=__('dreamjob.search.opening');?></h1>

Binary file not shown.

After

Width:  |  Height:  |  Size: 23 KiB