Skip to content

Commit

Permalink
Merge branch 'main' into reenable-pylint
Browse files Browse the repository at this point in the history
  • Loading branch information
@mergify
mergify[bot] authored Jul 1, 2024
2 parents a7e35d4 + 0db9f8f commit f05f75b
Show file tree
Hide file tree
Showing 62 changed files with 380 additions and 407 deletions.
32 changes: 16 additions & 16 deletions content/adventures/de.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -884,9 +884,9 @@ adventures:
{print} Heute schau wir uns film _wahl an
Magst {ask} Magst du den Film?
{print} Morgen schauen wir etwas anderes.
{add} film_wahl {to} film_auswahl
{print} Morgen schauen wir morgige_filme
morgige_filme {is} film_auswahl {at} {random}
{add} film_wahl {to_list} film_auswahl
{print} Morgen schauen wir morgigen_film
morgigen_film {is} film_auswahl {at} {random}
I hole uns mal das Popcorn! {print}
```
4:
Expand Down Expand Up @@ -1432,11 +1432,12 @@ adventures:
Bis jetzt konntest du mit Hedy keine Dezimalzahlen (das sind Kommazahlen) wie 1,5 verwenden, aber jetzt geht das. Denke jedoch daran, dass Hedy (wie viele andere Programmiersprachen auch) anstatt des Kommas einen Punkt (`.`) verwendet.
example_code: |
```
{print} 'Zweieinhalb plus zweieinhalb macht...'
{print} 2.5 + 2.5
burger = 5
getraenk = 2
gesamt = burger + getraenk
print 'Du hast einen Burger und ein Getränk bestellt'
print 'Das macht zusammen 'total' Euro, bitte'
```
{print} 2.5 + 2.5
13:
story_text: |-
Wir werden jetzt `{and}` und `{or}` lernen! Wenn du zwei Angaben überprüfen willst, musst du nicht zwei Mal `{if}` verwenden, sondern kannst `{and}` und `{or}` benutzen.
Expand Down Expand Up @@ -3573,14 +3574,13 @@ adventures:
Good news! In this level you will be allowed to put an {if} inside an {if}, or inside a {repeat} command. Putting a block of code inside another block of code is called nesting. ``` Putting a block of code inside another block of code is called nesting.
example_code: |
```
answer = {ask} 'Are you ready to learn something new?'
{if} answer {is} yes
{print} 'Great! You can learn to use the repeat command in the if command!'
{print} 'Hooray!'
{print} 'Hooray!'
{print} 'Hooray!'
{else}
{print} 'Maybe you should practice some more in the previous level'
{repeat} 3 {times}
bestellung = {ask} 'Was möchtest du bestellen?'
{if} bestellung {is} pizza
{print} 'Lecker!'
{else}
{print} 'Pizza ist besser!'
```
repeat_command_2:
name: '{repeat} 2'
default_save_name: repeat_command_2
Expand Down Expand Up @@ -3844,7 +3844,7 @@ adventures:
```
{print} 'Willkommen im Restaurant Hedy!'
Leute = {ask} 'Für wie viele Leute möchten Sie bestellen?'
{print} 'Also möchten Sie für' Leute ' Leute bestellen.'
{print} 'Also möchten Sie für 'Leute ' Leute bestellen.'
{print} "Los geht's!"
```
12:
Expand Down
31 changes: 31 additions & 0 deletions static/js/admin.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,35 @@ export function initializeAdminUserPage(_options: InitializeAdminUsersPageOption
$('#hidden_page_input').attr('value', token);
$('#filterform').submit();
});
}

