diff --git a/www/css/custom.css b/www/css/custom.css index a179b3e..e7d96d1 100644 --- a/www/css/custom.css +++ b/www/css/custom.css @@ -62,3 +62,6 @@ span.timestamp { color: #006699; } +.disabled { + color: #999; +} \ No newline at end of file diff --git a/www/css/gridview.css b/www/css/gridview.css deleted file mode 100644 index 44dd706..0000000 --- a/www/css/gridview.css +++ /dev/null @@ -1,638 +0,0 @@ -/* - * File: demo_table_jui.css - * CVS: $Id$ - * Description: CSS descriptions for DataTables demo pages - * Author: Allan Jardine - * Created: Tue May 12 06:47:22 BST 2009 - * Modified: $Date$ by $Author$ - * Language: CSS - * Project: DataTables - * - * Copyright 2009 Allan Jardine. All Rights Reserved. - * - * *************************************************************************** - * DESCRIPTION - * - * The styles given here are suitable for the demos that are used with the standard DataTables - * distribution (see www.datatables.net). You will most likely wish to modify these styles to - * meet the layout requirements of your site. - * - * Common issues: - * 'full_numbers' pagination - I use an extra selector on the body tag to ensure that there is - * no conflict between the two pagination types. If you want to use full_numbers pagination - * ensure that you either have "example_alt_pagination" as a body class name, or better yet, - * modify that selector. - * Note that the path used for Images is relative. All images are by default located in - * ../images/ - relative to this CSS file. - */ - - -/* - * jQuery UI specific styling - */ - -/*.paging_two_button .ui-button { - float: left; - cursor: pointer; - * cursor: hand; -}*/ - -/*.paging_full_numbers .ui-button { - padding: 2px 6px; - margin: 0; - cursor: pointer; - * cursor: hand; - color: #333 !important; -}*/ - -/*.dataTables_paginate .ui-button { - margin-right: -0.1em !important; -} - -.paging_full_numbers { - width: 350px !important; -}*/ - -.dataTables_wrapper .ui-toolbar { - padding: 5px; -} - -/*.dataTables_paginate { - width: auto; -}*/ - -.dataTables_info { - padding: 10px; -} - -table.display thead th { - padding: 3px 0px 3px 10px; - cursor: pointer; - * cursor: hand; -} - -div.dataTables_wrapper .ui-widget-header { - font-weight: normal; -} - - -/* - * Sort arrow icon positioning - */ -table.display thead th div.DataTables_sort_wrapper { - position: relative; - padding-right: 20px; - padding-right: 20px; -} - -table.display thead th div.DataTables_sort_wrapper span { - position: absolute; - top: 50%; - margin-top: -8px; - right: 0; -} - - - - -/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * - * Everything below this line is the same as demo_table.css. This file is - * required for 'cleanliness' of the markup - * - * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ - - - -/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * DataTables features - */ - -.dataTables_wrapper { - background: url("../images/thead.png") repeat-x scroll left top #EEEEEE; - border: 1px solid #CCCCCC; - border-radius: 3px 3px 3px 3px; - position: relative; -} - -.dataTables_processing { - position: absolute; - top: 0px; - left: 50%; - width: 250px; - margin-left: -125px; - border: 1px solid #ddd; - text-align: center; - color: #999; - font-size: 11px; - padding: 2px 0; -} - -.dataTables_length { - padding: 10px; -} - -.dataTables_toolbar { - width: auto; - margin-left: 2em; - float: right; - text-align: right; -} - -.dataTables_filter { - position: absolute; - right: 5px; - top: 11px; -} - -.dataTables_info { - -} - -.dataTables_paginate { - bottom: 7px; - position: absolute; - right: 8px; -} - -/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Pagination - */ - -.paging_full_numbers { - position: absolute; - bottom: 7px; - right: 8px; -} - -.paging_full_numbers .ui-button { - display: inline-block; - padding: 2px 8px; - border: 1px solid #ccc; - margin-left: 5px; - background: #eee url(../images/buttonbg5.png) repeat-x top left; - cursor: pointer; - -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; -} - -.paging_full_numbers .ui-button:hover { - background: #eee; - -moz-box-shadow: inset 1px 1px 2px #ccc; -webkit-box-shadow: inset 1px 1px 2px #ccc; - box-shadow: inset 1px 1px 2px #ccc; -} - -.paging_full_numbers .paginate_active, .paging_full_numbers .ui-button:active { - display: inline-block; padding: 2px 8px; border: 1px solid #405A87; margin-left: 5px; - background: #405A87 url(../images/buttonbg3.png) repeat-x top left; color: #fff; - -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; -} - -.paging_full_numbers .ui-state-disabled { - color: #999; -} - - -.paginate_disabled_previous, .paginate_enabled_previous, .paginate_disabled_next, .paginate_enabled_next { - height: 19px; - width: 19px; - margin-left: 3px; - float: left; -} - -.paginate_disabled_previous { - background-image: url('../images/back_disabled.jpg'); -} - -.paginate_enabled_previous { - background-image: url('../images/back_enabled.jpg'); -} - -.paginate_disabled_next { - background-image: url('../images/forward_disabled.jpg'); -} - -.paginate_enabled_next { - background-image: url('../images/forward_enabled.jpg'); -} - -.paging_full_numbers a.paginate_button, -.paging_full_numbers a.paginate_active { - border: 1px solid #aaa; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - padding: 2px 5px; - margin: 0 3px; - cursor: pointer; - *cursor: hand; - color: #333 !important; -} - -.paging_full_numbers a.paginate_button { - background-color: #ddd; -} - -.paging_full_numbers a.paginate_button:hover { - background-color: #ccc; - text-decoration: none !important; -} - -.paging_full_numbers a.paginate_active { - background-color: #99B3FF; -} - -/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * DataTables display - */ -table.display { - width: 100%; - background: #fcfcfc; - border-collapse: collapse; - border: none; - margin: 0 auto; - clear: both; -} - -table.display thead th, table.display tfoot td { - padding: 5px 10px; - color: #fff; - font-weight: normal; - text-align: left; - background-color: #666; -} - -table.display thead th a, table.display tfoot td a { - color: #fff; -} - -table.display tr.heading2 td { - border-bottom: 1px solid #aaa; -} - -table.display tr:first-child td { - border-top: 0; -} - -table.display tr td { - padding: 5px 10px; - border-top: 1px solid #ddd; -} - -table.display td.center { - text-align: center; -} - - - -/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * DataTables sorting - */ - -.sorting_asc { - background-image: url(../images/sort_asc.png); - background-repeat: no-repeat; - background-position: right 6px; -} - -.sorting_desc { - background-image: url(../images/sort_desc.png); - background-repeat: no-repeat; - background-position: right 6px; -} - -.sorting { - background-image: url(../images/sort_both.png); - background-repeat: no-repeat; - background-position: right 5px; -} - -.sorting_asc_disabled { - background: none; -} - -.sorting_desc_disabled { - background: none; -} - - - - -/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * DataTables row classes - */ -table.display tr.odd.gradeA { - background-color: #ddffdd; -} - -table.display tr.even.gradeA { - background-color: #eeffee; -} - - - - -table.display tr.odd.gradeA { - background-color: #ddffdd; -} - -table.display tr.even.gradeA { - background-color: #eeffee; -} - -table.display tr.odd.gradeC { - background-color: #ddddff; -} - -table.display tr.even.gradeC { - background-color: #eeeeff; -} - -table.display tr.odd.gradeX { - background-color: #ffdddd; -} - -table.display tr.even.gradeX { - background-color: #ffeeee; -} - -table.display tr.odd.gradeU { - background-color: #ddd; -} - -table.display tr.even.gradeU { - background-color: #eee; -} - - -tr.odd { - -} - -tr.even { - background: #eee; -} - - - - - -/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Misc - */ -.dataTables_scroll { - clear: both; -} - -.top, .bottom { - padding: 15px; - background-color: #F5F5F5; - border: 1px solid #CCCCCC; -} - -.top .dataTables_info { - float: none; -} - -.dataTables_empty { - text-align: center; -} - -tfoot input { - margin: 0.5em 0; - width: 100%; - color: #444; -} - -tfoot input.search_init { - color: #999; -} - -td.group { - background-color: #d1cfd0; - border-bottom: 2px solid #A19B9E; - border-top: 2px solid #A19B9E; -} - -td.details { - background-color: #d1cfd0; - border: 2px solid #A19B9E; -} - - -.example_alt_pagination div.dataTables_info { - width: 40%; -} - - - -table.display tr.even.row_selected td { - background-color: #B0BED9; -} - -table.display tr.odd.row_selected td { - background-color: #9FAFD1; -} - - -/* - * Sorting classes for columns - */ -/* For the standard odd/even */ -tr.odd td.sorting_1 { - background: #f7f7f7; -} - -tr.odd td.sorting_2 { - background: #f7f7f7; -} - -tr.odd td.sorting_3 { - background: #f7f7f7; -} - -tr.even td.sorting_1 { - background: #eee; -} - -tr.even td.sorting_2 { - background: #eee; -} - -tr.even td.sorting_3 { - background: #eee; -} - - -/* For the Conditional-CSS grading rows */ -/* - Colour calculations (based off the main row colours) - Level 1: - dd > c4 - ee > d5 - Level 2: - dd > d1 - ee > e2 - */ -tr.odd.gradeA td.sorting_1 { - background-color: #c4ffc4; -} - -tr.odd.gradeA td.sorting_2 { - background-color: #d1ffd1; -} - -tr.odd.gradeA td.sorting_3 { - background-color: #d1ffd1; -} - -tr.even.gradeA td.sorting_1 { - background-color: #d5ffd5; -} - -tr.even.gradeA td.sorting_2 { - background-color: #e2ffe2; -} - -tr.even.gradeA td.sorting_3 { - background-color: #e2ffe2; -} - -tr.odd.gradeC td.sorting_1 { - background-color: #c4c4ff; -} - -tr.odd.gradeC td.sorting_2 { - background-color: #d1d1ff; -} - -tr.odd.gradeC td.sorting_3 { - background-color: #d1d1ff; -} - -tr.even.gradeC td.sorting_1 { - background-color: #d5d5ff; -} - -tr.even.gradeC td.sorting_2 { - background-color: #e2e2ff; -} - -tr.even.gradeC td.sorting_3 { - background-color: #e2e2ff; -} - -tr.odd.gradeX td.sorting_1 { - background-color: #ffc4c4; -} - -tr.odd.gradeX td.sorting_2 { - background-color: #ffd1d1; -} - -tr.odd.gradeX td.sorting_3 { - background-color: #ffd1d1; -} - -tr.even.gradeX td.sorting_1 { - background-color: #ffd5d5; -} - -tr.even.gradeX td.sorting_2 { - background-color: #ffe2e2; -} - -tr.even.gradeX td.sorting_3 { - background-color: #ffe2e2; -} - -tr.odd.gradeU td.sorting_1 { - background-color: #c4c4c4; -} - -tr.odd.gradeU td.sorting_2 { - background-color: #d1d1d1; -} - -tr.odd.gradeU td.sorting_3 { - background-color: #d1d1d1; -} - -tr.even.gradeU td.sorting_1 { - background-color: #d5d5d5; -} - -tr.even.gradeU td.sorting_2 { - background-color: #e2e2e2; -} - -tr.even.gradeU td.sorting_3 { - background-color: #e2e2e2; -} - - -/* - * Row highlighting example - */ -.ex_highlight #example tbody tr.even:hover, #example tbody tr.even td.highlighted { - background-color: #ECFFB3; -} - -.ex_highlight #example tbody tr.odd:hover, #example tbody tr.odd td.highlighted { - background-color: #E6FF99; -} - - - - - - - - - - - - - - - - - - - - -.dataTables_wrapper label { - display: inline-block; - margin-right: 5px; -} - -/** paginacion **/ -/* -.paging_full_numbers .paginate_button:hover { - background: #eee; -moz-box-shadow: inset 1px 1px 2px #ccc; -webkit-box-shadow: inset 1px 1px 2px #ccc; - box-shadow: inset 1px 1px 2px #ccc; -} -.paging_full_numbers .paginate_active, .paging_full_numbers .paginate_button:active { - display: inline-block; padding: 2px 8px; border: 1px solid #405A87; margin-left: 5px; - background: #405A87 url(../images/buttonbg3.png) repeat-x top left; color: #fff; - -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; -} -.paging_full_numbers .paginate_button_disabled { color: #999; }*/ - - -/*.grid-view label { display: inline-block; margin-right: 5px; }*/ -/*.items { } -.items thead th, .items tfoot td { } -.items thead th a, .items tfoot td a { } -.items thead th, .items tfoot td { } -.items thead th.head0, .items tfoot td.head0 { background: #666; } -.items thead th.head1, .items tfoot td.head1 { background: #555; } -.items tbody tr td { } -.items tbody tr:first-child td { } -.items .con1 { background: #eee; } -.items .con0 { background: #f7f7f7; } -.items .odd { } -.items .even { } -.items thead th.sorting { } -.items thead th.sorting_asc { } -.items thead th.sorting_desc { }*/ - -/*.summary { padding: 10px; }*/ \ No newline at end of file diff --git a/www/css/gridview2.css b/www/css/gridview2.css index 99ce468..1e34d2a 100644 --- a/www/css/gridview2.css +++ b/www/css/gridview2.css @@ -283,10 +283,11 @@ tfoot input { margin: 0.5em 0; width: 100%; color: #444; + background-color: #eee; } -tfoot input.search_init { - color: #999; +tfoot td:last-child input { + width: 97%; } td.group { diff --git a/www/css/style.css b/www/css/style.css index f7e4974..90fb12c 100644 --- a/www/css/style.css +++ b/www/css/style.css @@ -454,27 +454,6 @@ input[type=radio], input[type=checkbox] { margin: 0; padding: 0; vertical-align: .sTable3 tbody tr td { padding: 10px; background: #fff; border-top: 1px solid #eee; border-left: 1px solid #eee; } .sTable3 tbody tr.even td { background: #fcfcfc; } -/**dynamic table***/ -/*.dataTables_wrapper { border: 1px solid #ccc; background: #eee url(../images/thead.png) repeat-x top left; - -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; position: relative; } -.dataTables_filter { position: absolute; top: 11px; right: 5px; } -.dataTables_length { padding: 10px 10px; } -.dataTables_wrapper label { display: inline-block; margin-right: 5px; } -.dyntable { width: 100%; background: #fcfcfc; } -.dyntable thead th, .dyntable tfoot th { padding: 5px 10px; color: #fff; font-weight: normal; text-align: left; } -.dyntable thead th.head0, .dyntable tfoot th.head0 { background: #666; } -.dyntable thead th.head1, .dyntable tfoot th.head1 { background: #555; } -.dyntable tbody tr td { padding: 5px 10px; border-top: 1px solid #ddd; } -.dyntable tbody tr:first-child td { border-top: 0; } -.dyntable .con1 { background: #eee; } -.dyntable .con0 { background: #f7f7f7; } -.dyntable thead th.sorting { background-image: url(../images/sort_both.png); background-repeat: no-repeat; background-position: right 5px; } -.dyntable thead th.sorting_asc { background-image: url(../images/sort_asc.png); background-repeat: no-repeat; background-position: right 6px; } -.dyntable thead th.sorting_desc { background-image: url(../images/sort_desc.png); background-repeat: no-repeat; background-position: right 6px; } - -.dataTables_info { padding: 10px; }*/ - - /***PAGINATION (users.html)***/ .pagination a { display: inline-block; padding: 5px 10px; color: #333; border: 1px solid #bbb; background: url(../images/buttonbg5.png) repeat-x bottom left; } .pagination a { -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; } diff --git a/www/protected/config/main.php b/www/protected/config/main.php index 0c7b8fa..38b9a74 100644 --- a/www/protected/config/main.php +++ b/www/protected/config/main.php @@ -47,7 +47,7 @@ return array( '//'=>'/', '/'=>'/', ), - ), + ), 'db'=>array( 'connectionString' => 'mysql:host=localhost;dbname=intranet_dev', 'emulatePrepare' => true, diff --git a/www/protected/controllers/CandidatoCapacidadController.php b/www/protected/controllers/CandidatoCapacidadController.php new file mode 100644 index 0000000..21efcd3 --- /dev/null +++ b/www/protected/controllers/CandidatoCapacidadController.php @@ -0,0 +1,176 @@ +array('index','view'), + 'users'=>array('*'), + ), + array('allow', // allow authenticated user to perform 'create' and 'update' actions + 'actions'=>array('create','update'), + 'users'=>array('@'), + ), + array('allow', // allow admin user to perform 'admin' and 'delete' actions + 'actions'=>array('admin','delete'), + 'users'=>array('admin'), + ), + array('deny', // deny all users + 'users'=>array('*'), + ), + ); + } + + /** + * Displays a particular model. + * @param integer $id the ID of the model to be displayed + */ + public function actionView($id) + { + $this->render('view',array( + 'model'=>$this->loadModel($id), + )); + } + + /** + * Creates a new model. + * If creation is successful, the browser will be redirected to the 'view' page. + */ + public function actionCreate() + { + $model=new CandidatoCapacidad; + + // Uncomment the following line if AJAX validation is needed + // $this->performAjaxValidation($model); + + if(isset($_POST['CandidatoCapacidad'])) + { + $model->attributes=$_POST['CandidatoCapacidad']; + if($model->save()) + $this->redirect(array('view','id'=>$model->id)); + } + + $this->render('create',array( + 'model'=>$model, + )); + } + + /** + * Updates a particular model. + * If update is successful, the browser will be redirected to the 'view' page. + * @param integer $id the ID of the model to be updated + */ + public function actionUpdate($id) + { + $model=$this->loadModel($id); + + // Uncomment the following line if AJAX validation is needed + // $this->performAjaxValidation($model); + + if(isset($_POST['CandidatoCapacidad'])) + { + $model->attributes=$_POST['CandidatoCapacidad']; + if($model->save()) + $this->redirect(array('view','id'=>$model->id)); + } + + $this->render('update',array( + 'model'=>$model, + )); + } + + /** + * Deletes a particular model. + * If deletion is successful, the browser will be redirected to the 'admin' page. + * @param integer $id the ID of the model to be deleted + */ + public function actionDelete($id) + { + if(Yii::app()->request->isPostRequest) + { + // we only allow deletion via POST request + $this->loadModel($id)->delete(); + + // if AJAX request (triggered by deletion via admin grid view), we should not redirect the browser + if(!isset($_GET['ajax'])) + $this->redirect(isset($_POST['returnUrl']) ? $_POST['returnUrl'] : array('admin')); + } + else + throw new CHttpException(400,'Invalid request. Please do not repeat this request again.'); + } + + /** + * Lists all models. + */ + public function actionIndex() + { + $dataProvider=new CActiveDataProvider('CandidatoCapacidad'); + $this->render('index',array( + 'dataProvider'=>$dataProvider, + )); + } + + /** + * Manages all models. + */ + public function actionAdmin() + { + $model=new CandidatoCapacidad('search'); + $model->unsetAttributes(); // clear any default values + if(isset($_GET['CandidatoCapacidad'])) + $model->attributes=$_GET['CandidatoCapacidad']; + + $this->render('admin',array( + 'model'=>$model, + )); + } + + /** + * Returns the data model based on the primary key given in the GET variable. + * If the data model is not found, an HTTP exception will be raised. + * @param integer the ID of the model to be loaded + */ + public function loadModel($id) + { + $model=CandidatoCapacidad::model()->findByPk($id); + if($model===null) + throw new CHttpException(404,'The requested page does not exist.'); + return $model; + } + + /** + * Performs the AJAX validation. + * @param CModel the model to be validated + */ + protected function performAjaxValidation($model) + { + if(isset($_POST['ajax']) && $_POST['ajax']==='candidato-capacidad-form') + { + echo CActiveForm::validate($model); + Yii::app()->end(); + } + } +} diff --git a/www/protected/controllers/CandidatoController.php b/www/protected/controllers/CandidatoController.php index 9dd1919..860313e 100644 --- a/www/protected/controllers/CandidatoController.php +++ b/www/protected/controllers/CandidatoController.php @@ -280,6 +280,7 @@ class CandidatoController extends Controller /** * Lists all models. + * */ public function actionIndex() { diff --git a/www/protected/controllers/SiteController.php b/www/protected/controllers/SiteController.php index 1c89d6d..b35d962 100644 --- a/www/protected/controllers/SiteController.php +++ b/www/protected/controllers/SiteController.php @@ -69,7 +69,8 @@ class SiteController extends Controller { // renders the view file 'protected/views/site/index.php' // using the default layout 'protected/views/layouts/main.php' - $this->render('tablero'); + $this->layout = 'tablero'; + $this->render('tablero'); } /** diff --git a/www/protected/extensions/SelGridView.php b/www/protected/extensions/SelGridView.php index ce7da57..580716b 100644 --- a/www/protected/extensions/SelGridView.php +++ b/www/protected/extensions/SelGridView.php @@ -6,6 +6,7 @@ */ Yii::import('zii.widgets.grid.CGridView'); +Yii::import('zii.widgets.grid.CCheckBoxColumn'); /** * SelGridView v1.1 @@ -21,7 +22,15 @@ Yii::import('zii.widgets.grid.CGridView'); * )); * */ - + +class SelCheckboxColumn extends CCheckBoxColumn +{ + public function renderFilterCell() + { + // + } +} + class SelGridView extends CGridView { /** @@ -59,10 +68,11 @@ class SelGridView extends CGridView } //creating hidden checkbox column - $checkboxColumn = new CCheckBoxColumn($this); + $checkboxColumn = new SelCheckboxColumn($this); $checkboxColumn->checked = 'isset($_GET["'.$this->selVar.'"]) ? in_array('.$primaryKey.', is_array($_GET["'.$this->selVar.'"]) ? $_GET["'.$this->selVar.'"] : array($_GET["'.$this->selVar.'"])) : false;'; $checkboxColumn->htmlOptions = array('style'=>'display:none'); $checkboxColumn->headerHtmlOptions = array('style'=>'display:none'); + $checkboxColumn->footerHtmlOptions = array('style'=>'display:none'); $checkboxColumn->init(); $this->columns[] = $checkboxColumn; diff --git a/www/protected/messages/es/intranet.php b/www/protected/messages/es/intranet.php index 35b2a4a..82d8797 100644 --- a/www/protected/messages/es/intranet.php +++ b/www/protected/messages/es/intranet.php @@ -19,6 +19,7 @@ * @version $Id: $ */ return array ( + 'Búsqueda avanzada' => '', 'Candidatos' => '', 'Gestión de candidatos' => '', 'Gestión de usuarios' => '', @@ -26,9 +27,11 @@ return array ( 'Modificar usuario' => '', 'Modificar usuario ' => '', 'No hay candidatos' => '', + 'No hay usuarios' => '', 'Nuevo usuario' => '', 'Ofertas' => '', 'Preferencias' => '', + 'Search' => 'Buscar', 'Sistema' => '', 'Solicitudes de oferta' => '', 'Tablero' => '', diff --git a/www/protected/migrations/m120130_120941_tbl_candidatos_capacidades.php b/www/protected/migrations/m120130_120941_tbl_candidatos_capacidades.php deleted file mode 100644 index 14bfd9b..0000000 --- a/www/protected/migrations/m120130_120941_tbl_candidatos_capacidades.php +++ /dev/null @@ -1,57 +0,0 @@ -createTable('tbl_candidatos_capacidades', array( - 'id' => 'pk', - 'candidato_id' => 'integer NOT NULL', - 'perfil_tecnico_id' => 'integer NOT NULL', - 'meses_perfil_tecnico' => 'integer', - 'perfil_funcional_id' => 'integer NOT NULL', - 'meses_perfil_funcional' => 'integer', - 'observaciones' => 'text', - )); - - $this->addForeignKey('fk_candidatos_capacidades_1', 'tbl_candidatos_capacidades', 'candidato_id', 'tbl_candidatos', 'id', 'CASCADE', 'CASCADE'); - $this->addForeignKey('fk_candidatos_capacidades_2', 'tbl_candidatos_capacidades', 'perfil_tecnico_id', 'tbl_perfiles_tecnicos', 'id', 'CASCADE', 'RESTRICT'); - $this->addForeignKey('fk_candidatos_capacidades_3', 'tbl_candidatos_capacidades', 'perfil_funcional_id', 'tbl_perfiles_funcionales', 'id', 'CASCADE', 'RESTRICT'); - - - $this->createTable('tbl_candidatos_capacidades_tecnologias', array( - 'id' => 'pk', - 'capacidad_id' => 'integer NOT NULL', - 'tecnologia_id' => 'integer NOT NULL', - 'meses_tecnologia' => 'integer', - )); - - $this->addForeignKey('tbl_candidatos_capacidades_tecnologias_1', 'tbl_candidatos_capacidades_tecnologias', 'capacidad_id', 'tbl_candidatos_capacidades', 'id', 'CASCADE', 'CASCADE'); - $this->addForeignKey('tbl_candidatos_capacidades_tecnologias_2', 'tbl_candidatos_capacidades_tecnologias', 'tecnologia_id', 'tbl_tecnologias', 'id', 'CASCADE', 'RESTRICT'); - - } - - public function down() - { - - $this->dropForeignKey('tbl_candidatos_capacidades_tecnologias_2', 'tbl_candidatos_capacidades_tecnologias'); - $this->dropForeignKey('tbl_candidatos_capacidades_tecnologias_1', 'tbl_candidatos_capacidades_tecnologias'); - $this->dropTable('tbl_candidatos_capacidades_tecnologias'); - - $this->dropForeignKey('fk_candidatos_capacidades_3', 'tbl_candidatos_capacidades'); - $this->dropForeignKey('fk_candidatos_capacidades_2', 'tbl_candidatos_capacidades'); - $this->dropForeignKey('fk_candidatos_capacidades_1', 'tbl_candidatos_capacidades'); - $this->dropTable('tbl_candidatos_capacidades'); - } - - /* - // Use safeUp/safeDown to do migration with transaction - public function safeUp() - { - } - - public function safeDown() - { - } - */ -} diff --git a/www/protected/migrations/m120306_173556_tbl_candidatos_capacidades.php b/www/protected/migrations/m120306_173556_tbl_candidatos_capacidades.php new file mode 100644 index 0000000..715c494 --- /dev/null +++ b/www/protected/migrations/m120306_173556_tbl_candidatos_capacidades.php @@ -0,0 +1,36 @@ +createTable('tbl_candidatos_capacidades', array( + 'id' => 'pk', + 'candidato_id' => 'integer NOT NULL', + 'perfil_tecnico_id' => 'integer NOT NULL', + 'meses_perfil_tecnico' => 'integer', + 'observaciones' => 'text', + )); + + $this->addForeignKey('fk_candidatos_capacidades_1', 'tbl_candidatos_capacidades', 'candidato_id', 'tbl_candidatos', 'id', 'CASCADE', 'CASCADE'); + $this->addForeignKey('fk_candidatos_capacidades_2', 'tbl_candidatos_capacidades', 'perfil_tecnico_id', 'tbl_perfiles_tecnicos', 'id', 'CASCADE', 'RESTRICT'); + } + + public function down() + { + $this->dropForeignKey('fk_candidatos_capacidades_2', 'tbl_candidatos_capacidades'); + $this->dropForeignKey('fk_candidatos_capacidades_1', 'tbl_candidatos_capacidades'); + $this->dropTable('tbl_candidatos_capacidades'); + } + + /* + // Use safeUp/safeDown to do migration with transaction + public function safeUp() + { + } + + public function safeDown() + { + } + */ +} \ No newline at end of file diff --git a/www/protected/migrations/m120306_174330_tbl_candidatos_capacidades_funcionales.php b/www/protected/migrations/m120306_174330_tbl_candidatos_capacidades_funcionales.php new file mode 100644 index 0000000..37f7f35 --- /dev/null +++ b/www/protected/migrations/m120306_174330_tbl_candidatos_capacidades_funcionales.php @@ -0,0 +1,35 @@ +createTable('tbl_candidatos_capacidades_funcionales', array( + 'id' => 'pk', + 'capacidad_id' => 'integer NOT NULL', + 'funcional_id' => 'integer NOT NULL', + 'meses_funcional' => 'integer', + )); + + $this->addForeignKey('tbl_candidatos_capacidades_funcionales_1', 'tbl_candidatos_capacidades_funcionales', 'capacidad_id', 'tbl_candidatos_capacidades', 'id', 'CASCADE', 'CASCADE'); + $this->addForeignKey('tbl_candidatos_capacidades_funcionales_2', 'tbl_candidatos_capacidades_funcionales', 'funcional_id', 'tbl_perfiles_funcionales', 'id', 'CASCADE', 'RESTRICT'); + } + + public function down() + { + $this->dropForeignKey('tbl_candidatos_capacidades_funcionales_2', 'tbl_candidatos_capacidades_funcionales'); + $this->dropForeignKey('tbl_candidatos_capacidades_funcionales_1', 'tbl_candidatos_capacidades_funcionales'); + $this->dropTable('tbl_candidatos_capacidades_funcionales'); + } + + /* + // Use safeUp/safeDown to do migration with transaction + public function safeUp() + { + } + + public function safeDown() + { + } + */ +} \ No newline at end of file diff --git a/www/protected/migrations/m120306_174413_tbl_candidatos_capacidades_tecnologias.php b/www/protected/migrations/m120306_174413_tbl_candidatos_capacidades_tecnologias.php new file mode 100644 index 0000000..dd19d91 --- /dev/null +++ b/www/protected/migrations/m120306_174413_tbl_candidatos_capacidades_tecnologias.php @@ -0,0 +1,35 @@ +createTable('tbl_candidatos_capacidades_tecnologias', array( + 'id' => 'pk', + 'capacidad_id' => 'integer NOT NULL', + 'tecnologia_id' => 'integer NOT NULL', + 'meses_tecnologia' => 'integer', + )); + + $this->addForeignKey('tbl_candidatos_capacidades_tecnologias_1', 'tbl_candidatos_capacidades_tecnologias', 'capacidad_id', 'tbl_candidatos_capacidades', 'id', 'CASCADE', 'CASCADE'); + $this->addForeignKey('tbl_candidatos_capacidades_tecnologias_2', 'tbl_candidatos_capacidades_tecnologias', 'tecnologia_id', 'tbl_tecnologias', 'id', 'CASCADE', 'RESTRICT'); + } + + public function down() + { + $this->dropForeignKey('tbl_candidatos_capacidades_tecnologias_2', 'tbl_candidatos_capacidades_tecnologias'); + $this->dropForeignKey('tbl_candidatos_capacidades_tecnologias_1', 'tbl_candidatos_capacidades_tecnologias'); + $this->dropTable('tbl_candidatos_capacidades_tecnologias'); + } + + /* + // Use safeUp/safeDown to do migration with transaction + public function safeUp() + { + } + + public function safeDown() + { + } + */ +} \ No newline at end of file diff --git a/www/protected/models/Candidato.php b/www/protected/models/Candidato.php index 6e1822e..79550f8 100644 --- a/www/protected/models/Candidato.php +++ b/www/protected/models/Candidato.php @@ -21,8 +21,9 @@ * @property integer $usuario_modificacion * * The followings are the available model relations: - * @property CapacidadProfesional[] $capacidades + * @property CandidatoCapacidad[] $capacidades * @property CandidatoIdioma[] $idiomas + * @property CandidatoTitulacion[] $titulaciones */ class Candidato extends CActiveRecord { @@ -121,9 +122,11 @@ class Candidato extends CActiveRecord // NOTE: you may need to adjust the relation name and the related // class name for the relations automatically generated below. return array( - 'capacidades' => array(self::HAS_MANY, 'CapacidadProfesional', 'candidato_id'), + 'capacidades' => array(self::HAS_MANY, 'CandidatoCapacidad', 'candidato_id'), 'idiomas' => array(self::HAS_MANY, 'CandidatoIdioma', 'candidato_id'), 'idiomasCount' => array(self::STAT, 'CandidatoIdioma', 'candidato_id'), + 'titulaciones' => array(self::HAS_MANY, 'CandidatoTitulacion', 'candidato_id'), + 'titulacionesCount' => array(self::STAT, 'CandidatoTitulacion', 'candidato_id'), ); } diff --git a/www/protected/models/CandidatoCapacidad.php b/www/protected/models/CandidatoCapacidad.php new file mode 100644 index 0000000..473ea36 --- /dev/null +++ b/www/protected/models/CandidatoCapacidad.php @@ -0,0 +1,106 @@ +true), + array('observaciones', 'safe'), + // The following rule is used by search(). + // Please remove those attributes that should not be searched. + array('id, candidato_id, perfil_tecnico_id, meses_perfil_tecnico, observaciones', 'safe', 'on'=>'search'), + ); + } + + /** + * @return array relational rules. + */ + public function relations() + { + // NOTE: you may need to adjust the relation name and the related + // class name for the relations automatically generated below. + return array( + 'perfilTecnico' => array(self::BELONGS_TO, 'PerfilesTecnicos', 'perfil_tecnico_id'), + 'candidato' => array(self::BELONGS_TO, 'Candidatos', 'candidato_id'), + 'capacidadesFuncionales' => array(self::HAS_MANY, 'CandidatosCapacidadesFuncionales', 'capacidad_id'), + 'tecnologias' => array(self::HAS_MANY, 'CandidatosCapacidadesTecnologias', 'capacidad_id'), + ); + } + + /** + * @return array customized attribute labels (name=>label) + */ + public function attributeLabels() + { + return array( + 'id' => 'ID', + 'candidato_id' => 'Candidato', + 'perfil_tecnico_id' => 'Perfil técnico', + 'meses_perfil_tecnico' => 'Meses', + 'observaciones' => 'Observaciones', + ); + } + + /** + * Retrieves a list of models based on the current search/filter conditions. + * @return CActiveDataProvider the data provider that can return the models based on the search/filter conditions. + */ + public function search() + { + // Warning: Please modify the following code to remove attributes that + // should not be searched. + + $criteria=new CDbCriteria; + + $criteria->compare('id',$this->id); + $criteria->compare('candidato_id',$this->candidato_id); + $criteria->compare('perfil_tecnico_id',$this->perfil_tecnico_id); + $criteria->compare('meses_perfil_tecnico',$this->meses_perfil_tecnico); + $criteria->compare('observaciones',$this->observaciones,true); + + return new CActiveDataProvider($this, array( + 'criteria'=>$criteria, + )); + } +} \ No newline at end of file diff --git a/www/protected/models/CapacidadProfesional.php b/www/protected/models/CapacidadProfesional.bak.php similarity index 100% rename from www/protected/models/CapacidadProfesional.php rename to www/protected/models/CapacidadProfesional.bak.php diff --git a/www/protected/models/CapacidadProfesionalTecnologia.php b/www/protected/models/CapacidadProfesionalTecnologia.bak.php similarity index 100% rename from www/protected/models/CapacidadProfesionalTecnologia.php rename to www/protected/models/CapacidadProfesionalTecnologia.bak.php diff --git a/www/protected/tests/fixtures/tbl_poblaciones.php b/www/protected/tests/fixtures/tbl_poblaciones.php index 2d0f1f7..363632d 100644 --- a/www/protected/tests/fixtures/tbl_poblaciones.php +++ b/www/protected/tests/fixtures/tbl_poblaciones.php @@ -8117,6 +8117,5 @@ return array ( '50298' => array('provincia'=>50, 'poblacion'=>'Zuera'), '51001' => array('provincia'=>51, 'poblacion'=>'Ceuta'), '52001' => array('provincia'=>52, 'poblacion'=>'Melilla'), - ); ?> diff --git a/www/protected/views/candidato/_idiomas.php b/www/protected/views/candidato/_idiomas.php index b0f2120..349867d 100644 --- a/www/protected/views/candidato/_idiomas.php +++ b/www/protected/views/candidato/_idiomas.php @@ -1,4 +1,5 @@ clientScript->registerScriptFile(Yii::app()->baseUrl . '/js/plugins/jquery-ui-1.8.16.custom.min.js'); $idiomaFormConfig = array( 'elements'=>array( diff --git a/www/protected/views/candidato/_search.php b/www/protected/views/candidato/_search.php index 0d15cd5..d3ef29b 100644 --- a/www/protected/views/candidato/_search.php +++ b/www/protected/views/candidato/_search.php @@ -81,7 +81,7 @@
- +
endWidget(); ?> diff --git a/www/protected/views/candidato/_titulaciones.php b/www/protected/views/candidato/_titulaciones.php index 385f962..eb3fc46 100644 --- a/www/protected/views/candidato/_titulaciones.php +++ b/www/protected/views/candidato/_titulaciones.php @@ -1,4 +1,5 @@ clientScript->registerScriptFile(Yii::app()->baseUrl . '/js/plugins/jquery-ui-1.8.16.custom.min.js'); $titulacionFormConfig = array( 'elements'=>array( diff --git a/www/protected/views/candidato/index.php b/www/protected/views/candidato/index.php index bc93292..6371041 100644 --- a/www/protected/views/candidato/index.php +++ b/www/protected/views/candidato/index.php @@ -56,11 +56,21 @@ $('.search-form form').submit(function(){
- +
Yii::t('intranet', 'Acciones'), + 'class'=>'CButtonColumn', + 'headerHtmlOptions'=>array( + 'style' => 'width:55px;', + 'class' => 'head1', + ), + 'template'=>'{update}{delete}', + 'cssClassExpression' => '"con1"', + ), /*array( 'type' => 'html', 'name' => 'nombreApellidos', @@ -77,6 +87,7 @@ $('.search-form form').submit(function(){ /*'colspan' => '1', 'rowspan' => '1',*/ ), + 'cssClassExpression' => '"con0"', ), array( 'type' => 'html', @@ -87,6 +98,7 @@ $('.search-form form').submit(function(){ /*'colspan' => '1', 'rowspan' => '2',*/ ), + 'cssClassExpression' => '"con0"', ), array( 'type' => 'html', @@ -97,8 +109,8 @@ $('.search-form form').submit(function(){ /*'colspan' => '1', 'rowspan' => '2',*/ ), + 'cssClassExpression' => '"con1"', ), - array( 'type' => 'html', 'name' => 'estado', @@ -108,20 +120,16 @@ $('.search-form form').submit(function(){ /*'colspan' => '1', 'rowspan' => '2',*/ ), + 'cssClassExpression' => '"con0"', ), array( 'name' => 'fecha_modificacion', 'headerHtmlOptions'=>array( - 'class' => 'head1 sorting', + 'class' => 'head0 sorting', /*'colspan' => '1', 'rowspan' => '2',*/ ), - ), - array( - 'class'=>'CButtonColumn', - //'template'=>'{update}{delete}', - //'updateButtonUrl'=>'Yii::app()->createUrl("/candidato/update", array("id" => $data["id"]))', - //'deleteButtonUrl'=>'Yii::app()->createUrl("/candidato/delete", array("id" => $data["id"]))', + 'cssClassExpression' => '"con1"', ), ); @@ -143,7 +151,7 @@ $('.search-form form').submit(function(){ 'summaryCssClass' => 'dataTables_info', 'summaryText' => 'Mostrando registros del {start} al {end} de {count} en total.', 'selectableRows' => 1, - )); + )); ?> diff --git a/www/protected/views/candidato/update.php b/www/protected/views/candidato/update.php index df5f099..01ff6d4 100644 --- a/www/protected/views/candidato/update.php +++ b/www/protected/views/candidato/update.php @@ -1,22 +1,19 @@ breadcrumbs=array( 'Candidatos'=>array('index'), - $model->id=>array('view','id'=>$model->id), - 'Update', + $model->nombre . ' ' . $model->apellidos, ); -$this->menu=array( +/*$this->menu=array( array('label'=>'List Candidato', 'url'=>array('index')), array('label'=>'Create Candidato', 'url'=>array('create')), array('label'=>'View Candidato', 'url'=>array('view', 'id'=>$model->id)), array('label'=>'Manage Candidato', 'url'=>array('admin')), -); +);*/ -$this->pageTitle='Modificar candidato ' . $model->nombre . ' ' . $model->apellidos; +$this->pageTitle='Modificar candidato "' . $model->nombre . ' ' . $model->apellidos . '"'; ?> -

Update Candidato id; ?>

- renderPartial('_form', array( 'model'=>$model, 'idioma'=>$idioma, diff --git a/www/protected/views/candidatoCapacidad/_form.php b/www/protected/views/candidatoCapacidad/_form.php new file mode 100644 index 0000000..1ea8f85 --- /dev/null +++ b/www/protected/views/candidatoCapacidad/_form.php @@ -0,0 +1,42 @@ +
+ +beginWidget('CActiveForm', array( + 'id'=>'candidato-capacidad-form', + 'enableAjaxValidation'=>false, +)); ?> + +

Fields with * are required.

+ + errorSummary($model); ?> + +
+ labelEx($model,'candidato_id'); ?> + textField($model,'candidato_id'); ?> + error($model,'candidato_id'); ?> +
+ +
+ labelEx($model,'perfil_tecnico_id'); ?> + textField($model,'perfil_tecnico_id'); ?> + error($model,'perfil_tecnico_id'); ?> +
+ +
+ labelEx($model,'meses_perfil_tecnico'); ?> + textField($model,'meses_perfil_tecnico'); ?> + error($model,'meses_perfil_tecnico'); ?> +
+ +
+ labelEx($model,'observaciones'); ?> + textArea($model,'observaciones',array('rows'=>6, 'cols'=>50)); ?> + error($model,'observaciones'); ?> +
+ +
+ isNewRecord ? 'Create' : 'Save'); ?> +
+ +endWidget(); ?> + +
\ No newline at end of file diff --git a/www/protected/views/candidatoCapacidad/_search.php b/www/protected/views/candidatoCapacidad/_search.php new file mode 100644 index 0000000..c63c20b --- /dev/null +++ b/www/protected/views/candidatoCapacidad/_search.php @@ -0,0 +1,39 @@ +
+ +beginWidget('CActiveForm', array( + 'action'=>Yii::app()->createUrl($this->route), + 'method'=>'get', +)); ?> + +
+ label($model,'id'); ?> + textField($model,'id'); ?> +
+ +
+ label($model,'candidato_id'); ?> + textField($model,'candidato_id'); ?> +
+ +
+ label($model,'perfil_tecnico_id'); ?> + textField($model,'perfil_tecnico_id'); ?> +
+ +
+ label($model,'meses_perfil_tecnico'); ?> + textField($model,'meses_perfil_tecnico'); ?> +
+ +
+ label($model,'observaciones'); ?> + textArea($model,'observaciones',array('rows'=>6, 'cols'=>50)); ?> +
+ +
+ +
+ +endWidget(); ?> + +
\ No newline at end of file diff --git a/www/protected/views/candidatoCapacidad/_view.php b/www/protected/views/candidatoCapacidad/_view.php new file mode 100644 index 0000000..c42fde1 --- /dev/null +++ b/www/protected/views/candidatoCapacidad/_view.php @@ -0,0 +1,24 @@ +
+ + getAttributeLabel('id')); ?>: + id), array('view', 'id'=>$data->id)); ?> +
+ + getAttributeLabel('candidato_id')); ?>: + candidato_id); ?> +
+ + getAttributeLabel('perfil_tecnico_id')); ?>: + perfil_tecnico_id); ?> +
+ + getAttributeLabel('meses_perfil_tecnico')); ?>: + meses_perfil_tecnico); ?> +
+ + getAttributeLabel('observaciones')); ?>: + observaciones); ?> +
+ + +
\ No newline at end of file diff --git a/www/protected/views/candidatoCapacidad/admin.php b/www/protected/views/candidatoCapacidad/admin.php new file mode 100644 index 0000000..aca0037 --- /dev/null +++ b/www/protected/views/candidatoCapacidad/admin.php @@ -0,0 +1,54 @@ +breadcrumbs=array( + 'Candidato Capacidads'=>array('index'), + 'Manage', +); + +$this->menu=array( + array('label'=>'List CandidatoCapacidad', 'url'=>array('index')), + array('label'=>'Create CandidatoCapacidad', 'url'=>array('create')), +); + +Yii::app()->clientScript->registerScript('search', " +$('.search-button').click(function(){ + $('.search-form').toggle(); + return false; +}); +$('.search-form form').submit(function(){ + $.fn.yiiGridView.update('candidato-capacidad-grid', { + data: $(this).serialize() + }); + return false; +}); +"); +?> + +

Manage Candidato Capacidads

+ +

+You may optionally enter a comparison operator (<, <=, >, >=, <> +or =) at the beginning of each of your search values to specify how the comparison should be done. +

+ +'search-button')); ?> + + +widget('zii.widgets.grid.CGridView', array( + 'id'=>'candidato-capacidad-grid', + 'dataProvider'=>$model->search(), + 'filter'=>$model, + 'columns'=>array( + 'id', + 'candidato_id', + 'perfil_tecnico_id', + 'meses_perfil_tecnico', + 'observaciones', + array( + 'class'=>'CButtonColumn', + ), + ), +)); ?> diff --git a/www/protected/views/candidatoCapacidad/create.php b/www/protected/views/candidatoCapacidad/create.php new file mode 100644 index 0000000..fef516f --- /dev/null +++ b/www/protected/views/candidatoCapacidad/create.php @@ -0,0 +1,15 @@ +breadcrumbs=array( + 'Candidato Capacidads'=>array('index'), + 'Create', +); + +$this->menu=array( + array('label'=>'List CandidatoCapacidad', 'url'=>array('index')), + array('label'=>'Manage CandidatoCapacidad', 'url'=>array('admin')), +); +?> + +

Create CandidatoCapacidad

+ +renderPartial('_form', array('model'=>$model)); ?> \ No newline at end of file diff --git a/www/protected/views/candidatoCapacidad/index.php b/www/protected/views/candidatoCapacidad/index.php new file mode 100644 index 0000000..46f943c --- /dev/null +++ b/www/protected/views/candidatoCapacidad/index.php @@ -0,0 +1,17 @@ +breadcrumbs=array( + 'Candidato Capacidads', +); + +$this->menu=array( + array('label'=>'Create CandidatoCapacidad', 'url'=>array('create')), + array('label'=>'Manage CandidatoCapacidad', 'url'=>array('admin')), +); +?> + +

