-
Notifications
You must be signed in to change notification settings - Fork 0
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Feature/189 incidents #201
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hauptsächlich noch der Text im Button, wenn vorhanden und ein paar Details. Sonst sieht alles perfekt aus!
color: rgba($body-color, 0.5); | ||
padding-right: $btn-padding-x; | ||
grid-area: comment; | ||
grid-area: incident; | ||
display: flex; | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
...app/presence-control/components/presence-control-entry/presence-control-entry.component.html
Show resolved
Hide resolved
src/app/presence-control/components/presence-control-entry/presence-control-entry.component.ts
Outdated
Show resolved
Hide resolved
...esence-control/components/presence-control-incident/presence-control-incident.component.scss
Show resolved
Hide resolved
d992d59
to
393b12d
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In der OpenAbsencesDetailComponent
wird noch der Kommentar angezeigt. Ich denke fachlich ist es nicht möglich, dass eine offene Absenz einen Vorfall hat (da sie ja einen anderen PresenceType hat). Wahrscheinlich können wir den Kommentar in diesem Fall dort einfach löschen?
<span class="incident">{{ | ||
entry.presenceType?.Designation | ||
}}</span> | ||
}}</ng-container> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
So wie ich es verstehe, auch wenn der Status gewechselt werden kann (= grün oder gelb oder offene Absenz) der Vorfall eben angezeigt werden, nicht? Sonst würden ja Vorfälle gar nicht angezeigt werden? Vielleicht müsste man den settings.absencePresenceTypeId
(die Standardabwesenheit, wenn kein Grund gesetzt ist) rausfiltern.
}}</span> | ||
<span *ngIf="!entry.presenceType?.IsIncident"> | ||
{{ 'presence-control.entry.incident' | translate }}</span | ||
> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Würde hier nicht eine Condition reichen:
<span>{{
entry.presenceType?.IsIncident && entry.presenceType?.Designation || 'presence-control.entry.incident'
| translate
}}</span>
No description provided.