From e6a724bdeeea0ff25704137535d548843db92fad Mon Sep 17 00:00:00 2001 From: Angel Fernando Quiroz Campos Date: Fri, 13 Apr 2018 14:15:56 -0500 Subject: [PATCH 1/4] Add exercise_attempts_report_show_username conf setting - refs BT#14212 Show the username field in exercise results report --- main/exercise/exercise_report.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/main/exercise/exercise_report.php b/main/exercise/exercise_report.php index e0b7154310..4f16228894 100755 --- a/main/exercise/exercise_report.php +++ b/main/exercise/exercise_report.php @@ -587,7 +587,14 @@ if ($is_allowedToEdit || $is_tutor) { $column_model = [ ['name' => 'firstname', 'index' => 'firstname', 'width' => '50', 'align' => 'left', 'search' => 'true'], ['name' => 'lastname', 'index' => 'lastname', 'width' => '50', 'align' => 'left', 'formatter' => 'action_formatter', 'search' => 'true'], - ['name' => 'login', 'index' => 'username', 'width' => '40', 'align' => 'left', 'search' => 'true', 'hidden' => 'true'], + [ + 'name' => 'login', + 'index' => 'username', + 'width' => '40', + 'align' => 'left', + 'search' => 'true', + 'hidden' => api_get_configuration_value('exercise_attempts_report_show_username') ? 'false' : 'true', + ], ['name' => 'group_name', 'index' => 'group_id', 'width' => '40', 'align' => 'left', 'search' => 'true', 'stype' => 'select', //for the bottom bar 'searchoptions' => [ From eda5c56e55fc927e8571cbe23d983e23054c5021 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20Arag=C3=B3n?= Date: Fri, 13 Apr 2018 15:44:02 -0500 Subject: [PATCH 2/4] fix sessionIsPremiun=null --- main/session/about.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/session/about.php b/main/session/about.php index 7aa890c027..eeb2e60008 100644 --- a/main/session/about.php +++ b/main/session/about.php @@ -198,7 +198,7 @@ $template->assign( $plugin = BuyCoursesPlugin::create(); $checker = $plugin->isEnabled(); - +$sessionIsPremium = null; if ($checker) { $sessionIsPremium = $plugin->getItemByProduct( $sessionId, From fbb1fb065fd838191d7510c94714e4704e616505 Mon Sep 17 00:00:00 2001 From: Angel Fernando Quiroz Campos Date: Fri, 13 Apr 2018 16:25:15 -0500 Subject: [PATCH 3/4] Add exercise_attempts_report_show_username conf setting - refs BT#14212 See e6a724bdeeea0ff25704137535d548843db92fad --- main/install/configuration.dist.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/main/install/configuration.dist.php b/main/install/configuration.dist.php index 348d3233bc..0a68c6117f 100755 --- a/main/install/configuration.dist.php +++ b/main/install/configuration.dist.php @@ -529,6 +529,8 @@ $_configuration['send_all_emails_to'] = [ //$_configuration['hide_free_question_score'] = false; // Hide user information in the quiz result's page //$_configuration['hide_user_info_in_quiz_result'] = false; +// Show the username field in exercise results report +//$_configuration['exercise_attempts_report_show_username'] = false; // Score model // Allow to convert a score into a text/color label From a1eef028ccb5cb851c2b76a39789cc74d52eb8d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20Arag=C3=B3n?= Date: Fri, 13 Apr 2018 16:59:22 -0500 Subject: [PATCH 4/4] view correction to verify password in add user --- app/Resources/public/css/base.css | 4 +-- main/admin/user_add.php | 32 ---------------------- main/inc/lib/pear/HTML/QuickForm/group.php | 2 +- 3 files changed, 3 insertions(+), 35 deletions(-) diff --git a/app/Resources/public/css/base.css b/app/Resources/public/css/base.css index a179d31a5a..bd24d70107 100644 --- a/app/Resources/public/css/base.css +++ b/app/Resources/public/css/base.css @@ -5484,11 +5484,11 @@ div#chat-remote-video video { box-shadow: none; } -#registration #status .radio{ +#registration #status-group .radio{ display: inline-block; position: relative; } -#registration #status .radio label p{ +#registration #status-group .radio label p{ text-align: center; padding-top: 5px; padding-bottom: 5px; diff --git a/main/admin/user_add.php b/main/admin/user_add.php index f38f1abe95..d1cd0ff48a 100755 --- a/main/admin/user_add.php +++ b/main/admin/user_add.php @@ -19,29 +19,6 @@ $is_platform_admin = api_is_platform_admin() ? 1 : 0; $message = null; $htmlHeadXtra[] = api_get_password_checker_js('#username', '#password'); - -$checkPass = api_get_setting('allow_strength_pass_checker'); -if ($checkPass == 'true') { - $htmlHeadXtra[] = ' - '; -} $htmlHeadXtra[] = api_get_css_asset('cropper/dist/cropper.min.css'); $htmlHeadXtra[] = api_get_asset('cropper/dist/cropper.min.js'); $htmlHeadXtra[] = ' @@ -247,15 +224,6 @@ $form->addGroup($group, 'password', get_lang('Password')); $form->addPasswordRule('password', 'password'); $form->addGroupRule('password', get_lang('EnterPassword'), 'required', null, 1); -if ($checkPass) { - $strengthLabels = ' -
-
- - '; - $form->addElement('label', null, $strengthLabels); -} - // Status $status = []; $status[COURSEMANAGER] = get_lang('Teacher'); diff --git a/main/inc/lib/pear/HTML/QuickForm/group.php b/main/inc/lib/pear/HTML/QuickForm/group.php index 2957ce1df6..0f090aed30 100755 --- a/main/inc/lib/pear/HTML/QuickForm/group.php +++ b/main/inc/lib/pear/HTML/QuickForm/group.php @@ -568,7 +568,7 @@ class HTML_QuickForm_group extends HTML_QuickForm_element break; case FormValidator::LAYOUT_HORIZONTAL: return ' -
+