Candidato Capacidads

+ +widget('zii.widgets.CListView', array( + 'dataProvider'=>$dataProvider, + 'itemView'=>'_view', +)); ?> diff --git a/www/protected/views/candidatoCapacidad/update.php b/www/protected/views/candidatoCapacidad/update.php new file mode 100644 index 0000000..f22e324 --- /dev/null +++ b/www/protected/views/candidatoCapacidad/update.php @@ -0,0 +1,18 @@ +breadcrumbs=array( + 'Candidato Capacidads'=>array('index'), + $model->id=>array('view','id'=>$model->id), + 'Update', +); + +$this->menu=array( + array('label'=>'List CandidatoCapacidad', 'url'=>array('index')), + array('label'=>'Create CandidatoCapacidad', 'url'=>array('create')), + array('label'=>'View CandidatoCapacidad', 'url'=>array('view', 'id'=>$model->id)), + array('label'=>'Manage CandidatoCapacidad', 'url'=>array('admin')), +); +?> + +

Update CandidatoCapacidad id; ?>

+ +renderPartial('_form', array('model'=>$model)); ?> \ No newline at end of file diff --git a/www/protected/views/candidatoCapacidad/view.php b/www/protected/views/candidatoCapacidad/view.php new file mode 100644 index 0000000..df394c5 --- /dev/null +++ b/www/protected/views/candidatoCapacidad/view.php @@ -0,0 +1,27 @@ +breadcrumbs=array( + 'Candidato Capacidads'=>array('index'), + $model->id, +); + +$this->menu=array( + array('label'=>'List CandidatoCapacidad', 'url'=>array('index')), + array('label'=>'Create CandidatoCapacidad', 'url'=>array('create')), + array('label'=>'Update CandidatoCapacidad', 'url'=>array('update', 'id'=>$model->id)), + array('label'=>'Delete CandidatoCapacidad', 'url'=>'#', 'linkOptions'=>array('submit'=>array('delete','id'=>$model->id),'confirm'=>'Are you sure you want to delete this item?')), + array('label'=>'Manage CandidatoCapacidad', 'url'=>array('admin')), +); +?> + +

