chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Import CSV: Get course color from last user result BT#16240

Browse Source
pull/3090/head
Julio Montoya 6 years ago
parent 5643beaace
commit eb7fc30a71
2 changed files with 57 additions and 51 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 64
      main/inc/lib/career.lib.php
  2. 44
      main/inc/lib/display.lib.php

64
main/inc/lib/career.lib.php
Unescape View File

@ -811,16 +811,16 @@ class Career extends Model
}
if (!empty($newGroup)) {
$graphHtml .= '<div
$graphHtml .= '<div
id ="group_'.$newGroup.'"
class="group'.$newGroup.' group_class"
style="display:grid;
class="group'.$newGroup.' group_class"
style="display:grid;
align-self: start;
grid-gap: 10px;
grid-gap: 10px;
justify-items: stretch;
align-items: start;
align-content: start;
justify-content: stretch;
align-content: start;
justify-content: stretch;
grid-area:'.$minRow.'/'.$minColumn.'/'.$maxRow.'/'.$maxColumn.'">'; //style="display:grid"
}
@ -870,6 +870,7 @@ class Career extends Model
$graphHtml = '';
/** @var Vertex $vertex */
foreach ($vertexList as $vertex) {
$borderColor = 'green';
$column = $vertex->getAttribute('Column');
$realRow = $originalRow = $vertex->getAttribute('Row');
if ($addRow) {
@ -877,12 +878,12 @@ class Career extends Model
}
$id = $vertex->getId();
$area = "$realRow/$column";
$graphHtml .= '<div
id = "row_wrapper_'.$id.'"
data= "'.$originalRow.'-'.$column.'"
$graphHtml .= '<div
id = "row_wrapper_'.$id.'"
data= "'.$originalRow.'-'.$column.'"
style="
align-self: start;
justify-content: stretch;
justify-content: stretch;
grid-area:'.$area.'"
>';
$color = '';
@ -893,6 +894,11 @@ class Career extends Model
$content .= '<div class="pull-right">['.$id.']</div>';
if (!empty($userResult) && isset($userResult[$id])) {
$lastItem = end($userResult[$id]);
if ($lastItem && isset($lastItem['BgColor']) && !empty($lastItem['BgColor'])) {
$color = $lastItem['BgColor'].'; color: '.$lastItem['Color'];
$borderColor = $lastItem['BorderColor'];
}
$results = '';
$size = 2;
foreach ($userResult[$id] as $resultId => $iconData) {
@ -947,7 +953,7 @@ class Career extends Model
$originalRow--;
$column--;
//$title = "$originalRow / $column";
$graphHtml .= Display::panel(
$content,
$title,
@ -974,7 +980,7 @@ class Career extends Model
$width = $graph->blockWidth - $graph->xGap;
$height = $graph->blockHeight - $graph->yGap;
$style = 'text;html=1;strokeColor=green;fillColor=#ffffff;overflow=fill;rounded=0;align=left;';
$style = 'text;html=1;strokeColor='.$borderColor.';fillColor=#ffffff;overflow=fill;rounded=0;align=left;';
$panel = str_replace(["\n", "\r"], '', $panel);
$vertexData = "var v$id = graph.insertVertex(parent, null, '".addslashes($panel)."', $x, $y, $width, $height, '$style');";
@ -1124,8 +1130,8 @@ class Career extends Model
$groupIdTag = "group_$group";
$borderLine = $showGroupLine === true ? 'border-style:solid;' : '';
$graphHtml = '<div
id="'.$groupIdTag.'" class="career_group"
$graphHtml = '<div
id="'.$groupIdTag.'" class="career_group"
style=" '.$borderLine.' padding:15px; float:left; margin-left:'.$leftGroup.'; width:'.$widthGroup.'%">';
if (!empty($groupLabel)) {
@ -1146,8 +1152,8 @@ class Career extends Model
}
// padding:15px;
$graphHtml .= '<div
id="subgroup_'.$subGroup.'" class="career_subgroup"
$graphHtml .= '<div
id="subgroup_'.$subGroup.'" class="career_subgroup"
style="'.$line.' margin-bottom:20px; padding:15px; float:left; margin-left:0px; width:100%">';
if (!empty($subGroupLabel)) {
$graphHtml .= '<h3>'.$subGroupLabel.'</h3>';
@ -1162,8 +1168,8 @@ class Career extends Model
}
$widthColumn = 85 / count($columnList);
$graphHtml .= '<div
id="col_'.$column.'" class="career_column"
$graphHtml .= '<div
id="col_'.$column.'" class="career_column"
style="padding:15px;float:left; margin-left:'.$leftColumn.'; width:'.$widthColumn.'%">';
$maxRow = 0;
foreach ($rows as $row => $vertex) {
@ -1336,19 +1342,19 @@ class Career extends Model
$html .= 'jsPlumb.connect({
source:"'.$source.'",
target:"'.$target.'",
endpoint:[ "Rectangle", { width:1, height:1 }],
connector: ["Flowchart"],
paintStyle: connectorPaintStyle,
hoverPaintStyle: endpointHoverStyle,
endpoint:[ "Rectangle", { width:1, height:1 }],
connector: ["Flowchart"],
paintStyle: connectorPaintStyle,
hoverPaintStyle: endpointHoverStyle,
anchor: ["'.$anchor.'"],
overlays: [
[
"Arrow",
{
location:1,
width:11,
length:11
}
[
"Arrow",
{
location:1,
width:11,
length:11
}
],
],
});';

44
main/inc/lib/display.lib.php
Unescape View File

@ -1638,7 +1638,7 @@ class Display
c_id = $course_id AND
access_user_id = '$user_id' AND
access_session_id ='".$sessionId."'
ORDER BY access_date DESC
ORDER BY access_date DESC
LIMIT 1
";
$result = Database::query($sql);
@ -1659,10 +1659,10 @@ class Display
$hideTools = [TOOL_NOTEBOOK, TOOL_CHAT];
// Get current tools in course
$sql = "SELECT name, link, image
FROM $course_tool_table
WHERE
c_id = $course_id AND
$sql = "SELECT name, link, image
FROM $course_tool_table
WHERE
c_id = $course_id AND
visibility = '1' AND
name NOT IN ('".implode("','", $hideTools)."')
";
@ -1684,7 +1684,7 @@ class Display
$toolName = addslashes($toolName);
$sql = "SELECT * FROM $tool_edit_table
$sql = "SELECT * FROM $tool_edit_table
WHERE
c_id = $course_id AND
$toolCondition
@ -2586,7 +2586,7 @@ class Display
* @param string $type primary|success|info|warning|danger
* @param string $extra
* @param string $id
* @param string $customColor
* @param string $backgroundColor
* @param string $extraClass
*
* @return string
@ -2598,12 +2598,12 @@ class Display
$type = 'default',
$extra = '',
$id = '',
$customColor = '',
$backgroundColor = '',
$extraClass = ''
) {
$headerStyle = '';
if (!empty($customColor)) {
$headerStyle = 'style = "color: white; background-color: '.$customColor.'" ';
if (!empty($backgroundColor)) {
$headerStyle = 'style = "color: white; background-color: '.$backgroundColor.'" ';
}
$title = !empty($title) ? '<div class="panel-heading" '.$headerStyle.' ><h3 class="panel-title">'.$title.'</h3>'.$extra.'</div>' : '';
@ -2861,9 +2861,9 @@ HTML;
$toolbar = '<div class="btn-group pull-right">'.$toolbar.'</div>';
}
return '<div id="user_card_'.$userInfo['id'].'" class="col-md-12">
return '<div id="user_card_'.$userInfo['id'].'" class="col-md-12">
<div class="row">
<div class="col-md-2">
<div class="col-md-2">
<img src="'.$userInfo['avatar'].'" class="img-responsive img-circle">
</div>
<div class="col-md-10">
@ -2872,7 +2872,7 @@ HTML;
<div class="col-md-2">
'.$status.'
</div>
<div class="col-md-10">
<div class="col-md-10">
'.$toolbar.'
</div>
</div>
@ -2978,7 +2978,7 @@ HTML;
$.frameReady(function() {
$(function () {
$("video:not(.skip), audio:not(.skip)").mediaelementplayer({
pluginPath: "'.$webPublicPath.'assets/mediaelement/plugins/",
pluginPath: "'.$webPublicPath.'assets/mediaelement/plugins/",
features: [\''.$videoFeatures.'\'],
success: function(mediaElement, originalNode, instance) {
'.ChamiloApi::getQuizMarkersRollsJS().'
@ -2986,29 +2986,29 @@ HTML;
vrPath: "'.$webPublicPath.'assets/vrview/build/vrview.js"
});
});
},
},
"'.$frameName.'",
[
{type:"script", src:"'.api_get_jquery_web_path().'", deps: [
'.$fixLink.'
'.$fixLink.'
{type:"script", src:"'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.highlight.js"},
{type:"script", src:"'.api_get_path(WEB_CODE_PATH).'glossary/glossary.js.php?'.api_get_cidreq().'"},
{type:"script", src:"'.$webPublicPath.'assets/jquery-ui/jquery-ui.min.js"},
{type:"script", src: "'.$webPublicPath.'assets/mediaelement/build/mediaelement-and-player.min.js",
{type:"script", src: "'.$webPublicPath.'assets/mediaelement/build/mediaelement-and-player.min.js",
deps: [
{type:"script", src: "'.$webPublicPath.'assets/mediaelement/plugins/vrview/vrview.js"},
{type:"script", src: "'.$webPublicPath.'assets/mediaelement/plugins/markersrolls/markersrolls.js"},
'.$videoPluginFiles.'
]},
'.$translateHtml.'
]},
'.$translateHtml.'
]},
'.$videoPluginCssFiles.'
{type:"script", src:"'.$webPublicPath.'assets/MathJax/MathJax.js?config=AM_HTMLorMML"},
{type:"stylesheet", src:"'.$webPublicPath.'assets/jquery-ui/themes/smoothness/jquery-ui.min.css"},
{type:"stylesheet", src:"'.$webPublicPath.'assets/jquery-ui/themes/smoothness/theme.css"},
{type:"stylesheet", src:"'.$webPublicPath.'assets/jquery-ui/themes/smoothness/theme.css"},
{type:"stylesheet", src:"'.$webPublicPath.'css/dialog.css"},
{type:"stylesheet", src: "'.$webPublicPath.'assets/mediaelement/build/mediaelementplayer.min.css"},
{type:"stylesheet", src: "'.$webPublicPath.'assets/mediaelement/build/mediaelementplayer.min.css"},
{type:"stylesheet", src: "'.$webPublicPath.'assets/mediaelement/plugins/vrview/vrview.css"},
]);';

Write Preview
Loading…
Cancel
Save