Skip to content

Conversation

@mcmpp
Copy link
Member

@mcmpp mcmpp commented Oct 14, 2025

No description provided.

@mcmpp mcmpp requested a review from AlwinEgger October 14, 2025 21:08

private def prependAbgesagt(existing: Option[String]): Option[String] =
existing match {
case Some(txt) if txt.trim.startsWith("<span class=\"status-icon cancelled\" title=\"Cancelled\">&#10060;</span>") => Some(txt) // already prefixed
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Adding HTML to the Field is not very nice.
In addition we add something to a field the person has added their comments.
Shouldn't we display the icon on the UI based on the Arbeitseinsatz.Status? Updating the Status is absolutely fine.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

handle now in frontend

case UserCommandFailed =>
complete(StatusCodes.BadRequest, s"Could not cancel the Arbeitsangebot, please check the input data.")
case _ =>
complete(StatusCodes.OK, "Arbeitsangebot cancelled and related einsätze removed.")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not true, the Arbeitseinsatz was not removed but the Status is set to Abgesagt

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

changed

val einsatzModify = copyTo[Arbeitseinsatz, ArbeitseinsatzModify](
einsatz,
"status" -> Abgesagt,
"bemerkungen" -> updatedBemerkungen
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You are overwriting the bemerkungen field from the same object. Didn't you want to append the bemerkung of the arbeitsangebot or something?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You are right, this is not required anymore. Now this is handled on frontend.

@github-actions
Copy link

github-actions bot commented Dec 9, 2025

Code Coverage

Package Line Rate Branch Rate
ch.openolitor.arbeitseinsatz 47% 25%
ch.openolitor.arbeitseinsatz.batch 100% 100%
ch.openolitor.arbeitseinsatz.batch.calculations 39% 100%
ch.openolitor.arbeitseinsatz.eventsourcing 89% 100%
ch.openolitor.arbeitseinsatz.models 100% 100%
ch.openolitor.arbeitseinsatz.reporting 38% 67%
ch.openolitor.arbeitseinsatz.repositories 20% 0%
ch.openolitor.buchhaltung 39% 17%
ch.openolitor.buchhaltung.eventsourcing 98% 100%
ch.openolitor.buchhaltung.models 83% 100%
ch.openolitor.buchhaltung.rechnungsexport.iso20022 95% 56%
ch.openolitor.buchhaltung.reporting 0% 0%
ch.openolitor.buchhaltung.repositories 15% 33%
ch.openolitor.buchhaltung.zahlungsimport 71% 100%
ch.openolitor.buchhaltung.zahlungsimport.esr 86% 65%
ch.openolitor.buchhaltung.zahlungsimport.iso20022 49% 25%
ch.openolitor.core 45% 32%
ch.openolitor.core.batch 40% 22%
ch.openolitor.core.data 0% 0%
ch.openolitor.core.data.parsers 0% 0%
ch.openolitor.core.db 71% 40%
ch.openolitor.core.db.evolution 86% 76%
ch.openolitor.core.db.evolution.scripts 96% 75%
ch.openolitor.core.db.evolution.scripts.recalculations 59% 0%
ch.openolitor.core.db.evolution.scripts.v1 90% 33%
ch.openolitor.core.db.evolution.scripts.v2 91% 50%
ch.openolitor.core.domain 67% 40%
ch.openolitor.core.eventsourcing 56% 7%
ch.openolitor.core.eventsourcing.events 42% 26%
ch.openolitor.core.filestore 22% 16%
ch.openolitor.core.filestore.batch 100% 100%
ch.openolitor.core.filestore.batch.housekeeping 37% 0%
ch.openolitor.core.jobs 40% 24%
ch.openolitor.core.mailservice 20% 6%
ch.openolitor.core.models 0% 0%
ch.openolitor.core.proxy 0% 0%
ch.openolitor.core.reporting 49% 41%
ch.openolitor.core.reporting.odf 57% 56%
ch.openolitor.core.reporting.pdf 85% 60%
ch.openolitor.core.repositories 67% 63%
ch.openolitor.core.security 40% 39%
ch.openolitor.core.system 0% 0%
ch.openolitor.core.ws 65% 30%
ch.openolitor.helloworld 100% 100%
ch.openolitor.kundenportal 37% 0%
ch.openolitor.kundenportal.repositories 27% 17%
ch.openolitor.mailtemplates 30% 38%
ch.openolitor.mailtemplates.engine 98% 100%
ch.openolitor.mailtemplates.eventsourcing 100% 100%
ch.openolitor.mailtemplates.model 0% 0%
ch.openolitor.mailtemplates.repositories 6% 100%
ch.openolitor.reports 22% 22%
ch.openolitor.reports.eventsourcing 100% 100%
ch.openolitor.reports.repositories 0% 0%
ch.openolitor.stammdaten 53% 24%
ch.openolitor.stammdaten.batch 100% 100%
ch.openolitor.stammdaten.batch.calculations 30% 100%
ch.openolitor.stammdaten.eventsourcing 70% 0%
ch.openolitor.stammdaten.models 90% 50%
ch.openolitor.stammdaten.reporting 31% 33%
ch.openolitor.stammdaten.repositories 36% 17%
ch.openolitor.util 20% 24%
ch.openolitor.util.jsonpath 99% 98%
ch.openolitor.util.jsonpath.functions 83% 79%
ch.openolitor.util.parsing 82% 54%
ch.openolitor.util.querybuilder 5% 10%
org.odftoolkit.simple 64% 43%
org.odftoolkit.simple.draw 69% 62%
Summary 50% (23334 / 46984) 30% (776 / 2574)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants