Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Internal: Fixes to skills assignment - refs #6063 #6115

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Internal: Fixes to skills assignment - refs #6063 #6115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d71d575
Internal: Fixes to skills assignment - refs #6063
christianbeeznest Mar 6, 2025
89d1633
Internal: Remove assigned_by field from SkillRelUser entity and datab…
christianbeeznest Mar 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion public/main/inc/ajax/skill.ajax.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -510,7 +510,6 @@
$skillUser->setArgumentation('');
$skillUser->setArgumentationAuthorId(api_get_user_id());
$skillUser->setAcquiredSkillAt(new DateTime());
$skillUser->setAssignedBy(0);
$em->persist($skillUser);
$em->flush();
$result = 'success';
Expand Down
1 change: 0 additions & 1 deletion public/main/inc/lib/SkillModel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2355,7 +2355,6 @@ public function addSkillToUserBadge(
->setSkill($skill)
->setArgumentation($argumentation)
->setArgumentationAuthorId($authorId)
->setAssignedBy(0)
;

if ($showLevels && !empty($levelId)) {
Expand Down
1 change: 0 additions & 1 deletion public/main/inc/lib/SkillRelUserModel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ class SkillRelUserModel extends Model
'user_id',
'skill_id',
'acquired_skill_at',
'assigned_by',
'course_id',
'session_id',
];
Expand Down
24 changes: 13 additions & 11 deletions public/main/skills/assign.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,10 @@
10
);
$form->applyFilter('argumentation', 'trim');
$form->addButtonSave(get_lang('Save'));
$form->addHtml('<div class="flex space-x-4">');
$form->addButton('save', get_lang('Save'), 'check', 'primary');
$form->addButton('save_and_add_more', get_lang('Save and add more'), 'check', 'secondary');
$form->addHtml('</div>');
$form->setDefaults($formDefaultValues);

if ($form->validate()) {
Expand Down Expand Up @@ -369,18 +372,17 @@
}
}

Display::addFlash(
Display::return_message(
sprintf(
get_lang('The skill %s has been assigned to user %s'),
$skill->getTitle(),
UserManager::formatUserFullName($user)
),
'success'
)
$_SESSION['flash_message'] = sprintf(
get_lang('The skill %s has been successfully assigned to user %s'),
$skill->getTitle(),
UserManager::formatUserFullName($user)
);

header('Location: '.api_get_path(WEB_PATH)."badge/{$skillUser->getId()}");
if (isset($_POST['save_and_add_more'])) {
header('Location: '.api_get_path(WEB_PATH)."badge/{$skillUser->getId()}");
} else {
header('Location: '.api_get_path(WEB_CODE_PATH).'admin/user_information.php?user_id='.$userId);
}
exit;
}

Expand Down
10 changes: 10 additions & 0 deletions public/main/skills/issued.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,16 @@
);
}

if (isset($_SESSION['flash_message'])) {
$flashMessage = $_SESSION['flash_message'];
unset($_SESSION['flash_message']);
$returnMessage .= Display::return_message(
$flashMessage,
'success',
false
);
}

$template = new Template(get_lang('Issued badge information'));
$template->assign('issue_info', $skillRelUserInfo);
$template->assign('allow_comment', $allowComment);
Expand Down
158 changes: 63 additions & 95 deletions public/main/template/default/skill/issued.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,158 +1,126 @@
<div class="row issued">
<div class="col-md-5">
<div class="thumbnail">
<div class="flex flex-col md:flex-row gap-6 issued">
<div class="w-full md:w-1/5">
<div class="border rounded-lg shadow-md p-4">
<figure class="text-center">
<img class="img-fluid center-block"
<img class="mx-auto w-full max-w-xs"
src="{{ issue_info.skill_badge_image }}"
alt="{{ issue_info.skill_name }}"
>
<figcaption>
<p class="lead">{{ issue_info.skill_name }}</p>
<p class="text-lg font-semibold">{{ issue_info.skill_name }}</p>
{% if issue_info.skill_short_code %}
<p>{{ issue_info.skill_short_code }}</p>
{% endif %}
</figcaption>
</figure>
<div class="caption">
<div class="mt-4">
{% if issue_info.skill_description %}
<p>{{ issue_info.skill_description }}</p>
{% endif %}
{% if issue_info.skill_criteria %}
<h4>{{ 'Criteria to earn the badge'|trans }}</h4>
<h4 class="font-bold">{{ 'Criteria to earn the badge'|trans }}</h4>
<p>{{ issue_info.skill_criteria }}</p>
{% endif %}
</div>
</div>