export function filter_admin() {
const params: Record<string, any> = {};

const filter = $('#admin_filter_category').val();
params['filter'] = filter;

if ($('#hidden_page_input').val()) {
params['page'] = $('#hidden_page_input').val();
}

switch (filter) {
case 'email':
case 'username':
params['substring'] = $('#email_filter_input').val();
break;
case 'language':
params['language'] = $('#language_filter_input').val();
break;
case 'keyword_language':
params['keyword_language'] = $('#keyword_language_filter_input').val();
break;
default:
params['start'] = $('#admin_start_date').val();
params['end'] = $('#admin_end_date').val();
break;
}

const queryString = Object.entries(params).map(([k, v]) => k + '=' + encodeURIComponent(v)).join('&');
window.open('?' + queryString, '_self');
}
31 changes: 0 additions & 31 deletions static/js/app.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1671,37 +1671,6 @@ export function select_profile_image(image: number) {
$('#image').val(image);
}

export function filter_admin() {
const params: Record<string, any> = {};

const filter = $('#admin_filter_category').val();
params['filter'] = filter;

if ($('#hidden_page_input').val()) {
params['page'] = $('#hidden_page_input').val();
}

switch (filter) {
case 'email':
case 'username':
params['substring'] = $('#email_filter_input').val();
break;
case 'language':
params['language'] = $('#language_filter_input').val();
break;
case 'keyword_language':
params['keyword_language'] = $('#keyword_language_filter_input').val();
break;
default:
params['start'] = $('#admin_start_date').val();
params['end'] = $('#admin_end_date').val();
break;
}

const queryString = Object.entries(params).map(([k, v]) => k + '=' + encodeURIComponent(v)).join('&');
window.open('?' + queryString, '_self');
}

