Added missing strings and behat

Author: prasanna-lmsace

block_dash.php

@@ -183,7 +183,7 @@ public function get_content() {
 
             $datasource = $bb->get_configuration()->get_data_source();
             // Conditionally hide the block when empty.
-            if (isset($this->config->hide_when_empty) && $this->config->hide_when_empty
+            if ($datasource && isset($this->config->hide_when_empty) && $this->config->hide_when_empty
                 && (($datasource->is_widget() && $datasource->is_empty())
                 || (!$datasource->is_widget() && $datasource->get_data()->is_empty()))
                 && !$this->page->user_is_editing()) {

lang/en/block_dash.php

@@ -700,7 +700,7 @@
 $string['learningpath:infoarea'] = 'Info area content';
 
 $string['widget:learningpath'] = 'Learning Path';
-$string['widget:learningpath_help'] = 'Display the levels associated with the selected skill as images.';
+$string['widget:learningpath_help'] = 'List of courses available in the learning path.';
 
 $string['dot'] = "Dot";
 $string['tinyimage'] = "Tiny image";
@@ -742,8 +742,10 @@
 $string['field:orderdirection_help'] = "Order direction";
 $string['field:limit'] = "Limit";
 $string['field:limit_help'] = "Limit";
-$string['field:learningpathtype'] = "Path";
-$string['leanringpath_infocontent'] = 'You have completed {$a->completed} out of {$a->total} courses. The next course in this learning path is: <b> {$a->nextcourse}</b>';
+$string['field:learningpathdesktop'] = "Path for Desktop";
+$string['field:learningpathtablet'] = "Path for Tablet";
+$string['field:learningpathmobile'] = "Path for Mobile";
+$string['leanringpath_infocontent'] = 'You have completed <b>{$a->completed}</b> out of <b> {$a->total} </b> courses. The next course in this learning path is: <b> {$a->nextcourse}</b>';
 $string['trialpath'] = "Trial";
 $string['anothertrailpath'] = "Another trial";
 $string['circlepath'] = "Circle";
@@ -759,12 +761,12 @@
 
 $string['resumecourse'] = "Resume course";
 $string['completedcourse'] = "Completed course";
+$string['startcourse'] = "Start course";
 
 $string['restrictcurrentsection'] = "Automatically restrict to current section";
 $string['restrictcurrentsection_desc'] = "If a dash block with the content addon is added to a single-section page, it shall be automatically restricted to that section.";
 
 $string['learningpathstart'] = 'Start';
 $string['learningpathfinish'] = 'Finish';
+$string['nocourselearnigpath'] = "No courses have been added to the learning path yet.";
 
-$string['restrictcurrentsection'] = "Automatically restrict to current section";
-$string['restrictcurrentsection_desc'] = "If a dash block with the content addon is added to a single-section page, it shall be automatically restricted to that section.";

tests/behat/behat_block_dash.php

@@ -35,10 +35,10 @@ class behat_block_dash extends behat_base {
 
     /**
      * Turns block editing mode on.
-     * @Given I switch block editing mode on
-     * @Given I turn block editing mode on
+     *
+     * @Give I turn dash block editing mode on
      */
-    public function i_turn_block_editing_mode_on() {
+    public function i_turn_dash_block_editing_mode_on() {
         global $CFG;
 
         if ($CFG->branch >= "400") {
@@ -70,15 +70,57 @@ public function i_follow_badge_recipients() {
 
     /**
      * I follow dashboard
-     * @Given I follow dashboard
+     * @Give I follow dashboard
      */
-    public function i_follow_dashboard() {
+    /* public function i_follow_dashboard() {
         global $CFG;
 
         if ($CFG->branch >= "400") {
             $this->execute('behat_general::i_click_on', ["Dashboard", 'link']);
         } else {
             $this->execute('behat_navigation::i_follow_in_the_user_menu', ["Dashboard"]);
         }
+    } */
+
+    /**
+     * Creates a datasource for dash block.
+     *
+     ** @Given /^I create dash "(?P<datasource>(?:[^"]|\\")*)" datasource $/
+     * @Given I create dash :arg1 datasource
+     *
+     * @throws ElementNotFoundException Thrown by behat_base::find
+     * @param string $datasource
+     * @param TableNode $data
+     */
+    public function i_create_dash_datasource($datasource) {
+        global $CFG;
+
+        $this->execute('behat_navigation::i_navigate_to_in_site_administration',
+            ['Appearance > Default Dashboard page']);
+        $this->execute('behat_block_dash::i_turn_dash_block_editing_mode_on', []);
+        $this->execute('behat_blocks::i_add_the_block', ["Dash"]);
+        $this->execute('behat_general::i_click_on_in_the', [$datasource, 'text', 'New Dash', 'block']);
+
+        // $this->execute('behat_general::i_click_on', ['Add menu item', 'button']);
+        // $this->execute('behat_forms::i_set_the_following_fields_to_these_values', [$data]);
+        // $this->execute('behat_general::i_click_on', ['Save changes', 'button']);
     }
+
+    /**
+     * Clicks on preference of the dash for specified block. Page must be in editing mode.
+     *
+     * Argument block_name may be either the name of the block or CSS class of the block.
+     *
+     * @Given /^I open the "(?P<block_name_string>(?:[^"]|\\")*)" block preference$/
+     * @param string $blockname
+     */
+    public function i_open_the_dash_block($blockname) {
+        // Note that since $blockname may be either block name or CSS class, we can not use the exact label of "Configure" link.
+        $this->execute("behat_blocks::i_open_the_blocks_action_menu", $this->escape($blockname));
+
+        $this->execute('behat_general::i_click_on_in_the',
+            array("Preference", "link", $this->escape($blockname), "block")
+        );
+    }
+
 }

version.php

@@ -24,7 +24,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2024030402;        // The current plugin version (Date: YYYYMMDDXX).
+$plugin->version   = 2024030403;        // The current plugin version (Date: YYYYMMDDXX).
 $plugin->requires  = 2021051700;        // Requires this Moodle version.
 $plugin->component = 'block_dash';      // Full name of the plugin (used for diagnostics).
 $plugin->maturity  = MATURITY_STABLE;