Ruderverein-Donau-Linz/rowt
1
1
Fork 0
Code Issues 30 Pull Requests Actions Packages Projects Wiki Activity

Merge pull request 'if user is logged in, use that user as default rower' (#445) from prefill-own-user-default-log into main
Some checks are pending
CI/CD Pipeline / test (push) Waiting to run
Details
CI/CD Pipeline / deploy-staging (push) Blocked by required conditions
Details
CI/CD Pipeline / deploy-main (push) Blocked by required conditions
Details

Browse Source 
Reviewed-on: #445
This commit is contained in:
philipp 2024-04-26 09:59:09 +02:00
commit e2306e890d
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
frontend/main.ts
View File

@ -5,6 +5,7 @@ export interface choiceMap {
[details: string]: Choices; [details: string]: Choices;
} }
declare var loggedin_user_id: string;
let choiceObjects: choiceMap = {}; let choiceObjects: choiceMap = {};
let boat_in_ottensheim = true; let boat_in_ottensheim = true;
let boat_reserved_today= true; let boat_reserved_today= true;
@ -176,6 +177,8 @@ function selectBoatChange() {
/** custom code for Etsch */ /** custom code for Etsch */
choiceObjects["newrower"].setChoiceByValue("81"); choiceObjects["newrower"].setChoiceByValue("81");
} }
}else if (typeof loggedin_user_id !== 'undefined'){
choiceObjects["newrower"].setChoiceByValue(loggedin_user_id);
} }
const inputElement = document.getElementById( const inputElement = document.getElementById(

2
frontend/tests/log.spec.ts
View File

@ -18,6 +18,7 @@ test("Cox can start and cancel trip", async ({ page }, testInfo) => {
await page.getByText('2x', { exact: true }).click(); await page.getByText('2x', { exact: true }).click();
await page.getByText("Joe", { exact: true }).click(); await page.getByText("Joe", { exact: true }).click();
} }
await page.getByLabel('Remove item: \'6\'').click(); // remove pre-filled cox2
await page.getByPlaceholder("Ruderer auswählen").click(); await page.getByPlaceholder("Ruderer auswählen").click();
await page.getByRole("option", { name: "rower2" }).click(); await page.getByRole("option", { name: "rower2" }).click();
await page.getByRole("option", { name: "cox2" }).click(); await page.getByRole("option", { name: "cox2" }).click();
@ -59,6 +60,7 @@ test("Cox can start and finish trip", async ({ page }, testInfo) => {
await page.getByText('2x', { exact: true }).click(); await page.getByText('2x', { exact: true }).click();
await page.getByText("Joe", { exact: true }).click(); await page.getByText("Joe", { exact: true }).click();
} }
await page.getByLabel('Remove item: \'6\'').click(); // remove pre-filled cox2
await page.getByPlaceholder("Ruderer auswählen").click(); await page.getByPlaceholder("Ruderer auswählen").click();
await page.getByRole("option", { name: "rower2" }).click(); await page.getByRole("option", { name: "rower2" }).click();
await page.getByRole("option", { name: "cox2" }).click(); await page.getByRole("option", { name: "cox2" }).click();

1
templates/log.html.tera
View File

@ -38,5 +38,6 @@
</div> </div>
</div> </div>
</div> </div>
{% if loggedin_user %}<script>var loggedin_user_id = "{{ loggedin_user.id }}";</script>{% endif %}
<script src="/public/logbook.js"></script> <script src="/public/logbook.js"></script>
{% endblock content %} {% endblock content %}