Merge pull request 'develop' (#21) from develop into master
Reviewed-on: ERRMS/ERRMS#21
This commit is contained in:
commit
195fc1da4f
|
@ -278,6 +278,7 @@ CommunicationModule = ( function() {
|
|||
|
||||
//Apply button handlers to new buttons
|
||||
$(".communication_edit_button").on("click", CommunicationModule.handle_edit_button);
|
||||
$(".communication_edit_save_button").on("click", CommunicationModule.handle_edit_save_button);
|
||||
$(".communication_save_new_button").on("click", CommunicationModule.handle_save_new_button);
|
||||
$(".communication_delete_button").on("click", CommunicationModule.handle_delete_button);
|
||||
//Clear input fields
|
||||
|
|
|
@ -69,19 +69,19 @@
|
|||
<table class="table table-striped table-hover">
|
||||
<thead>
|
||||
<tr>
|
||||
<th scope="col">personnel number</th>
|
||||
<th scope="col">first name</th>
|
||||
<th scope="col">last name</th>
|
||||
<th scope="col">date of birth</th>
|
||||
<th scope="col">actions</th>
|
||||
<th scope="col">Personalnummer</th>
|
||||
<th scope="col">Nachname</th>
|
||||
<th scope="col">Vorname</th>
|
||||
<th scope="col">Geburtsdatum</th>
|
||||
<th scope="col">Aktionen</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{{#each member_list}}
|
||||
<tr>
|
||||
<td>{{member.personnel_number}}</td>
|
||||
<td>{{member.firstname}}</td>
|
||||
<td>{{member.lastname}}</td>
|
||||
<td>{{member.firstname}}</td>
|
||||
<td>{{member.date_of_birth}}</td>
|
||||
<td>{{#if read}}
|
||||
<a href="/portal/mm/profile?action=view&id={{member.entity_id}}"><svg width="1.5em" height="1.5em" fill="currentColor">
|
||||
|
|
|
@ -198,6 +198,7 @@ pub fn get_raw_members_in_group(
|
|||
bic
|
||||
))
|
||||
.distinct()
|
||||
.order((lastname.asc()))
|
||||
.load(&connection);
|
||||
|
||||
match data {
|
||||
|
|
Loading…
Reference in New Issue