Skip to content
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

Dev/oo#159 new state in arbeitsangebote #675

Merged
merged 6 commits into from
May 27, 2024

Conversation

mcmpp
Copy link
Member

@mcmpp mcmpp commented May 21, 2024

No description provided.

@mcmpp mcmpp requested a review from AlwinEgger May 21, 2024 09:08
@@ -5,6 +5,8 @@
<div class="panel-heading clearfix">
<h3 class="panel-title"><span class="navbar-brand" translate>Arbeitsangebote</span>
<form class="navbar-form pull-right" role="search">
<span translate>Archiviert anzeigen</span>
Copy link
Member

Choose a reason for hiding this comment

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

Archivierte anzeigen

Copy link
Member Author

Choose a reason for hiding this comment

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

done

@@ -18,8 +18,10 @@ <h3>
<button ng-if="arbeitsangebot.status === 'Bereit'" type="button" role="button" ng-click="aaZurueckziehen()" class="btn btn-warning"><span class="fa fa-pause"></span> <span translate>Zurückziehen</span></button>
<button ng-if="arbeitsangebot.status === 'Bereit'" type="button" role="button" ng-click="aaAbsagen()" class="btn btn-info"><span class="fa fa-ban"></span> <span translate>Absagen</i></span></button>
<button ng-if="arbeitsangebot.status === 'Bereit'" type="button" role="button" ng-click="aaAbschliessen()" class="btn btn-danger"><span class="fa fa-stop"></span> <span translate>Abschliessen <i class="fa fa-info-circle" aria-hidden="true" uib-tooltip-template="'abschliessenTooltip.html'"></i></span></button>
<oo-save-button model="arbeitsangebot" form="arbeitsangebotForm" entity="Arbeitsangebot" on-save="save" on-cancel="backToList" on-created="created">{{fullName() || 'Arbeitsangebot'|translate}}</oo-save-button>
<oo-delete-button ng-if="!arbeitsangebot.anzahlTeilnehmer || arbeitsangebot.anzahlTeilnehmer == 0" model="arbeitsangebot" entity="Arbeitsangebot" on-delete="delete" on-deleted="backToList"></oo-delete-button>
<button ng-if="arbeitsangebot.status === 'Beendet'" type="button" role="button" ng-click="aaArchiviert()" class="btn btn-danger"><span class="fa fa-stop"></span> <span translate>Archiviert<i class="fa fa-info-circle" aria-hidden="true" uib-tooltip-template="'archiviertTooltip.html'"></i></span></button>
Copy link
Member

Choose a reason for hiding this comment

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

Archiviert -> Archivieren

And there is a space missing between the text and the (i) button.

The archiviertTooltip.html is missing:

Diesen abgeschlossenen Arbeitseinsatz als Archiviert markieren. Anschliessend ist eine Abänderung nicht mehr möglich.

Copy link
Member Author

Choose a reason for hiding this comment

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

done

@mcmpp mcmpp merged commit fa84fc1 into prod May 27, 2024
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants