소스 검색

deleted profiles

beta
Daniel 1 년 전
부모
커밋
b5d96031fe
6개의 변경된 파일36개의 추가작업 그리고 6개의 파일을 삭제
  1. +5
    -0
      src/client/app/js/app/model/Profile.js
  2. +3
    -4
      src/client/app/js/app/state/GroupMemberManagementMember.js
  3. +1
    -1
      src/client/app/tmpl/group-member-management-member-body.html
  4. +2
    -0
      src/client/manager/js/app/components/members/member-data-table.html
  5. +24
    -0
      src/client/manager/js/app/model/UserProfile.js
  6. +1
    -1
      src/client/manager/js/app/views/members/MemberList.js

+ 5
- 0
src/client/app/js/app/model/Profile.js 파일 보기

@@ -223,6 +223,11 @@ app.model.Profile = function( data, groupsData )
teamData = gd;
};
this.getGroupStatus = function( groupId )
{
return this.getGroupData(groupId).status;
}
this.isOwn = function()
{
return ( this.getId() == app.model.SessionUser.getUserProfile().getId() );


+ 3
- 4
src/client/app/js/app/state/GroupMemberManagementMember.js 파일 보기

@@ -11,7 +11,6 @@ app.state.GroupMemberManagementMember = function()
state.onEnter = function( p )
{
console.log(p);
let $content = app.core.View.getContent(),
fnRenderMemberForm = null,
fnGetMemberById = null,
@@ -27,9 +26,9 @@ app.state.GroupMemberManagementMember = function()
fnRenderMemberForm = function( profile )
{
let statusDeleted = false;
let status = '';
if (profile) {
statusDeleted = profile.getGroupData(groupId).status === 'deleted';
status = profile.getGroupData(groupId).status;
}
$memberContainer = $content.find( '[data-id="member-container"]' ).first();
@@ -39,7 +38,7 @@ app.state.GroupMemberManagementMember = function()
{
p : profile,
g : group,
statusDeleted: statusDeleted
status: status
}
)
);


+ 1
- 1
src/client/app/tmpl/group-member-management-member-body.html 파일 보기

@@ -81,7 +81,7 @@
</div>
</div>
<hr />
<% if ( statusDeleted === false ) { %>
<% if ( status !== 'deleted' ) { %>
<div class="row">
<div class="col">
<strong><%= _lc( 'CHANGE_ROLE' ) %></strong>


+ 2
- 0
src/client/manager/js/app/components/members/member-data-table.html 파일 보기

@@ -9,6 +9,7 @@
<th>Postleitzahl</th>
<th>Stadt</th>
<th>Telefon/Mobile</th>
<th>Status</th>
<th></th>
</tr>
</thead>
@@ -22,6 +23,7 @@
<td><%= members[ mi ].zip ? members[ mi ].zip : '' %></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 ].getGroupStatusText() %></td>
<td class="text-center">
<button type="button"
data-type="btn-edit-memeber"


+ 24
- 0
src/client/manager/js/app/model/UserProfile.js 파일 보기

@@ -102,6 +102,30 @@ const UserProfile = {
}
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()
{
var gd = this.getGroupData( this.contextGroupId ),


+ 1
- 1
src/client/manager/js/app/views/members/MemberList.js 파일 보기

@@ -41,7 +41,7 @@ const MemberList = {
this.createComponent(
'member-data-table',
$container.find( '[f-id="container-member-data-table"]' ).first().get( 0 ),
members
members,
);
}
$container.find( '.sk-loading' ).toggleClass( 'sk-loading' );


불러오는 중...
취소
저장