diff --git a/Android/ZensoftHRCRM/app/build.gradle b/Android/ZensoftHRCRM/app/build.gradle index 63472f145..2924db00c 100644 --- a/Android/ZensoftHRCRM/app/build.gradle +++ b/Android/ZensoftHRCRM/app/build.gradle @@ -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' diff --git a/Android/ZensoftHRCRM/app/src/main/java/com/erkprog/zensofthrcrm/data/db/SQLiteHelper.java b/Android/ZensoftHRCRM/app/src/main/java/com/erkprog/zensofthrcrm/data/db/SQLiteHelper.java index a7d6928ca..486c1c65c 100644 --- a/Android/ZensoftHRCRM/app/src/main/java/com/erkprog/zensofthrcrm/data/db/SQLiteHelper.java +++ b/Android/ZensoftHRCRM/app/src/main/java/com/erkprog/zensofthrcrm/data/db/SQLiteHelper.java @@ -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 " + @@ -145,7 +145,7 @@ public class SQLiteHelper extends SQLiteOpenHelper { ID + " INTEGER_PRIMARY_KEY, " + FIRST_NAME + " TEXT, " + LAST_NAME + " TEXT, " + - EMAIL + " TEXT, " + + EMAIL + " TEXT, " + LEVEL + " TEXT, " + CREATED + " TEXT, " + PHONE + " TEXT, " + @@ -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);"; @@ -342,8 +340,7 @@ public void saveRequirements(List 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 @@ -394,10 +391,14 @@ public void saveInterviews(List interviews) { .getCandidate().getPosition()))); saveCandidates(new ArrayList(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()); } @@ -678,7 +679,7 @@ public void saveTemplates(List