subject in application

app/Config/routes.php

@@ -58,8 +58,7 @@
 	
 	Router::connect('/application', array('controller' => 'job', 'action' => 'applicationList'));
 	Router::connect('/application/:id', array('controller' => 'job', 'action' => 'applicationGet'),array("id" => "[0-9]+"));
-	Router::connect('/application/:id/pdf', array('controller' => 'pdf', 'action' => 'applicationGetPdf'),array("id" => "[0-9]+"));
+		
-		Router::connect('/application/:id.pdf', array('controller' => 'pdf', 'action' => 'applicationGetPdf'),array("id" => "[0-9]+"));
 	Router::connect('/application/:id/page/:page', array('controller' => 'job', 'action' => 'applicationGet'),array("id" => "[0-9]+","page" => "[0-9]+"));
 	Router::connect('/application/:id/curriculum:vitea', array('controller' => 'job', 'action' => 'applicationGet'), array("id" => "[0-9]+",'vitea' => '(?i:vitea)'));
 	Router::connect('/application/:id/mess:ages', array('controller' => 'job', 'action' => 'applicationGet'), array("id" => "[0-9]+",'ages' => '(?i:ages)'));
@@ -80,6 +79,10 @@
 	
 	Router::connect('/test/', array('controller' => 'user', 'action' => 'test'));
 	
+	Router::parseExtensions('pdf');
+	Router::connect('/application/:id.pdf', array('controller' => 'pdf', 'action' => 'applicationGetPdf'),array("id" => "[0-9]+"));
+	Router::connect('/profil.pdf', array('controller' => 'pdf', 'action' => 'profilGetPdf'));
+	
 	Router::parseExtensions('json');
 	Router::connect('/profil/save/cv', array('controller' => 'user', 'action' => 'saveCvJson'));
 	Router::connect('/settings/pages/delete', array('controller' => 'user', 'action' => 'savePageDeleteJson'));

app/Controller/PdfController.php

@@ -4,7 +4,7 @@ App::uses('AppController', 'Controller');
 
 class PdfController extends AppController {
 
-	public $uses = array('DreamjobJobApplication','DreamjobCvEntry','DreamjobListCvCategory');
+	public $uses = array('DreamjobJobApplication','DreamjobCvEntry','DreamjobListCvCategory','DreamjobPageText','DreamjobPageImage');
 
 	public function applicationGetPdf(){
 		$this->MiconwareSession->init($this);
@@ -31,7 +31,30 @@ class PdfController extends AppController {
 			$this->set('cvp0', $cvp0);
 			$this->set('edit', false);
 			$this->layout = 'pdf';
-			$this->render('/Pdf/opening'); 
+			$this->render('/Pdf/application'); 
+		}
+	}
+	public function profilGetPdf(){
+		$this->MiconwareSession->init($this);
+		
+		$this->MiconwareSession->initWeb($this);
+		$WORKER = $this->MiconwareSession->getWorker();
+			
+		if(!is_array($WORKER) or count($WORKER) <= 0){
+			$this->set('error', 'dreamjob.error.noPermision');
+			$this->render('/Home/error');
+		}else{
+			$cv = $this->DreamjobCvEntry->find('all',array('conditions' => array('worker_id'=> $WORKER['AppUser']['id'])));
+			$this->set("cv",$cv);
+			$cvp0 = $this->DreamjobListCvCategory->find('first',array('conditions' => array('DreamjobListCvCategory.position' => 0)));
+			$this->set('cvp0', $cvp0);
+			$this->set('edit', false);
+			
+			$this->set("pageText",$this->DreamjobPageText->find('all',array('DreamjobPageInh.user_id' =>$WORKER['AppUser']['id'])));
+			$this->set("pageImage",$this->DreamjobPageImage->find('all',array('DreamjobPageInh.user_id' =>$WORKER['AppUser']['id'])));
+			
+			$this->layout = 'pdf';
+			$this->render('/Pdf/profil'); 
 		}
 	}
 }

app/Model/DreamjobWorker.php

