Skip to content
This repository was archived by the owner on Apr 17, 2019. It is now read-only.

Android. Edit candidate initial #271

Open
GiantYhorm wants to merge 10 commits into
base: master
Choose a base branch
from
Open

Android. Edit candidate initial #271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
70722c6
change models response results
GiantYhorm Jul 13, 2018
4820378
Changeentities
GiantYhorm Jul 13, 2018
8533fc2
reformat
GiantYhorm Jul 13, 2018
2de6b28
Save and show detailed interview. SQlite
GiantYhorm Jul 13, 2018
9e3f323
remove unnecessary operators
GiantYhorm Jul 13, 2018
becb9ce
fix
GiantYhorm Jul 13, 2018
01a0b3d
fix
GiantYhorm Jul 13, 2018
abc295e
edit names of methods
GiantYhorm Jul 13, 2018
8b11b1d
initial for edit candidate
GiantYhorm Jul 16, 2018
547aeaa
fix bugs
GiantYhorm Jul 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions Android/ZensoftHRCRM/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,20 @@ dependencies {
//create fake responses from json files
implementation 'com.github.tientun:retrofit-mock-response:1.0.0'

implementation 'io.reactivex.rxjava2:rxandroid:2.0.2'
implementation 'io.reactivex:rxjava:1.2.0'
implementation 'com.android.support:recyclerview-v7:27.1.1'

implementation 'io.reactivex.rxjava2:rxjava:2.1.16'
implementation 'io.reactivex.rxjava2:rxandroid:2.0.2'

implementation 'com.jakewharton.retrofit:retrofit2-rxjava2-adapter:1.0.0'

// butter knife
implementation "com.jakewharton:butterknife:8.8.1"
annotationProcessor "com.jakewharton:butterknife-compiler:8.8.1"


implementation 'com.thoughtbot:expandablerecyclerview:1.3'
implementation 'com.squareup.retrofit2:retrofit:2.4.0'
implementation 'com.squareup.retrofit2:converter-gson:2.4.0'
Expand Down
106 changes: 51 additions & 55 deletions Android/ZensoftHRCRM/app/src/main/java/com/erkprog/zensofthrcrm/data/db/SQLiteHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,8 @@ public class SQLiteHelper extends SQLiteOpenHelper {
private static final String CREATE_TABLE_REQUIREMENTS = "CREATE TABLE IF NOT EXISTS " +
REQUIREMENTS + "(" +
ID + " INTEGER_PRIMARY_KEY, " +
DEPARTMENT + ID + " TEXT, " +
TYPE + " INTEGER, " +
DEPARTMENT + ID + " INTEGER, " +
TYPE + " TEXT, " +
NAME + " TEXT);";

private static final String CREATE_TABLE_CVC = "CREATE TABLE IF NOT EXISTS " +
Expand Down Expand Up @@ -145,7 +145,7 @@ public class SQLiteHelper extends SQLiteOpenHelper {
ID + " INTEGER_PRIMARY_KEY, " +
FIRST_NAME + " TEXT, " +
LAST_NAME + " TEXT, " +
Copy link
Copy Markdown
Member

@trenatov trenatov Jul 16, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why you havent used room db framework)

Copy link
Copy Markdown
Contributor Author

@GiantYhorm GiantYhorm Jul 16, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've just found out about that. Will know -_-.

EMAIL + " TEXT, " +
EMAIL + " TEXT, " +
LEVEL + " TEXT, " +
CREATED + " TEXT, " +
PHONE + " TEXT, " +
Expand Down Expand Up @@ -178,13 +178,11 @@ public class SQLiteHelper extends SQLiteOpenHelper {
private static final String CREATE_TABLE_CRITERIAS = "CREATE TABLE IF NOT EXISTS " +
CRITERIAS + "(" +
ID + " INTEGER_PRIMARY_KEY, " +
DEPARTMENT + ID + " TEXT, " +
NAME + " TEXT);";

private static final String CREATE_TABLE_COMMENTS = "CREATE TABLE IF NOT EXISTS " +
COMMENTS + "(" +
ID + " INTEGER_PRIMARY_KEY, " +
CANDIDATE + ID + " TEXT, " +
CREATED_BY + ID + " TEXT, " +
TEXT + " TEXT);";

Expand Down Expand Up @@ -342,8 +340,7 @@ public void saveRequirements(List<Requirement> requirements) {
cv.put(ID, requirement.getId());
cv.put(NAME, requirement.getName());
cv.put(TYPE, requirement.getType());
if (requirement.getDepartment() != null)
cv.put(DEPARTMENT + ID, requirement.getDepartment().getName());
cv.put(DEPARTMENT + ID, requirement.getId());


Cursor cursor = db.rawQuery("SELECT * FROM " + REQUIREMENTS + " WHERE " + ID + " =?", new
Expand Down Expand Up @@ -394,10 +391,14 @@ public void saveInterviews(List<Interview> interviews) {
.getCandidate().getPosition())));
saveCandidates(new ArrayList<Candidate>(Arrays.asList(interviews.get(i)
.getCandidate())));

for (int j = 0; j < interviews.get(i).getInterviewersList().size(); j++) {
if(interviews.get(i).getInterviewersList().get(j).getEvaluaionList() != null)
saveEvaluations(interviews.get(i)
.getInterviewersList().get(j).getEvaluaionList());

}

saveInterviewers(interviews.get(i).getInterviewersList());
}

Expand Down Expand Up @@ -678,7 +679,7 @@ public void saveTemplates(List<Template> templates) {
}

//GET BY ID
private Department getDepartment(String departmentId) {
public Department getDepartment(String departmentId) {
Department department = new Department();

SQLiteDatabase dbReadable = this.getReadableDatabase();
Expand All @@ -701,7 +702,7 @@ private Department getDepartment(String departmentId) {
return department;
}

private Cv getCv(String cvId) {
public Cv getCv(String cvId) {
Cv cv = new Cv();

SQLiteDatabase dbReadable = this.getReadableDatabase();
Expand All @@ -724,7 +725,7 @@ private Cv getCv(String cvId) {
return cv;
}

private Criteria getCriteria(String criteriaId) {
public Criteria getCriteria(String criteriaId) {
Criteria criteria = new Criteria();

SQLiteDatabase dbReadable = this.getReadableDatabase();
Expand All @@ -737,8 +738,7 @@ private Criteria getCriteria(String criteriaId) {
do {
criteria.setId(criteriaCursor.getInt(criteriaCursor.getColumnIndex(ID)));
criteria.setName(criteriaCursor.getString(criteriaCursor.getColumnIndex(NAME)));
criteria.setDepartment(getDepartment(criteriaCursor.getString(criteriaCursor
.getColumnIndex(DEPARTMENT + ID))));

} while (criteriaCursor.moveToNext());
}

Expand All @@ -748,7 +748,7 @@ private Criteria getCriteria(String criteriaId) {
return criteria;
}

private Template getTemplate(String templateId) {
public Template getTemplate(String templateId) {
Template template = new Template();

SQLiteDatabase dbReadable = this.getReadableDatabase();
Expand All @@ -773,7 +773,7 @@ private Template getTemplate(String templateId) {
return template;
}

private Position getPosition(String positionId) {
public Position getPosition(String positionId) {
Position position = new Position();

SQLiteDatabase dbReadable = this.getReadableDatabase();
Expand All @@ -798,7 +798,7 @@ private Position getPosition(String positionId) {
return position;
}

private Requirement getRequirement(String requirementId) {
public Requirement getRequirement(String requirementId) {
Requirement requirement = new Requirement();

SQLiteDatabase dbReadable = this.getReadableDatabase();
Expand All @@ -811,9 +811,9 @@ private Requirement getRequirement(String requirementId) {
do {
requirement.setId(requirementCursor.getInt(requirementCursor.getColumnIndex(ID)));
requirement.setName(requirementCursor.getString(requirementCursor.getColumnIndex(NAME)));
requirement.setDepartment(getDepartment(requirementCursor.getString(requirementCursor
.getColumnIndex(DEPARTMENT + ID))));
requirement.setType(requirementCursor.getInt(requirementCursor.getColumnIndex(TYPE)));
requirement.setDepartment(requirementCursor.getInt(requirementCursor
.getColumnIndex(DEPARTMENT + ID)));
requirement.setType(requirementCursor.getString(requirementCursor.getColumnIndex(TYPE)));
} while (requirementCursor.moveToNext());
}

Expand All @@ -823,7 +823,7 @@ private Requirement getRequirement(String requirementId) {
return requirement;
}

private Vacancy getVacancy(String vacancyId) {
public Vacancy getVacancy(String vacancyId) {
Vacancy vacancy = new Vacancy();

SQLiteDatabase dbReadable = this.getReadableDatabase();
Expand All @@ -848,7 +848,7 @@ private Vacancy getVacancy(String vacancyId) {
return vacancy;
}

private User getUser(String userId) {
public User getUser(String userId) {
User user = new User();

SQLiteDatabase dbReadable = this.getReadableDatabase();
Expand All @@ -875,7 +875,7 @@ private User getUser(String userId) {
return user;
}

private Request getRequest(String requestId) {
public Request getRequest(String requestId) {
Request request = new Request();

SQLiteDatabase dbReadable = this.getReadableDatabase();
Expand All @@ -896,14 +896,14 @@ private Request getRequest(String requestId) {
request.setModified(requestCursor.getString(requestCursor.getColumnIndex(MODIFIED)));
request.setStatus(requestCursor.getString(requestCursor.getColumnIndex(STATUS)));

if (requestCursor.getString(requestCursor.getColumnIndex(REQUIREMENTS+ ID)) != null) {
List<String> reqStringList = Converter.convertStringToList(requestCursor.getString
(requestCursor
.getColumnIndex
(REQUIREMENTS + ID)));

List<String> reqStringList = Converter.convertStringToList(requestCursor.getString
(requestCursor
.getColumnIndex
(REQUIREMENTS + ID)));

request.setRequirementList(getRequirements(reqStringList));

request.setRequirementList(getRequirements(reqStringList));
}
} while (requestCursor.moveToNext());
}

Expand All @@ -913,7 +913,7 @@ private Request getRequest(String requestId) {
return request;
}

private Evaluation getEvaluation(String evaluationId) {
public Evaluation getEvaluation(String evaluationId) {
Evaluation evaluation = new Evaluation();

SQLiteDatabase dbReadable = this.getReadableDatabase();
Expand All @@ -938,7 +938,7 @@ private Evaluation getEvaluation(String evaluationId) {
return evaluation;
}

private Interviewer getInterviewer(String interviewerId) {
public Interviewer getInterviewer(String interviewerId) {
Interviewer interviewer = new Interviewer();

SQLiteDatabase dbReadable = this.getReadableDatabase();
Expand All @@ -955,12 +955,13 @@ private Interviewer getInterviewer(String interviewerId) {
interviewer.setUser(getUser(interviewerCursor.getString(interviewerCursor
.getColumnIndex(USER + ID))));

List<String> evalStringList = Converter.convertStringToList(interviewerCursor.getString
(interviewerCursor
.getColumnIndex
(EVALUATIONS + ID)));
interviewer.setEvaluaionList(getEvaluations(evalStringList));

if (interviewerCursor.getString(interviewerCursor.getColumnIndex(EVALUATIONS + ID)) != null) {
List<String> evalStringList = Converter.convertStringToList(interviewerCursor.getString
(interviewerCursor
.getColumnIndex
(EVALUATIONS + ID)));
interviewer.setEvaluaionList(getEvaluations(evalStringList));
}
} while (interviewerCursor.moveToNext());
}

Expand All @@ -970,7 +971,7 @@ private Interviewer getInterviewer(String interviewerId) {
return interviewer;
}

private Comment getComment(String commentId) {
public Comment getComment(String commentId) {
Comment comment = new Comment();

SQLiteDatabase dbReadable = this.getReadableDatabase();
Expand All @@ -983,8 +984,6 @@ private Comment getComment(String commentId) {
do {
comment.setId(commentCursor.getInt(commentCursor.getColumnIndex(ID)));
comment.setText(commentCursor.getString(commentCursor.getColumnIndex(TEXT)));
comment.setCandidate(getCandidate(commentCursor.getString(commentCursor.getColumnIndex
(CANDIDATE + ID))));
comment.setCreatedBy(getUser(commentCursor.getString(commentCursor
.getColumnIndex(CREATED_BY + ID))));
} while (commentCursor.moveToNext());
Expand All @@ -996,7 +995,7 @@ private Comment getComment(String commentId) {
return comment;
}

private Candidate getCandidate(String candidateId) {
public Candidate getCandidate(String candidateId) {
Candidate candidate = new Candidate();

SQLiteDatabase dbReadable = this.getReadableDatabase();
Expand Down Expand Up @@ -1053,7 +1052,7 @@ private Candidate getCandidate(String candidateId) {
return candidate;
}

private Interview getInterview(String interviewId) {
public Interview getInterview(String interviewId) {
Interview interview = new Interview();

SQLiteDatabase dbReadable = this.getReadableDatabase();
Expand All @@ -1071,11 +1070,13 @@ private Interview getInterview(String interviewId) {
interview.setDate(interviewCursor.getString(interviewCursor.getColumnIndex(DATE)));
interview.setStatus(interviewCursor.getString(interviewCursor.getColumnIndex(STATUS)));

List<String> interviewerStringList = Converter.convertStringToList(interviewCursor.getString
(interviewCursor
.getColumnIndex
(INTERVIEWERS + ID)));
interview.setInterviewersList(getInterviewers(interviewerStringList));
if (interviewCursor.getString(interviewCursor.getColumnIndex(INTERVIEWERS + ID)) != null) {
List<String> interviewerStringList = Converter.convertStringToList(interviewCursor.getString
(interviewCursor
.getColumnIndex
(INTERVIEWERS + ID)));
interview.setInterviewersList(getInterviewers(interviewerStringList));
}

} while (interviewCursor.moveToNext());
}
Expand Down Expand Up @@ -1264,15 +1265,14 @@ public ArrayList<Requirement> getRequirements() {
Requirement requirement = new Requirement();

int id = cursor.getInt(idIndex);
String departmentId = cursor.getString(departmentIdIndex);
int departmentId = cursor.getInt(departmentIdIndex);
String name = cursor.getString(nameIndex);
int type = cursor.getInt(typeIndex);
String type = cursor.getString(typeIndex);

if (departmentId != null)
requirement.setDepartment(getDepartment(departmentId));
requirement.setDepartment(departmentId);
requirement.setId(id);
requirement.setName(name);
requirement.setType(typeIndex);
requirement.setType(type);

requirements.add(requirement);

Expand Down Expand Up @@ -1627,24 +1627,20 @@ public ArrayList<Comment> getComments() {

if (cursor.moveToFirst()) {
int idIndex = cursor.getColumnIndex(ID);
int candidateIdIndex = cursor.getColumnIndex(CANDIDATE + ID);
int createdByIdIndex = cursor.getColumnIndex(CREATED_BY + ID);
int textIndex = cursor.getColumnIndex(TEXT);

do {
Comment comment = new Comment();

int id = cursor.getInt(idIndex);
String candidateId = cursor.getString(candidateIdIndex);
String createdById = cursor.getString(createdByIdIndex);
String text = cursor.getString(textIndex);

comment.setId(id);
comment.setText(text);
if (createdById != null)
comment.setCreatedBy(getUser(createdById));
if (candidateId != null)
comment.setCandidate(getCandidate(candidateId));

comments.add(comment);

Expand Down
20 changes: 4 additions & 16 deletions Android/ZensoftHRCRM/app/src/main/java/com/erkprog/zensofthrcrm/data/entity/Candidate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,34 +6,22 @@

public class Candidate {

@SerializedName("id")
private Integer id;
@SerializedName("first_name")
private String firstName;
@SerializedName("last_name")
private String lastName;
@SerializedName("email")
private String email;
@SerializedName("position")
private Position position = null;
@SerializedName("experience")
private Position position;
private Float experience;
@SerializedName("level")
private String level;
@SerializedName("created")
private String created;
@SerializedName("skype")
private String skype;
@SerializedName("status")
private String status;
@SerializedName("phone")
private String phone;
@SerializedName("cvs")
private List<Cv> cvs = null;
@SerializedName("interviews")
private List<Interview> interviews = null;
@SerializedName("comments")
private List<Comment> comments = null;
private List<Cv> cvs;
private List<Interview> interviews;
private List<Comment> comments;

public String getCreated() {
return created;
Expand Down
5 changes: 1 addition & 4 deletions ...nsoftHRCRM/app/src/main/java/com/erkprog/zensofthrcrm/data/entity/CandidatesResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,11 @@
import java.util.List;

public class CandidatesResponse {
@SerializedName("count")
private Integer count;
@SerializedName("next")
private String next;
@SerializedName("previous")
private String previous;
@SerializedName("results")
private List<Candidate> candidateList = null;
private List<Candidate> candidateList;

public Integer getCount() {
return count;
Expand Down
Loading