Compare commits

..

No commits in common. "df9f1c398bdbeb8adb800a66d7c637e59b712514" and "ee17bc2ab30d7f448f2150800a1e174d0489c00d" have entirely different histories.

4 changed files with 12 additions and 12 deletions

View File

@ -15,7 +15,7 @@ test("cox can create and delete trip", async ({ page }) => {
await page.locator("#sidebar #planned_starting_time").press("Tab"); await page.locator("#sidebar #planned_starting_time").press("Tab");
await page.getByRole("spinbutton").fill("5"); await page.getByRole("spinbutton").fill("5");
await page.getByRole("button", { name: "Erstellen", exact: true }).click(); await page.getByRole("button", { name: "Erstellen", exact: true }).click();
await expect(page.locator("body")).toContainText("18:00 Uhr (cox) Details"); await expect(page.locator("body")).toContainText("18:00 Uhr (cox ) Details");
await page.goto("http://localhost:8000/planned"); await page.goto("http://localhost:8000/planned");
await page.getByRole("link", { name: "Details" }).click(); await page.getByRole("link", { name: "Details" }).click();
@ -132,7 +132,7 @@ test.describe("cox can edit trips", () => {
await expect(sharedPage.locator("body")).toContainText( await expect(sharedPage.locator("body")).toContainText(
"Ausfahrt erfolgreich aktualisiert.", "Ausfahrt erfolgreich aktualisiert.",
); );
await expect(sharedPage.locator("body")).toContainText("(Absage cox)"); await expect(sharedPage.locator("body")).toContainText("(Absage cox )");
}); });
test.afterEach(async () => { test.afterEach(async () => {

View File

@ -87,7 +87,7 @@ test("Cox can start and finish trip", async ({ page }, testInfo) => {
await expect(page.locator('body')).toContainText('Joe'); await expect(page.locator('body')).toContainText('Joe');
await expect(page.locator('body')).toContainText('(cox2 )'); await expect(page.locator('body')).toContainText('(cox2 )');
await expect(page.locator('body')).toContainText('Ottensheim (25 km)'); await expect(page.locator('body')).toContainText('Ottensheim (25 km)');
await expect(page.locator('body')).toContainText('Ruderer: cox2, rower2'); await expect(page.locator('body')).toContainText('Ruderer: cox2 , rower2');
}); });
test("Kiosk can start and cancel trip", async ({ page }, testInfo) => { test("Kiosk can start and cancel trip", async ({ page }, testInfo) => {
@ -162,5 +162,5 @@ test("Kiosk can start and finish trip", async ({ page }, testInfo) => {
await expect(page.locator('body')).toContainText('Joe'); await expect(page.locator('body')).toContainText('Joe');
await expect(page.locator('body')).toContainText('(cox2 )'); await expect(page.locator('body')).toContainText('(cox2 )');
await expect(page.locator('body')).toContainText('Ottensheim (25 km)'); await expect(page.locator('body')).toContainText('Ottensheim (25 km)');
await expect(page.locator('body')).toContainText('Ruderer: cox2, rower2'); await expect(page.locator('body')).toContainText('Ruderer: cox2 , rower2');
}); });

View File

@ -180,8 +180,8 @@
</div> </div>
{% endif %} {% endif %}
<div {% if log.logtype %}class="mt-4 sm:mt-0"{% endif %}> <div {% if log.logtype %}class="mt-4 sm:mt-0"{% endif %}>
<strong class="text-black dark:text-white">{{ log.boat.name }}</strong> <small class="text-gray-600 dark:text-gray-100">({{ log.shipmaster_user.name -}} <strong class="text-black dark:text-white">{{ log.boat.name }}</strong> <small class="text-gray-600 dark:text-gray-100">({{ log.shipmaster_user.name }}
{% if log.shipmaster_only_steering %}- handgesteuert{% endif -%} {% if log.shipmaster_only_steering %}- handgesteuert{% endif %}
)</small> )</small>
<small class="block text-gray-600 dark:text-gray-100"> <small class="block text-gray-600 dark:text-gray-100">
{% if state == "completed" and log.departure | date(format='%d.%m.%Y') == log.arrival | date(format='%d.%m.%Y') %} {% if state == "completed" and log.departure | date(format='%d.%m.%Y') == log.arrival | date(format='%d.%m.%Y') %}
@ -208,8 +208,8 @@
{% if amount_guests > 0 or log.rowers | length > 0 %} {% if amount_guests > 0 or log.rowers | length > 0 %}
<div class="text-sm text-gray-600 dark:text-gray-100"> <div class="text-sm text-gray-600 dark:text-gray-100">
Ruderer: Ruderer:
{% for rower in log.rowers -%} {% for rower in log.rowers %}
{{ rower.name -}} {{ rower.name }}
{% if not loop.last or amount_guests > 0 and log.boat.name != 'Externes Boot' %},{% endif %} {% if not loop.last or amount_guests > 0 and log.boat.name != 'Externes Boot' %},{% endif %}
{% endfor %} {% endfor %}
{% if amount_guests > 0 and log.boat.name != 'Externes Boot' %} {% if amount_guests > 0 and log.boat.name != 'Externes Boot' %}

View File

@ -228,17 +228,17 @@
{{ trip.planned_starting_time }} {{ trip.planned_starting_time }}
Uhr</strong> Uhr</strong>
<small class="text-[#f43f5e]">(Absage <small class="text-[#f43f5e]">(Absage
{{ trip.cox_name -}} {{ trip.cox_name }}
{% if trip.trip_type %} {% if trip.trip_type %}
- -
{{ trip.trip_type.icon | safe }}{{ trip.trip_type.name }} {{ trip.trip_type.icon | safe }}{{ trip.trip_type.name }}
{% endif -%} {% endif %}
)</small> )</small>
{% else %} {% else %}
<strong class="text-primary-900 dark:text-white">{{ trip.planned_starting_time }} <strong class="text-primary-900 dark:text-white">{{ trip.planned_starting_time }}
Uhr</strong> Uhr</strong>
<small class="text-gray-600 dark:text-gray-100">({{ trip.cox_name -}} <small class="text-gray-600 dark:text-gray-100">({{ trip.cox_name }}
{% if trip.trip_type %}- {{ trip.trip_type.icon | safe }} {{ trip.trip_type.name }}{% endif -%} {% if trip.trip_type %}- {{ trip.trip_type.icon | safe }} {{ trip.trip_type.name }}{% endif %}
)</small> )</small>
{% endif %} {% endif %}
<br /> <br />