miconware
/
dreamjob
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

subject in application

This commit is contained in:
Martin Müller 2014-04-23 16:13:39 +02:00
parent 1d0b51b35b
commit d58707210e
8 changed files with 90 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Controller/UserController.php
View File

@ -49,8 +49,6 @@ class UserController extends AppController {
//get Profil
$hard_error = false;
if(!$this->MiconwareSession->isLoggedin())
$hard_error = true;
$company = false;
$page = null;
@ -93,6 +91,8 @@ class UserController extends AppController {
$hard_error = true;
//error
$this->set('edit', false);
if(!isset( $profil['AppUser']['id']))
$hard_error = true;
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;

2
app/Locale/cake.pot
View File

@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"POT-Creation-Date: 2014-04-23 12:47+0200\n"
"POT-Creation-Date: 2014-04-23 16:12+0200\n"
"PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n"
"Last-Translator: NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <EMAIL@ADDRESS>\n"

2
app/Locale/cake_dev.pot
View File

@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"POT-Creation-Date: 2014-04-23 12:47+0200\n"
"POT-Creation-Date: 2014-04-23 16:12+0200\n"
"PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n"
"Last-Translator: NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <EMAIL@ADDRESS>\n"

138
app/Locale/default.pot
View File

@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"POT-Creation-Date: 2014-04-23 12:47+0200\n"
"POT-Creation-Date: 2014-04-23 16:12+0200\n"
"PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n"
"Last-Translator: NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <EMAIL@ADDRESS>\n"
@ -22,7 +22,7 @@ msgstr ""
msgid "dreamjob.loggedinError"
msgstr ""
#: Controller/RegistrationController.php:63;124
#: Controller/RegistrationController.php:63;118
#: Controller/UserController.php:293
msgid "dreamjob.error.password.notEqual"
msgstr ""
@ -66,14 +66,14 @@ msgstr ""
#: View/Search/internship.ctp:23
#: View/Search/opening.ctp:23
#: View/User/company.ctp:81
#: View/User/settings_account.ctp:67
#: View/User/settings_account.ctp:66
#: View/User/settings_isearch.ctp:29
msgid "dreamjob.branch"
msgstr ""
#: View/Elements/job_company_item.ctp:38
#: View/Elements/job_opening_item.ctp:67
#: View/Elements/user_worker_cv.ctp:42
#: View/Elements/user_worker_cv.ctp:46
#: View/Elements/user_worker_cv_edit.ctp:46
#: View/Elements/user_worker_item.ctp:40
#: View/Job/opening_edit.ctp:45
@ -84,7 +84,7 @@ msgstr ""
#: View/Search/education.ctp:24
#: View/Search/internship.ctp:24
#: View/Search/opening.ctp:25
#: View/User/settings_account.ctp:76
#: View/User/settings_account.ctp:75
msgid "dreamjob.city"
msgstr ""
@ -121,20 +121,20 @@ msgstr ""
#: View/Elements/job_opening_head_extra.ctp:16
#: View/Registration/company.ctp:19
#: View/User/settings_account.ctp:62
#: View/User/settings_account.ctp:61
msgid "dreamjob.company"
msgstr ""
#: View/Elements/job_opening_head_extra.ctp:17
#: View/Registration/company.ctp:25
#: View/User/settings_account.ctp:68
#: View/User/settings_account.ctp:67
msgid "dreamjob.headcount"
msgstr ""
#: View/Elements/job_opening_head_extra.ctp:18
#: View/Registration/company.ctp:23
#: View/User/company.ctp:77
#: View/User/settings_account.ctp:66
#: View/User/settings_account.ctp:65
msgid "dreamjob.owner"
msgstr ""
@ -150,8 +150,8 @@ msgstr ""
#: View/Elements/job_opening_item.ctp:77
#: View/Elements/user_worker_item.ctp:68
#: View/Job/application.ctp:12;64
#: View/Pdf/opening.ctp:27
#: View/Job/application.ctp:12
#: View/Pdf/opening.ctp:25
msgid "dreamjob.application"
msgstr ""
@ -190,7 +190,6 @@ msgstr ""
#: View/Search/internship.ctp:27
#: View/Search/opening.ctp:30
#: View/Search/worker.ctp:24
#: View/User/company.ctp:97
msgid "dreamjob.search"
msgstr ""
@ -207,14 +206,14 @@ msgstr ""
#: View/Registration/company.ctp:15
#: View/Registration/worker.ctp:15
#: View/User/company.ctp:45;68
#: View/User/settings_account.ctp:36
#: View/User/settings_account.ctp:35
msgid "dreamjob.mail"
msgstr ""
#: View/Elements/navbar.ctp:30
#: View/Registration/company.ctp:16
#: View/Registration/worker.ctp:16
#: View/User/settings_account.ctp:38
#: View/User/settings_account.ctp:37
msgid "dreamjob.password"
msgstr ""
@ -252,39 +251,39 @@ msgstr ""
msgid "dreamjob.search.internship"
msgstr ""
#: View/Elements/user_worker_cv.ctp:9
#: View/Elements/user_worker_cv.ctp:11
#: View/Elements/user_worker_cv_edit.ctp:12
#: View/Job/application.ctp:67
#: View/Pdf/opening.ctp:59
#: View/Pdf/opening.ctp:58
#: View/User/worker.ctp:23;25
msgid "dreamjob.cv"
msgstr ""
#: View/Elements/user_worker_cv.ctp:11
#: View/Elements/user_worker_cv.ctp:13
msgid "dreamjob.edit"
msgstr ""
#: View/Elements/user_worker_cv.ctp:23
#: View/Elements/user_worker_cv.ctp:27
#: View/Elements/user_worker_cv_edit.ctp:27
#: View/Registration/worker.ctp:24
#: View/User/settings_account.ctp:48
#: View/User/settings_account.ctp:47
msgid "dreamjob.bday"
msgstr ""
#: View/Elements/user_worker_cv.ctp:34
#: View/Elements/user_worker_cv.ctp:38
#: View/Elements/user_worker_cv_edit.ctp:38
#: View/Elements/user_worker_item.ctp:43
#: View/Registration/worker.ctp:27
#: View/User/settings_account.ctp:51
#: View/User/settings_account.ctp:50
msgid "dreamjob.workexperience"
msgstr ""
#: View/Elements/user_worker_cv.ctp:38
#: View/Elements/user_worker_cv.ctp:42
#: View/Elements/user_worker_cv_edit.ctp:42
msgid "dreamjob.graducation.worker"
msgstr ""
#: View/Elements/user_worker_cv.ctp:46
#: View/Elements/user_worker_cv.ctp:50
#: View/Elements/user_worker_cv_edit.ctp:50
msgid "dreamjob.country.worker"
msgstr ""
@ -313,7 +312,7 @@ msgstr ""
#: View/Elements/user_worker_header.ctp:39
#: View/Registration/worker.ctp:25
#: View/User/settings_account.ctp:49
#: View/User/settings_account.ctp:48
msgid "dreamjob.iam"
msgstr ""
@ -321,7 +320,7 @@ msgstr ""
#: View/Job/opening_edit.ctp:34
#: View/Registration/worker.ctp:26
#: View/Search/opening.ctp:26
#: View/User/settings_account.ctp:50
#: View/User/settings_account.ctp:49
msgid "dreamjob.graducation"
msgstr ""
@ -364,15 +363,28 @@ msgid "dreamjob.my.application"
msgstr ""
#: View/Job/application.ctp:16
#: View/User/company.ctp:107;109;128
#: View/User/company.ctp:111;113;132
msgid "dreamjob.opening"
msgstr ""
#: View/Job/application.ctp:129
#: View/Job/application.ctp:27
msgid "dreamjob.application.close"
msgstr ""
#: View/Job/application.ctp:29
msgid "dreamjob.application.close.actived"
msgstr ""
#: View/Job/application.ctp:64;118
#: View/Pdf/opening.ctp:35
msgid "dreamjob.application.why"
msgstr ""
#: View/Job/application.ctp:131
msgid "dreamjob.message"
msgstr ""
#: View/Job/application.ctp:132
#: View/Job/application.ctp:134
#: View/Job/opening_edit.ctp:49
msgid "dreamjob.save"
msgstr ""
@ -397,24 +409,28 @@ msgstr ""
msgid "dreamjob.application.form"
msgstr ""
#: View/Job/application_send.ctp:21
#: View/Job/application_send.ctp:18
msgid "dreamjob.application.subject"
msgstr ""
#: View/Job/application_send.ctp:22
msgid "dreamjob.application.addPages"
msgstr ""
#: View/Job/application_send.ctp:33
#: View/Job/application_send.ctp:34
#: View/Registration/company.ctp:38
#: View/Registration/worker.ctp:39
msgid "dreamjob.agb.accept"
msgstr ""
#: View/Job/application_send.ctp:33
#: View/Job/application_send.ctp:34
#: View/Layouts/default.ctp:116
#: View/Registration/company.ctp:38
#: View/Registration/worker.ctp:39
msgid "dreamjob.agb"
msgstr ""
#: View/Job/application_send.ctp:36
#: View/Job/application_send.ctp:37
msgid "dreamjob.application.send"
msgstr ""
@ -445,7 +461,7 @@ msgstr ""
#: View/Job/opening_edit.ctp:43
#: View/Registration/company.ctp:31
#: View/Registration/worker.ctp:31
#: View/User/settings_account.ctp:75
#: View/User/settings_account.ctp:74
msgid "dreamjob.street"
msgstr ""
@ -453,7 +469,7 @@ msgstr ""
#: View/Registration/company.ctp:33
#: View/Registration/worker.ctp:33
#: View/Search/opening.ctp:24
#: View/User/settings_account.ctp:77
#: View/User/settings_account.ctp:76
msgid "dreamjob.postcode"
msgstr ""
@ -513,18 +529,10 @@ msgstr ""
msgid "dreamjob.advbyus"
msgstr ""
#: View/Pdf/opening.ctp:29
#: View/Pdf/opening.ctp:27
msgid "dreamjob.application.for"
msgstr ""
#: View/Pdf/opening.ctp:37
msgid "dreamjob.application.why"
msgstr ""
#: View/Pdf/opening.ctp:53
msgid "dreamjob.application.subject"
msgstr ""
#: View/Registration/active.ctp:4
msgid "dreamjob.active"
msgstr ""
@ -544,41 +552,41 @@ msgstr ""
#: View/Registration/company.ctp:13
#: View/Registration/worker.ctp:13
#: View/User/settings_account.ctp:34
#: View/User/settings_account.ctp:33
msgid "dreamjob.account"
msgstr ""
#: View/Registration/company.ctp:17
#: View/Registration/worker.ctp:17
#: View/User/settings_account.ctp:39
#: View/User/settings_account.ctp:38
msgid "dreamjob.password2"
msgstr ""
#: View/Registration/company.ctp:21
#: View/User/settings_account.ctp:64
#: View/User/settings_account.ctp:63
msgid "dreamjob.company.nickname"
msgstr ""
#: View/Registration/company.ctp:22
#: View/User/settings_account.ctp:65
#: View/User/settings_account.ctp:64
msgid "dreamjob.corporateform"
msgstr ""
#: View/Registration/company.ctp:27
#: View/User/company.ctp:38;61
#: View/User/settings_account.ctp:70
#: View/User/settings_account.ctp:69
msgid "dreamjob.website"
msgstr ""
#: View/Registration/company.ctp:29
#: View/Registration/worker.ctp:29
#: View/User/settings_account.ctp:73
#: View/User/settings_account.ctp:72
msgid "dreamjob.addresse"
msgstr ""
#: View/Registration/company.ctp:41
#: View/Registration/worker.ctp:42
#: View/User/settings_account.ctp:83
#: View/User/settings_account.ctp:82
#: View/User/settings_imageUpload.ctp:14
#: View/User/settings_pages.ctp:94
msgid "dreamjob.settings.save"
@ -599,27 +607,27 @@ msgid "dreamjob.registration.worker"
msgstr ""
#: View/Registration/worker.ctp:19
#: View/User/settings_account.ctp:43
#: View/User/settings_account.ctp:42
msgid "dreamjob.worker"
msgstr ""
#: View/Registration/worker.ctp:21
#: View/User/settings_account.ctp:45
#: View/User/settings_account.ctp:44
msgid "dreamjob.mannerofaddress"
msgstr ""
#: View/Registration/worker.ctp:22
#: View/User/settings_account.ctp:46
#: View/User/settings_account.ctp:45
msgid "dreamjob.first_name"
msgstr ""
#: View/Registration/worker.ctp:23
#: View/User/settings_account.ctp:47
#: View/User/settings_account.ctp:46
msgid "dreamjob.last_name"
msgstr ""
#: View/Registration/worker.ctp:34
#: View/User/settings_account.ctp:79
#: View/User/settings_account.ctp:78
msgid "dreamjob.country"
msgstr ""
@ -631,32 +639,32 @@ msgstr ""
msgid "dreamjob.search.worker"
msgstr ""
#: View/User/settings_account.ctp:18;29
#: View/User/settings_account.ctp:17;28
#: View/User/settings_account_delete.ctp:9
#: View/User/settings_isearch.ctp:17
#: View/User/settings_pages.ctp:35
msgid "dreamjob.settings"
msgstr ""
#: View/User/settings_account.ctp:19
#: View/User/settings_account.ctp:18
#: View/User/settings_account_delete.ctp:10
#: View/User/settings_isearch.ctp:18
#: View/User/settings_pages.ctp:36;46
msgid "dreamjob.settings.pages"
msgstr ""
#: View/User/settings_account.ctp:23
#: View/User/settings_account.ctp:22
#: View/User/settings_account_delete.ctp:14
#: View/User/settings_isearch.ctp:19;22
#: View/User/settings_pages.ctp:40
msgid "dreamjob.settings.isearch"
msgstr ""
#: View/User/settings_account.ctp:54;56
#: View/User/settings_account.ctp:53;55
msgid "dreamjob.searchhidden"
msgstr ""
#: View/User/settings_account.ctp:82
#: View/User/settings_account.ctp:81
#: View/User/settings_account_delete.ctp:27
msgid "dreamjob.settings.delete"
msgstr ""
@ -689,10 +697,22 @@ msgstr ""
msgid "dreamjob.page.new"
msgstr ""
#: View/User/settings_pages.ctp:69
msgid "dreamjob.page.title"
msgstr ""
#: View/User/settings_pages.ctp:72
msgid "dreamjob.pages.types"
msgstr ""
#: View/User/settings_pages.ctp:76
msgid "dreamjob.page.image"
msgstr ""
#: View/User/settings_pages.ctp:85
msgid "dreamjob.page.text"
msgstr ""
#: View/User/settings_pages.ctp:91
msgid "dreamjob.page.del"
msgstr ""

3
app/View/Job/application.ctp
View File

@ -26,7 +26,7 @@
<?php if(!empty($COMPANY)){
$str = __('dreamjob.application.close');
if($application['DreamjobJobApplication']['closed'])
$str = __('dreamjob.application.close.activet');
$str = __('dreamjob.application.close.actived');
?>
<?=$this->Html->link($str,array('controller'=>'job','action'=>'applicationGet','id'=>$application['DreamjobJobApplication']['id'],'hiv'=>'hiv')); ?>
<?php } ?>
@ -116,6 +116,7 @@
<?php }else{ ?>
<h1><?=__('dreamjob.application.why');?></h1>
<h3><?=$application['DreamjobJobApplication']['subject'];?></h3>
<?=$application['DreamjobJobApplication']['text'];?>
</div>
<?php

1
app/View/Job/application_send.ctp
View File

@ -15,6 +15,7 @@
//echo $this->Form->hidden('DreamjobJobApplication.id');
echo $this->Form->hidden('DreamjobJobApplication.opening_id');
echo $this->Form->hidden('DreamjobJobApplication.worker_id');
echo $this->Form->input('DreamjobJobApplication.subject',array('label'=>array('text'=>__("dreamjob.application.subject"),"class"=>$default_Form['inputDefaults']['label']['class']))).'<br/>';
echo $this->Form->textarea('DreamjobJobApplication.text',array("class"=>'form-control',"rows"=>10));
?>

2
app/View/Pdf/opening.ctp
View File

@ -48,7 +48,7 @@ $tcpdf->Cell(0,0, $application['DreamjobUser']['postcode'].' '.$application['Dre
$tcpdf->SetY(85);
$tcpdf->SetFont($tcpdf->font,'B',$tcpdf->fontsize);
$tcpdf->Cell(0,0, __('dreamjob.application.subject'), 0,1,'L');
$tcpdf->Cell(0,0, $application['DreamjobJobApplication']['subject'], 0,1,'L');
$tcpdf->SetFont($tcpdf->font);
$tcpdf->SetAutoPageBreak( true,50);
$tcpdf->writeHTML($application['DreamjobJobApplication']['text']);

6
app/View/User/settings_pages.ctp
View File

@ -66,14 +66,14 @@ if($profil['AppUser']['take_systemwide']){
?>
<fieldset>
<?php
echo $this->Form->input('DreamjobPageInh.title');
echo $this->Form->input('DreamjobPageInh.title',array('label'=>array('text'=>__("dreamjob.page.title"),"class"=>$default_Form['inputDefaults']['label']['class'])));
?>
</fieldset>
<legend><?=__('dreamjob.pages.types');?></legend>
<fieldset>
<?php
if(empty($page) or isset($page['DreamjobPageImage']))
echo $this->Form->input('DreamjobPageImage.image',array('type'=>'file'));
echo $this->Form->input('DreamjobPageImage.image',array('label'=>array('text'=>__("dreamjob.page.image"),"class"=>$default_Form['inputDefaults']['label']['class']),'type'=>'file'));
if(empty($page)){
?>
@ -82,7 +82,7 @@ if($profil['AppUser']['take_systemwide']){
}
if(empty($page) or isset($page['DreamjobPageText']))
echo $this->Form->input('DreamjobPageText.text');
echo $this->Form->input('DreamjobPageText.text',array('label'=>array('text'=>__("dreamjob.page.text"),"class"=>$default_Form['inputDefaults']['label']['class'])));
?>
</fieldset>
<div class="buttonrow">