{% if not personal_badge is empty %}
<p class="text-center">
<a href="{{ personal_badge }}" class="btn btn--primary" target="_blank">
<em class="fa fa-download fa-fw"></em> {{ 'Download badges'|trans }}
</a>
</p>
{% endif %}
{% if not personal_badge is empty %}
<p class="text-center mt-4">
<a href="{{ personal_badge }}" class="btn btn--primary" target="_blank">
<em class="fa fa-download fa-fw"></em> {{ 'Download badges'|trans }}
</a>
</p>
{% endif %}

{% if allow_export %}
<hr>
<p class="text-center">
<a href="#" class="btn btn--success" id="badge-export-button">
<em class="fa fa-external-link-square fa-fw"></em> {{ 'Export badge'|trans }}
</a>
</p>
<div class='col-md-12 text-center'>
<h5><b> {{ 'Share with your friends'|trans }} </b></h5>
<a href="http://www.facebook.com/sharer.php?u={{ url('badge_issued', { 'id': issue_info.id }) }}"
target="_blank">
<em class='fa fa-facebook-square fa-3x text-info' aria-hidden='true'></em>
</a>
<a href="https://twitter.com/home?status={{ 'I have achieved skill %s on %s'|trans|format(
issue_info.skill_name, chamilo_settings_get('platform.site_name')
) }} - {{ url('badge_issued', { 'id': issue_info.id }) }}"
target="_new">
<em class='fa fa-twitter-square fa-3x text-light' aria-hidden='true'></em>
</a>
<a href="{{ 'https://www.linkedin.com/profile/add?' ~ {
'certId':issue_info.id,
'certUrl': url('badge_issued', { 'id': issue_info.id }),
'isFromA2p':'true',
'issueMonth':issue_info.month,
'issueYear': issue_info.year,
'name':'Badge: %s'|trans|format(issue_info.skill_name),
'organizationId':issue_info.linkedin_organization_id
}|url_encode }}" target="_new">
<em class='fa fa-linkedin-square fa-3x txt-linkedin' aria-hidden='true'></em>
</a>
</div>
{% endif %}
{% if allow_export %}
<hr class="my-4">
<p class="text-center">
<a href="#" class="btn btn--success" id="badge-export-button">
<em class="fa fa-external-link-square fa-fw"></em> {{ 'Export badge'|trans }}
</a>
</p>
{% endif %}
</div>
</div>
<div class="col-md-7">
<h3>{{ 'Recipient details'|trans }}</h3>
<p class="lead">{{ issue_info.user_complete_name }}</p>
<h4>{{ 'Skill acquired at'|trans }}</h4>
<ul class="fa-ul">
<li>
<div class="w-full md:w-4/5 px-4">
<h3 class="text-xl font-bold">{{ 'Recipient details'|trans }}</h3>
<p class="text-lg font-semibold">{{ issue_info.user_complete_name }}</p>

<h4 class="mt-4 font-bold">{{ 'Skill acquired at'|trans }}</h4>
<ul class="list-none">
<li class="mt-2">
{% if issue_info.source_name %}
<em class="fa-li fa fa-clock-o fa-fw"></em>
<em class="fa fa-clock-o fa-fw"></em>
{{ '%s through %s'|trans|format(issue_info.datetime, issue_info.source_name) }}
{% else %}
<em class="fa-li fa fa-clock-o fa-fw"></em>
<em class="fa fa-clock-o fa-fw"></em>
{{ issue_info.datetime }}
{% endif %}
{% if issue_info.argumentation %}
<strong>
<p style="font-style: italic;">
{{ 'User %s indicated:'|trans|format(issue_info.argumentation_author_name) }}
</p>
</strong>
<p class="italic font-semibold">
{{ 'User %s indicated:'|trans|format(issue_info.argumentation_author_name) }}
</p>
<p>{{ issue_info.argumentation }}</p>
{% endif %}
</li>
</ul>

