Merge remote-tracking branch 'origin/develop' into develop

android/Pictogram/commonlibrary/src/main/java/com/yottacode/pictogram/dao/PCBDBHelper.java

@@ -218,7 +218,7 @@ public class PCBDBHelper extends SQLiteOpenHelper {
      */
      */
     public Vocabulary getStudentVocabulary(Vocabulary vocabulary ) throws JSONException {
     public Vocabulary getStudentVocabulary(Vocabulary vocabulary ) throws JSONException {
         int id_stu = this.currentUser.get_id_stu();
         int id_stu = this.currentUser.get_id_stu();
-        int id_scene = getActiveSceneForStudent(id_stu);
+        int id_scene = this.currentUser.get_active_scene();
 
 
         SQLiteDatabase db = this.getReadableDatabase();
         SQLiteDatabase db = this.getReadableDatabase();
 
 
@@ -253,7 +253,7 @@ public class PCBDBHelper extends SQLiteOpenHelper {
             Log.i(LOG_TAG,"inserting "+picto.get_id()+":"+picto.get_translation()+":"+picto.get_json_attrs()+"-id_sce: "+PCBcontext.getPcbdb().getCurrentUser().get_active_scene());
             Log.i(LOG_TAG,"inserting "+picto.get_id()+":"+picto.get_translation()+":"+picto.get_json_attrs()+"-id_sce: "+PCBcontext.getPcbdb().getCurrentUser().get_active_scene());
 
 
                 values.put("id_picto", picto.get_id());
                 values.put("id_picto", picto.get_id());
-                values.put("id_scene", getActiveSceneForStudent(id_stu));
+                values.put("id_scene", this.currentUser.get_active_scene());
                 values.put("id_stupicto", picto.get_stupicto_id());
                 values.put("id_stupicto", picto.get_stupicto_id());
                 values.put("url", picto.get_url());
                 values.put("url", picto.get_url());
                 values.put("translation",picto.get_translation());
                 values.put("translation",picto.get_translation());
@@ -279,7 +279,7 @@ public class PCBDBHelper extends SQLiteOpenHelper {
         values.put("id_stu", id_stu);
         values.put("id_stu", id_stu);
         values.put("id_picto", picto.get_id());
         values.put("id_picto", picto.get_id());
         //TODO: Añadir aqui el id de escena activa para el estudiante
         //TODO: Añadir aqui el id de escena activa para el estudiante
-        values.put("id_scene",PCBcontext.getPcbdb().getCurrentUser().get_active_scene());
+        values.put("id_scene",this.currentUser.get_active_scene());
         values.put("id_stupicto",picto.get_stupicto_id());
         values.put("id_stupicto",picto.get_stupicto_id());
         values.put("url", picto.get_url());
         values.put("url", picto.get_url());
         values.put("translation",picto.get_translation());
         values.put("translation",picto.get_translation());