Skip to content

Commit 484ea7a

Browse files
committed
Add configuration "hide_skill_levels" see BT#13768
- Hides levels options when assigning a skill
1 parent 7518a6b commit 484ea7a

File tree

6 files changed

+59
-29
lines changed

6 files changed

+59
-29
lines changed

main/badge/assign.php

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -204,8 +204,14 @@
204204
$form->addHidden('user', $user->getId());
205205
$form->addHidden('id', $skillId);
206206
$form->addRule('skill', get_lang('ThisFieldIsRequired'), 'required');
207-
$form->addSelect('acquired_level', get_lang('AcquiredLevel'), $acquiredLevel);
208-
//$form->addRule('acquired_level', get_lang('ThisFieldIsRequired'), 'required');
207+
208+
$showLevels = api_get_configuration_value('hide_skill_levels') === false;
209+
210+
if ($showLevels) {
211+
$form->addSelect('acquired_level', get_lang('AcquiredLevel'), $acquiredLevel);
212+
//$form->addRule('acquired_level', get_lang('ThisFieldIsRequired'), 'required');
213+
}
214+
209215
$form->addTextarea('argumentation', get_lang('Argumentation'), ['rows' => 6]);
210216
$form->addRule('argumentation', get_lang('ThisFieldIsRequired'), 'required');
211217
$form->addRule(
@@ -260,8 +266,12 @@
260266
$skillUser = new SkillRelUser();
261267
$skillUser->setUser($user);
262268
$skillUser->setSkill($skill);
263-
$level = $skillLevelRepo->find(intval($values['acquired_level']));
264-
$skillUser->setAcquiredLevel($level);
269+
270+
if ($showLevels) {
271+
$level = $skillLevelRepo->find(intval($values['acquired_level']));
272+
$skillUser->setAcquiredLevel($level);
273+
}
274+
265275
$skillUser->setArgumentation($values['argumentation']);
266276
$skillUser->setArgumentationAuthorId(api_get_user_id());
267277
$skillUser->setAcquiredSkillAt(new DateTime());

main/badge/issued.php

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@
4848

4949
Skill::isAllowed($user->getId());
5050

51+
$showLevels = api_get_configuration_value('hide_skill_levels') === false;
52+
5153
$userInfo = [
5254
'id' => $user->getId(),
5355
'complete_name' => $user->getCompleteName()
@@ -168,24 +170,26 @@
168170
}
169171
}
170172