export function hide_editor() {
$('#fold_in_toggle_container').hide();
$('#code_editor').toggle();
Expand Down
74 changes: 0 additions & 74 deletions static/js/appbundle.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60439,7 +60439,6 @@ ${o3}` : i3;
edit_user_tags: () => edit_user_tags,
enable_level: () => enable_level,
error: () => error,
filter_admin: () => filter_admin,
generate_passwords: () => generate_passwords,
getEditorContents: () => getEditorContents,
getForTeacherTable: () => getForTeacherTable,
Expand Down Expand Up @@ -60472,8 +60471,6 @@ ${o3}` : i3;
load_variables: () => load_variables,
logout: () => logout,
logs: () => logs,
markAsTeacher: () => markAsTeacher,
markSuperTeacher: () => markSuperTeacher,
modal: () => modal,
modalStepOne: () => modalStepOne,
preview_adventure: () => preview_adventure,
Expand Down Expand Up @@ -119271,51 +119268,6 @@ def note_with_error(value, err):
}
});
}
function markAsTeacher(checkbox, username, is_teacher, pending_request, by_super_teacher = false) {
$(checkbox).prop("checked", false);
let text = "Are you sure you want to remove " + username + " as a teacher?";
if (is_teacher) {
text = "Are you sure you want to make " + username + " a teacher?";
}
modal.confirm(text, async () => {
try {
await postNoResponse(by_super_teacher ? "/super-teacher/mark-as-teacher" : "/admin/mark-as-teacher", {
username,
is_teacher
});
location.reload();
} catch (e) {
console.error(e);
modal.notifyError(["Error when", is_teacher ? "marking" : "unmarking", "user", username, "as teacher"].join(" "));
}
}, async () => {
if (pending_request) {
await postJson("/admin/mark-as-teacher", {
username,
is_teacher: false
});
location.reload();
}
});
}
function markSuperTeacher(checkbox, username, is_super_teacher) {
let text = "Are you sure you want to make " + username + " a super teacher?";
if (is_super_teacher) {
text = "Are you sure you want to revoke super teacher privilege from " + username + "?";
}
modal.confirm(text, async () => {
try {
await postNoResponse("/admin/mark-super-teacher", {
username
});
location.reload();
} catch (e) {
console.error(e);
modal.notifyError(e);
$(checkbox).prop("checked", is_super_teacher);
}
}, () => $(checkbox).prop("checked", is_super_teacher));
}
function changeUserEmail(username, email) {
modal.prompt("Please enter the corrected email", email, async function(correctedEmail) {
if (correctedEmail === email)
Expand Down Expand Up @@ -120885,32 +120837,6 @@ def note_with_error(value, err):
$("#profile_image_" + image).addClass("border-2 border-blue-600");
$("#image").val(image);
}
function filter_admin() {
const params = {};
const filter = $("#admin_filter_category").val();
params["filter"] = filter;
if ($("#hidden_page_input").val()) {
params["page"] = $("#hidden_page_input").val();
}
switch (filter) {
case "email":
case "username":
params["substring"] = $("#email_filter_input").val();
break;
case "language":
params["language"] = $("#language_filter_input").val();
break;
case "keyword_language":
params["keyword_language"] = $("#keyword_language_filter_input").val();
break;
default:
params["start"] = $("#admin_start_date").val();
params["end"] = $("#admin_end_date").val();
break;
}
const queryString = Object.entries(params).map(([k, v]) => k + "=" + encodeURIComponent(v)).join("&");
window.open("?" + queryString, "_self");
}
function hide_editor() {
$("#fold_in_toggle_container").hide();
$("#code_editor").toggle();
Expand Down
4 changes: 2 additions & 2 deletions static/js/appbundle.js.map
View file

Large diffs are not rendered by default.

50 changes: 0 additions & 50 deletions static/js/auth.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -184,56 +184,6 @@ export function initializeFormSubmits() {

// *** Admin functionality ***

export function markAsTeacher(checkbox: any, username: string, is_teacher: boolean, pending_request: boolean, by_super_teacher = false) {
$(checkbox).prop('checked', false);
let text = "Are you sure you want to remove " + username + " as a teacher?";
if (is_teacher) {
text = "Are you sure you want to make " + username + " a teacher?";
}
modal.confirm (text, async () => {
try {
await postNoResponse(by_super_teacher ? '/super-teacher/mark-as-teacher' : '/admin/mark-as-teacher', {
username: username,
is_teacher: is_teacher,
});
location.reload();
} catch (e) {
console.error(e);
modal.notifyError(['Error when', is_teacher ? 'marking' : 'unmarking', 'user', username, 'as teacher'].join(' '));
}
}, async () => {
// If there is a pending request, we decline the modal -> remove the teacher request
if (pending_request) {
await postJson('/admin/mark-as-teacher', {
username: username,
is_teacher: false
});
location.reload();
}
});
}

export function markSuperTeacher(checkbox: any, username: string, is_super_teacher: boolean) {
let text = "Are you sure you want to make " + username + " a super teacher?";
if (is_super_teacher) {
text = "Are you sure you want to revoke super teacher privilege from " + username + "?";
}
modal.confirm (text, async () => {
try {
await postNoResponse('/admin/mark-super-teacher', {
username: username,
});
location.reload();
} catch (e: any) {
console.error(e);
modal.notifyError(e);
$(checkbox).prop('checked', is_super_teacher);
}
}, () => $(checkbox).prop('checked', is_super_teacher)
);
}


export function changeUserEmail(username: string, email: string) {
modal.prompt ('Please enter the corrected email', email, async function (correctedEmail) {
if (correctedEmail === email) return;
Expand Down
1 change: 0 additions & 1 deletion static/js/autosave.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ export function autoSave(formId: string,
// If the event is not from a customEvent with is the element autosaved, we pass.
return
}

// Now we can simply trigger the submit event on the parent form element.
formElement.requestSubmit()

Expand Down
24 changes: 20 additions & 4 deletions templates/admin/admin-users.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -165,11 +165,27 @@ <h4 class="text-center">Total amount of shown users: {{ users|length }}</h4>
<td class="experience_cell hidden">{{user.prog_experience}}</td>
<td class="tags_cell text-center cursor-pointer"><span onclick="hedyApp.edit_user_tags('{{user.username}}');">✏️</span></td>
{% if user.teacher_request %}
<td class="teacher_cell text-center"><span class="fa-solid fa-circle-question cursor-pointer" onclick="hedyApp.markAsTeacher (this, '{{user.username}}', true, true)"></span></td>
{% else %}
<td class="teacher_cell text-center"><input type="checkbox" {% if user.is_teacher %}checked="checked"{% endif %} onclick="hedyApp.markAsTeacher (this, '{{user.username}}', {% if user.is_teacher %}false{% else %}true{% endif %}, false)"></td>
<td id="teacher_request_{{user.username}}" class="teacher_cell text-center">
<span class="fa-solid fa-circle-question cursor-pointer"
hx-trigger="click"
hx-post="/admin/mark-as-teacher/{{user.username}}"
_="on click
remove #teacher_request_{{user.username}}
then toggle .hidden on #is_teacher_{{user.username}}
then set #check_teacher_{{user.username}}.checked to true">
</span>
</td>
{% endif %}
<td class="teacher_cell text-center"><input type="checkbox" {% if user.is_super_teacher %}checked="checked"{% endif %} onclick="hedyApp.markSuperTeacher (this, '{{user.username}}', {% if user.is_super_teacher %}true{% else %}false{% endif %})"></td>
<td id="is_teacher_{{user.username}}" class="{% if user.teacher_request %}hidden{% endif %} teacher_cell text-center">
<input id="check_teacher_{{user.username}}" type="checkbox" {% if user.is_teacher %}checked{% endif %}
hx-trigger="click"
hx-post="/admin/mark-as-teacher/{{user.username}}">
</td>
<td class="teacher_cell text-center">
<input type="checkbox" {% if user.is_super_teacher %}checked="checked"{% endif %}
hx-trigger="click"
hx-post="/admin/mark-super-teacher/{{user.username}}">
</td>
<td class="verified_cell hidden">{{user.email_verified}}</td>
<td class="third_party_cell hidden text-center"><input type="checkbox" {% if user.third_party %}checked="checked"{% endif %} ></td>
</tr>
Expand Down
19 changes: 12 additions & 7 deletions templates/super-teacher/support.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,19 @@ <h4 class="text-center">Total amount of shown users: {{ users|length }}</h4>
<td class="country_cell text-center p-2">{{user.country}}</td>
<td class="tags_cell text-center cursor-pointer text-center p-2">
{% if user.teacher_request %}
<button class="blue-btn" onclick="hedyApp.markAsTeacher (this, '{{user.username}}', true, true, true)">Make teacher</button>
<button id="teacher_request_{{user.username}}" class="blue-btn"
hx-trigger="click"
hx-post="/admin/mark-as-teacher/{{user.username}}"
_="on click
remove #teacher_request_{{user.username}}
then toggle .hidden on #invite_support_teacher_{{user.username}}"
>Make teacher</button>
{% endif %}
{% if user.support_teacher %}
{{user.support_teacher}}
{% else %}
{% if user.support_teacher %}
{{user.support_teacher}}
{% else %}
<button class="green-btn" id="invite-support-teacher"
onclick='hedyApp.invite_support_teacher("{{user.username}}")'>Pair support teacher</button>
{% endif %}
<button class="green-btn {% if user.teacher_request %}hidden{% endif %}" id="invite_support_teacher_{{user.username}}"
onclick='hedyApp.invite_support_teacher("{{user.username}}")'>Pair support teacher</button>
{% endif %}
</td>
</tr>
Expand Down
4 changes: 2 additions & 2 deletions tests_e2e.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -170,15 +170,15 @@ def make_current_user_teacher(self):
Need to log in again to refresh the session.
"""
self.post_data('admin/mark-as-teacher', {'username': self.username, 'is_teacher': True})
self.post_data('admin/mark-as-teacher/' + self.username, {'is_teacher': True})
return self.login_user(self.username)

def make_current_user_super_teacher(self):
"""Mark the current user as super-teacher.
Need to log in again to refresh the session.
"""
self.post_data('admin/mark-super-teacher', {'username': self.username})
self.post_data('admin/mark-super-teacher/' + self.username, {})
return self.login_user(self.username)

def given_user_is_logged_in(self):
Expand Down
Loading

0 comments on commit f05f75b

Please sign in to comment.