From b243acf97d33cb2161a617de3c0d274d00c8e78c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20M=C3=BCller?= Date: Sun, 13 Apr 2014 20:06:35 +0200 Subject: [PATCH] lebenslauf <-> profil-Kopf --- app/Controller/UserController.php | 2 +- app/Model/DreamjobCvEntry.php | 2 +- app/Model/DreamjobListCvCategory.php | 1 + app/View/Elements/user_worker_cv.ctp | 25 +++++++++++++++++++++++ app/View/Elements/user_worker_cv_edit.ctp | 25 +++++++++++++++++++++++ app/View/Elements/user_worker_header.ctp | 25 ++--------------------- app/View/User/worker.ctp | 9 +++++++- update.sql | 13 ++++++++++++ 8 files changed, 76 insertions(+), 26 deletions(-) diff --git a/app/Controller/UserController.php b/app/Controller/UserController.php index 3d941cd..f1c0dde 100755 --- a/app/Controller/UserController.php +++ b/app/Controller/UserController.php @@ -139,7 +139,7 @@ class UserController extends AppController { $this->MiconwareSession->setFlash('dreamjob.settings.save.error','flash',array('alert'=>'danger')); } } - $cvc = $this->DreamjobListCvCategory->find('all',array('order'=>'id')); + $cvc = $this->DreamjobListCvCategory->find('all'); $cve = $this->DreamjobCvEntry->find('all',array('conditions' => array('worker_id'=> $self['AppUser']['id']))); $cve2 = array('DreamjobCvEntry'=>null); foreach($cve as $i => $data) diff --git a/app/Model/DreamjobCvEntry.php b/app/Model/DreamjobCvEntry.php index 3d13cb2..b5d667b 100644 --- a/app/Model/DreamjobCvEntry.php +++ b/app/Model/DreamjobCvEntry.php @@ -27,7 +27,7 @@ class DreamjobCvEntry extends AppModel { * @var string */ public $displayField = 'title'; - public $order = array('DreamjobCvEntry.category_id','DreamjobCvEntry.enddate desc','DreamjobCvEntry.id'); + public $order = array('DreamjobListCvCategory.position','DreamjobCvEntry.enddate desc','DreamjobCvEntry.id'); public function saveAndDelete($data,$old){ $dataSource = $this->getDataSource(); diff --git a/app/Model/DreamjobListCvCategory.php b/app/Model/DreamjobListCvCategory.php index e0e4d66..1fabd5d 100644 --- a/app/Model/DreamjobListCvCategory.php +++ b/app/Model/DreamjobListCvCategory.php @@ -26,6 +26,7 @@ class DreamjobListCvCategory extends AppModel { * @var string */ public $displayField = 'name'; + public $order ='position'; /** * Validation rules diff --git a/app/View/Elements/user_worker_cv.ctp b/app/View/Elements/user_worker_cv.ctp index 8066a20..dab9dd6 100644 --- a/app/View/Elements/user_worker_cv.ctp +++ b/app/View/Elements/user_worker_cv.ctp @@ -24,7 +24,32 @@ if($edit){

+ + + + + + + + + + + + + + + + + diff --git a/app/View/Elements/user_worker_cv_edit.ctp b/app/View/Elements/user_worker_cv_edit.ctp index 0e57010..c6c487e 100644 --- a/app/View/Elements/user_worker_cv_edit.ctp +++ b/app/View/Elements/user_worker_cv_edit.ctp @@ -22,6 +22,31 @@ echo $this->Html->link($text,array('controller'=>'user','action'=>'profil'),arra

+ Time->format('d.m.Y', $profil['User']['bday']); + else + echo $this->Time->format('d.m.Y', $profil['AppUser']['bday']); + ?> +
+ + + + + + + + + + + + + + + + + + $i and $cvc_item['DreamjobListCvCategory']['id']==$cve[$i]['DreamjobCvEntry']['category_id']){ ?> diff --git a/app/View/Elements/user_worker_header.ctp b/app/View/Elements/user_worker_header.ctp index 76aead2..54285bb 100644 --- a/app/View/Elements/user_worker_header.ctp +++ b/app/View/Elements/user_worker_header.ctp @@ -33,32 +33,11 @@

+ 0){ ?>

- -
-

- :
- Time->format('d.m.Y', $profil['User']['bday']); - else - echo $this->Time->format('d.m.Y', $profil['AppUser']['bday']); - ?> -

-

- :
- -

-

- :
- -

-

- :
- -

+
diff --git a/app/View/User/worker.ctp b/app/View/User/worker.ctp index 3907a09..a733000 100644 --- a/app/View/User/worker.ctp +++ b/app/View/User/worker.ctp @@ -50,5 +50,12 @@ if(( !empty($COMPANY) and is_array($COMPANY) and count($COMPANY) > 0 and ($COMPA 0){ +?> +
+

+ +
+ diff --git a/update.sql b/update.sql index 2cc72d4..c7ecaf1 100644 --- a/update.sql +++ b/update.sql @@ -74,3 +74,16 @@ Update `mic_dj_cv_entry` left join `mic_dj_cv_category` on `mic_dj_cv_category`. Update `mic_sys_micacc` `a` join `mic_sys_micacc` `d` on `d`.`id` = `a`.`id` set `a`.`code`=concat('a:',`d`.`code`) where not `a`.`code` like '_:%' and not `a`.`code` =''; --Update `mic_sys_micacc` `a` join `mic_sys_micacc` `d` on `d`.`id` = `a`.`id` set `a`.`code`=replace(`d`.`code`,'a:','') where `a`.`code` like 'a:\%%' --Update `mic_sys_micacc` `a` join `mic_sys_micacc` `d` on `d`.`id` = `a`.`id` set `a`.`code`=replace(`d`.`code`,'a:','') where not `a`.`code` like '_:%' + +-- cv sortieren +ALTER TABLE `mic_dj_list_cv-category` ADD `position` INT NOT NULL AFTER `id`; +UPDATE `muellersql3`.`mic_dj_list_cv-category` SET `position` = '10' WHERE `mic_dj_list_cv-category`.`id` = 1; +UPDATE `muellersql3`.`mic_dj_list_cv-category` SET `position` = '20' WHERE `mic_dj_list_cv-category`.`id` = 9; +UPDATE `muellersql3`.`mic_dj_list_cv-category` SET `position` = '30' WHERE `mic_dj_list_cv-category`.`id` = 3; +UPDATE `muellersql3`.`mic_dj_list_cv-category` SET `position` = '40' WHERE `mic_dj_list_cv-category`.`id` = 5; +UPDATE `muellersql3`.`mic_dj_list_cv-category` SET `position` = '50' WHERE `mic_dj_list_cv-category`.`id` = 6; +UPDATE `muellersql3`.`mic_dj_list_cv-category` SET `position` = '60' WHERE `mic_dj_list_cv-category`.`id` = 7; +UPDATE `muellersql3`.`mic_dj_list_cv-category` SET `position` = '70' WHERE `mic_dj_list_cv-category`.`id` = 8; +UPDATE `muellersql3`.`mic_dj_list_cv-category` SET `position` = '80' WHERE `mic_dj_list_cv-category`.`id` = 2; +UPDATE `muellersql3`.`mic_dj_list_cv-category` SET `position` = '90' WHERE `mic_dj_list_cv-category`.`id` = 10; +
+ Time->format('d.m.Y', $profil['User']['bday']); + else + echo $this->Time->format('d.m.Y', $profil['AppUser']['bday']); + ?> +