@@ -307,7 +307,13 @@ class DreamjobWorker extends AppModel {
             'foreignKey' => false,
             'conditions' => array('DreamjobListCity.id=DreamjobUser.city_id'),
             'limit' => 1
-        )
+        ),
+        'Mannerofaddress' => array(
+		    'className' => 'Mannerofaddress',
+		    'foreignKey' => false,
+		    'conditions' => array('DreamjobWorker.djaccount_ptr_id=AppUser.id and Mannerofaddress.id=AppUser.mannerofaddress_id'),
+		    'limit' => 1
+		),
 	);
 	public $hasMany = array(
 		'DreamjobPageInh' => array(
@@ -315,6 +321,9 @@ class DreamjobWorker extends AppModel {
 			'foreignKey' => 'user_id',
 			'order' => "DreamjobPageInh.position"
 		),
+		
+		
+		
 		'DreamjobJobApplication' => array(
 			'className' => 'DreamjobJobApplication',
 			'foreignKey' => 'worker_id'

app/View/Elements/user_worker_cv.ctp

@@ -36,7 +36,7 @@ if($edit){
 			</tr>
 			<tr>
 				<td><?=__("dreamjob.workexperience");?></td>
-				<td><?=$profil['DreamjobWorker']['workexperience'];?></td>
+				<td><?=$profil['DreamjobWorker']['workexperience'].' '.__('dreamjob.years');?></td>
 			</tr>
 			<tr>
 				<td><?=__("dreamjob.graducation.worker");?></td>

app/View/Elements/user_worker_cv_edit.ctp

@@ -36,7 +36,7 @@ echo $this->Html->link($text,array('controller'=>'user','action'=>'profil'),arra
 			</tr>
 			<tr>
 				<td><?=__("dreamjob.workexperience");?></td>
-				<td><?=$profil['DreamjobWorker']['workexperience'];?></td>
+				<td><?=$profil['DreamjobWorker']['workexperience'].' '.__('dreamjob.years');?></td>
 			</tr>
 			<tr>
 				<td><?=__("dreamjob.graducation.worker");?></td>

app/View/Elements/user_worker_header.ctp

@@ -38,13 +38,15 @@
         <p>
             <?=__("dreamjob.iam");?>:<br/>
             <?=$profil['DreamjobWorker']['iam'];?>
-            <c:out value="${profil.iam}"/>
         </p>
-        <?php if(!empty($WORKER) and is_array($WORKER) and count($WORKER) > 0){ ?>
+        <?php if(!empty($WORKER) and is_array($WORKER) and count($WORKER) > 0 and !isset($application)){ ?>
         <h3><?=__("dreamjob.mail");?></h3>
         <a href="mailto:<?=$profil['User']['mail'];?>">
-			<?=$profil['User']['mail'];?>
+			<?=__('dreamjob.mail.contact');?>
         </a>
+		<?=$this->Html->link(__('dreamjob.application.mappePDF'),array('controller'=>'pdf','action'=>'profilGetPdf'));?>
+        <?php }elseif(isset($application)){ ?>
+	        <?=$this->Html->link(__('dreamjob.application.mappePDF'),array('controller'=>'pdf','action'=>'applicationGetPdf','id'=>$application['DreamjobJobApplication']['id']));?>
         <?php } ?>
     </div>
 </div>

app/View/Elements/user_worker_item.ctp

@@ -40,7 +40,7 @@
 		<span><?=__('dreamjob.city').': '.$profil['DreamjobListCity']['name'];?></span>
 		<span><?=__('dreamjob.graducation').': '.$profil[$DreamjobListGraducation]['name'];?></span>
 		<?php if($profil['DreamjobWorker']['workexperience']){ ?>
-		<span><?=__('dreamjob.workexperience').': '.$profil['DreamjobWorker']['workexperience'].' ',__('dreamjob.years');?></span>
+		<span><?=__('dreamjob.workexperience').': '.$profil['DreamjobWorker']['workexperience'].' '.__('dreamjob.years');?></span>
 		<?php } ?>
 		<?php if(isset($enableOpening) and $enableOpening){ ?>
 			<span><?=$this->Time->format('d.m.Y H:i', $profil['DreamjobJobApplication']['created']);?></span>

app/View/Job/application.ctp

@@ -49,7 +49,7 @@
 		'AppUser'=>$application["AppUserWorker"],
 		'User'=>$application["WorkerUser"],
 		'DreamjobListGraducation'=>$application["WorkerGraducation"]);
-	echo $this->element('user_worker_header',array('profil'=>$profil));
+	echo $this->element('user_worker_header',array('profil'=>$profil,'application'=>$application));
 	?>
 	</div>
 <?php } ?>

app/View/User/company.ctp

@@ -67,7 +67,7 @@ if($profil['AppUser']['take_systemwide']){
                     <p>
 						<?=__("dreamjob.mail");?><br/>
 						<a href="mailto:<?=$profil['User']['mail'];?>">
-						    <?=$profil['User']['mail'];?>
+						    <?=__('dreamjob.mail.contact');?>
 						</a>
                     </p>
                 </div>