Minor - flint fixes, format code

pull/2606/head
Julio Montoya 8 years ago
parent 5bdc33e235
commit d538d822ef
  1. 6
      main/admin/usergroup_users.php
  2. 18
      main/exercise/MultipleAnswerTrueFalseDegreeCertainty.php
  3. 4
      plugin/learning_calendar/LearningCalendarPlugin.php
  4. 1
      plugin/learning_calendar/lang/english.php

@ -272,7 +272,7 @@ $(function() {
{ width:500 } // search options
)
.navButtonAdd('#usergroups_pager',{
caption:"<?php echo addslashes($calendarPlugin->get_lang('UpdateCalendar'));?>",
caption:"<?php echo addslashes($calendarPlugin->get_lang('UpdateCalendar')); ?>",
buttonicon:"ui-icon ui-icon-plus",
onClickButton: function(a) {
var userIdList = $("#usergroups").jqGrid('getGridParam', 'selarrrow');
@ -280,7 +280,7 @@ $(function() {
$(".modal-body #add_multiple_calendar_user_list").val(userIdList);
$('#myModal').modal();
} else {
alert("<?php echo addslashes(get_lang('SelectStudents'));?>");
alert("<?php echo addslashes(get_lang('SelectStudents')); ?>");
}
},
position:"last"
@ -299,7 +299,7 @@ $(function() {
</h4>
</div>
<div class="modal-body">
<?php echo $form->display() ?>
<?php echo $form->display(); ?>
</div>
</div>
</div>

@ -530,7 +530,7 @@ class MultipleAnswerTrueFalseDegreeCertainty extends Question
'DegreeOfCertaintyVerySure',
];
$html .= '<ul class="chart-legend">';
foreach ($legendTitle as $i => $item){
foreach ($legendTitle as $i => $item) {
$html .= '<li><i class="fa fa-square square_color'.$i.'" aria-hidden="true"></i> '.get_lang($item).'</li>';
}
$html .= '</ul>';
@ -601,8 +601,7 @@ class MultipleAnswerTrueFalseDegreeCertainty extends Question
$returnHeight = false,
$groupCategoriesByBracket = false,
$numberOfQuestions = 0
)
{
) {
$topAndBottomMargin = 10;
$colorList = [
self::LEVEL_DARKRED,
@ -643,11 +642,9 @@ class MultipleAnswerTrueFalseDegreeCertainty extends Question
strpos($title, 'votre dernier résultat à ce test') > 0
) ? 100 : 80;
$html .= '<div class="row-chart">';
$html .= '<h4 class="chart-title">'.$titleDisplay.'</h4>';
$nbResponsesInc = 0;
if (isset($scoreList[4])) {
$nbResponsesInc += (int) $scoreList[4];
@ -670,7 +667,6 @@ class MultipleAnswerTrueFalseDegreeCertainty extends Question
$IgnoranceAnswers = sprintf(get_lang('IgnoranceAnswersX'), $nbResponsesIng);
$CorrectAnswers = sprintf(get_lang('CorrectAnswersX'), $nbResponsesCor);
$html .= '<div class="chart-grid">';
$explainHistoList = null;
@ -693,17 +689,17 @@ class MultipleAnswerTrueFalseDegreeCertainty extends Question
}
$sizeBar = ($scoreOnBottom * $sizeRatio * 2).'px;';
if ($i == 0 ) {
if ($i == 0) {
$html .= '<div class="item">';
$html .= '<div class="panel-certaint" style="min-height:'.$verticalLineHeight.'px; position: relative;">';
$html .= '<div class="answers-title">'.$IncorrectAnswers.'</div>';
$html .= '<ul class="certaint-list-two">';
} else if($i == 3){
} elseif ($i == 3) {
$html .= '<div class="item">';
$html .= '<div class="panel-certaint" style="height:'.$verticalLineHeight.'px; position: relative;">';
$html .= '<div class="answers-title">'.$CorrectAnswers.'</div>';
$html .= '<ul class="certaint-list-two">';
} else if($i==2){
} elseif ($i == 2) {
$html .= '<div class="item">';
$html .= '<div class="panel-certaint" style="height:'.$verticalLineHeight.'px; position: relative;">';
$html .= '<div class="answers-title">'.$IgnoranceAnswers.'</div>';
@ -727,7 +723,6 @@ class MultipleAnswerTrueFalseDegreeCertainty extends Question
$html .= '</div>';
$html .= '</div>';
if ($returnHeight) {
return [$html, $verticalLineHeight];
} else {
@ -760,8 +755,7 @@ class MultipleAnswerTrueFalseDegreeCertainty extends Question
$returnHeight = false,
$groupCategoriesByBracket = false,
$numberOfQuestions = 0
)
{
) {
$topAndBottomMargin = 10;
$colorList = [
self::LEVEL_DARKRED,

@ -256,6 +256,7 @@ class LearningCalendarPlugin extends Plugin
if ($getCount) {
return 0;
}
return [];
}
@ -1066,6 +1067,7 @@ class LearningCalendarPlugin extends Plugin
foreach ($list as $item) {
$points[] = [$item['control_date'], $item['control_value']];
}
return $points;
}
@ -1091,7 +1093,7 @@ class LearningCalendarPlugin extends Plugin
];
$data = Database::fetch_array($result);
$id = $data['id'];
Database::update('learning_calendar_control_point', $params, [ 'id = ?' => $id]);
Database::update('learning_calendar_control_point', $params, ['id = ?' => $id]);
} else {
$params = [
'user_id' => $userId,

@ -20,4 +20,3 @@ $strings['NumberOfDays'] = 'Number of days';
$strings['Date'] = 'Date';
$strings['AddMultipleUsersToCalendar'] = 'Add multiple users to a calendar';
$strings['UpdateCalendar'] = 'Update calendar';

Loading…
Cancel
Save