171-
$formAcquiredLevel = new FormValidator('acquired_level');
172-
$formAcquiredLevel->addSelect('acquired_level', get_lang('AcquiredLevel'), $acquiredLevel);
173-
$formAcquiredLevel->addHidden('user', $skillIssue->getUser()->getId());
174-
$formAcquiredLevel->addHidden('issue', $skillIssue->getId());
175-
$formAcquiredLevel->addButtonSave(get_lang('Save'));
173+
if ($showLevels) {
174+
$formAcquiredLevel = new FormValidator('acquired_level');
175+
$formAcquiredLevel->addSelect('acquired_level', get_lang('AcquiredLevel'), $acquiredLevel);
176+
$formAcquiredLevel->addHidden('user', $skillIssue->getUser()->getId());
177+
$formAcquiredLevel->addHidden('issue', $skillIssue->getId());
178+
$formAcquiredLevel->addButtonSave(get_lang('Save'));
176179

177-
if ($formAcquiredLevel->validate() && $allowComment) {
178-
$values = $formAcquiredLevel->exportValues();
180+
if ($formAcquiredLevel->validate() && $allowComment) {
181+
$values = $formAcquiredLevel->exportValues();
179182

180-
$level = $skillLevelRepo->find(intval($values['acquired_level']));
181-
$skillIssue->setAcquiredLevel($level);
183+
$level = $skillLevelRepo->find(intval($values['acquired_level']));
184+
$skillIssue->setAcquiredLevel($level);
182185

183-
$entityManager->persist($skillIssue);
184-
$entityManager->flush();
185-
Display::addFlash(Display::return_message(get_lang('Saved')));
186+
$entityManager->persist($skillIssue);
187+
$entityManager->flush();
188+
Display::addFlash(Display::return_message(get_lang('Saved')));
186189

187-
header("Location: ".$skillIssue->getIssueUrl());
188-
exit;
190+
header("Location: ".$skillIssue->getIssueUrl());
191+
exit;
192+
}
189193
}
190194

191195
$form = new FormValidator('comment');
@@ -275,9 +279,12 @@
275279
$template->assign('allow_comment', $allowComment);
276280
$template->assign('allow_download_export', $allowDownloadExport);
277281
$template->assign('comment_form', $form->returnForm());
278-
$template->assign('acquired_level_form', $formAcquiredLevel->returnForm());
282+
if ($showLevels) {
283+
$template->assign('acquired_level_form', $formAcquiredLevel->returnForm());
284+
}
279285
$template->assign('badge_error', $badgeInfoError);
280286
$template->assign('personal_badge', $personalBadge);
287+
$template->assign('show_level', $showLevels);
281288

282289
$content = $template->fetch(
283290
$template->get_template('skill/issued.tpl')

main/badge/issued_all.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@
274274

275275
$template = new Template(get_lang('IssuedBadgeInformation'));
276276
$template->assign('user_badges', $allUserBadges);
277-
277+
$template->assign('show_level', api_get_configuration_value('hide_skill_levels') == false;
278278

279279
$content = $template->fetch(
280280
$template->get_template('skill/issued_all.tpl')

main/install/configuration.dist.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -689,6 +689,10 @@
689689
3 => 'Dimension',
690690
]
691691
];*/
692+
693+
// Hide skill levels options
694+
//$_configuration['hide_skill_levels'] = false;
695+
692696
// Hide the session list in Reporting tool. Useful when a course has too many sessions.
693697
//$_configuration['hide_reporting_session_list'] = false;
694698

@@ -701,6 +705,7 @@
701705
// Google translate key
702706
//$_configuration['translate_app_google_key'] = '';
703707

708+
704709
// ------ Custom DB changes
705710
// Add user activation by confirmation email
706711
// This option prevents the new user to login in the platform if your account is not confirmed via email

main/template/default/skill/issued.tpl

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -73,24 +73,29 @@
7373
{% endif %}
7474
</li>
7575
</ul>
76+
77+
{% if show_level %}
7678
<h4>{{ 'AcquiredLevel'|get_lang }}</h4>
7779
<ul class="fa-ul">
7880
<li>
7981
<em class="fa-li fa fa-check-circle-o fa-fw"></em> {{ issue_info.acquired_level }}
8082
</li>
8183
</ul>
84+
{% endif %}
8285

8386
{% if allow_comment %}
84-
<hr>
85-
<div class="panel panel-info">
86-
<div class="panel-heading">
87-
<em class="fa fa-check-circle-o fa-fw" aria-hidden="true"></em>
88-
{{ 'ChangeAcquiredLevel'|get_lang }}
89-
</div>
90-
<div class="panel-body">
91-
{{ acquired_level_form }}
87+
{% if show_level %}
88+
<hr>
89+
<div class="panel panel-info">
90+
<div class="panel-heading">
91+
<em class="fa fa-check-circle-o fa-fw" aria-hidden="true"></em>
92+
{{ 'ChangeAcquiredLevel'|get_lang }}
93+
</div>
94+
<div class="panel-body">
95+
{{ acquired_level_form }}
96+
</div>
9297
</div>
93-
</div>
98+
{% endif %}
9499
<hr>
95100
<div class="panel panel-info">
96101
<div class="panel-heading">

main/template/default/skill/issued_all.tpl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,15 @@
6868
{% endif %}
6969
</li>
7070
</ul>
71+
72+
{% if show_level %}
7173
<h4>{{ 'AcquiredLevel'|get_lang }}</h4>
7274
<ul class="fa-ul">
7375
<li>
7476
<em class="fa-li fa fa-check-circle-o fa-fw"></em> {{ badge.issue_info.acquired_level }}
7577
</li>
7678
</ul>
79+
{% endif %}
7780

7881
{% if badge.allow_comment %}
7982
<hr>

0 commit comments

Comments
 (0)