View CandidatoCapacidad #id; ?>

+ +widget('zii.widgets.CDetailView', array( + 'data'=>$model, + 'attributes'=>array( + 'id', + 'candidato_id', + 'perfil_tecnico_id', + 'meses_perfil_tecnico', + 'observaciones', + ), +)); ?> diff --git a/www/protected/views/layouts/default.php b/www/protected/views/layouts/default.php index 960f143..b178403 100644 --- a/www/protected/views/layouts/default.php +++ b/www/protected/views/layouts/default.php @@ -76,13 +76,13 @@ ), array( 'label'=>Yii::t('intranet', 'Ofertas'), - 'url'=>array(''), + 'url'=>array('/site/index'), 'linkOptions'=>array('class'=>'ofertas'), 'active' => ($this->getId() == 'oferta'), ), array( 'label'=>Yii::t('intranet', 'Solicitudes de oferta'), - 'url'=>array(''), + 'url'=>array('/site/index'), 'linkOptions'=>array('class'=>'solicitudes'), 'active' => ($this->getId() == 'solicitud'), ), @@ -99,7 +99,7 @@
- Avatar + Avatar

user->name; ?>

@@ -168,7 +168,7 @@
- Copyright © by My Company.
+ by My Company.
*/ ?>
diff --git a/www/protected/views/layouts/tablero.php b/www/protected/views/layouts/tablero.php new file mode 100644 index 0000000..fabdc12 --- /dev/null +++ b/www/protected/views/layouts/tablero.php @@ -0,0 +1,135 @@ + + + + + + + + + + + + + + + + + <?php echo CHtml::encode($this->pageTitle); ?> + + + +
+ +
+ + + +
+ +
+ + + + Logo + +
+ widget('zii.widgets.CMenu',array( + 'activeCssClass'=>'current', + 'linkLabelWrapper' => 'span', + 'items'=>array( + array( + 'label'=>Yii::t('intranet', 'Tablero'), + 'url'=>array('/site/index'), + 'linkOptions'=>array('class'=>'dashboard'), + 'active' => ($this->getId() == 'tablero'), + ), + array( + 'label'=>Yii::t('intranet', 'Candidatos'), + 'url'=>array('/candidato'), + 'linkOptions'=>array('class'=>'candidatos'), + 'active' => ($this->getId() == 'candidato'), + ), + array( + 'label'=>Yii::t('intranet', 'Ofertas'), + 'url'=>array('/site/index'), + 'linkOptions'=>array('class'=>'ofertas'), + 'active' => ($this->getId() == 'oferta'), + ), + array( + 'label'=>Yii::t('intranet', 'Solicitudes de oferta'), + 'url'=>array('/site/index'), + 'linkOptions'=>array('class'=>'solicitudes'), + 'active' => ($this->getId() == 'solicitud'), + ), + array( + 'label'=>Yii::t('intranet', 'Sistema'), + 'url'=>array('/usuario'), + 'linkOptions'=>array('class'=>'sistema'), + 'active' => ($this->getId() == 'usuario') + ), + ), + )); ?> +
+ + + +
+ Avatar +
+

user->name; ?>

+ +

+ + createAbsoluteUrl('site/logout')); ?> +

+
+
+
+ +
+ +
+ breadcrumbs)):?> + widget('zii.widgets.CBreadcrumbs', array( + 'homeLink'=>CHtml::link(Yii::t('intranet', 'Tablero'), array('/site/index')), + 'links'=>$this->breadcrumbs, + 'separator'=>'', + )); ?> + + +
+ +
+
+
+ by My Company.
*/ ?> +
+
+ + + diff --git a/www/protected/views/site/tablero.php b/www/protected/views/site/tablero.php index d0376f2..5a2f547 100644 --- a/www/protected/views/site/tablero.php +++ b/www/protected/views/site/tablero.php @@ -1 +1,322 @@ -

SOY EL TABLERO

+clientScript->registerScriptFile(Yii::app()->baseUrl . '/js/plugins/jquery.flot.min.js'); +Yii::app()->clientScript->registerScriptFile(Yii::app()->baseUrl . '/js/custom/dashboard.js'); +?> + +
+
+ +
+ + ¡¡¡¡ ESTE TABLERO ES UN EJEMPLO !!!! + +
+ + + + + + + +
+

Actividad reciente

+
+ + + El 2012-01-09 a las 13:37:18 por Supervisor +

Fulanito de tal: Cambio de estado (Borrador a Rechazado)

+ + + El 2012-01-09 a las 13:37:18 por Supervisor + +

Menganito de tal: Cambio de estado (Borrador a Sin capacidades)

+ + + El 2012-01-09 a las 13:37:18 por Supervisor +

Menganito de tal: Estado inicial ( Borrador )

+ + + + El 2012-01-09 a las 13:37:18 por Supervisor +

Fulanito de tal: Cambio de estado (Sin capacidades a En proceso: Disponible)

+ + + + El 2012-01-09 a las 13:37:18 por Supervisor +

Menganito de tal: Nuevo candidato

+ +
+
+
+
+
+ + +
+

Sample Chart

+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Column 1Column 2Column 3ImpressionsPercentageColumn 6
Row Text 1Row Text 2Row Text 32 100.0020%Row Text 6
Row Text 1Row Text 2Row Text 32 100.0020%Row Text 6
Row Text 1Row Text 2Row Text 32 100.0020%Row Text 6
Row Text 1Row Text 2Row Text 32 100.0020%Row Text 6
Row Text 1Row Text 2Row Text 32 100.0020%Row Text 6
+ +
+
+ +
+

Sample Chart

+
+
+
+
+ + +
+

Buttons

+
+   +   +   + +   +   +   +   +
+ +
+
+ +
+ +
+
+ +
+
+ +
+

RESUMEN

+ +
+ +

78 candidatos

+

Estimate earnings by the end of the day: $300.00

+ +
+ +
+

9 ofertas

+ Yesterday's earnings + +
+ +
+

2 solicitudes de oferta

+ This month's earnings +
+ + +
+
+ +
+ +

Form with validation

+
+
+ +
+ +

+ + +

+ + +

+ + +

+ +

+ + + +

+ +

+ + Male      Female +

+ +

+ + + English      + Mandarin      + German +

+ +

+ + +

+ +

+ +

+ +
+
+ + +
+
+ +
+

PROGRESS BAR

+
+ +
+ Storage (60%) +
+
+ + +
+ Bandwidth (86%) +
+
+ +
+ Impression (34%) +
+
+ +
+
+ + +
+

Widget Box 2

+
+ +

Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam. Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium.

+ + +
+
+ +
+ +
+

Proin elit arcu, rutrum commodo, vehicula tempus, commodo a, risus. Curabitur nec arcu. Donec sollicitudin mi sit amet mauris. Nam elementum quam ullamcorper ante. Etiam aliquet massa et lorem. Mauris dapibus lacus auctor risus. Aenean tempor ullamcorper leo. Vivamus sed magna quis ligula eleifend adipiscing. Duis orci. Aliquam sodales tortor vitae ipsum. Aliquam nulla. Duis aliquam molestie erat. Ut et mauris vel pede varius sollicitudin. Sed ut dolor nec orci tincidunt interdum. Phasellus ipsum. Nunc tristique tempus lectus.

