Skip to content

Commit cbd37d0

Browse files
ywarnierywarnier
committed
Merge branch '7149'
2 parents 9e968ec + 2d752c7 commit cbd37d0

35 files changed

Lines changed: 2030 additions & 394 deletions

‎assets/vue/components/assignments/CorrectAndRateModal.vue‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
</div>
4343

4444
<Textarea
45+
id="assignment-comment"
4546
v-model="comment"
4647
:placeholder="t('Write your comment...')"
4748
class="w-full"
@@ -88,6 +89,7 @@
8889
<div class="flex flex-col gap-2">
8990
<label>{{ t("Attach file (optional)") }}</label>
9091
<input
92+
id="assignment-attach-correction"
9193
type="file"
9294
@change="handleFileUpload"
9395
/>
@@ -107,11 +109,13 @@
107109
<Button
108110
:label="t('Cancel')"
109111
class="p-button-text"
112+
id="assignment-cancel"
110113
@click="close"
111114
/>
112115
<Button
113116
:label="t('Send')"
114117
:disabled="submitting"
118+
id="assignment-send"
115119
@click="submit"
116120
/>
117121
</div>

‎assets/vue/components/course/AdvancedCourseFilters.vue‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<InputText
99
v-model="model.title"
1010
:placeholder="$t('Search by title')"
11+
id="search_by_title"
1112
/>
1213
</div>
1314

@@ -211,7 +212,7 @@
211212
<!-- TEXT / INTEGER / FLOAT / DURATION -->
212213
<div v-else>
213214
<label class="block text-sm font-medium mb-1">{{ f.title }}</label>
214-
<InputText v-model="model.extra[f.variable]" />
215+
<InputText v-model="model.extra[f.variable]" :id="`extra-${f.variable}`" />
215216
</div>
216217
</template>
217218

‎assets/vue/views/course/CatalogueCourses.vue‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
<div class="relative">
3434
<i class="pi pi-search absolute left-3 top-1/2 transform -translate-y-1/2 text-gray-400" />
3535
<InputText
36+
id = "search_catalogue"
3637
v-model="filters['global'].value"
3738
:placeholder="$t('Search')"
3839
class="pl-10 w-64"