{% if show_level %}
<h4>{{ 'Level acquired'|trans }}</h4>
<ul class="fa-ul">
<li>
<em class="fa-li fa fa-check-circle-o fa-fw"></em> {{ issue_info.acquired_level }}
<h4 class="mt-4 font-bold">{{ 'Level acquired'|trans }}</h4>
<ul class="list-none">
<li class="mt-2">
<em class="fa fa-check-circle-o fa-fw text-green-500"></em> {{ issue_info.acquired_level }}
</li>
</ul>
{% endif %}

{% if allow_comment %}
{% if show_level %}
<hr>
<div class="panel panel-info">
<div class="panel-heading">
<em class="fa fa-check-circle-o fa-fw" aria-hidden="true"></em>
{{ 'Change acquired level'|trans }}
<hr class="my-4">
<div class="border border-blue-300 rounded-lg bg-blue-100 p-4">
<div class="font-bold text-blue-700">
<em class="fa fa-check-circle-o fa-fw"></em> {{ 'Change acquired level'|trans }}
</div>
<div class="panel-body">
<div class="mt-2">
{% autoescape false %}{{ acquired_level_form }}{% endautoescape %}
</div>
</div>
{% endif %}
<hr>
<div class="panel panel-info">
<div class="panel-heading">
<em class="fa fa-comment-o fa-fw" aria-hidden="true"></em>
<hr class="my-4">
<div class="border border-blue-300 rounded-lg bg-blue-100 p-4">
<div class="font-bold text-blue-700">
<em class="fa fa-comment-o fa-fw"></em>
{{ '%s comments'|trans|format(issue_info.comments|length) }}
/
<em class="fa fa-thumbs-o-up fa-fw" aria-hidden="true"></em>
<em class="fa fa-thumbs-o-up fa-fw"></em>
{{ 'Average rating %s'|trans|format(issue_info.feedback_average) }}
</div>
<div class="panel-body">
<div class="mt-2">
{% autoescape false %}{{ comment_form }}{% endautoescape %}
{% if issue_info.comments %}
<hr>
<hr class="my-4">
{% for comment in issue_info.comments %}
<article class="media">
<div class="media-body">
<h4 class="media-heading">{{ comment.giver_complete_name }}</h4>
<p><small>{{ comment.datetime }}</small></p>
<article class="flex items-start space-x-4">
<div>
<h4 class="font-bold">{{ comment.giver_complete_name }}</h4>
<p class="text-sm text-gray-600">{{ comment.datetime }}</p>
<p>{{ comment.text }}</p>
</div>
<div class="media-right text-right">
<div style="width: 80px;">
{% if comment.value %}
<em class="fa fa-certificate fa-fw"
aria-label="{{ 'Average rating'|trans }}"></em>
<span class="sr-only">{{ 'Average rating'|trans }}</span> {{ comment.value }}
{% endif %}
</div>
<div class="flex justify-end items-center w-20">
{% if comment.value %}
<em class="fa fa-certificate fa-fw"></em> {{ comment.value }}
{% endif %}
</div>
</article>
{% endfor %}
{% endif %}
</div>
</div>
{% else %}
<hr />
<p class="lead">
<em class="fa fa-comment-o fa-fw" aria-hidden="true"></em>
{{ '%s comments'|trans|format(issue_info.comments|length) }}
<hr class="my-4" />
<p class="text-lg font-semibold">
<em class="fa fa-comment-o fa-fw"></em> {{ '%s comments'|trans|format(issue_info.comments|length) }}
/
<em class="fa fa-thumbs-o-up fa-fw" aria-hidden="true"></em>
{{ 'Average rating %s'|trans|format(issue_info.feedback_average) }}
<em class="fa fa-thumbs-o-up fa-fw"></em> {{ 'Average rating %s'|trans|format(issue_info.feedback_average) }}
</p>
{% endif %}
</div>
Expand Down
Loading
Loading