Merge pull request 'if user is logged in, use that user as default rower' (#445) from prefill-own-user-default-log into main

Reviewed-on: #445

frontend/main.ts

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

frontend/tests/log.spec.ts

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

templates/log.html.tera

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