| @@ -223,6 +223,11 @@ app.model.Profile = function( data, groupsData ) | |||||
| teamData = gd; | teamData = gd; | ||||
| }; | }; | ||||
| this.getGroupStatus = function( groupId ) | |||||
| { | |||||
| return this.getGroupData(groupId).status; | |||||
| } | |||||
| this.isOwn = function() | this.isOwn = function() | ||||
| { | { | ||||
| return ( this.getId() == app.model.SessionUser.getUserProfile().getId() ); | return ( this.getId() == app.model.SessionUser.getUserProfile().getId() ); | ||||
| @@ -11,7 +11,6 @@ app.state.GroupMemberManagementMember = function() | |||||
| state.onEnter = function( p ) | state.onEnter = function( p ) | ||||
| { | { | ||||
| console.log(p); | |||||
| let $content = app.core.View.getContent(), | let $content = app.core.View.getContent(), | ||||
| fnRenderMemberForm = null, | fnRenderMemberForm = null, | ||||
| fnGetMemberById = null, | fnGetMemberById = null, | ||||
| @@ -27,9 +26,9 @@ app.state.GroupMemberManagementMember = function() | |||||
| fnRenderMemberForm = function( profile ) | fnRenderMemberForm = function( profile ) | ||||
| { | { | ||||
| let statusDeleted = false; | |||||
| let status = ''; | |||||
| if (profile) { | if (profile) { | ||||
| statusDeleted = profile.getGroupData(groupId).status === 'deleted'; | |||||
| status = profile.getGroupData(groupId).status; | |||||
| } | } | ||||
| $memberContainer = $content.find( '[data-id="member-container"]' ).first(); | $memberContainer = $content.find( '[data-id="member-container"]' ).first(); | ||||
| @@ -39,7 +38,7 @@ app.state.GroupMemberManagementMember = function() | |||||
| { | { | ||||
| p : profile, | p : profile, | ||||
| g : group, | g : group, | ||||
| statusDeleted: statusDeleted | |||||
| status: status | |||||
| } | } | ||||
| ) | ) | ||||
| ); | ); | ||||
| @@ -81,7 +81,7 @@ | |||||
| </div> | </div> | ||||
| </div> | </div> | ||||
| <hr /> | <hr /> | ||||
| <% if ( statusDeleted === false ) { %> | |||||
| <% if ( status !== 'deleted' ) { %> | |||||
| <div class="row"> | <div class="row"> | ||||
| <div class="col"> | <div class="col"> | ||||
| <strong><%= _lc( 'CHANGE_ROLE' ) %></strong> | <strong><%= _lc( 'CHANGE_ROLE' ) %></strong> | ||||
| @@ -9,6 +9,7 @@ | |||||
| <th>Postleitzahl</th> | <th>Postleitzahl</th> | ||||
| <th>Stadt</th> | <th>Stadt</th> | ||||
| <th>Telefon/Mobile</th> | <th>Telefon/Mobile</th> | ||||
| <th>Status</th> | |||||
| <th></th> | <th></th> | ||||
| </tr> | </tr> | ||||
| </thead> | </thead> | ||||
| @@ -22,6 +23,7 @@ | |||||
| <td><%= members[ mi ].zip ? members[ mi ].zip : '' %></td> | <td><%= members[ mi ].zip ? members[ mi ].zip : '' %></td> | ||||
| <td><%= members[ mi ].city ? members[ mi ].city : '' %></td> | <td><%= members[ mi ].city ? members[ mi ].city : '' %></td> | ||||
| <td><%= members[ mi ].phone ? members[ mi ].phone : '---' %> / <%= members[ mi ].mobile ? members[ mi ].mobile : '---' %></td> | <td><%= members[ mi ].phone ? members[ mi ].phone : '---' %> / <%= members[ mi ].mobile ? members[ mi ].mobile : '---' %></td> | ||||
| <td><%= members[ mi ].getGroupStatusText() %></td> | |||||
| <td class="text-center"> | <td class="text-center"> | ||||
| <button type="button" | <button type="button" | ||||
| data-type="btn-edit-memeber" | data-type="btn-edit-memeber" | ||||
| @@ -102,6 +102,30 @@ const UserProfile = { | |||||
| } | } | ||||
| return gd; | return gd; | ||||
| }, | }, | ||||
| getGroupStatus : function( groupId ) | |||||
| { | |||||
| if ( !groupId ) { | |||||
| groupId = this.contextGroupId; | |||||
| } | |||||
| return this.getGroupData(groupId).status; | |||||
| }, | |||||
| getGroupStatusText : function( groupId ) | |||||
| { | |||||
| if ( !groupId ) { | |||||
| groupId = this.contextGroupId; | |||||
| } | |||||
| switch (this.getGroupData(groupId).status) { | |||||
| case 'active': | |||||
| return 'aktiv'; | |||||
| case 'inactive': | |||||
| return 'inaktiv'; | |||||
| case 'not_approved': | |||||
| return 'unbestätigt'; | |||||
| case 'deleted': | |||||
| return 'gelöscht'; | |||||
| } | |||||
| return ''; | |||||
| }, | |||||
| getRoleName : function() | getRoleName : function() | ||||
| { | { | ||||
| var gd = this.getGroupData( this.contextGroupId ), | var gd = this.getGroupData( this.contextGroupId ), | ||||
| @@ -41,7 +41,7 @@ const MemberList = { | |||||
| this.createComponent( | this.createComponent( | ||||
| 'member-data-table', | 'member-data-table', | ||||
| $container.find( '[f-id="container-member-data-table"]' ).first().get( 0 ), | $container.find( '[f-id="container-member-data-table"]' ).first().get( 0 ), | ||||
| members | |||||
| members, | |||||
| ); | ); | ||||
| } | } | ||||
| $container.find( '.sk-loading' ).toggleClass( 'sk-loading' ); | $container.find( '.sk-loading' ).toggleClass( 'sk-loading' ); | ||||