diff --git a/src/client/app/css/app.css b/src/client/app/css/app.css index 53d8c3d..cf10f98 100644 --- a/src/client/app/css/app.css +++ b/src/client/app/css/app.css @@ -535,10 +535,10 @@ body.body-auth .action-button { [data-id="member-header"] .nav-tabs .nav-link { cursor: pointer; } -.group-members-content { +.group-members-tab-content { display: none; } -.group-members-content.active { +.group-members-tab-content.active { display: block; } diff --git a/src/client/app/tmpl/group-detail.html b/src/client/app/tmpl/group-detail.html index b5de451..b061196 100644 --- a/src/client/app/tmpl/group-detail.html +++ b/src/client/app/tmpl/group-detail.html @@ -48,6 +48,21 @@
+

+ <% var status = currentProfile.getGroupData( group.getId() ).status %> + <%= _lc( 'GROUP_DETAIL_STATUS' ) %>: + <% if ( status === 'active' ) { %> + <%= _lc( 'GROUP_MANAGEMENT_MEMBERS_ACTIVE' ) %> + <% } else if ( status === 'inactive' ) { %> + <%= _lc( 'GROUP_MANAGEMENT_MEMBERS_INACTIVE' ) %> + <% } else if ( status === 'not_approved' ) { %> + <%= _lc( 'GROUP_MANAGEMENT_MEMBERS_NOT_APPROVED' ) %> + <% } %> +
+ <% if ( status === 'inactive' || status === 'not_approved' ) { %> + <%= _lc( 'GROUP_DETAIL_NOTE_INACTIVE_OR_NOT_APPROVED' ) %> + <% } %> +

<% if ( null !== currentProfile && currentProfile.isAdminOfGroup( group.getId() ) ) { %>
-
- <% var status = currentProfile.getGroupData( group.getId() ).status %> - <%= _lc( 'GROUP_DETAIL_STATUS' ) %>: - <% if ( status === 'active' ) { %> - <%= _lc( 'GROUP_MANAGEMENT_MEMBERS_ACTIVE' ) %> - <% } else if ( status === 'inactive' ) { %> - <%= _lc( 'GROUP_MANAGEMENT_MEMBERS_INACTIVE' ) %> - <% } else if ( status === 'not_approved' ) { %> - <%= _lc( 'GROUP_MANAGEMENT_MEMBERS_NOT_APPROVED' ) %> - <% } %> -
- <% if ( status === 'inactive' || status === 'not_approved' ) { %> - <%= _lc( 'GROUP_DETAIL_NOTE_INACTIVE_OR_NOT_APPROVED' ) %> - <% } %> -
diff --git a/src/client/app/tmpl/group-member-management-body-adminnote.html b/src/client/app/tmpl/group-member-management-body-adminnote.html deleted file mode 100644 index ad329bb..0000000 --- a/src/client/app/tmpl/group-member-management-body-adminnote.html +++ /dev/null @@ -1,3 +0,0 @@ - \ No newline at end of file diff --git a/src/client/app/tmpl/group-member-management-body-appointment-log.html b/src/client/app/tmpl/group-member-management-body-appointment-log.html deleted file mode 100644 index e9f06fe..0000000 --- a/src/client/app/tmpl/group-member-management-body-appointment-log.html +++ /dev/null @@ -1,62 +0,0 @@ -
- - - - - - - - - - - <% if ( logs && logs.length > 0 ) { %> - - <% for ( var li = 0; li < logs.length; li++ ) { %> - - - - - - - - - <% } %> - - <% } else { %> - - - - - - <% } %> - -
- <%= _lc( 'COURSE' ) %> - - <%= _lc( 'STARTTIME' ) %> - - <%= _lc( 'ENDTIME' ) %> - -   -
- <%= logs[ li ].subject %>
- - <%= _lc( 'ATTENDANCE' ) %> - <% if ( 'accepted' === logs[ li ].status ) { %> - (<%= _lc( 'WITH_ACCEPTED_FEEDBACK' ) %>) - <% } else { %> - (<%= _lc( 'WITHOUT_ACCEPTED_FEEDBACK' ) %>) - <% } %> - - 		- <%= app.util.Helper.getMomentFromUTCTime( logs[ li ].start_dt ).format( 'DD.MM.YYYY [-] HH:mm' ) %> - - <%= app.util.Helper.getMomentFromUTCTime( logs[ li ].end_dt ).format( 'DD.MM.YYYY [-] HH:mm' ) %> - - -
- <%= _lc( 'NO_LOG_ENTRIES_FOUND' ) %> -
-
\ No newline at end of file diff --git a/src/client/app/tmpl/group-member-management-body.html b/src/client/app/tmpl/group-member-management-body.html deleted file mode 100644 index ac29e2f..0000000 --- a/src/client/app/tmpl/group-member-management-body.html +++ /dev/null @@ -1,251 +0,0 @@ -<% if ( p ) { %> - -
-
- -
-
-
-
-
- <%=raw p.getName() %> -
- <% if ( p.isInGroupCategory( 'DOGSCHOOL' ) ) { %> -
- <%= _lc( 'PROFILE_DOGNAME' ) %> -
-
- <%= p.getCustomGroupProperty( 'DOGSCHOOL', 'dogname' ) ? p.getCustomGroupProperty( 'DOGSCHOOL', 'dogname' ) : '---' %> -
- <% } %> -
- <%= _lc( 'PROFILE_STATUS' ) %> -
-
- <%= p.getStatus() %> -
-
- <%= _lc( 'ADDRESS' ) %> -
-
- <%= p.getStreet() ? p.getStreet() : '---' %>
- - <%= p.getZipCode() ? p.getZipCode() : '' %> <%= p.getCity() ? p.getCity() : '' %> -
-
- <%= _lc( 'PHONE' ) %> -
-
- <% if ( p.getMobile() ) { %> - <%= p.getMobile() %> - <% } else { %> - --- - <% } %> -
- <% if ( p.getPhone() ) { %> - <%= p.getPhone() %> - <% } else { %> - --- - <% } %> -
-
- <%= _lc( 'EMAIL' ) %> -
-
- <% if ( p.getEmail() ) { %> - <%= p.getEmail() %> - <% } else { %> - --- - <% } %> -
-
- <%= _lc( 'BIRTHDAY' ) %> -
-
- <%= ( null != p.getMomentBirthday() ) ? p.getMomentBirthday().format( 'DD.MM.YYYY' ) : '---' %> -
-
- <%= _lc( 'JOIN_DT' ) %> -
-
- <% var momentJoin = p.getMomentJoinInGroup( g.getId() ); %> - <%= ( null != momentJoin ) ? momentJoin.format( 'DD.MM.YYYY' ) : '---' %> -
-
-
-
-
-
- <%= _lc( 'CHANGE_ROLE' ) %> -
-
-
-
- -
-
- -
- <% if ( 'trainer' === p.getRoleInGroup( g.getId() ) ) { %> -
- <%= _lc( 'CANNOT_CHANGE_GROUP_OWNER_ROLE_INFO' ) %> -
- <% } %> -
-
-
-
- <%= _lc( 'ASSIGNED_MEMBER_GROUP_CATEGORIES' ) %> -
-
-
-
- <% var cgs = g.getCourseCategoriesForProfile( p ); %> - <% for ( var cgsi = 0; cgsi < cgs.length; cgsi++ ) { %> - <% if ( cgsi > 0 ) { %> - <%= ' ' %> - <% } %> - <%= cgs[ cgsi ].name %> - <% } %> -
-
- <%= _lc( 'ASSIGNED_MEMBER_CATEOGORY_INFO' ) %> -
-
- - <%= _lc( 'BTN_NAVIGATE_TO_CATEGORY_MANAGEMENT' ) %> - -
-
-
-
-
- <%= _lc( 'MEMBER_CONTRACT' ) %> -
-
-
-
-
- - -
-
-
-
- - -
-
-
- -
-
-
-
-
- <%= _lc( 'APPOINTMENT_LOG' ) %> -
-
-
-
-
- - -
-
-
-
- - -
-
-
- -
-
-
-
- -
-
-
-
-
- <%= _lc( 'ADMIN_NOTES' ) %> - <%= _lc( 'ADMIN_NOTES_INFO' ) %> -
-
-
-
- -
-
-
-
- -
-
- -<% } else { %> - -
-
- <%= _lc( 'SELECT_MEMBER_TO_EDIT' ) %> -
-
- -<% } %> \ No newline at end of file diff --git a/src/client/app/tmpl/group-member-management.html b/src/client/app/tmpl/group-member-management.html index 3045539..ef38664 100644 --- a/src/client/app/tmpl/group-member-management.html +++ b/src/client/app/tmpl/group-member-management.html @@ -44,7 +44,7 @@
-
+
@@ -56,7 +56,7 @@ -
+
@@ -68,7 +68,7 @@ -
+