+
+ +
+

Morbi tincidunt, dui sit amet facilisis feugiat, odio metus gravida ante, ut pharetra massa metus id nunc. Duis scelerisque molestie turpis. Sed fringilla, massa eget luctus malesuada, metus eros molestie lectus, ut tempus eros massa ut dolor. Aenean aliquet fringilla sem. Suspendisse sed ligula in ligula suscipit aliquam. Praesent in eros vestibulum mi adipiscing adipiscing. Morbi facilisis. Curabitur ornare consequat nunc. Aenean vel metus. Ut posuere viverra nulla. Aliquam erat volutpat. Pellentesque convallis. Maecenas feugiat, tellus pellentesque pretium posuere, felis lorem euismod felis, eu ornare leo nisi vel felis. Mauris consectetur tortor et purus.

+
+
+

Duis cursus. Maecenas ligula eros, blandit nec, pharetra at, semper at, magna. Nullam ac lacus. Nulla facilisi. Praesent viverra justo vitae neque. Praesent blandit adipiscing velit. Suspendisse potenti. Donec mattis, pede vel pharetra blandit, magna ligula faucibus eros, id euismod lacus dolor eget odio. Nam scelerisque. Donec non libero sed nulla mattis commodo. Ut sagittis. Donec nisi lectus, feugiat porttitor, tempor ac, tempor vitae, pede. Aenean vehicula velit eu tellus interdum rutrum. Maecenas commodo. Pellentesque nec elit. Fusce in lacus. Vivamus a libero vitae lectus hendrerit hendrerit.

+
+ +
+ +
+ + +
+

First header

+
Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo. Nemo enim ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit, sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt.
+

Second header

+
Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo. Nemo enim ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit, sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt.
+

Third header

+ +
Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo. Nemo enim ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit, sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt.
+
+ +
+
+ +
diff --git a/www/protected/views/usuario/_search.php b/www/protected/views/usuario/_search.php index da5e619..5f02ae4 100644 --- a/www/protected/views/usuario/_search.php +++ b/www/protected/views/usuario/_search.php @@ -31,7 +31,7 @@
- +
endWidget(); ?> diff --git a/www/protected/views/usuario/index.php b/www/protected/views/usuario/index.php index 8e48c3d..551ccd9 100644 --- a/www/protected/views/usuario/index.php +++ b/www/protected/views/usuario/index.php @@ -59,11 +59,21 @@ $('.search-form form').submit(function(){
- +
Yii::t('intranet', 'Acciones'), + 'class'=>'CButtonColumn', + 'headerHtmlOptions'=>array( + 'style' => 'width:55px;', + 'class' => 'head1', + ), + 'template'=>'{update}{delete}', + 'cssClassExpression' => '"con1"', + ), array( 'type' => 'html', 'name' => 'name', @@ -98,11 +108,6 @@ $('.search-form form').submit(function(){ ), 'cssClassExpression' => '"con1"', ), - array( - 'class'=>'CButtonColumn', - 'cssClassExpression' => '"con0"', - ) - ); $dataProvider = $model->search();