Skip to content

I
InstiApp
Commit 18405272 authored by amanbharti008's avatar amanbharti008 Committed by Varun Patil
Browse files
Options

fix(user): Fix repeat bug in former role and add year (#285) 

* Remove duplication in Former Roles. Add year in display

* Revert gradle version

* Revert .idea

* Remove assetWizardSettings
parent 90bdb968
Show whitespace changes
Inline Side-by-side
Showing with 33 additions and 4 deletions
app/src/main/java/app/insti/api/model/Role.java
View file @ 18405272
......@@ -37,7 +37,10 @@ public class Role implements CardInterface {
@SerializedName("users_detail")
private List<User> roleUsersDetail;
public Role(String roleID, String roleName, boolean roleInheritable, String roleBody, Body roleBodyDetails, List<Body> roleBodies, List<String> rolePermissions, List<String> roleUsers, List<User> roleUsersDetail) {
@SerializedName("year")
private String roleYear;
public Role(String roleID, String roleName, boolean roleInheritable, String roleBody, Body roleBodyDetails, List<Body> roleBodies, List<String> rolePermissions, List<String> roleUsers, List<User> roleUsersDetail,String roleYear) {
this.roleID = roleID;
this.roleName = roleName;
this.roleInheritable = roleInheritable;
......@@ -47,6 +50,20 @@ public class Role implements CardInterface {
this.rolePermissions = rolePermissions;
this.roleUsers = roleUsers;
this.roleUsersDetail = roleUsersDetail;
this.roleYear = roleYear;
}
public Role(Role original) {
this.roleID = original.roleID;
this.roleName = original.roleName;
this.roleInheritable = original.roleInheritable;
this.roleBody = original.roleBody;
this.roleBodyDetails = original.roleBodyDetails;
this.roleBodies = original.roleBodies;
this.rolePermissions = original.rolePermissions;
this.roleUsers = original.roleUsers;
this.roleUsersDetail = original.roleUsersDetail;
this.roleYear = original.roleYear;
}
public String getRoleID() {
......@@ -65,6 +82,15 @@ public class Role implements CardInterface {
this.roleName = roleName;
}
public String getRoleYear() {
return roleYear;
}
public void setRoleYear(String roleYear) {
this.roleYear = roleYear;
}
public boolean isRoleInheritable() {
return roleInheritable;
}
......
app/src/main/java/app/insti/fragment/UserFragment.java
View file @ 18405272
......@@ -25,6 +25,7 @@ import android.widget.TextView;
import com.squareup.picasso.Picasso;
import java.util.ArrayList;
import java.util.List;
import app.insti.Constants;
......@@ -178,14 +179,16 @@ public class UserFragment extends BackHandledFragment implements TransitionTarge
final List<Body> bodyList = user.getUserFollowedBodies();
final List<Event> eventList = user.getUserGoingEvents();
List<Role> formerRoleList = user.getUserFormerRoles();
List<Role> allRoles = new ArrayList<>(roleList);
for (Role role : formerRoleList) {
role.setRoleName("Former " + role.getRoleName());
Role temp = new Role(role);
temp.setRoleName("Former " + role.getRoleName() + " " + role.getRoleYear());
allRoles.add(temp);
}
roleList.addAll(formerRoleList);
List<Event> eventInterestedList = user.getUserInterestedEvents();
eventList.removeAll(eventInterestedList);
eventList.addAll(eventInterestedList);
RoleRecyclerViewFragment frag1 = RoleRecyclerViewFragment.newInstance(roleList);
RoleRecyclerViewFragment frag1 = RoleRecyclerViewFragment.newInstance(allRoles);
BodyRecyclerViewFragment frag2 = BodyRecyclerViewFragment.newInstance(bodyList);
EventRecyclerViewFragment frag3 = EventRecyclerViewFragment.newInstance(eventList);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment