diff --git a/backend/modules/card/controllers/UserCardController.php b/backend/modules/card/controllers/UserCardController.php index 0cc1510..97a601f 100755 --- a/backend/modules/card/controllers/UserCardController.php +++ b/backend/modules/card/controllers/UserCardController.php @@ -296,7 +296,8 @@ class UserCardController extends Controller // (B) ADD HTML CONTENT $section = $pw->addSection(); - \PhpOffice\PhpWord\Shared\Html::addHtml($section, $model->resume_text, false, false); + $resumeText = str_replace(array('
', '
', '
'), ' ', $model->resume_text); + \PhpOffice\PhpWord\Shared\Html::addHtml($section, $resumeText, false, false); // (C) SAVE TO DOCX ON SERVER // $pw->save("convert.docx", "Word2007"); diff --git a/backend/modules/card/views/resume-template/_form.php b/backend/modules/card/views/resume-template/_form.php index f4d8b7d..fc4627e 100644 --- a/backend/modules/card/views/resume-template/_form.php +++ b/backend/modules/card/views/resume-template/_form.php @@ -50,95 +50,110 @@ use yii\widgets\ActiveForm; - ФИО + ФИО ${fio} - Паспорт + Паспорт ${passport} - Электронная почта + Электронная почта ${email} - Пол + Пол ${gender} - Резюме + Резюме ${resume} - Зароботная плата + Зароботная плата ${salary} - Позиция + Позиция ${position_id} - Город + Город ${city} - Ссылка ВК + Ссылка ВК ${link_vk} - Ссылка Телграм + Ссылка Телграм ${link_telegram} - Резюме текст + Резюме текст ${vc_text} - Уровень + Уровень ${level} - Резюме текст + Резюме текст ${vc_text} - Резюме короткий текст + Резюме короткий текст ${vc_text_short} - Лет опыта + Лет опыта ${years_of_exp} - Спецификация + Спецификация ${specification} - Навыки + Навыки ${skills} +
+

+ Нажмите на ячейку чтобы скопировать содержимое +

+
- - - - - - - - - - - - - - - - - + diff --git a/backend/modules/card/views/user-card/_form.php b/backend/modules/card/views/user-card/_form.php index 8327dc6..230cb4f 100755 --- a/backend/modules/card/views/user-card/_form.php +++ b/backend/modules/card/views/user-card/_form.php @@ -26,7 +26,7 @@ use yii\widgets\ActiveForm; -
add_a_test_task_completion_date_to_ucer_card +
- 'ru', diff --git a/backend/modules/card/views/user-card/resume.php b/backend/modules/card/views/user-card/resume.php index d1fae3a..ac417c6 100644 --- a/backend/modules/card/views/user-card/resume.php +++ b/backend/modules/card/views/user-card/resume.php @@ -16,6 +16,10 @@ $this->params['breadcrumbs'][] = ['label' => $model->id, 'url' => ['view', 'id' $this->params['breadcrumbs'][] = 'Резюме'; ?> +
+ $model->id], ['class' => 'btn btn-primary']) ?> +
+
'text-by-template-form', diff --git a/backend/views/layouts/left.php b/backend/views/layouts/left.php index 256befe..6a9a865 100755 --- a/backend/views/layouts/left.php +++ b/backend/views/layouts/left.php @@ -7,7 +7,6 @@ foreach ($userStatuses as $key => $status) { $menuItems[] = ['label' => $status, 'icon' => 'id-card', 'url' => ['/card/user-card?UserCardSearch[status]=' . $key], 'active' => \Yii::$app->controller->id == 'user-card',]; } - $menuItems[] = ['label' => 'Шаблоны резюме', 'icon' => 'file', 'url' => ['/card/resume-template'], 'active' => \Yii::$app->controller->id == 'resume-template']; $projectStatuses = \common\models\Status::getStatusesArray(\common\models\UseStatus::USE_PROJECT); $projectItems = [['label' => 'Все', 'icon' => 'cubes', 'url' => ['/project/project'], 'active' => \Yii::$app->controller->id == 'project']]; @@ -28,13 +27,14 @@ ['label' => 'Доп. поля', 'icon' => 'file-text-o', 'url' => ['/settings/additional-fields'], 'active' => \Yii::$app->controller->id == 'additional-fields'], ['label' => 'Должность', 'icon' => 'spotify', 'url' => ['/settings/position'], 'active' => \Yii::$app->controller->id == 'position'], ['label' => 'Навыки', 'icon' => 'flask', 'url' => ['/settings/skill'], 'active' => \Yii::$app->controller->id == 'skill'], + ['label' => 'Шаблоны резюме', 'icon' => 'file', 'url' => ['/card/resume-template'], 'active' => \Yii::$app->controller->id == 'resume-template'] ], - //'visible' => Yii::$app->user->can('confidential_information') + 'visible' => Yii::$app->user->can('confidential_information') ], [ - 'label' => 'Профили', 'icon' => 'address-book-o', 'url' => '#', //'active' => \Yii::$app->controller->id == 'user-card', + 'label' => 'Профили', 'icon' => 'address-book-o', 'url' => '#', 'items' => $menuItems, - //'visible' => Yii::$app->user->can('confidential_information') + 'visible' => Yii::$app->user->can('confidential_information') ], [ 'label' => 'Сотрудники', 'icon' => 'users', 'url' => '#', @@ -62,7 +62,7 @@ 'visible' => Yii::$app->user->can('confidential_information') ], [ - 'label' => 'Проекты', 'icon' => 'cubes', 'url' => ['#'], //'active' => \Yii::$app->controller->id == 'project', + 'label' => 'Проекты', 'icon' => 'cubes', 'url' => ['#'], 'items' => $projectItems, 'visible' => Yii::$app->user->can('confidential_information') ],