‎public/main/gradebook/lib/GradebookUtils.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ public static function build_edit_icons_eval($eval, $selectcat)
347347
$modify_icons = Display::getMdiIcon(ActionIcon::EDIT, 'ch-tool-icon-disabled', null, ICON_SIZE_SMALL, get_lang('Edit'));
348348
} else {
349349
$modify_icons = '<a href="gradebook_edit_eval.php?editeval='.$eval->get_id().'&'.$courseParams.'">'.
350-
Display::getMdiIcon(ActionIcon::EDIT, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Edit')).
350+
Display::getMdiIcon(ActionIcon::EDIT, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Edit weight')).
351351
'</a>';
352352
}
353353

@@ -416,7 +416,7 @@ public static function build_edit_icons_link($link, $selectcat)
416416
$modify_icons = Display::getMdiIcon(ActionIcon::EDIT, 'ch-tool-icon-disabled', null, ICON_SIZE_SMALL, get_lang('Edit'));
417417
} else {
418418
$modify_icons = '<a href="gradebook_edit_link.php?editlink='.$link->get_id().'&'.$courseParams.'">'.
419-
Display::getMdiIcon(ActionIcon::EDIT, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Edit')).
419+
Display::getMdiIcon(ActionIcon::EDIT, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Edit weight')).
420420
'</a>';
421421
}
422422
$modify_icons .= '&nbsp;<a href="'.api_get_self().'?visiblelink='.$link->get_id().'&'.$visibility_command.'=&selectcat='.$selectcat.'&'.$courseParams.' ">'.

‎public/main/inc/lib/extra_field.lib.php‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2487,23 +2487,23 @@ public function return_form($url, $action)
24872487
);
24882488

24892489
$group = [];
2490-
$group[] = $form->createElement('radio', 'visible_to_self', null, get_lang('Yes'), 1);
2491-
$group[] = $form->createElement('radio', 'visible_to_self', null, get_lang('No'), 0);
2490+
$group[] = $form->createElement('radio', 'visible_to_self', null, get_lang('Yes'), 1, ['id' => 'visible_to_self_yes']);
2491+
$group[] = $form->createElement('radio', 'visible_to_self', null, get_lang('No'), 0, ['id' => 'visible_to_self_no']);
24922492
$form->addGroup($group, '', get_lang('Visible to self'), null, false);
24932493

24942494
$group = [];
2495-
$group[] = $form->createElement('radio', 'visible_to_others', null, get_lang('Yes'), 1);
2496-
$group[] = $form->createElement('radio', 'visible_to_others', null, get_lang('No'), 0);
2495+
$group[] = $form->createElement('radio', 'visible_to_others', null, get_lang('Yes'), 1, ['id' => 'visible_to_others_yes']);
2496+
$group[] = $form->createElement('radio', 'visible_to_others', null, get_lang('No'), 0, ['id' => 'visible_to_others_no']);
24972497
$form->addGroup($group, '', get_lang('Visible to others'), null, false);
24982498

24992499
$group = [];
2500-
$group[] = $form->createElement('radio', 'changeable', null, get_lang('Yes'), 1);
2501-
$group[] = $form->createElement('radio', 'changeable', null, get_lang('No'), 0);
2500+
$group[] = $form->createElement('radio', 'changeable', null, get_lang('Yes'), 1, ['id' => 'changeable_yes']);
2501+
$group[] = $form->createElement('radio', 'changeable', null, get_lang('No'), 0, ['id' => 'changeable_no']);
25022502
$form->addGroup($group, '', get_lang('Can change'), null, false);
25032503

25042504
$group = [];
2505-
$group[] = $form->createElement('radio', 'filter', null, get_lang('Yes'), 1);
2506-
$group[] = $form->createElement('radio', 'filter', null, get_lang('No'), 0);
2505+
$group[] = $form->createElement('radio', 'filter', null, get_lang('Yes'), 1, ['id' => 'filter_yes']);
2506+
$group[] = $form->createElement('radio', 'filter', null, get_lang('No'), 0, ['id' => 'filter_no']);
25072507
$form->addGroup($group, '', get_lang('Filter'), null, false);
25082508

25092509
/* Enable this when field_loggeable is introduced as a table field (2.0)

‎tests/behat/features/adminChamiloOrgBlock.feature‎

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
Feature: Admin Chamilo.org block navigation
2+
In order to verify Chamilo.org links present in the admin dashboard
3+
As a platform administrator
4+
I want to open each Chamilo.org related link and ensure the page loads without errors
5+
6+
Background:
7+
Given I am a platform administrator
8+
And I wait for the page to be loaded
9+
10+
Scenario: Open Chamilo homepage
11+
Given I am on "/admin"
12+
And I wait for the page to be loaded
13+
And I zoom out to maximum
14+
And I follow "Chamilo homepage"
15+
And I wait for the page to be loaded
16+
Then I should not see an error
17+
18+
Scenario: Open User guides
19+
Given I am on "/admin"
20+
And I wait for the page to be loaded
21+
And I zoom out to maximum
22+
And I follow "User guides"
23+
And I wait for the page to be loaded
24+
Then I should not see an error
25+
26+
Scenario: Open Chamilo forum
27+
Given I am on "/admin"
28+
And I wait for the page to be loaded
29+
And I zoom out to maximum
30+
And I follow "Chamilo forum"
31+
And I wait for the page to be loaded
32+
Then I should not see an error
33+
34+
Scenario: Open Installation guide
35+
Given I am on "/admin"
36+
And I wait for the page to be loaded
37+
And I zoom out to maximum
38+
And I follow "Installation guide"
39+
And I wait for the page to be loaded
40+
Then I should not see an error
41+
42+
Scenario: Open Changes in last version
43+
Given I am on "/admin"
44+
And I wait for the page to be loaded
45+
And I zoom out to maximum
46+
And I follow "Changes in last version"
47+
And I wait for the page to be loaded
48+
Then I should not see an error
49+
50+
Scenario: Open Contributors list
51+
Given I am on "/admin"
52+
And I wait for the page to be loaded
53+
And I zoom out to maximum
54+
And I follow "Contributors list"
55+
And I wait for the page to be loaded
56+
Then I should not see an error
57+
58+
Scenario: Open Security guide
59+
Given I am on "/admin"
60+
And I wait for the page to be loaded
61+
And I zoom out to maximum
62+
And I follow "Security guide"
63+
And I wait for the page to be loaded
64+
Then I should not see an error
65+
66+
Scenario: Open Optimization guide
67+
Given I am on "/admin"
68+
And I wait for the page to be loaded
69+
And I zoom out to maximum
70+
And I follow "Optimization guide"
71+
And I wait for the page to be loaded
72+
Then I should not see an error
73+
74+
#Scenario: Open Chamilo extensions
75+
# Given I am on "/admin"
76+
#And I wait for the page to be loaded
77+
#And I zoom out to maximum
78+
#And I follow "Chamilo extensions"
79+
#And I wait for the page to be loaded
80+
#Then I should not see an error
81+
82+
Scenario: Open Chamilo official services providers
83+
Given I am on "/admin"
84+
And I wait for the page to be loaded
85+
And I zoom out to maximum
86+
And I follow "Chamilo official services providers"
87+
And I wait for the page to be loaded
88+
Then I should not see an error

‎tests/behat/features/adminCourseBlock.feature‎

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
Feature: Admin Course management block
2+
In order to verify course management admin pages
3+
As a platform administrator
4+
I want to open each course management link and ensure the page loads without errors
5+
6+
Background:
7+
Given I am a platform administrator
8+
And I wait for the page to be loaded
9+
10+
Scenario: Open Course list
11+
Given I am on "/admin"
12+
And I wait for the page to be loaded
13+
And I zoom out to maximum
14+
And I follow "Course list"
15+
And I wait for the page to be loaded
16+
Then I should not see an error
17+
18+
Scenario: Open Add course
19+
Given I am on "/admin"
20+
And I wait for the page to be loaded
21+
And I zoom out to maximum
22+
And I follow "Add course"
23+
And I wait for the page to be loaded
24+
Then I should not see an error
25+
26+
Scenario: Open Export courses
27+
Given I am on "/admin"
28+
And I wait for the page to be loaded
29+
And I zoom out to maximum
30+
And I follow "Export courses"
31+
And I wait for the page to be loaded
32+
Then I should not see an error
33+
34+
Scenario: Open Import courses list
35+
Given I am on "/admin"
36+
And I wait for the page to be loaded
37+
And I zoom out to maximum
38+
And I follow "Import courses list"
39+
And I wait for the page to be loaded
40+
Then I should not see an error
41+
42+
Scenario: Open Course categories
43+
Given I am on "/admin"
44+
And I wait for the page to be loaded
45+
And I zoom out to maximum
46+
And I follow "Course categories"
47+
And I wait for the page to be loaded
48+
Then I should not see an error
49+
50+
Scenario: Open Add a user to a course
51+
Given I am on "/admin"
52+
And I wait for the page to be loaded
53+
And I zoom out to maximum
54+
And I follow "Add a user to a course"
55+
And I wait for the page to be loaded
56+
Then I should not see an error
57+
58+
Scenario: Open Import users list (course block)
59+
Given I am on "/admin"
60+
And I wait for the page to be loaded
61+
And I zoom out to maximum
62+
And I follow "Import users list"
63+
And I wait for the page to be loaded
64+
Then I should not see an error
65+
66+
Scenario: Open Manage extra fields for courses
67+
Given I am on "/admin"
68+
And I wait for the page to be loaded
69+
And I zoom out to maximum
70+
And I follow "Manage extra fields for courses"
71+
And I wait for the page to be loaded
72+
Then I should not see an error
73+
74+
Scenario: Open Questions
75+
Given I am on "/admin"
76+
And I wait for the page to be loaded
77+
And I zoom out to maximum
78+
And I follow "Questions"
79+
And I wait for the page to be loaded
80+
Then I should not see an error
81+
82+
Scenario: Open Resources sequencing
83+
Given I am on "/admin"
84+
And I wait for the page to be loaded
85+
And I zoom out to maximum
86+
And I follow "Resources sequencing"
87+
And I wait for the page to be loaded
88+
Then I should not see an error

‎tests/behat/features/adminHealthBlock.feature‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
Feature: Admin Health check block
2+
In order to verify admin health checks
3+
As a platform administrator
4+
I want to open the health check page and ensure it loads without errors
5+
6+
Background:
7+
Given I am a platform administrator
8+
And I wait for the page to be loaded
9+
10+
Scenario: Open Health check
11+
Given I am on "/admin"
12+
And I wait for the page to be loaded
13+
And I zoom out to maximum
14+
And I follow "Health check"
15+
And I wait for the page to be loaded
16+
Then I should not see an error
17+
18+
Scenario: See health warnings
19+
Given I am on "/admin"
20+
And I wait for the page to be loaded
21+
And I zoom out to maximum
22+
And I follow "Health check"
23+
And I wait for the page to be loaded
24+
Then I should not see an error

0 commit comments

Comments
 (0)