EinsatzOnline
/
EinsatzOnline
1
0
Fork 0
Code Issues 19 Pull Requests Projects 5 Releases Wiki Activity

Merge pull request 'develop' (#21) from develop into master 

Reviewed-on: ERRMS/ERRMS#21
This commit is contained in:
anghenfil 2020-12-30 16:31:58 +01:00
parent edf94111fd 3aee93afe4
commit 195fc1da4f
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
resources/js/member_management_profile.js
View File

@ -278,6 +278,7 @@ CommunicationModule = ( function() {
//Apply button handlers to new buttons //Apply button handlers to new buttons
$(".communication_edit_button").on("click", CommunicationModule.handle_edit_button); $(".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_save_new_button").on("click", CommunicationModule.handle_save_new_button);
$(".communication_delete_button").on("click", CommunicationModule.handle_delete_button); $(".communication_delete_button").on("click", CommunicationModule.handle_delete_button);
//Clear input fields //Clear input fields

12
resources/templates/module_member_management_selection.hbs
View File

@ -69,19 +69,19 @@
<table class="table table-striped table-hover"> <table class="table table-striped table-hover">
<thead> <thead>
<tr> <tr>
<th scope="col">personnel number</th> <th scope="col">Personalnummer</th>
<th scope="col">first name</th> <th scope="col">Nachname</th>
<th scope="col">last name</th> <th scope="col">Vorname</th>
<th scope="col">date of birth</th> <th scope="col">Geburtsdatum</th>
<th scope="col">actions</th> <th scope="col">Aktionen</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{{#each member_list}} {{#each member_list}}
<tr> <tr>
<td>{{member.personnel_number}}</td> <td>{{member.personnel_number}}</td>
<td>{{member.firstname}}</td>
<td>{{member.lastname}}</td> <td>{{member.lastname}}</td>
<td>{{member.firstname}}</td>
<td>{{member.date_of_birth}}</td> <td>{{member.date_of_birth}}</td>
<td>{{#if read}} <td>{{#if read}}
<a href="/portal/mm/profile?action=view&id={{member.entity_id}}"><svg width="1.5em" height="1.5em" fill="currentColor"> <a href="/portal/mm/profile?action=view&id={{member.entity_id}}"><svg width="1.5em" height="1.5em" fill="currentColor">

1
src/database/controller/members.rs
View File

@ -198,6 +198,7 @@ pub fn get_raw_members_in_group(
bic bic
)) ))
.distinct() .distinct()
.order((lastname.asc()))
.load(&connection); .load(&connection);
match data { match data {