Skip to content

yotta / pictogram

Go to a project
Commit e1bd1eff by Arturo Montejo Ráez
Options

solving conflict in merge

parents 1b79b877 69feb3e7
Inline Side-by-side
Showing with 1398 additions and 1173 deletions
.gitignore
......@@ -46,6 +46,10 @@ sails/upload.zip
.idea
android/Pictogram/.idea
android/Pictogram/commonlibrary/commonlibrary.iml
android/Pictogram/commonlibrary/local.properties
android/Pictogram/commonlibrary/gradle
android/Pictogram/commonlibrary/gradlew
android/Pictogram/commonlibrary/gradlew.bat
android/Pictogram/tablet/tablet.iml
android/Pictogram/watch/watch.iml
android/Pictogram/Pictogrammar.iml
......
android/Pictogram/commonlibrary/build.gradle
......@@ -11,9 +11,6 @@ android {
versionName "1.0"
resValue "string", "db_name", "PCB.db"
resValue "string", "core_vocabulary", "core_vocabulary"
resValue "integer", "rows", "5"
resValue "integer", "columns", "10"
}
buildTypes {
release {
......
android/Pictogram/commonlibrary/src/main/java/com/yottacode/pictogram/dao/Picto.java
......@@ -43,7 +43,7 @@ public class Picto extends Img {
static String INVISIBLE = "invisible";
}
public final static int NO_CATEGORY=-1;
public final static int ROW_UNCATEGORIZED_CONCEPTS=0;
public final static int COL_UNCATEGORIZED_CONCEPTS=0;
......@@ -323,7 +323,7 @@ public class Picto extends Img {
*/
public boolean is_category() {
return this.get_category()==Picto.NO_CATEGORY &&
this.get_column() != Picto.ROW_UNCATEGORIZED_CONCEPTS &&
this.get_row() != Picto.COL_UNCATEGORIZED_CONCEPTS &&
this.getFreeColumn() == -1 &&
this.getFreeRow() == -1;
}
......
android/Pictogram/commonlibrary/src/main/java/com/yottacode/pictogram/dao/User.java
package com.yottacode.pictogram.dao;
import java.io.IOException;
import org.json.JSONObject;
import org.json.JSONException;
import android.content.Context;
import android.graphics.Bitmap;
import com.yottacode.pictogram.tools.Img;
import com.yottacode.pictogram.grammar.Vocabulary;
import org.json.JSONException;
import org.json.JSONObject;
import java.io.IOException;
/**
* A user of the PCB. A user can be an Student or a Supervisor using a student configuration
......@@ -29,7 +28,7 @@ public class User {
static String CATEGORIES = "categories";
static String INPUT_FEEDBACK = "input feedback";
static String INPUT_SELECTION = "input selection";
static String PICTOGRAM_SIZE = "pictogram size";
static String PICTOGRAM_SIZE ="pictogram size";
static String TTS_ENGINE = "tts engine";
static String TTS_VOICE = "tts voice";
}
......@@ -38,6 +37,7 @@ public class User {
private JSONObject attributes_stu;
private Img img_sup;
private String email_sup, pwd_sup, name_sup, surname_sup, gender_sup, lang_sup, tts_engine_sup;
private int max_columns,max_rows;
public User(int id_stu, String nickname_stu, String pwd_stu, String name_stu, String surname_stu, String url_img_stu, String gender_stu, String lang_stu, String attributes_stu) throws JSONException {
......@@ -62,6 +62,7 @@ public class User {
this.gender_sup=gender_sup;
this.lang_sup=lang_sup;
this.tts_engine_sup=tts_engine_sup;
}
......@@ -259,18 +260,21 @@ public class User {
}
}
/**
*
* @return pictogram size of the student configuration (default: "normal")
*/
public String get_pictogram_size() {
public boolean is_picto_size_big() {
try {
return this.attributes_stu.getString(JSON_STUDENT_ATTTRS.PICTOGRAM_SIZE);
} catch (JSONException e) {
return "normal";
return !get_json_attr(JSON_STUDENT_ATTTRS.PICTOGRAM_SIZE).equals("normal");
} catch (Exception e) {
return true;
}
}
public boolean is_supervisor() {
return get_id_sup()!=User.NO_SUPERVISOR;
}
......@@ -288,4 +292,4 @@ public class User {
}
\ No newline at end of file
}
android/Pictogram/commonlibrary/src/main/java/com/yottacode/pictogram/tools/PCBcontext.java
......@@ -56,10 +56,11 @@ public final class PCBcontext {
*/
public static void set_user(User student, String token, iImgDownloaderListener listener) {
if (!init) {
Log.i(PCBcontext.class.getCanonicalName(), "PCBcontext.init must be called once previously ");
throw new java.lang.AssertionError("init must be called once previously ");
}
Log.i(PCBcontext.class.getCanonicalName(), "User set at student " + student.get_name_stu());
Log.e(PCBcontext.class.getCanonicalName(), "User set at student " + student.get_name_stu());
wrapper.setToken(token);
pcbdb = new PCBDBHelper(null, 1, student);
pcbdb.user_online(token!=null);
......@@ -70,6 +71,7 @@ public final class PCBcontext {
}
public static void unset_user() {
Log.i(PCBcontext.class.getCanonicalName(), "User unset. Student " + getPcbdb().getCurrentUser().get_name_stu());
pcbdb = null;
if (room!=null) room.exit();
room = null;
......
android/Pictogram/commonlibrary/src/main/res/values-es/strings.xml
......@@ -51,8 +51,6 @@
<string name="nogrammar">Advertencia: Lenguaje no soportado</string>
<string name="pictogrammar">SUpO_PICTOES</string>
<item type="integer" name="maxInTape">8</item>
<!--Upload local img -->
<string name="enterImgLabel">Introduzca etiqueta de la imagen</string>
<string name="notNewCats">No puede añadir nuevas categorias</string>
......
android/Pictogram/commonlibrary/src/main/res/values/dimens.xml
......@@ -10,4 +10,7 @@
<dimen name="picto_normal_height">75dp</dimen>
<dimen name="picto_normal_width">75dp</dimen>
<dimen name="tape_normal_height">90dp</dimen>
<dimen name="picto_big_height">90dp</dimen>
<dimen name="picto_big_width">90dp</dimen>
<dimen name="tape_big_height">110dp</dimen>
</resources>
android/Pictogram/commonlibrary/src/main/res/values/strings.xml
......@@ -60,7 +60,6 @@
<string name="upload_error">No pudo subirse al servidor. Se intentará más adelante</string>
<string name="upload_ok">Se subió correctamente al servidor</string>
<item name="maxInTape" type="integer">8</item>
<string name="title_activity_img_label">img_label</string>
<!-- Strings related to login -->
......
android/Pictogram/supervisor_tablet/src/main/res/layout/activity_serial.xml
......@@ -57,15 +57,16 @@
/>
<TextView
android:text="SUPERVISOR"
android:textStyle="bold"
android:textColor="@color/green"
android:layout_width="200px"
android:layout_height="50px"
android:layout_marginLeft="20px"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:id="@+id/textView3"
android:textAppearance="@style/TextAppearance.AppCompat"
android:id="@+id/text_supervisor"
android:layout_below="@+id/imageView"
android:layout_alignStart="@+id/imageView" />
android:layout_toEndOf="@+id/serialmail"
android:layout_marginLeft="60px"
/>
</RelativeLayout>
......
android/Pictogram/supervisor_tablet/supervisor_tablet.iml
......@@ -8,12 +8,12 @@
</facet>
<facet type="android" name="Android">
<configuration>
<option name="SELECTED_BUILD_VARIANT" value="DevFlavorDebug" />
<option name="SELECTED_BUILD_VARIANT" value="CIFlavorDebug" />
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
<option name="ASSEMBLE_TASK_NAME" value="assembleDevFlavorDebug" />
<option name="COMPILE_JAVA_TASK_NAME" value="compileDevFlavorDebugSources" />
<option name="ASSEMBLE_TASK_NAME" value="assembleCIFlavorDebug" />
<option name="COMPILE_JAVA_TASK_NAME" value="compileCIFlavorDebugSources" />
<afterSyncTasks>
<task>generateDevFlavorDebugSources</task>
<task>generateCIFlavorDebugSources</task>
</afterSyncTasks>
<option name="ALLOW_USER_CONFIGURATION" value="false" />
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
......@@ -24,64 +24,64 @@
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/build/intermediates/classes/DevFlavor/debug" />
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/DevFlavor/debug" />
<output url="file://$MODULE_DIR$/build/intermediates/classes/CIFlavor/debug" />
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/CIFlavor/debug" />
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/DevFlavor/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/DevFlavor/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/DevFlavor/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/DevFlavor/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/DevFlavor/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/DevFlavor/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/DevFlavor/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/DevFlavorDebug/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/DevFlavorDebug/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/DevFlavorDebug/assets" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/DevFlavorDebug/aidl" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/DevFlavorDebug/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/DevFlavorDebug/jni" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/DevFlavorDebug/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/DevFlavorDebug/shaders" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/DevFlavor/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/DevFlavor/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/DevFlavor/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/DevFlavor/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/DevFlavor/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/DevFlavor/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/DevFlavor/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDevFlavorDebug/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDevFlavorDebug/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDevFlavorDebug/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDevFlavorDebug/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDevFlavorDebug/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDevFlavorDebug/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDevFlavorDebug/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDevFlavorDebug/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/DevFlavor/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/DevFlavor/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/DevFlavor/assets" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/DevFlavor/aidl" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/DevFlavor/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/DevFlavor/jni" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/DevFlavor/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/DevFlavor/shaders" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDevFlavor/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDevFlavor/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDevFlavor/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDevFlavor/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDevFlavor/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDevFlavor/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDevFlavor/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDevFlavor/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDevFlavor/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDevFlavor/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDevFlavor/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDevFlavor/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDevFlavor/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDevFlavor/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDevFlavor/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDevFlavor/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/CIFlavor/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/CIFlavor/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/CIFlavor/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/CIFlavor/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/CIFlavor/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/CIFlavor/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/CIFlavor/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/CIFlavorDebug/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/CIFlavorDebug/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/CIFlavorDebug/assets" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/CIFlavorDebug/aidl" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/CIFlavorDebug/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/CIFlavorDebug/jni" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/CIFlavorDebug/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/CIFlavorDebug/shaders" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/CIFlavor/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/CIFlavor/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/CIFlavor/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/CIFlavor/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/CIFlavor/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/CIFlavor/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/CIFlavor/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testCIFlavorDebug/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testCIFlavorDebug/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testCIFlavorDebug/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testCIFlavorDebug/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testCIFlavorDebug/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testCIFlavorDebug/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testCIFlavorDebug/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testCIFlavorDebug/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/CIFlavor/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/CIFlavor/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/CIFlavor/assets" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/CIFlavor/aidl" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/CIFlavor/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/CIFlavor/jni" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/CIFlavor/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/CIFlavor/shaders" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/testCIFlavor/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testCIFlavor/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testCIFlavor/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testCIFlavor/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testCIFlavor/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testCIFlavor/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testCIFlavor/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testCIFlavor/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestCIFlavor/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestCIFlavor/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestCIFlavor/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestCIFlavor/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestCIFlavor/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestCIFlavor/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestCIFlavor/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestCIFlavor/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
......@@ -106,14 +106,6 @@
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
......@@ -122,7 +114,19 @@
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/animated-vector-drawable/24.2.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/24.2.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-compat/24.2.1/jars" />
......@@ -133,11 +137,23 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/24.2.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-vector-drawable/24.2.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-resources" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content>
<orderEntry type="jdk" jdkName="Android API 24 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
......
android/Pictogram/tabletlibrary/build.gradle
......@@ -9,6 +9,10 @@ android {
versionCode 1
versionName "1.0"
resValue "string","SerialClass","com.yottacode.pictogram.tabletlibrary.gui.SerialActivity"
resValue "integer", "rows", "5"
resValue "integer", "columns", "10"
resValue "integer", "rows_big", "4"
resValue "integer", "columns_big", "8"
}
buildTypes {
release {
......
android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/MainActivity.java
......@@ -10,8 +10,6 @@ import android.view.Window;
import android.view.WindowManager;
import com.yottacode.pictogram.tabletlibrary.R;
import com.yottacode.pictogram.tabletlibrary.net.NetServiceTablet;
import com.yottacode.pictogram.tools.PCBcontext;
public class MainActivity extends Activity {
......@@ -27,9 +25,6 @@ public class MainActivity extends Activity {
// For deactivating the lock screen (just before setContentView)
getWindow().addFlags(WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD);
PCBcontext.init(this, new NetServiceTablet());
Class serialClass;
try {
serialClass=Class.forName(getString(R.string.SerialClass));
......
android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/PictoItemViewGenerator.java
......@@ -19,17 +19,29 @@ import java.io.IOException;
*/
public class PictoItemViewGenerator {
public static final int LAYOUT = R.layout.picto_grid_item;
public static final int LAYOUT_BIG = R.layout.picto_grid_item_big;
public static View getPictoView(Picto picto, View convertView, ViewGroup parent) {
if (convertView == null) {
convertView = LayoutInflater.from(parent.getContext()).inflate(LAYOUT, parent, false);
convertView = LayoutInflater.from(parent.getContext()).inflate(PCBcontext.getPcbdb().getCurrentUser().is_picto_size_big() ? LAYOUT_BIG : LAYOUT, parent, false);
}
RelativeLayout layoutWrapper = (RelativeLayout) convertView.findViewById(R.id.picto_grid_item_layout_wrapper);
FrameLayout layout = (FrameLayout) convertView.findViewById(R.id.picto_grid_item_layout);
ImageView pictoImage = (ImageView) convertView.findViewById(R.id.picto_grid_item_image);
ImageView redCrossImage = (ImageView) convertView.findViewById(R.id.picto_grid_item_redcross);
RelativeLayout layoutWrapper ;
FrameLayout layout ;
ImageView pictoImage ;
ImageView redCrossImage ;
if (PCBcontext.getPcbdb().getCurrentUser().is_picto_size_big()) {
layoutWrapper = (RelativeLayout) convertView.findViewById(R.id.picto_grid_item_layout_wrapper_big);
layout = (FrameLayout) convertView.findViewById(R.id.picto_grid_item_layout_big);
pictoImage = (ImageView) convertView.findViewById(R.id.picto_grid_item_image_big);
redCrossImage = (ImageView) convertView.findViewById(R.id.picto_grid_item_redcross_big);
} else
{
layoutWrapper = (RelativeLayout) convertView.findViewById(R.id.picto_grid_item_layout_wrapper);
layout = (FrameLayout) convertView.findViewById(R.id.picto_grid_item_layout);
pictoImage = (ImageView) convertView.findViewById(R.id.picto_grid_item_image);
redCrossImage = (ImageView) convertView.findViewById(R.id.picto_grid_item_redcross);
}
layoutWrapper.setVisibility(View.GONE);
layoutWrapper.setBackground(null);
layoutWrapper.setAlpha(0.25f);
......
android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/PictogramActivity.java
......@@ -93,12 +93,25 @@ public class PictogramActivity extends Activity implements iVocabularyListener,
// Button used for showing the picto category view
ImageButton showPictoCategoriesViewButton;
int maxColumns,maxRows,maxInTape;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
if (PCBcontext.getPcbdb().getCurrentUser().is_picto_size_big()) {
maxColumns= getResources().getInteger(R.integer.columns_big);
maxRows= getResources().getInteger(R.integer.rows_big);
maxInTape = getResources().getInteger(R.integer.maxInTape_big);
} else {
maxColumns= getResources().getInteger(R.integer.columns);
maxRows= getResources().getInteger(R.integer.rows);
maxInTape = getResources().getInteger(R.integer.maxInTape);
}
requestWindowFeature(Window.FEATURE_NO_TITLE);
setContentView(R.layout.activity_pictogram);
setContentView(PCBcontext.getPcbdb().getCurrentUser().is_picto_size_big() ? R.layout.activity_pictogram_big : R.layout.activity_pictogram);
this.mainLayout = (RelativeLayout) findViewById(R.id.pictogramLayout);
this.currentCategory = null;
......@@ -143,21 +156,24 @@ public class PictogramActivity extends Activity implements iVocabularyListener,
this.pictoCategoryGridView = (GridView) this.findViewById(R.id.picto_category_grid_view);
this.pictoCategoryGridView.setAdapter(this.pictoCategoryGridAdapter);
// @TODO take this value from user configuration (0: normal, 1: large)
int pictogramSize = 0;
if (pictogramSize == 0) {
this.pictoMainGridView.setNumColumns(10);
this.pictoCategoryGridView.setNumColumns(10);
} else if (pictogramSize == 1) {
this.pictoMainGridView.setNumColumns(4);
this.pictoCategoryGridView.setNumColumns(4);
}
this.pictoMainGridView.setNumColumns(this.maxColumns);
this.pictoCategoryGridView.setNumColumns(this.maxColumns);
// tts = new TextToSpeech(this, this, "IVONA Text-to-Speech HQ");
tts = new TextToSpeech(this, this);
tts.setOnUtteranceProgressListener(new OnTTSEndListener());
this.tapeGridView.setOnDragListener(new OnPictoDragListener());
this.tapeGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
@Override
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
Log.i(this.getClass().getCanonicalName()," Delete item "+position+"("+PictogramActivity.this.tapeAdapter.getItem(position).get_translation()+")");
PCBcontext.getActionLog().log(new TalkAction(TalkAction.DELETE, PictogramActivity.this.tapeAdapter.getItem(position)));
PictogramActivity.this.tapeAdapter.deleteItem(position);
PictogramActivity.this.tapeAdapter.notifyDataSetChanged();
}
});
this.pictoMainGridView.setOnDragListener(new OnPictoDragListener());
this.pictoCategoryGridView.setOnDragListener(new OnPictoDragListener());
......@@ -315,9 +331,7 @@ public class PictogramActivity extends Activity implements iVocabularyListener,
// This is to show the pictos ordered in the 2D Array that represents the panel
int rows = getResources().getInteger(R.integer.rows);
int cols = getResources().getInteger(R.integer.columns);
Picto[][] mp = new Picto[rows][cols];
Picto[][] mp = new Picto[maxRows][maxColumns];
for (Picto p : list) {
if (PCBcontext.getPcbdb().getCurrentUser().has_categories()) {
......@@ -339,8 +353,8 @@ public class PictogramActivity extends Activity implements iVocabularyListener,
"{\"magnify\":false,\"highlight\":false,\"coord_y\":1,\"id_cat\":12303,\"status\":\"invisible\",\"coord_x\":4}");
*/
for(int i=0; i<rows; i++){
for(int j=0; j<cols; j++){
for(int i=0; i<maxRows; i++){
for(int j=0; j<maxColumns; j++){
if(mp[i][j] != null) ll.add(mp[i][j]);
else ll.add(null); // Add the "blank picto" simulating an empty position
}
......@@ -596,7 +610,6 @@ public class PictogramActivity extends Activity implements iVocabularyListener,
//LinkedList<Picto> ll = vocabulary.next(p);
Log.d(LOG_TAG, "Lista de pictos recuperada: " + ll.toString());
int maxInTape = getResources().getInteger(R.integer.maxInTape);
// If the picto is a category
if (p.is_category()) {
......@@ -604,7 +617,7 @@ public class PictogramActivity extends Activity implements iVocabularyListener,
PCBcontext.getActionLog().log(new TalkAction(TalkAction.SELECT, p));
hidePictoMainGridView();
} else if (tapeAdapter.getCount() < maxInTape) {
} else if (tapeAdapter.getCount() < PictogramActivity.this.maxInTape) {
currentCategory = null;
tapeAdapter.addItem(p);
tapeAdapter.notifyDataSetChanged();
......@@ -628,8 +641,8 @@ public class PictogramActivity extends Activity implements iVocabularyListener,
// No tengo pictograma. Abro una nueva ventana de selección desde el Carrete del device si no es categoria
if (currentCategory != null || !PCBcontext.getPcbdb().getCurrentUser().has_categories()) {
Log.d(LOG_TAG, "No tengo pictograma. Abro carrete...");
int cols = getResources().getInteger(R.integer.columns);
addPicto(position % cols, (int) (position / cols));
addPicto(position % maxColumns, (int) (position / maxColumns));
}
else
Toast.makeText(PictogramActivity.this, PictogramActivity.this.getResources().getString(R.string.notNewCats), Toast.LENGTH_SHORT).show();
......@@ -649,7 +662,7 @@ public class PictogramActivity extends Activity implements iVocabularyListener,
if (p.get_id() != 0 &&
!p.get_status().equalsIgnoreCase("invisible") &&
!p.get_status().equalsIgnoreCase("disabled") &&
tapeAdapter.getCount() < 8) {
tapeAdapter.getCount() < PictogramActivity.this.maxInTape) {
View.DragShadowBuilder shadowBuilder = new View.DragShadowBuilder(view);
view.startDrag(data, //data to be dragged
......
android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/SerialActivity.java
......@@ -12,6 +12,8 @@ import android.widget.EditText;
import com.yottacode.pictogram.dao.UserLogin;
import com.yottacode.pictogram.tabletlibrary.R;
import com.yottacode.pictogram.tabletlibrary.net.NetServiceTablet;
import com.yottacode.pictogram.tools.PCBcontext;
/**
......@@ -46,6 +48,7 @@ public class SerialActivity extends Activity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
PCBcontext.init(this, new NetServiceTablet());
requestWindowFeature(Window.FEATURE_NO_TITLE);
setContentView(R.layout.activity_serial);
......
android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/StudentFragmentGrid.java
......@@ -47,6 +47,7 @@ public class StudentFragmentGrid extends Fragment{
final String TAG_LANG = "lang";
final String TAG_ATTRIBUTES = "attributes";
final String TAG_SUPERVISION="supervision";
ProgressDialog progressDialog;
Vector<Integer> idStudents;
String nameStudents[];
Vector<Bitmap> imageStudents;
......@@ -110,12 +111,12 @@ public class StudentFragmentGrid extends Fragment{
PCBcontext.getDevice().insertUser(new_user);
Log.i(this.getClass().getCanonicalName(),"Loading vocabulary for "+new_user.get_name_stu());
final ProgressDialog progressDialog=ProgressDialog.show(getActivity(), getString(R.string.loadingGrammar),
progressDialog=ProgressDialog.show(getActivity(), getString(R.string.loadingGrammar),
getString(R.string.userLoadingTxt), false, false);
PCBcontext.set_user(new_user, intent.getStringExtra("token"), new iImgDownloaderListener() {
@Override
public void loadComplete() {
if (progressDialog.isShowing()) progressDialog.dismiss();
if (progressDialog!=null && progressDialog.isShowing()) progressDialog.dismiss();
Intent pictogramActivity = new Intent(getActivity(), PictogramActivity.class);
startActivity(pictogramActivity);
}
......@@ -160,12 +161,12 @@ public class StudentFragmentGrid extends Fragment{
}
} //for
final ProgressDialog progressDialog= ProgressDialog.show(getActivity(), getString(R.string.imguserLoadingMsg),
progressDialog= ProgressDialog.show(getActivity(), getString(R.string.imguserLoadingMsg),
getString(R.string.userLoadingTxt), false, false);
ImgDownloader downloader = new ImgDownloader(getActivity(), new iImgDownloaderListener() {
@Override
public void loadComplete() {
if (progressDialog.isShowing()) progressDialog.dismiss();
if (progressDialog!=null && progressDialog.isShowing()) progressDialog.dismiss();
if (downloaded_students.size() > 1) {
for (int i = 0; i < imgs.size(); i++)
try {
......@@ -200,7 +201,7 @@ public class StudentFragmentGrid extends Fragment{
RestapiWrapper wrapper = new RestapiWrapper(
getActivity().getApplicationContext().getResources().getString(R.string.server), token);
String operation = "sup/" + sup_id + "/students";
final ProgressDialog progressDialog= ProgressDialog.show(getActivity(), getString(R.string.userLoadingTxt),
progressDialog= ProgressDialog.show(getActivity(), getString(R.string.userLoadingTxt),
getString(R.string.userLoadingTxt), false, false);
wrapper.ask(operation, new iRestapiListener() {
@Override
......@@ -219,7 +220,7 @@ public class StudentFragmentGrid extends Fragment{
}
@Override
public void result(JSONArray students) {
if (progressDialog.isShowing()) progressDialog.dismiss();
if (progressDialog!=null && progressDialog.isShowing()) progressDialog.dismiss();
StudentFragmentGrid.this.downloaded_students=new Vector();
for (int i=0;i<students.length();i++) {
JSONObject student;
......@@ -308,4 +309,13 @@ public class StudentFragmentGrid extends Fragment{
return view;
}
@Override
public void onPause() {
super.onPause();
if ((progressDialog!= null) && progressDialog.isShowing())
progressDialog.dismiss();
progressDialog = null;
}
}
android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/TapeAdapter.java
......@@ -81,6 +81,8 @@ public class TapeAdapter extends BaseAdapter {
return complete;
}
// DEVUELVE último elemento
public Picto getLastItem(){
return pictoLinkedList.getLast();
......
android/Pictogram/tabletlibrary/src/main/res/layout/activity_pictogram.xml
......@@ -11,40 +11,38 @@
<!-- android:keepScreenOn - To keep the screen bright as long as the app is visible (also forever) -->
<GridView
android:id="@+id/tape_grid_view"
android:layout_width="wrap_content"
android:layout_height="@dimen/tape_normal_height"
android:padding="@dimen/small_padding"
android:gravity="center"
android:numColumns="10"
android:accessibilityLiveRegion="none"
android:background="@android:color/holo_red_light"
android:clickable="false"
android:layout_alignParentTop="true"
android:layout_alignParentStart="true"
android:layout_alignParentEnd="true"
android:paddingRight="192dp"
android:horizontalSpacing="@dimen/picto_grid_spacing">
</GridView>
<ImageButton
android:layout_width="@dimen/picto_normal_width"
android:layout_height="@dimen/tape_normal_height"
android:src="@drawable/remove_picto_from_tape"
android:id="@+id/button_delete"
android:layout_alignParentTop="true"
android:layout_toLeftOf="@+id/button_tts"
android:layout_alignParentStart="true"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:clickable="true"
android:background="@null" />
android:background="@android:color/holo_red_light" />
<GridView
android:id="@+id/tape_grid_view"
android:layout_toEndOf="@+id/button_delete"
android:layout_toStartOf="@+id/button_tts"
android:layout_width="@dimen/picto_normal_width"
android:layout_height="@dimen/tape_normal_height"
android:padding="@dimen/small_padding"
android:gravity="center"
android:numColumns="8"
android:accessibilityLiveRegion="none"
android:background="@android:color/holo_red_light"
android:clickable="true"
android:horizontalSpacing="@dimen/picto_grid_spacing">
</GridView>
<ImageButton
android:layout_width="@dimen/picto_normal_width"
android:layout_height="@dimen/tape_normal_height"
android:src="@drawable/send_tape"
android:background="@null"
android:background="@android:color/holo_red_light"
android:id="@+id/button_tts"
android:adjustViewBounds="true"
android:layout_alignParentTop="true"
......@@ -88,7 +86,6 @@
android:layout_width="match_parent"
android:layout_below="@+id/tape_grid_view"
android:layout_alignParentStart="true"
android:numColumns="10"
android:gravity="center_vertical|center|center_horizontal"
android:background="#DDDDDD"
android:layout_alignParentBottom="true"
......
android/Pictogram/tabletlibrary/src/main/res/layout/activity_pictogram_big.xml 0 → 100644
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal"
android:background="#BDBDBD"
android:keepScreenOn="true"
android:id="@+id/pictogramLayout"
tools:context="com.yottacode.pictogram.tabletlibrary.gui.PictogramActivity"
android:padding="@dimen/small_padding">
<!-- android:keepScreenOn - To keep the screen bright as long as the app is visible (also forever) -->
<ImageButton
android:layout_width="@dimen/picto_big_width"
android:layout_height="@dimen/tape_big_height"
android:src="@drawable/remove_picto_from_tape"
android:id="@+id/button_delete"
android:layout_alignParentTop="true"
android:layout_alignParentStart="true"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:clickable="true"
android:background="@android:color/holo_red_light" />
<GridView
android:id="@+id/tape_grid_view"
android:layout_toEndOf="@+id/button_delete"
android:layout_toStartOf="@+id/button_tts"
android:layout_width="@dimen/picto_big_width"
android:layout_height="@dimen/tape_big_height"
android:padding="@dimen/small_padding"
android:gravity="center"
android:numColumns="6"
android:accessibilityLiveRegion="none"
android:background="@android:color/holo_red_light"
android:clickable="true"
android:horizontalSpacing="@dimen/picto_grid_spacing">
</GridView>
<ImageButton
android:layout_width="@dimen/picto_big_width"
android:layout_height="@dimen/tape_big_height"
android:src="@drawable/send_tape"
android:background="@android:color/holo_red_light"
android:id="@+id/button_tts"
android:adjustViewBounds="true"
android:layout_alignParentTop="true"
android:layout_alignParentEnd="true"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:clickable="true" />
<ImageButton
android:layout_width="96dp"
android:layout_height="match_parent"
android:id="@+id/showPictoCategoriesViewButton"
android:layout_alignParentStart="true"
android:src="@drawable/show_categories_grid"
android:background="#EEEEEE"
android:layout_below="@+id/tape_grid_view"
android:scaleType="fitCenter" />
<GridView
android:id="@+id/picto_category_grid_view"
android:layout_height="match_parent"
android:layout_width="match_parent"
android:layout_below="@+id/tape_grid_view"
android:layout_alignParentBottom="true"
android:numColumns="8"
android:gravity="center_vertical|center|center_horizontal"
android:background="#DDDDDD"
android:layout_alignParentEnd="true"
android:layout_toEndOf="@+id/showPictoCategoriesViewButton"
android:paddingLeft="@dimen/small_padding"
android:paddingTop="@dimen/small_padding"
android:paddingRight="@dimen/small_padding"
android:paddingBottom="@dimen/small_padding"
android:verticalSpacing="@dimen/picto_grid_spacing"
android:horizontalSpacing="@dimen/picto_grid_spacing">
</GridView>
<GridView
android:id="@+id/picto_main_grid_view"
android:layout_height="match_parent"
android:layout_width="match_parent"
android:layout_below="@+id/tape_grid_view"
android:layout_alignParentStart="true"
android:gravity="center_vertical|center|center_horizontal"
android:background="#DDDDDD"
android:layout_alignParentBottom="true"
android:layout_alignParentEnd="true"
android:paddingLeft="@dimen/small_padding"
android:paddingTop="@dimen/small_padding"
android:horizontalSpacing="@dimen/picto_grid_spacing"
android:verticalSpacing="@dimen/picto_grid_spacing">
</GridView>
</RelativeLayout>
android/Pictogram/tabletlibrary/src/main/res/layout/picto_grid_item.xml
......@@ -27,4 +27,4 @@
</FrameLayout>
</RelativeLayout>
\ No newline at end of file
</RelativeLayout>
android/Pictogram/tabletlibrary/src/main/res/layout/picto_grid_item_big.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical|center|center_horizontal"
android:id="@+id/picto_grid_item_layout_wrapper_big"
android:background="@drawable/picto_grid_item_border"
android:padding="@dimen/picto_border_width">
<FrameLayout
android:layout_width="match_parent"
android:layout_height="@dimen/picto_big_height"
android:id="@+id/picto_grid_item_layout_big"
android:background="@color/picto_default_background"
android:padding="@dimen/picto_padding">
<ImageView
android:id="@+id/picto_grid_item_image_big"
android:layout_width="match_parent"
android:layout_height="match_parent" />
<ImageView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/picto_grid_item_redcross_big"
android:src="@drawable/disabled_picto" />
</FrameLayout>
</RelativeLayout>
android/Pictogram/tabletlibrary/src/main/res/values/strings.xml
<resources>
<string name="app_name">com.yottacode.pictogram.Tablet</string>
<item name="maxInTape" type="integer">8</item>
<item name="maxInTape_big" type="integer">6</item>
</resources>
android/Pictogram/tabletlibrary/tabletlibrary.iml
......@@ -73,14 +73,6 @@
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
......@@ -89,6 +81,14 @@
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
......
android/Pictogram/watch/watch.iml
......@@ -43,6 +43,13 @@
<sourceFolder url="file://$MODULE_DIR$/src/DefaultFlavorDebug/jni" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/DefaultFlavorDebug/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/DefaultFlavorDebug/shaders" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/DefaultFlavor/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/DefaultFlavor/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/DefaultFlavor/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/DefaultFlavor/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/DefaultFlavor/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/DefaultFlavor/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/DefaultFlavor/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDefaultFlavorDebug/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDefaultFlavorDebug/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDefaultFlavorDebug/assets" type="java-test-resource" />
......@@ -51,13 +58,6 @@
<sourceFolder url="file://$MODULE_DIR$/src/testDefaultFlavorDebug/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDefaultFlavorDebug/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDefaultFlavorDebug/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/DefaultFlavor/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/DefaultFlavor/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/DefaultFlavor/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/DefaultFlavor/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/DefaultFlavor/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/DefaultFlavor/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/DefaultFlavor/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/DefaultFlavor/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/DefaultFlavor/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/DefaultFlavor/assets" type="java-resource" />
......@@ -66,14 +66,6 @@
<sourceFolder url="file://$MODULE_DIR$/src/DefaultFlavor/jni" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/DefaultFlavor/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/DefaultFlavor/shaders" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/testDefaultFlavor/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDefaultFlavor/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDefaultFlavor/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDefaultFlavor/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDefaultFlavor/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDefaultFlavor/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDefaultFlavor/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDefaultFlavor/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDefaultFlavor/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDefaultFlavor/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDefaultFlavor/assets" type="java-test-resource" />
......@@ -82,6 +74,14 @@
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDefaultFlavor/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDefaultFlavor/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDefaultFlavor/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDefaultFlavor/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDefaultFlavor/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDefaultFlavor/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDefaultFlavor/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDefaultFlavor/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDefaultFlavor/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDefaultFlavor/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDefaultFlavor/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
......@@ -106,14 +106,6 @@
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
......@@ -122,7 +114,17 @@
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/23.0.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.0.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-base/9.2.1/jars" />
......@@ -131,11 +133,13 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-wearable/9.2.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.support/wearable/2.0.0-alpha2/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content>
<orderEntry type="jdk" jdkName="Android API 24 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
......
android/Pictogram/yotta_tablet/yotta_tablet.iml
......@@ -8,12 +8,12 @@
</facet>
<facet type="android" name="Android">
<configuration>
<option name="SELECTED_BUILD_VARIANT" value="CIFlavorDebug" />
<option name="SELECTED_BUILD_VARIANT" value="PreFlavorDebug" />
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
<option name="ASSEMBLE_TASK_NAME" value="assembleCIFlavorDebug" />
<option name="COMPILE_JAVA_TASK_NAME" value="compileCIFlavorDebugSources" />
<option name="ASSEMBLE_TASK_NAME" value="assemblePreFlavorDebug" />
<option name="COMPILE_JAVA_TASK_NAME" value="compilePreFlavorDebugSources" />
<afterSyncTasks>
<task>generateCIFlavorDebugSources</task>
<task>generatePreFlavorDebugSources</task>
</afterSyncTasks>
<option name="ALLOW_USER_CONFIGURATION" value="false" />
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
......@@ -24,64 +24,64 @@
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/build/intermediates/classes/CIFlavor/debug" />
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/CIFlavor/debug" />
<output url="file://$MODULE_DIR$/build/intermediates/classes/PreFlavor/debug" />
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/PreFlavor/debug" />
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/CIFlavor/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/CIFlavor/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/CIFlavor/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/CIFlavor/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/CIFlavor/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/CIFlavor/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/CIFlavor/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/CIFlavorDebug/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/CIFlavorDebug/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/CIFlavorDebug/assets" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/CIFlavorDebug/aidl" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/CIFlavorDebug/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/CIFlavorDebug/jni" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/CIFlavorDebug/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/CIFlavorDebug/shaders" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/testCIFlavorDebug/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testCIFlavorDebug/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testCIFlavorDebug/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testCIFlavorDebug/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testCIFlavorDebug/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testCIFlavorDebug/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testCIFlavorDebug/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testCIFlavorDebug/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/CIFlavor/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/CIFlavor/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/CIFlavor/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/CIFlavor/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/CIFlavor/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/CIFlavor/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/CIFlavor/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/CIFlavor/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/CIFlavor/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/CIFlavor/assets" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/CIFlavor/aidl" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/CIFlavor/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/CIFlavor/jni" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/CIFlavor/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/CIFlavor/shaders" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestCIFlavor/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestCIFlavor/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestCIFlavor/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestCIFlavor/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestCIFlavor/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestCIFlavor/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestCIFlavor/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestCIFlavor/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testCIFlavor/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testCIFlavor/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testCIFlavor/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testCIFlavor/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testCIFlavor/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testCIFlavor/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testCIFlavor/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testCIFlavor/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/PreFlavor/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/PreFlavor/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/PreFlavor/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/PreFlavor/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/PreFlavor/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/PreFlavor/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/PreFlavor/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/PreFlavorDebug/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/PreFlavorDebug/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/PreFlavorDebug/assets" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/PreFlavorDebug/aidl" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/PreFlavorDebug/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/PreFlavorDebug/jni" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/PreFlavorDebug/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/PreFlavorDebug/shaders" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/PreFlavor/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/PreFlavor/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/PreFlavor/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/PreFlavor/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/PreFlavor/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/PreFlavor/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/PreFlavor/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testPreFlavorDebug/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testPreFlavorDebug/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testPreFlavorDebug/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testPreFlavorDebug/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testPreFlavorDebug/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testPreFlavorDebug/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testPreFlavorDebug/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testPreFlavorDebug/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/PreFlavor/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/PreFlavor/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/PreFlavor/assets" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/PreFlavor/aidl" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/PreFlavor/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/PreFlavor/jni" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/PreFlavor/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/PreFlavor/shaders" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/testPreFlavor/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testPreFlavor/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testPreFlavor/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testPreFlavor/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testPreFlavor/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testPreFlavor/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testPreFlavor/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testPreFlavor/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestPreFlavor/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestPreFlavor/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestPreFlavor/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestPreFlavor/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestPreFlavor/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestPreFlavor/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestPreFlavor/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestPreFlavor/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
......@@ -106,14 +106,6 @@
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
......@@ -122,9 +114,15 @@
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/animated-vector-drawable/24.2.1/jars" />
......@@ -137,21 +135,11 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/24.2.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-vector-drawable/24.2.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-resources" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content>
......
sails/INSTALL.md
......@@ -72,6 +72,19 @@ sails$ vagrant ssh
[vagrant@localhost src]$ sails console
```
Descargar upload.zip y symbolstx.zip desde el servidor de Yottacode,
descomprimir y crear enlaces simbólicos (en /vagrant/):
```
scp ec2-user@dev.yottacode.com:~/upload.tgz .
scp ec2-user@dev.yottacode.com:~/symbolstx.tgz .
tar zxvf upload.tgz
tar zxvf symbolstx.tgz
ln -s symbolstx_96x82 symbolstx
rm upload.tgz
rm symbolstx.tgz
```
Es importante asegurarse de (si no hemos generado claves SSL) editar `src/config/local.js`
y quitar lo relativo a certificados SSL (toda la entrada de la clave `ssl`).
Si hacemos esto, también tendremos que apuntar Angular al backend correcto (no usar https, sino http)
......
sails/Vagrantfile
......@@ -3,8 +3,8 @@
Vagrant.configure(2) do |config|
# "ubuntu/trusty64" for ubuntu environment
# "boxcutter/centos71" for AWS similar environment
config.vm.box = "boxcutter/centos72"
# "boxcutter/centos72" for AWS similar environment
config.vm.box = "aspyatkin/ubuntu-16.04-server-amd64"
config.vm.network "forwarded_port", guest: 1337, host: 1337
config.vm.network "forwarded_port", guest: 80, host: 8080
config.ssh.insert_key = false
......
sails/roles/database/files/pictodb-data-core.sql 0 → 100644
DELETE FROM `picto_core`;
--
-- Volcado de datos para la tabla `picto_core`
--
INSERT INTO `picto_core` (`id`, `id_pic`, `id_cat_pic`, `coord_x`, `coord_y`,`color`) VALUES
(1, 2982, NULL, 0, 0, NULL), -- yes
(2, 4391, NULL, 1, 0, NULL), -- no
(4, 2237, NULL, 2, 0, NULL), -- i want
(229, 2224, NULL, 3, 0, NULL), -- i have
(131, 8148,NULL, 0, 1, '#FE9A2E'), -- Places and rooms
(134, 7989, 8148, 0, 0, NULL), -- Places.Hospital
(135, 8155, 8148, 0, 1, NULL), -- Places.Playground
(136, 8354, 8148, 0, 2, NULL), -- Places.Zoo
(137, 7768, 8148, 0, 3, NULL), -- Places.Beach
(138, 8087, 8148, 0, 4, NULL), -- Places.Mountain
(139, 53111, 8148, 0, 5, NULL), -- Places.Coutry
(140, 7830, 8148, 1, 6, NULL), -- Places.Church
(133, 7987, 8148, 1, 0, NULL), -- Places.Home
(132, 10456, 8148,1, 1, NULL), -- Places.School
(141, 5250, 8148,1, 2, NULL), -- Rooms.Bedroom
(142, 50070, 8148,1, 3, NULL), -- Rooms.Bathroom
(143, 11297, 8148,1, 4, NULL), -- Rooms.Living room
(144, 8033, 8148,1, 5, NULL), -- Rooms.Kitchen
(145, 51522, 8148,1, 6, NULL), -- Rooms.Classroom
(146, 52800, 8148,1, 7, NULL), -- Rooms.Doctor's office
(227, 52366, NULL, 0, 2, '#F4FA58'), -- Devices
(174, 11039, 52366, 0, 0, NULL), -- Devices.television
(175, 11387, 52366, 0, 1, NULL), -- Devices.radio
(176, 11237, 52366, 0, 2, NULL), -- Devices.console
(177, 49654, 52366, 0, 3, NULL), -- Devices.tablet
(178, 9394, 52366, 0, 4, NULL), -- Devices.computer
(156, 5393, NULL, 0, 3, '#F4FA58'), -- Furniture
(170, 5293, 5393, 0, 0, NULL), -- Furniture.chair
(171, 11437, 5393, 0, 1, NULL), -- Furniture.sofa
(172, 11454, 5393, 0, 2, NULL), -- Furniture.table
(173, 5249, 5393, 0, 3, NULL), -- Furniture.bed
(10, 10361, NULL, 0, 4, '#008000'), -- Kinship
(69, 7287, 10361, 0, 1, NULL), -- Kinship.sister
(70, 7269, 10361, 0, 2, NULL), -- Kinship.brother
(71, 49287, 10361, 0, 3, NULL), -- Kinship.dad
(72, 7476, 10361, 0, 4, NULL), -- Kinship.mom
(73, 7348, 10361, 0, 5, NULL), -- Kinship.grandma
(74, 7350, 10361, 0, 6, NULL), -- Kinship.grandpa
(75, 7265, 10361, 0, 7, NULL), -- Kinship.family
(9, 7515, NULL, 0, 5, '#008000'), -- People professons and pronoums
(47, 51174, 7515, 0, 0, NULL), -- Pronouns.I
(48, 7730, 7515, 0, 1, NULL), -- Pronouns.you
(49, 12499, 7515, 0, 2, NULL), -- Pronouns.he
(50, 12504, 7515, 0, 3, NULL), -- Pronouns.she
(51, 7698, 7515, 0, 4, NULL), -- Pronouns.we
(52, 54220, 7515, 0, 5, NULL), -- Pronouns.you
(53, 7669, 7515, 0, 6, NULL), -- Pronouns.they
(76, 7329, 7515, 1, 0, NULL), -- People.girl
(77, 7136, 7515, 1, 1, NULL), -- People.boy
(78, 7188, 7515, 1, 2, NULL), -- People.children
(79, 7438, 7515, 1, 3, NULL), -- People.man
(80, 7710, 7515, 1, 4, NULL), -- People.woman
(81, 7118, 7515, 1, 5, NULL), -- People.baby
(82, 10389, 7515, 1, 6, NULL), -- People.friend
(109, 50266, 7515, 2, 3, NULL), -- Professions.bus_driver
(110, 7658, 7515, 2, 4, NULL), -- Professions.teacher
(111, 7237, 7515, 2, 5, NULL), -- Professions.doctor
(112, 7500, 7515, 2, 6, NULL), -- Professions.nurse
(192, 51336,NULL, 0, 6, '#008000'), -- Animals_and_plants
(219, 992,51336, 0, 3, NULL), -- Animals_and_plants.dog
(220, 1206,51336, 0, 4, NULL), -- Animals_and_plants.cat
(221, 853,51336, 0, 5, NULL), -- Animals_and_plants.bird
(222, 57236,51336, 0, 6, NULL), -- Animals_and_plants.tree
(223, 57384,51336, 0, 7, NULL), -- Animals_and_plants.plant
(228, 56255,NULL, 0, 7, '#F4FA58'), -- Books, films and tv
(224, 10921,56255, 0, 5, NULL), -- Books, TV and Films.Dibujos animados
(225, 10926,56255, 0, 6, NULL), -- Books, TV and Films.Film
(226, 10927,56255, 0, 7, NULL), -- Books, TV and Films.Book
(125, 376, NULL, 1, 1, '#FF0000'), -- Desiring
(25, 676, 376, 1, 0, NULL), -- Desiring.want
(27, 277, 376, 1, 1, NULL), -- Desiring.have
(230, 243, 376, 1, 2, NULL), -- Desiring.get
(128, 253, NULL, 1, 2, '#FF0000'), -- Motion
(29, 485, 253, 1, 2, NULL), -- Motion.go
(13, 22, NULL, 1, 3, '#FF0000'), -- Ingestion
(113, 170, 22, 1, 3, NULL), -- Ingestion.drink
(114, 184, 22, 1, 4, NULL), -- Ingestion.eat
(14, 4967, NULL, 1, 4, '#FF0000'), -- Senses
(62, 631, 4967, 1, 1, NULL), -- Senses.feel
(63, 49835, 4967, 1, 2, NULL), -- Senses.smell
(64, 493, 4967, 1, 3, NULL), -- Senses.see
(65, 333, 4967, 1, 4, NULL), -- Senses.hear
(66, 610, 4967, 1, 5, NULL), -- Senses.taste
(231, 286, 4967, 1, 6, NULL), -- Senses.hurt
(126, 2640, NULL, 1, 5, '#FF0000'), -- Roles
(26, 292, 2640, 1, 4, NULL), -- Roles.be
(28, 9907, 2640, 1, 5, NULL), -- Roles.play
(127, 54270, NULL, 1, 6, '#FF0000'), -- Change
(186, 325, 54270, 1, 6, NULL), -- Change.turn on
(187, 328, 54270, 1, 7, NULL), -- Change.turn off
(159, 2547,NULL, 1, 7, '#2E9AFE'), -- Articles and determinants
(181, 102771, 2547, 1,4, NULL), -- Articles and determinants.a
(182, 2935, 2547, 1,5, NULL), -- Articles and determinants.the
(183, 2922, 2547, 1,6, NULL), -- Articles and determinants.these
(184, 2929, 2547, 1,7, NULL), -- Articles and determinants.those
(155, 12303,NULL, 2, 1, '#F4FA58'), -- Classroom items
(147, 49789, 12303,3, 1, NULL), -- Classroom.eraser
(148, 1456, 12303,3, 2, NULL), -- Classroom.pen
(149, 51558, 12303,3, 3, NULL), -- Classroom.pencil sharpener
(150, 11988, 12303,3, 5, NULL), -- Classroom.marker
(151, 1453, 12303,3, 6, NULL), -- Classroom.paper
(152, 9396, 12303,3, 7, NULL), -- Classroom.notebook
(153, 10908, 12303,3, 4, NULL), -- Classroom.book
(17, 5866, NULL, 2, 2, '#FF00FF'), -- Sizes
(67, 2559, 5866, 2, 2, NULL), -- Sizes.big
(68, 2870, 5866, 2, 3, NULL), -- Sizes.small
(16, 2049, NULL, 2, 3, '#FF00FF'), -- Colors
(38, 2047, 2049, 2, 0, NULL), -- Colors.brown
(39, 2092, 2049, 2, 1, NULL), -- Colors.yellow
(40, 2043, 2049, 2, 2, NULL), -- Colors.blue
(41, 2073, 2049, 2, 3, NULL), -- Colors.red
(42, 2037, 2049, 2, 4, NULL), -- Colors.black
(43, 2090, 2049, 2, 5, NULL), -- Colors.white
(44, 2065, 2049, 2, 6, NULL), -- Colors.orange
(45, 2061, 2049, 2, 7, NULL), -- Colors.green
(37, 2070, 2049, 1, 0, NULL), -- Colors.purple
(46, 2093, 2049, 1, 1, NULL), -- Colors.pink
(18, 4814, NULL, 2, 4, '#FF00FF'), -- Subjectives (feelings)
(54, 2980, 4814, 2, 0, NULL), -- Subjectives.wrong
(55, 2844, 4814, 2, 1, NULL), -- Subjectives.good
(56, 50259, 4814, 2, 2, NULL), -- Subjectives.bad
(57, 2552, 4814, 2, 3, NULL), -- Subjectives.silly
(58, 274, 4814, 2, 4, NULL), -- Subjectives.intelligent
(59, 2604, 4814, 2, 5, NULL), -- Subjectives.crazy
(19, 609, NULL, 2, 5, '#FF00FF'), -- Tastes
(30, 49839, 609, 2, 0, NULL), -- Tastes.stink
(31, 2718, 609, 2, 1, NULL), -- Tastes.spicy
(32, 3753, 609, 2, 2, NULL), -- Tastes.hot
(33, 2910, 609, 2, 3, NULL), -- Tastes.sweet
(34, 319, 609, 2, 4, NULL), -- Tastes.tasty
(35, 4077, 609, 2, 5, NULL), -- Tastes.salty
(36, 2562, 609, 2, 6, NULL), -- Tastes.bitter
(185, 56262, NULL, 2, 6, '#FF00FF'),-- Aesthetics
(60, 2938, 56262, 2, 6, NULL), -- Aesthetics.ugly
(61, 2865, 56262, 2, 7, NULL), -- Aesthetics.beautiful
(15, 50343, NULL, 2, 7, '#2E9AFE'), -- Prepositions
(108, 52212, 50343, 2, 5, NULL), -- Prepositions.with
(179, 1406, 50343, 2,6, NULL), -- Prepositions.of
(180, 1407, 50343, 2,7, NULL), -- Prepositions.in
(157, 11368,NULL, 3, 1, '#F4FA58'), -- Kitchen items
(160, 51295, 11368, 2, 4, NULL), -- Kitchen.plate
(161, 5394, 11368, 2, 5, NULL), -- Kitchen.glass
(162, 5387, 11368, 3, 0, NULL), -- Kitchen.fork
(163, 11442, 11368, 3, 1, NULL), -- Kitchen.spoon
(164, 11491, 11368, 3, 2, NULL), -- Kitchen.knife
(165, 11257, 11368, 3, 3, NULL), -- Kitchen.bowl
(166, 5390, 11368, 3, 4, NULL), -- Kitchen.frying-pan
(167, 5349, 11368, 3, 5, NULL), -- Kitchen.dishwasher
(168, 11311, 11368, 3, 6, NULL), -- Kitchen.microwave
(169, 11463, 11368, 3, 7, NULL), -- Kitchen.toaster
(20, 11216, NULL, 3, 2, '#F4FA58'), -- Toys
(99, 10820, 11216, 2, 7, NULL), -- Toys.block
(100, 11059, 11216, 3, 0, NULL), -- Toys.bubbles
(101, 11080, 11216, 3, 1, NULL), -- Toys.doll
(102, 55704, 11216, 3, 2, NULL), -- Toys.game
(103, 11180, 11216, 3, 3, NULL), -- Toys.puzzle
(104, 11047, 11216, 3, 4, NULL), -- Toys.ball
(105, 11048, 11216, 3, 5, NULL), -- Toys.balloon
(106, 101441, 11216, 3, 6, NULL), -- Toys.figure_toys
(107, 11218, 11216, 3, 7, NULL), -- Toys.tower_toys
(21, 52736, NULL, 3, 3, '#F4FA58'), -- Drinks
(118, 51192, 52736, 3, 2, NULL), -- Drinks.juice
(119, 4164, 52736, 3, 3, NULL), -- Drinks.tea
(120, 51605, 52736, 3, 4, NULL), -- Drinks.water
(188, 52670, 52736, 3, 5, NULL), -- Drinks.milk
(22, 10087, NULL, 3, 4, '#F4FA58'), -- Food
(83, 3977, 10087, 1, 0, NULL), -- Foods.pizza
(92, 51151, 10087, 1, 1, NULL), -- Foods.coockie
(93, 4167, 10087, 1, 2, NULL), -- Foods.toast
(115, 50391, 10087, 1, 3, NULL), -- Food.breakfast
(116, 186, 10087, 1, 4, NULL), -- Food.lunch
(117, 49786, 10087, 1, 5, NULL), -- Food.dinner
(130, 53077, 10087, 2, 6, NULL), -- Foods.beans
(84, 3739, 10087, 2, 0, NULL), -- Foods.hamburger
(85, 4131, 10087, 2, 1, NULL), -- Foods.meat
(86, 4233, 10087, 2, 2, NULL), -- Foods.fish
(87, 3904, 10087, 2, 3, NULL), -- Foods.orange
(88, 3308, 10087, 2, 4, NULL), -- Foods.banana
(89, 3282, 10087, 2, 5, NULL), -- Foods.apricot
(90, 3937, 10087, 2, 6, NULL), -- Foods.pear
(91, 3261, 10087, 2, 7, NULL), -- Foods.apple
(94, 4209, 10087, 3, 0, NULL), -- Foods.waffle
(95, 3358, 10087, 3, 1, NULL), -- Foods.bread
(96, 52781, 10087, 3, 2, NULL), -- Foods.yogurt
(97, 3464, 10087, 3, 3, NULL), -- Foods.cheese
(98, 49673, 10087, 3, 4, NULL), -- Foods.chips
(129, 3567, 10087, 3, 5, NULL), -- Foods.corn
(23, 52758, NULL, 3, 5, '#F4FA58'), -- Sweets
(121, 51518, 52758, 3, 3, NULL), -- Sweets.candy
(122, 3699, 52758, 3, 4, NULL), -- Sweets.snack
(123, 52751, 52758, 3, 6, NULL), -- Sweets.popcorn
(190, 4724,NULL, 3, 6, '#F4FA58'), -- Body parts
(194, 4848,4724, 0, 0, NULL), -- Body parts.hair
(195, 4872,4724, 0, 1, NULL), -- Body parts.head
(196, 50694,4724, 0, 2, NULL), -- Body parts.eye
(197, 4787 ,4724, 0, 3, NULL), -- Body parts.ear
(198, 4933,4724, 0, 4, NULL), -- Body parts.nose
(199, 4921,4724, 0, 5, NULL), -- Body parts.mouth
(200, 5009,4724, 0, 6, NULL), -- Body parts.tooth
(201, 4752,4724, 0, 7, NULL), -- Body parts.cheek
(202, 4756,4724, 1, 0, NULL), -- Body parts.chin
(203, 4929,4724, 1, 1, NULL), -- Body parts.neck
(204, 4974,4724, 1, 2, NULL), -- Body parts.shoulder
(205, 4754,4724, 1, 3, NULL), -- Body parts.chest
(206, 4997 ,4724, 1, 4, NULL), -- Body parts.stomatch
(207, 4699,4724, 1, 5, NULL), -- Body parts.back
(208, 4739 ,4724, 1, 6, NULL), -- Body parts.bottom
(209, 4689,4724, 1, 7, NULL), -- Body parts.arm
(210, 4795,4724, 2, 0, NULL), -- Body parts.elbow
(211, 5053,4724, 2, 1, NULL), -- Body parts.wrist
(212, 4868,4724, 2, 2, NULL), -- Body parts.hand
(213, 4820,4724, 2, 3, NULL), -- Body parts.finger
(214, 4821,4724, 2, 4, NULL), -- Body parts.nail
(215, 4903,4724, 2, 5, NULL), -- Body parts.leg
(216, 4898,4724, 2, 6, NULL), -- Body parts.knee
(217, 4687,4724, 2, 7, NULL), -- Body parts.ankle
(218, 4829,4724, 3, 5, NULL), -- Body parts.foot
(232, 1379,NULL, 3, 7, '#2E9AFE'), -- Advers and interjections
(189, 2278,1379, 3, 2, NULL), -- Adverbs and interjections.ok
(3, 2284, 1379, 3, 3, NULL), -- Adverbs and interjections.please
(6, 2891, 1379, 3, 4, NULL), -- Adverbs and interjections.sorry
(5, 266, 1379, 3, 5, NULL), -- Adverbs and interjections.help
(7, 2179, 1379, 3, 6, NULL), -- Adverbs and interjections.hello
(124, 2169,1379, 3, 7, NULL); -- Adverbs and interjections.bye
sails/roles/database/files/pictodb-data-coreexp.sql 0 → 100755
UPDATE picto_exp SET text='ok' WHERE id_pic=2278 and lang='en-gb';
UPDATE picto_exp SET text='vale' WHERE id_pic=2278 and lang='es-es';
UPDATE picto_exp SET text='hello' WHERE id_pic=2179 and lang='en-us';
UPDATE picto_exp SET text='hello' WHERE id_pic=2179 and lang='en-gb';
UPDATE picto_exp SET text='hola' WHERE id_pic=2179 and lang='es-es';
UPDATE picto_exp SET text='bye' WHERE id_pic=2169 and lang='en-us';
UPDATE picto_exp SET text='bye' WHERE id_pic=2169 and lang='en-gb';
UPDATE picto_exp SET text='adiós' WHERE id_pic=2169 and lang='es-es';
UPDATE picto_exp SET text='Pronouns' WHERE id_pic=4436 and lang='en-us';
UPDATE picto_exp SET text='Pronouns' WHERE id_pic=4436 and lang='en-gb';
UPDATE picto_exp SET text='Pronombres' WHERE id_pic=4436 and lang='es-es';
UPDATE picto_exp SET text='People ' WHERE id_pic=7515 and lang='en-us';
UPDATE picto_exp SET text='People ' WHERE id_pic=7515 and lang='en-gb';
UPDATE picto_exp SET text='Gente' WHERE id_pic=7515 and lang='es-es';
UPDATE picto_exp SET text='Kinship' WHERE id_pic=10361 and lang='en-us';
UPDATE picto_exp SET text='Kinship' WHERE id_pic=10361 and lang='en-gb';
UPDATE picto_exp SET text='Familia' WHERE id_pic=10361 and lang='es-es';
UPDATE picto_exp SET text='Professions' WHERE id_pic=50388 and lang='en-us';
UPDATE picto_exp SET text='Professions' WHERE id_pic=50388 and lang='en-gb';
UPDATE picto_exp SET text='Profesiones' WHERE id_pic=50388 and lang='es-es';
UPDATE picto_exp SET text='Desiring' WHERE id_pic=376 and lang='en-us';
UPDATE picto_exp SET text='Desiring' WHERE id_pic=376 and lang='en-gb';
UPDATE picto_exp SET text='Desear' WHERE id_pic=376 and lang='es-es';
UPDATE picto_exp SET text='Ingestion' WHERE id_pic=22 and lang='en-us';
UPDATE picto_exp SET text='Ingestion' WHERE id_pic=22 and lang='en-gb';
UPDATE picto_exp SET text='Ingerir' WHERE id_pic=22 and lang='es-es';
UPDATE picto_exp SET text='Sense' WHERE id_pic=4967 and lang='en-us';
UPDATE picto_exp SET text='Sense' WHERE id_pic=4967 and lang='en-gb';
UPDATE picto_exp SET text='Sentir' WHERE id_pic=4967 and lang='es-es';
UPDATE picto_exp SET text='Roles' WHERE id_pic=2640 and lang='en-us';
UPDATE picto_exp SET text='Roles' WHERE id_pic=2640 and lang='en-gb';
UPDATE picto_exp SET text='Roles' WHERE id_pic=2640 and lang='es-es';
UPDATE picto_exp SET text='Change' WHERE id_pic=54270 and lang='en-us';
UPDATE picto_exp SET text='Change' WHERE id_pic=54270 and lang='en-gb';
--
-- Update wrong translations
--
UPDATE picto_exp SET text='yes' WHERE id_pic=2982 and lang='en-us';
UPDATE picto_exp SET text='yes' WHERE id_pic=2982 and lang='en-gb';
UPDATE picto_exp SET text='sí' WHERE id_pic=2982 and lang='es-es';
UPDATE picto_exp SET text='no' WHERE id_pic=4391 and lang='en-us';
UPDATE picto_exp SET text='no' WHERE id_pic=4391 and lang='en-gb';
UPDATE picto_exp SET text='no' WHERE id_pic=4391 and lang='es-es';
UPDATE picto_exp SET text='please' WHERE id_pic=2284 and lang='en-us';
UPDATE picto_exp SET text='please' WHERE id_pic=2284 and lang='en-gb';
UPDATE picto_exp SET text='por favor' WHERE id_pic=2284 and lang='es-es';
UPDATE picto_exp SET text='i want' WHERE id_pic=2237 and lang='en-us';
UPDATE picto_exp SET text='i want' WHERE id_pic=2237 and lang='en-gb';
UPDATE picto_exp SET text='quiero' WHERE id_pic=2237 and lang='es-es';
UPDATE picto_exp SET text='help' WHERE id_pic=266 and lang='en-us';
UPDATE picto_exp SET text='help' WHERE id_pic=266 and lang='en-gb';
UPDATE picto_exp SET text='ayuda' WHERE id_pic=266 and lang='es-es';
UPDATE picto_exp SET text='sorry' WHERE id_pic=2891 and lang='en-us';
UPDATE picto_exp SET text='sorry' WHERE id_pic=2891 and lang='en-gb';
UPDATE picto_exp SET text='perdón' WHERE id_pic=2891 and lang='es-es';
UPDATE picto_exp SET text='ok' WHERE id_pic=2278 and lang='en-us';
UPDATE picto_exp SET text='Cambiar' WHERE id_pic=54270 and lang='es-es';
UPDATE picto_exp SET text='Prepositions' WHERE id_pic=50343 and lang='en-us';
UPDATE picto_exp SET text='Prepositions' WHERE id_pic=50343 and lang='en-gb';
UPDATE picto_exp SET text='Preposiciones' WHERE id_pic=50343 and lang='es-es';
UPDATE picto_exp SET text='Colors' WHERE id_pic=2049 and lang='en-us';
UPDATE picto_exp SET text='Colors' WHERE id_pic=2049 and lang='en-gb';
UPDATE picto_exp SET text='Colores' WHERE id_pic=2049 and lang='es-es';
UPDATE picto_exp SET text='Sizes' WHERE id_pic=5866 and lang='en-us';
UPDATE picto_exp SET text='Sizes' WHERE id_pic=5866 and lang='en-gb';
UPDATE picto_exp SET text='Tamaños' WHERE id_pic=5866 and lang='es-es';
UPDATE picto_exp SET text='Subjectives (feelings)' WHERE id_pic=4814 and lang='en-us';
UPDATE picto_exp SET text='Subjectives (feelings)' WHERE id_pic=4814 and lang='en-gb';
UPDATE picto_exp SET text='Sentimientos' WHERE id_pic=4814 and lang='es-es';
UPDATE picto_exp SET text='Tastes' WHERE id_pic=609 and lang='en-us';
UPDATE picto_exp SET text='Tastes' WHERE id_pic=609 and lang='en-gb';
UPDATE picto_exp SET text='Gustos' WHERE id_pic=609 and lang='es-es';
UPDATE picto_exp SET text='Aesthetics' WHERE id_pic=56262 and lang='en-us';
UPDATE picto_exp SET text='Aesthetics' WHERE id_pic=56262 and lang='en-gb';
UPDATE picto_exp SET text='Apariencia' WHERE id_pic=56262 and lang='es-es';
UPDATE picto_exp SET text='Toys' WHERE id_pic=11216 and lang='en-us';
UPDATE picto_exp SET text='Toys' WHERE id_pic=11216 and lang='en-gb';
UPDATE picto_exp SET text='Juguetes' WHERE id_pic=11216 and lang='es-es';
UPDATE picto_exp SET text='Drinks' WHERE id_pic=52736 and lang='en-us';
UPDATE picto_exp SET text='Drinks' WHERE id_pic=52736 and lang='en-gb';
UPDATE picto_exp SET text='Bebidas' WHERE id_pic=52736 and lang='es-es';
UPDATE picto_exp SET text='Food' WHERE id_pic=10087 and lang='en-us';
UPDATE picto_exp SET text='Food' WHERE id_pic=10087 and lang='en-gb';
UPDATE picto_exp SET text='Comida' WHERE id_pic=10087 and lang='es-es';
UPDATE picto_exp SET text='Sweets' WHERE id_pic=52758 and lang='en-us';
UPDATE picto_exp SET text='Sweets' WHERE id_pic=52758 and lang='en-gb';
UPDATE picto_exp SET text='Dulces' WHERE id_pic=52758 and lang='es-es';
UPDATE picto_exp SET text='Motion' WHERE id_pic=253 and lang='en-us';
UPDATE picto_exp SET text='Motion' WHERE id_pic=253 and lang='en-gb';
UPDATE picto_exp SET text='Movimiento' WHERE id_pic=253 and lang='es-es';
UPDATE picto_exp SET text='Places' WHERE id_pic=8148 and lang='en-us';
UPDATE picto_exp SET text='Places and rooms' WHERE id_pic=8148 and lang='en-gb';
UPDATE picto_exp SET text='Lugares y habitaciones' WHERE id_pic=8148 and lang='es-es';
UPDATE picto_exp SET text='Clasroom items' WHERE id_pic=12303 and lang='en-us';
UPDATE picto_exp SET text='Clasroom items' WHERE id_pic=12303 and lang='en-gb';
UPDATE picto_exp SET text='Utensilios de clase' WHERE id_pic=12303 and lang='es-es';
UPDATE picto_exp SET text='Furniture' WHERE id_pic=5393 and lang='en-us';
UPDATE picto_exp SET text='Furniture' WHERE id_pic=5393 and lang='en-gb';
UPDATE picto_exp SET text='Mobiliario' WHERE id_pic=5393 and lang='es-es';
UPDATE picto_exp SET text='Kitchen items' WHERE id_pic=11368 and lang='en-us';
UPDATE picto_exp SET text='Kitchen items' WHERE id_pic=11368 and lang='en-gb';
UPDATE picto_exp SET text='Utensilios de cocina' WHERE id_pic=11368 and lang='es-es';
UPDATE picto_exp SET text='Articles and determinants' WHERE id_pic=2547 and lang='en-us';
UPDATE picto_exp SET text='Articles and determinants' WHERE id_pic=2547 and lang='en-gb';
UPDATE picto_exp SET text='Artículos y determinantes' WHERE id_pic=2547 and lang='es-es';
UPDATE picto_exp SET text='want' WHERE id_pic=676 and lang='en-us';
UPDATE picto_exp SET text='want' WHERE id_pic=676 and lang='en-gb';
UPDATE picto_exp SET text='querer' WHERE id_pic=676 and lang='es-es';
UPDATE picto_exp SET text='be' WHERE id_pic=292 and lang='en-us';
UPDATE picto_exp SET text='be' WHERE id_pic=292 and lang='en-gb';
UPDATE picto_exp SET text='ser' WHERE id_pic=292 and lang='es-es';
UPDATE picto_exp SET text='have' WHERE id_pic=277 and lang='en-us';
UPDATE picto_exp SET text='have' WHERE id_pic=277 and lang='en-gb';
UPDATE picto_exp SET text='tener' WHERE id_pic=277 and lang='es-es';
UPDATE picto_exp SET text='play' WHERE id_pic=9907 and lang='en-us';
UPDATE picto_exp SET text='play' WHERE id_pic=9907 and lang='en-gb';
UPDATE picto_exp SET text='jugar' WHERE id_pic=9907 and lang='es-es';
UPDATE picto_exp SET text='go' WHERE id_pic=485 and lang='en-us';
UPDATE picto_exp SET text='go' WHERE id_pic=485 and lang='en-gb';
UPDATE picto_exp SET text='ir' WHERE id_pic=485 and lang='es-es';
UPDATE picto_exp SET text='stink' WHERE id_pic=49839 and lang='en-us';
UPDATE picto_exp SET text='stink' WHERE id_pic=49839 and lang='en-gb';
UPDATE picto_exp SET text='hediondo' WHERE id_pic=49839 and lang='es-es';
UPDATE picto_exp SET text='spicy' WHERE id_pic=2718 and lang='en-us';
UPDATE picto_exp SET text='spicy' WHERE id_pic=2718 and lang='en-gb';
UPDATE picto_exp SET text='picante' WHERE id_pic=2718 and lang='es-es';
UPDATE picto_exp SET text='hot' WHERE id_pic=3753 and lang='en-us';
UPDATE picto_exp SET text='hot' WHERE id_pic=3753 and lang='en-gb';
UPDATE picto_exp SET text='caliente' WHERE id_pic=3753 and lang='es-es';
UPDATE picto_exp SET text='sweet' WHERE id_pic=2910 and lang='en-us';
UPDATE picto_exp SET text='sweet' WHERE id_pic=2910 and lang='en-gb';
UPDATE picto_exp SET text='dulce' WHERE id_pic=2910 and lang='es-es';
UPDATE picto_exp SET text='tasty' WHERE id_pic=319 and lang='en-us';
UPDATE picto_exp SET text='tasty' WHERE id_pic=319 and lang='en-gb';
UPDATE picto_exp SET text='rico' WHERE id_pic=319 and lang='es-es';
UPDATE picto_exp SET text='salty' WHERE id_pic=4077 and lang='en-us';
UPDATE picto_exp SET text='salty' WHERE id_pic=4077 and lang='en-gb';
UPDATE picto_exp SET text='salado' WHERE id_pic=4077 and lang='es-es';
UPDATE picto_exp SET text='bitter' WHERE id_pic=2562 and lang='en-us';
UPDATE picto_exp SET text='bitter' WHERE id_pic=2562 and lang='en-gb';
UPDATE picto_exp SET text='amargo' WHERE id_pic=2562 and lang='es-es';
UPDATE picto_exp SET text='purple' WHERE id_pic=2070 and lang='en-us';
UPDATE picto_exp SET text='purple' WHERE id_pic=2070 and lang='en-gb';
UPDATE picto_exp SET text='púrpura' WHERE id_pic=2070 and lang='es-es';
UPDATE picto_exp SET text='brown' WHERE id_pic=2047 and lang='en-us';
UPDATE picto_exp SET text='brown' WHERE id_pic=2047 and lang='en-gb';
UPDATE picto_exp SET text='marrón' WHERE id_pic=2047 and lang='es-es';
UPDATE picto_exp SET text='yellow' WHERE id_pic=2092 and lang='en-us';
UPDATE picto_exp SET text='yellow' WHERE id_pic=2092 and lang='en-gb';
UPDATE picto_exp SET text='amarillo' WHERE id_pic=2092 and lang='es-es';
UPDATE picto_exp SET text='blue' WHERE id_pic=2043 and lang='en-us';
UPDATE picto_exp SET text='blue' WHERE id_pic=2043 and lang='en-gb';
UPDATE picto_exp SET text='azul' WHERE id_pic=2043 and lang='es-es';
UPDATE picto_exp SET text='red' WHERE id_pic=2073 and lang='en-us';
UPDATE picto_exp SET text='red' WHERE id_pic=2073 and lang='en-gb';
UPDATE picto_exp SET text='rojo' WHERE id_pic=2073 and lang='es-es';
UPDATE picto_exp SET text='black' WHERE id_pic=2037 and lang='en-us';
UPDATE picto_exp SET text='black' WHERE id_pic=2037 and lang='en-gb';
UPDATE picto_exp SET text='negro' WHERE id_pic=2037 and lang='es-es';
UPDATE picto_exp SET text='white' WHERE id_pic=2090 and lang='en-us';
UPDATE picto_exp SET text='white' WHERE id_pic=2090 and lang='en-gb';
UPDATE picto_exp SET text='blanco' WHERE id_pic=2090 and lang='es-es';
UPDATE picto_exp SET text='orange' WHERE id_pic=2065 and lang='en-us';
UPDATE picto_exp SET text='orange' WHERE id_pic=2065 and lang='en-gb';
UPDATE picto_exp SET text='naranja' WHERE id_pic=2065 and lang='es-es';
UPDATE picto_exp SET text='green' WHERE id_pic=2061 and lang='en-us';
UPDATE picto_exp SET text='green' WHERE id_pic=2061 and lang='en-gb';
UPDATE picto_exp SET text='verde' WHERE id_pic=2061 and lang='es-es';
UPDATE picto_exp SET text='pink' WHERE id_pic=2093 and lang='en-us';
UPDATE picto_exp SET text='pink' WHERE id_pic=2093 and lang='en-gb';
UPDATE picto_exp SET text='rosa' WHERE id_pic=2093 and lang='es-es';
UPDATE picto_exp SET text='I' WHERE id_pic=51174 and lang='en-us';
UPDATE picto_exp SET text='I' WHERE id_pic=51174 and lang='en-gb';
UPDATE picto_exp SET text='yo' WHERE id_pic=51174 and lang='es-es';
UPDATE picto_exp SET text='you' WHERE id_pic=7730 and lang='en-us';
UPDATE picto_exp SET text='you' WHERE id_pic=7730 and lang='en-gb';
UPDATE picto_exp SET text='tú' WHERE id_pic=7730 and lang='es-es';
UPDATE picto_exp SET text='he' WHERE id_pic=12499 and lang='en-us';
UPDATE picto_exp SET text='he' WHERE id_pic=12499 and lang='en-gb';
UPDATE picto_exp SET text='él' WHERE id_pic=12499 and lang='es-es';
UPDATE picto_exp SET text='she' WHERE id_pic=12504 and lang='en-us';
UPDATE picto_exp SET text='she' WHERE id_pic=12504 and lang='en-gb';
UPDATE picto_exp SET text='ella' WHERE id_pic=12504 and lang='es-es';
UPDATE picto_exp SET text='we' WHERE id_pic=7698 and lang='en-us';
UPDATE picto_exp SET text='we' WHERE id_pic=7698 and lang='en-gb';
UPDATE picto_exp SET text='nosotros' WHERE id_pic=7698 and lang='es-es';
UPDATE picto_exp SET text='you' WHERE id_pic=54220 and lang='en-us';
UPDATE picto_exp SET text='you' WHERE id_pic=54220 and lang='en-gb';
UPDATE picto_exp SET text='vosotros' WHERE id_pic=54220 and lang='es-es';
UPDATE picto_exp SET text='they' WHERE id_pic=7669 and lang='en-us';
UPDATE picto_exp SET text='they' WHERE id_pic=7669 and lang='en-gb';
UPDATE picto_exp SET text='ellos' WHERE id_pic=7669 and lang='es-es';
UPDATE picto_exp SET text='wrong' WHERE id_pic=2980 and lang='en-us';
UPDATE picto_exp SET text='wrong' WHERE id_pic=2980 and lang='en-gb';
UPDATE picto_exp SET text='mal' WHERE id_pic=2980 and lang='es-es';
UPDATE picto_exp SET text='good' WHERE id_pic=2844 and lang='en-us';
UPDATE picto_exp SET text='good' WHERE id_pic=2844 and lang='en-gb';
UPDATE picto_exp SET text='bien' WHERE id_pic=2844 and lang='es-es';
UPDATE picto_exp SET text='bad' WHERE id_pic=50259 and lang='en-us';
UPDATE picto_exp SET text='bad' WHERE id_pic=50259 and lang='en-gb';
UPDATE picto_exp SET text='malo' WHERE id_pic=50259 and lang='es-es';
UPDATE picto_exp SET text='silly' WHERE id_pic=2552 and lang='en-us';
UPDATE picto_exp SET text='silly' WHERE id_pic=2552 and lang='en-gb';
UPDATE picto_exp SET text='tonto' WHERE id_pic=2552 and lang='es-es';
UPDATE picto_exp SET text='intelligent' WHERE id_pic=274 and lang='en-us';
UPDATE picto_exp SET text='intelligent' WHERE id_pic=274 and lang='en-gb';
UPDATE picto_exp SET text='inteligente' WHERE id_pic=274 and lang='es-es';
UPDATE picto_exp SET text='crazy' WHERE id_pic=2604 and lang='en-us';
UPDATE picto_exp SET text='crazy' WHERE id_pic=2604 and lang='en-gb';
UPDATE picto_exp SET text='loco' WHERE id_pic=2604 and lang='es-es';
UPDATE picto_exp SET text='ugly' WHERE id_pic=2938 and lang='en-us';
UPDATE picto_exp SET text='ugly' WHERE id_pic=2938 and lang='en-gb';
UPDATE picto_exp SET text='feo' WHERE id_pic=2938 and lang='es-es';
UPDATE picto_exp SET text='beautiful' WHERE id_pic=2865 and lang='en-us';
UPDATE picto_exp SET text='beautiful' WHERE id_pic=2865 and lang='en-gb';
UPDATE picto_exp SET text='bonito' WHERE id_pic=2865 and lang='es-es';
UPDATE picto_exp SET text='feel' WHERE id_pic=631 and lang='en-us';
UPDATE picto_exp SET text='feel' WHERE id_pic=631 and lang='en-gb';
UPDATE picto_exp SET text='sentir' WHERE id_pic=631 and lang='es-es';
UPDATE picto_exp SET text='smell' WHERE id_pic=49835 and lang='en-us';
UPDATE picto_exp SET text='smell' WHERE id_pic=49835 and lang='en-gb';
UPDATE picto_exp SET text='oler' WHERE id_pic=49835 and lang='es-es';
UPDATE picto_exp SET text='see' WHERE id_pic=493 and lang='en-us';
UPDATE picto_exp SET text='see' WHERE id_pic=493 and lang='en-gb';
UPDATE picto_exp SET text='ver' WHERE id_pic=493 and lang='es-es';
UPDATE picto_exp SET text='hear' WHERE id_pic=333 and lang='en-us';
UPDATE picto_exp SET text='hear' WHERE id_pic=333 and lang='en-gb';
UPDATE picto_exp SET text='oir' WHERE id_pic=333 and lang='es-es';
UPDATE picto_exp SET text='taste' WHERE id_pic=610 and lang='en-us';
UPDATE picto_exp SET text='taste' WHERE id_pic=610 and lang='en-gb';
UPDATE picto_exp SET text='sabor' WHERE id_pic=610 and lang='es-es';
UPDATE picto_exp SET text='big' WHERE id_pic=2559 and lang='en-us';
UPDATE picto_exp SET text='big' WHERE id_pic=2559 and lang='en-gb';
UPDATE picto_exp SET text='grande' WHERE id_pic=2559 and lang='es-es';
UPDATE picto_exp SET text='small' WHERE id_pic=2870 and lang='en-us';
UPDATE picto_exp SET text='small' WHERE id_pic=2870 and lang='en-gb';
UPDATE picto_exp SET text='pequeño' WHERE id_pic=2870 and lang='es-es';
UPDATE picto_exp SET text='sister' WHERE id_pic=7287 and lang='en-us';
UPDATE picto_exp SET text='sister' WHERE id_pic=7287 and lang='en-gb';
UPDATE picto_exp SET text='hermana' WHERE id_pic=7287 and lang='es-es';
UPDATE picto_exp SET text='brother' WHERE id_pic=7269 and lang='en-us';
UPDATE picto_exp SET text='brother' WHERE id_pic=7269 and lang='en-gb';
UPDATE picto_exp SET text='hermano' WHERE id_pic=7269 and lang='es-es';
UPDATE picto_exp SET text='dad' WHERE id_pic=49287 and lang='en-us';
UPDATE picto_exp SET text='dad' WHERE id_pic=49287 and lang='en-gb';
UPDATE picto_exp SET text='papá' WHERE id_pic=49287 and lang='es-es';
UPDATE picto_exp SET text='mom' WHERE id_pic=7476 and lang='en-us';
UPDATE picto_exp SET text='mom' WHERE id_pic=7476 and lang='en-gb';
UPDATE picto_exp SET text='mamá' WHERE id_pic=7476 and lang='es-es';
UPDATE picto_exp SET text='grandpa' WHERE id_pic=7348 and lang='en-us';
UPDATE picto_exp SET text='grandpa' WHERE id_pic=7348 and lang='en-gb';
UPDATE picto_exp SET text='abuelo' WHERE id_pic=7348 and lang='es-es';
UPDATE picto_exp SET text='grandma' WHERE id_pic=7350 and lang='en-us';
UPDATE picto_exp SET text='grandma' WHERE id_pic=7350 and lang='en-gb';
UPDATE picto_exp SET text='abuela' WHERE id_pic=7350 and lang='es-es';
UPDATE picto_exp SET text='girl' WHERE id_pic=7329 and lang='en-us';
UPDATE picto_exp SET text='girl' WHERE id_pic=7329 and lang='en-gb';
UPDATE picto_exp SET text='chica' WHERE id_pic=7329 and lang='es-es';
UPDATE picto_exp SET text='boy' WHERE id_pic=7136 and lang='en-us';
UPDATE picto_exp SET text='boy' WHERE id_pic=7136 and lang='en-gb';
UPDATE picto_exp SET text='chico' WHERE id_pic=7136 and lang='es-es';
UPDATE picto_exp SET text='children' WHERE id_pic=7188 and lang='en-us';
UPDATE picto_exp SET text='children' WHERE id_pic=7188 and lang='en-gb';
UPDATE picto_exp SET text='niños' WHERE id_pic=7188 and lang='es-es';
UPDATE picto_exp SET text='man' WHERE id_pic=7438 and lang='en-us';
UPDATE picto_exp SET text='man' WHERE id_pic=7438 and lang='en-gb';
UPDATE picto_exp SET text='hombre' WHERE id_pic=7438 and lang='es-es';
UPDATE picto_exp SET text='woman' WHERE id_pic=7710 and lang='en-us';
UPDATE picto_exp SET text='woman' WHERE id_pic=7710 and lang='en-gb';
UPDATE picto_exp SET text='mujer' WHERE id_pic=7710 and lang='es-es';
UPDATE picto_exp SET text='baby' WHERE id_pic=7118 and lang='en-us';
UPDATE picto_exp SET text='baby' WHERE id_pic=7118 and lang='en-gb';
UPDATE picto_exp SET text='bebé' WHERE id_pic=7118 and lang='es-es';
UPDATE picto_exp SET text='friend' WHERE id_pic=10389 and lang='en-us';
UPDATE picto_exp SET text='friend' WHERE id_pic=10389 and lang='en-gb';
UPDATE picto_exp SET text='amigo' WHERE id_pic=10389 and lang='es-es';
UPDATE picto_exp SET text='pizza' WHERE id_pic=3977 and lang='en-us';
UPDATE picto_exp SET text='pizza' WHERE id_pic=3977 and lang='en-gb';
UPDATE picto_exp SET text='pizza' WHERE id_pic=3977 and lang='es-es';
UPDATE picto_exp SET text='hamburger' WHERE id_pic=3739 and lang='en-us';
UPDATE picto_exp SET text='hamburger' WHERE id_pic=3739 and lang='en-gb';
UPDATE picto_exp SET text='hamburgesa' WHERE id_pic=3739 and lang='es-es';
UPDATE picto_exp SET text='meat' WHERE id_pic=4131 and lang='en-us';
UPDATE picto_exp SET text='meat' WHERE id_pic=4131 and lang='en-gb';
UPDATE picto_exp SET text='carne' WHERE id_pic=4131 and lang='es-es';
UPDATE picto_exp SET text='fish' WHERE id_pic=4233 and lang='en-us';
UPDATE picto_exp SET text='fish' WHERE id_pic=4233 and lang='en-gb';
UPDATE picto_exp SET text='pescado' WHERE id_pic=4233 and lang='es-es';
UPDATE picto_exp SET text='orange' WHERE id_pic=3904 and lang='en-us';
UPDATE picto_exp SET text='orange' WHERE id_pic=3904 and lang='en-gb';
UPDATE picto_exp SET text='naranja' WHERE id_pic=3904 and lang='es-es';
UPDATE picto_exp SET text='banana' WHERE id_pic=3308 and lang='en-us';
UPDATE picto_exp SET text='banana' WHERE id_pic=3308 and lang='en-gb';
UPDATE picto_exp SET text='plátano' WHERE id_pic=3308 and lang='es-es';
UPDATE picto_exp SET text='apricot' WHERE id_pic=3282 and lang='en-us';
UPDATE picto_exp SET text='apricot' WHERE id_pic=3282 and lang='en-gb';
UPDATE picto_exp SET text='melocotón' WHERE id_pic=3282 and lang='es-es';
UPDATE picto_exp SET text='pear' WHERE id_pic=3937 and lang='en-us';
UPDATE picto_exp SET text='pear' WHERE id_pic=3937 and lang='en-gb';
UPDATE picto_exp SET text='pera' WHERE id_pic=3937 and lang='es-es';
UPDATE picto_exp SET text='apple' WHERE id_pic=3261 and lang='en-us';
UPDATE picto_exp SET text='apple' WHERE id_pic=3261 and lang='en-gb';
UPDATE picto_exp SET text='manzana' WHERE id_pic=3261 and lang='es-es';
UPDATE picto_exp SET text='coockie' WHERE id_pic=51151 and lang='en-us';
UPDATE picto_exp SET text='coockie' WHERE id_pic=51151 and lang='en-gb';
UPDATE picto_exp SET text='galleta' WHERE id_pic=51151 and lang='es-es';
UPDATE picto_exp SET text='toast' WHERE id_pic=4167 and lang='en-us';
UPDATE picto_exp SET text='toast' WHERE id_pic=4167 and lang='en-gb';
UPDATE picto_exp SET text='tostada' WHERE id_pic=4167 and lang='es-es';
UPDATE picto_exp SET text='waffle' WHERE id_pic=4209 and lang='en-us';
UPDATE picto_exp SET text='waffle' WHERE id_pic=4209 and lang='en-gb';
UPDATE picto_exp SET text='gofre' WHERE id_pic=4209 and lang='es-es';
UPDATE picto_exp SET text='bread' WHERE id_pic=3358 and lang='en-us';
UPDATE picto_exp SET text='bread' WHERE id_pic=3358 and lang='en-gb';
UPDATE picto_exp SET text='pan' WHERE id_pic=3358 and lang='es-es';
UPDATE picto_exp SET text='yogurt' WHERE id_pic=52781 and lang='en-us';
UPDATE picto_exp SET text='yogurt' WHERE id_pic=52781 and lang='en-gb';
UPDATE picto_exp SET text='yogur' WHERE id_pic=52781 and lang='es-es';
UPDATE picto_exp SET text='cheese' WHERE id_pic=3464 and lang='en-us';
UPDATE picto_exp SET text='cheese' WHERE id_pic=3464 and lang='en-gb';
UPDATE picto_exp SET text='queso' WHERE id_pic=3464 and lang='es-es';
UPDATE picto_exp SET text='chips' WHERE id_pic=49673 and lang='en-us';
UPDATE picto_exp SET text='chips' WHERE id_pic=49673 and lang='en-gb';
UPDATE picto_exp SET text='patatas' WHERE id_pic=49673 and lang='es-es';
UPDATE picto_exp SET text='corn' WHERE id_pic=3567 and lang='en-us';
UPDATE picto_exp SET text='corn' WHERE id_pic=3567 and lang='en-gb';
UPDATE picto_exp SET text='maíz' WHERE id_pic=3567 and lang='es-es';
UPDATE picto_exp SET text='beans' WHERE id_pic=53077 and lang='en-us';
UPDATE picto_exp SET text='beans' WHERE id_pic=53077 and lang='en-gb';
UPDATE picto_exp SET text='habichuelas' WHERE id_pic=53077 and lang='es-es';
UPDATE picto_exp SET text='eat' WHERE id_pic=50391 and lang='en-us';
UPDATE picto_exp SET text='eat' WHERE id_pic=50391 and lang='en-gb';
UPDATE picto_exp SET text='alimentarse' WHERE id_pic=50391 and lang='es-es';
UPDATE picto_exp SET text='lunch' WHERE id_pic=186 and lang='en-us';
UPDATE picto_exp SET text='lunch' WHERE id_pic=186 and lang='en-gb';
UPDATE picto_exp SET text='almuerzo' WHERE id_pic=186 and lang='es-es';
UPDATE picto_exp SET text='dinner' WHERE id_pic=49786 and lang='en-us';
UPDATE picto_exp SET text='dinner' WHERE id_pic=49786 and lang='en-gb';
UPDATE picto_exp SET text='cena' WHERE id_pic=49786 and lang='es-es';
UPDATE picto_exp SET text='block' WHERE id_pic=10820 and lang='en-us';
UPDATE picto_exp SET text='block' WHERE id_pic=10820 and lang='en-gb';
UPDATE picto_exp SET text='bloque' WHERE id_pic=10820 and lang='es-es';
UPDATE picto_exp SET text='bubbles' WHERE id_pic=11059 and lang='en-us';
UPDATE picto_exp SET text='bubbles' WHERE id_pic=11059 and lang='en-gb';
UPDATE picto_exp SET text='pompas' WHERE id_pic=11059 and lang='es-es';
UPDATE picto_exp SET text='doll' WHERE id_pic=11080 and lang='en-us';
UPDATE picto_exp SET text='doll' WHERE id_pic=11080 and lang='en-gb';
UPDATE picto_exp SET text='muñeco' WHERE id_pic=11080 and lang='es-es';
UPDATE picto_exp SET text='game' WHERE id_pic=55704 and lang='en-us';
UPDATE picto_exp SET text='game' WHERE id_pic=55704 and lang='en-gb';
UPDATE picto_exp SET text='juego' WHERE id_pic=55704 and lang='es-es';
UPDATE picto_exp SET text='puzzle' WHERE id_pic=11180 and lang='en-us';
UPDATE picto_exp SET text='puzzle' WHERE id_pic=11180 and lang='en-gb';
UPDATE picto_exp SET text='puzzle' WHERE id_pic=11180 and lang='es-es';
UPDATE picto_exp SET text='ball' WHERE id_pic=11047 and lang='en-us';
UPDATE picto_exp SET text='ball' WHERE id_pic=11047 and lang='en-gb';
UPDATE picto_exp SET text='pelota' WHERE id_pic=11047 and lang='es-es';
UPDATE picto_exp SET text='balloon' WHERE id_pic=11048 and lang='en-us';
UPDATE picto_exp SET text='balloon' WHERE id_pic=11048 and lang='en-gb';
UPDATE picto_exp SET text='balón' WHERE id_pic=11048 and lang='es-es';
UPDATE picto_exp SET text='figure toys' WHERE id_pic=101441 and lang='en-us';
UPDATE picto_exp SET text='figure toys' WHERE id_pic=101441 and lang='en-gb';
UPDATE picto_exp SET text='muñeco' WHERE id_pic=101441 and lang='es-es';
UPDATE picto_exp SET text='tower toys' WHERE id_pic=11218 and lang='en-us';
UPDATE picto_exp SET text='tower toys' WHERE id_pic=11218 and lang='en-gb';
UPDATE picto_exp SET text='torre' WHERE id_pic=11218 and lang='es-es';
UPDATE picto_exp SET text='with' WHERE id_pic=52212 and lang='en-us';
UPDATE picto_exp SET text='with' WHERE id_pic=52212 and lang='en-gb';
UPDATE picto_exp SET text='con' WHERE id_pic=52212 and lang='es-es';
UPDATE picto_exp SET text='bus driver' WHERE id_pic=50266 and lang='en-us';
UPDATE picto_exp SET text='bus driver' WHERE id_pic=50266 and lang='en-gb';
UPDATE picto_exp SET text='conductor de autobús' WHERE id_pic=50266 and lang='es-es';
UPDATE picto_exp SET text='teacher' WHERE id_pic=7658 and lang='en-us';
UPDATE picto_exp SET text='teacher' WHERE id_pic=7658 and lang='en-gb';
UPDATE picto_exp SET text='profesor' WHERE id_pic=7658 and lang='es-es';
UPDATE picto_exp SET text='doctor' WHERE id_pic=7237 and lang='en-us';
UPDATE picto_exp SET text='doctor' WHERE id_pic=7237 and lang='en-gb';
UPDATE picto_exp SET text='médico' WHERE id_pic=7237 and lang='es-es';
UPDATE picto_exp SET text='nurse' WHERE id_pic=7500 and lang='en-us';
UPDATE picto_exp SET text='nurse' WHERE id_pic=7500 and lang='en-gb';
UPDATE picto_exp SET text='enfermera' WHERE id_pic=7500 and lang='es-es';
UPDATE picto_exp SET text='drink' WHERE id_pic=170 and lang='en-us';
UPDATE picto_exp SET text='drink' WHERE id_pic=170 and lang='en-gb';
UPDATE picto_exp SET text='beber' WHERE id_pic=170 and lang='es-es';
UPDATE picto_exp SET text='eat' WHERE id_pic=184 and lang='en-us';
UPDATE picto_exp SET text='eat' WHERE id_pic=184 and lang='en-gb';
UPDATE picto_exp SET text='comer' WHERE id_pic=184 and lang='es-es';
UPDATE picto_exp SET text='juice' WHERE id_pic=51192 and lang='en-us';
UPDATE picto_exp SET text='juice' WHERE id_pic=51192 and lang='en-gb';
UPDATE picto_exp SET text='zumo' WHERE id_pic=51192 and lang='es-es';
UPDATE picto_exp SET text='tea' WHERE id_pic=4164 and lang='en-us';
UPDATE picto_exp SET text='tea' WHERE id_pic=4164 and lang='en-gb';
UPDATE picto_exp SET text='té' WHERE id_pic=4164 and lang='es-es';
UPDATE picto_exp SET text='water' WHERE id_pic=51605 and lang='en-us';
UPDATE picto_exp SET text='water' WHERE id_pic=51605 and lang='en-gb';
UPDATE picto_exp SET text='agua' WHERE id_pic=51605 and lang='es-es';
UPDATE picto_exp SET text='milk' WHERE id_pic=52670 and lang='en-us';
UPDATE picto_exp SET text='milk' WHERE id_pic=52670 and lang='en-gb';
UPDATE picto_exp SET text='leche' WHERE id_pic=52670 and lang='es-es';
UPDATE picto_exp SET text='candy' WHERE id_pic=51518 and lang='en-us';
UPDATE picto_exp SET text='candy' WHERE id_pic=51518 and lang='en-gb';
UPDATE picto_exp SET text='gominola' WHERE id_pic=51518 and lang='es-es';
UPDATE picto_exp SET text='snack' WHERE id_pic=3699 and lang='en-us';
UPDATE picto_exp SET text='snack' WHERE id_pic=3699 and lang='en-gb';
UPDATE picto_exp SET text='snack' WHERE id_pic=3699 and lang='es-es';
UPDATE picto_exp SET text='popcorn' WHERE id_pic=52751 and lang='en-us';
UPDATE picto_exp SET text='popcorn' WHERE id_pic=52751 and lang='en-gb';
UPDATE picto_exp SET text='palomitas' WHERE id_pic=52751 and lang='es-es';
UPDATE picto_exp SET text='School' WHERE id_pic=10456 and lang='en-us';
UPDATE picto_exp SET text='School' WHERE id_pic=10456 and lang='en-gb';
UPDATE picto_exp SET text='Colegio' WHERE id_pic=10456 and lang='es-es';
UPDATE picto_exp SET text='Home' WHERE id_pic=7987 and lang='en-us';
UPDATE picto_exp SET text='Home' WHERE id_pic=7987 and lang='en-gb';
UPDATE picto_exp SET text='Casa' WHERE id_pic=7987 and lang='es-es';
UPDATE picto_exp SET text='Hospital' WHERE id_pic=7989 and lang='en-us';
UPDATE picto_exp SET text='Hospital' WHERE id_pic=7989 and lang='en-gb';
UPDATE picto_exp SET text='Hospital' WHERE id_pic=7989 and lang='es-es';
UPDATE picto_exp SET text='Playground' WHERE id_pic=8155 and lang='en-us';
UPDATE picto_exp SET text='Playground' WHERE id_pic=8155 and lang='en-gb';
UPDATE picto_exp SET text='Recreo' WHERE id_pic=8155 and lang='es-es';
UPDATE picto_exp SET text='Zoo' WHERE id_pic=8354 and lang='en-us';
UPDATE picto_exp SET text='Zoo' WHERE id_pic=8354 and lang='en-gb';
UPDATE picto_exp SET text='Zoo' WHERE id_pic=8354 and lang='es-es';
UPDATE picto_exp SET text='Beach' WHERE id_pic=7768 and lang='en-us';
UPDATE picto_exp SET text='Beach' WHERE id_pic=7768 and lang='en-gb';
UPDATE picto_exp SET text='Playa' WHERE id_pic=7768 and lang='es-es';
UPDATE picto_exp SET text='Mountain' WHERE id_pic=8087 and lang='en-us';
UPDATE picto_exp SET text='Mountain' WHERE id_pic=8087 and lang='en-gb';
UPDATE picto_exp SET text='Montaña' WHERE id_pic=8087 and lang='es-es';
UPDATE picto_exp SET text='Country' WHERE id_pic=53111 and lang='en-us';
UPDATE picto_exp SET text='Country' WHERE id_pic=53111 and lang='en-gb';
UPDATE picto_exp SET text='Campo' WHERE id_pic=53111 and lang='es-es';
UPDATE picto_exp SET text='Church' WHERE id_pic=7830 and lang='en-us';
UPDATE picto_exp SET text='Church' WHERE id_pic=7830 and lang='en-gb';
UPDATE picto_exp SET text='Iglesia' WHERE id_pic=7830 and lang='es-es';
UPDATE picto_exp SET text='Bedroom' WHERE id_pic=5250 and lang='en-us';
UPDATE picto_exp SET text='Bedroom' WHERE id_pic=5250 and lang='en-gb';
UPDATE picto_exp SET text='Dormitorio' WHERE id_pic=5250 and lang='es-es';
UPDATE picto_exp SET text='Bathroom' WHERE id_pic=50070 and lang='en-us';
UPDATE picto_exp SET text='Bathroom' WHERE id_pic=50070 and lang='en-gb';
UPDATE picto_exp SET text='Baño' WHERE id_pic=50070 and lang='es-es';
UPDATE picto_exp SET text='Living room' WHERE id_pic=11297 and lang='en-us';
UPDATE picto_exp SET text='Living room' WHERE id_pic=11297 and lang='en-gb';
UPDATE picto_exp SET text='Salón' WHERE id_pic=11297 and lang='es-es';
UPDATE picto_exp SET text='Kitchen' WHERE id_pic=8033 and lang='en-us';
UPDATE picto_exp SET text='Kitchen' WHERE id_pic=8033 and lang='en-gb';
UPDATE picto_exp SET text='Cocina' WHERE id_pic=8033 and lang='es-es';
UPDATE picto_exp SET text='Classroom' WHERE id_pic=51522 and lang='en-us';
UPDATE picto_exp SET text='Classroom' WHERE id_pic=51522 and lang='en-gb';
UPDATE picto_exp SET text='Clase' WHERE id_pic=51522 and lang='es-es';
UPDATE picto_exp SET text='Doctor s office' WHERE id_pic=52800 and lang='en-us';
UPDATE picto_exp SET text='Doctor s office' WHERE id_pic=52800 and lang='en-gb';
UPDATE picto_exp SET text='Consulta médica' WHERE id_pic=52800 and lang='es-es';
UPDATE picto_exp SET text='eraser' WHERE id_pic=49789 and lang='en-us';
UPDATE picto_exp SET text='eraser' WHERE id_pic=49789 and lang='en-gb';
UPDATE picto_exp SET text='goma' WHERE id_pic=49789 and lang='es-es';
UPDATE picto_exp SET text='pen' WHERE id_pic=1456 and lang='en-us';
UPDATE picto_exp SET text='pen' WHERE id_pic=1456 and lang='en-gb';
UPDATE picto_exp SET text='lapiz' WHERE id_pic=1456 and lang='es-es';
UPDATE picto_exp SET text='pencil sharpener' WHERE id_pic=51558 and lang='en-us';
UPDATE picto_exp SET text='pencil sharpener' WHERE id_pic=51558 and lang='en-gb';
UPDATE picto_exp SET text='sacapuntas' WHERE id_pic=51558 and lang='es-es';
UPDATE picto_exp SET text='marker' WHERE id_pic=11988 and lang='en-us';
UPDATE picto_exp SET text='marker' WHERE id_pic=11988 and lang='en-gb';
UPDATE picto_exp SET text='rotulador' WHERE id_pic=11988 and lang='es-es';
UPDATE picto_exp SET text='paper' WHERE id_pic=1453 and lang='en-us';
UPDATE picto_exp SET text='paper' WHERE id_pic=1453 and lang='en-gb';
UPDATE picto_exp SET text='papel' WHERE id_pic=1453 and lang='es-es';
UPDATE picto_exp SET text='notebook' WHERE id_pic=8460 and lang='en-us';
UPDATE picto_exp SET text='notebook' WHERE id_pic=8460 and lang='en-gb';
UPDATE picto_exp SET text='portátil' WHERE id_pic=8460 and lang='es-es';
UPDATE picto_exp SET text='book' WHERE id_pic=10908 and lang='en-us';
UPDATE picto_exp SET text='book' WHERE id_pic=10908 and lang='en-gb';
UPDATE picto_exp SET text='libro' WHERE id_pic=10908 and lang='es-es';
UPDATE picto_exp SET text='plate' WHERE id_pic=51295 and lang='en-us';
UPDATE picto_exp SET text='plate' WHERE id_pic=51295 and lang='en-gb';
UPDATE picto_exp SET text='plato' WHERE id_pic=51295 and lang='es-es';
UPDATE picto_exp SET text='glass' WHERE id_pic=5394 and lang='en-us';
UPDATE picto_exp SET text='glass' WHERE id_pic=5394 and lang='en-gb';
UPDATE picto_exp SET text='vaso' WHERE id_pic=5394 and lang='es-es';
UPDATE picto_exp SET text='fork' WHERE id_pic=5387 and lang='en-us';
UPDATE picto_exp SET text='fork' WHERE id_pic=5387 and lang='en-gb';
UPDATE picto_exp SET text='tenedor' WHERE id_pic=5387 and lang='es-es';
UPDATE picto_exp SET text='spoon' WHERE id_pic=11442 and lang='en-us';
UPDATE picto_exp SET text='spoon' WHERE id_pic=11442 and lang='en-gb';
UPDATE picto_exp SET text='cuchara' WHERE id_pic=11442 and lang='es-es';
UPDATE picto_exp SET text='knife' WHERE id_pic=11491 and lang='en-us';
UPDATE picto_exp SET text='knife' WHERE id_pic=11491 and lang='en-gb';
UPDATE picto_exp SET text='cuchillo' WHERE id_pic=11491 and lang='es-es';
UPDATE picto_exp SET text='bowl' WHERE id_pic=11257 and lang='en-us';
UPDATE picto_exp SET text='bowl' WHERE id_pic=11257 and lang='en-gb';
UPDATE picto_exp SET text='cuenco' WHERE id_pic=11257 and lang='es-es';
UPDATE picto_exp SET text='frying-pan' WHERE id_pic=5390 and lang='en-us';
UPDATE picto_exp SET text='frying-pan' WHERE id_pic=5390 and lang='en-gb';
UPDATE picto_exp SET text='sartén' WHERE id_pic=5390 and lang='es-es';
UPDATE picto_exp SET text='dishwasher' WHERE id_pic=5349 and lang='en-us';
UPDATE picto_exp SET text='dishwasher' WHERE id_pic=5349 and lang='en-gb';
UPDATE picto_exp SET text='lava-vajillas' WHERE id_pic=5349 and lang='es-es';
UPDATE picto_exp SET text='microwave' WHERE id_pic=11311 and lang='en-us';
UPDATE picto_exp SET text='microwave' WHERE id_pic=11311 and lang='en-gb';
UPDATE picto_exp SET text='microhondas' WHERE id_pic=11311 and lang='es-es';
UPDATE picto_exp SET text='toaster' WHERE id_pic=11463 and lang='en-us';
UPDATE picto_exp SET text='toaster' WHERE id_pic=11463 and lang='en-gb';
UPDATE picto_exp SET text='tostadora' WHERE id_pic=11463 and lang='es-es';
UPDATE picto_exp SET text='chair' WHERE id_pic=5293 and lang='en-us';
UPDATE picto_exp SET text='chair' WHERE id_pic=5293 and lang='en-gb';
UPDATE picto_exp SET text='silla' WHERE id_pic=5293 and lang='es-es';
UPDATE picto_exp SET text='sofa' WHERE id_pic=11437 and lang='en-us';
UPDATE picto_exp SET text='sofa' WHERE id_pic=11437 and lang='en-gb';
UPDATE picto_exp SET text='sofá' WHERE id_pic=11437 and lang='es-es';
UPDATE picto_exp SET text='table' WHERE id_pic=11454 and lang='en-us';
UPDATE picto_exp SET text='table' WHERE id_pic=11454 and lang='en-gb';
UPDATE picto_exp SET text='mesa' WHERE id_pic=11454 and lang='es-es';
UPDATE picto_exp SET text='bed' WHERE id_pic=5249 and lang='en-us';
UPDATE picto_exp SET text='bed' WHERE id_pic=5249 and lang='en-gb';
UPDATE picto_exp SET text='cama' WHERE id_pic=5249 and lang='es-es';
UPDATE picto_exp SET text='television' WHERE id_pic=11039 and lang='en-us';
UPDATE picto_exp SET text='television' WHERE id_pic=11039 and lang='en-gb';
UPDATE picto_exp SET text='televisión' WHERE id_pic=11039 and lang='es-es';
UPDATE picto_exp SET text='radio' WHERE id_pic=11387 and lang='en-us';
UPDATE picto_exp SET text='radio' WHERE id_pic=11387 and lang='en-gb';
UPDATE picto_exp SET text='radio' WHERE id_pic=11387 and lang='es-es';
UPDATE picto_exp SET text='console' WHERE id_pic=11237 and lang='en-us';
UPDATE picto_exp SET text='console' WHERE id_pic=11237 and lang='en-gb';
UPDATE picto_exp SET text='consola' WHERE id_pic=11237 and lang='es-es';
UPDATE picto_exp SET text='tablet' WHERE id_pic=49654 and lang='en-us';
UPDATE picto_exp SET text='tablet' WHERE id_pic=49654 and lang='en-gb';
UPDATE picto_exp SET text='tablet' WHERE id_pic=49654 and lang='es-es';
UPDATE picto_exp SET text='computer' WHERE id_pic=9394 and lang='en-us';
UPDATE picto_exp SET text='computer' WHERE id_pic=9394 and lang='en-gb';
UPDATE picto_exp SET text='ordenador' WHERE id_pic=9394 and lang='es-es';
UPDATE picto_exp SET text='of' WHERE id_pic=1406 and lang='en-us';
UPDATE picto_exp SET text='of' WHERE id_pic=1406 and lang='en-gb';
UPDATE picto_exp SET text='de' WHERE id_pic=1406 and lang='es-es';
UPDATE picto_exp SET text='in' WHERE id_pic=1407 and lang='en-us';
UPDATE picto_exp SET text='in' WHERE id_pic=1407 and lang='en-gb';
UPDATE picto_exp SET text='en' WHERE id_pic=1407 and lang='es-es';
UPDATE picto_exp SET text='a' WHERE id_pic=102771 and lang='en-us';
UPDATE picto_exp SET text='a' WHERE id_pic=102771 and lang='en-gb';
UPDATE picto_exp SET text='a' WHERE id_pic=102771 and lang='es-es';
UPDATE picto_exp SET text='the' WHERE id_pic=2935 and lang='en-us';
UPDATE picto_exp SET text='the' WHERE id_pic=2935 and lang='en-gb';
UPDATE picto_exp SET text='el' WHERE id_pic=2935 and lang='es-es';
UPDATE picto_exp SET text='these' WHERE id_pic=2922 and lang='en-us';
UPDATE picto_exp SET text='these' WHERE id_pic=2922 and lang='en-gb';
UPDATE picto_exp SET text='esos' WHERE id_pic=2922 and lang='es-es';
UPDATE picto_exp SET text='those' WHERE id_pic=2929 and lang='en-us';
UPDATE picto_exp SET text='those' WHERE id_pic=2929 and lang='en-gb';
UPDATE picto_exp SET text='aquellos' WHERE id_pic=2929 and lang='es-es';
UPDATE picto_exp SET text='turn on' WHERE id_pic=325 and lang='en-us';
UPDATE picto_exp SET text='turn on' WHERE id_pic=325 and lang='en-gb';
UPDATE picto_exp SET text='encender' WHERE id_pic=325 and lang='es-es';
UPDATE picto_exp SET text='turn off' WHERE id_pic=328 and lang='en-us';
UPDATE picto_exp SET text='turn off' WHERE id_pic=328 and lang='en-gb';
UPDATE picto_exp SET text='apagar' WHERE id_pic=328 and lang='es-es';
UPDATE picto_exp SET text='Body' WHERE id_pic=4724 and lang='en-us';
UPDATE picto_exp SET text='Body' WHERE id_pic=4724 and lang='en-gb';
UPDATE picto_exp SET text='Cuerpo' WHERE id_pic=4724 and lang='es-es';
UPDATE picto_exp SET text='stuff' WHERE id_pic=4491 and lang='en-us';
UPDATE picto_exp SET text='stuff' WHERE id_pic=4491 and lang='en-gb';
UPDATE picto_exp SET text='cosas' WHERE id_pic=4491 and lang='es-es';
UPDATE picto_exp SET text='Animals and plants' WHERE id_pic=51336 and lang='en-us';
UPDATE picto_exp SET text='Animals and plants' WHERE id_pic=51336 and lang='en-gb';
UPDATE picto_exp SET text='Animales y plantas' WHERE id_pic=51336 and lang='es-es';
UPDATE picto_exp SET text='cat' WHERE id_pic=1206 and lang='en-us';
UPDATE picto_exp SET text='cat' WHERE id_pic=1206 and lang='en-gb';
UPDATE picto_exp SET text='gato' WHERE id_pic=1206 and lang='es-es';
UPDATE picto_exp SET text='bird' WHERE id_pic=853 and lang='en-us';
UPDATE picto_exp SET text='bird' WHERE id_pic=853 and lang='en-gb';
UPDATE picto_exp SET text='pájaro' WHERE id_pic=853 and lang='es-es';
UPDATE picto_exp SET text='Books, TV and films' WHERE id_pic=56255 and lang='en-us';
UPDATE picto_exp SET text='Books, TV and films' WHERE id_pic=56255 and lang='en-gb';
UPDATE picto_exp SET text='Libros, TV y películas' WHERE id_pic=56255 and lang='es-es';
UPDATE picto_exp SET text='cartooms' WHERE id_pic=10921 and lang='en-us';
UPDATE picto_exp SET text='cartooms' WHERE id_pic=10921 and lang='en-gb';
UPDATE picto_exp SET text='dibujos animados' WHERE id_pic=10921 and lang='es-es';
UPDATE picto_exp SET text='TV' WHERE id_pic=10926 and lang='en-us';
UPDATE picto_exp SET text='TV' WHERE id_pic=10926 and lang='en-gb';
UPDATE picto_exp SET text='tele' WHERE id_pic=10926 and lang='es-es';
UPDATE picto_exp SET text='comic' WHERE id_pic=10927 and lang='en-us';
UPDATE picto_exp SET text='comic' WHERE id_pic=10927 and lang='en-gb';
UPDATE picto_exp SET text='tebeo' WHERE id_pic=10927 and lang='es-es';
UPDATE picto_exp SET text='Electronic devices' WHERE id_pic=52366 and lang='en-us';
UPDATE picto_exp SET text='Electronic devices' WHERE id_pic=52366 and lang='en-gb';
UPDATE picto_exp SET text='Dispositivos electrónicos' WHERE id_pic=52366 and lang='es-es';
UPDATE picto_exp SET text='I have' WHERE id_pic=2224 and lang='en-us';
UPDATE picto_exp SET text='I have' WHERE id_pic=2224 and lang='en-gb';
UPDATE picto_exp SET text='Yo tengo' WHERE id_pic=2224 and lang='es-es';
UPDATE picto_exp SET text='get' WHERE id_pic=243 and lang='en-us';
UPDATE picto_exp SET text='get' WHERE id_pic=243 and lang='en-gb';
UPDATE picto_exp SET text='coger' WHERE id_pic=243 and lang='es-es';
UPDATE picto_exp SET text='hurt' WHERE id_pic=286 and lang='en-us';
UPDATE picto_exp SET text='hurt' WHERE id_pic=286 and lang='en-gb';
UPDATE picto_exp SET text='doler' WHERE id_pic=286 and lang='es-es';
UPDATE picto_exp SET text='Adverbs and prepositions' WHERE id_pic=1379 and lang='en-us';
UPDATE picto_exp SET text='Adverbs and prepositions' WHERE id_pic=1379 and lang='en-gb';
UPDATE picto_exp SET text='Adverbios y preposiciones' WHERE id_pic=1379 and lang='es-es';
sails/roles/database/files/pictodb-data.sql
......@@ -53,835 +53,7 @@ SET foreign_key_checks=0;
--
-- Volcado de datos para la tabla `picto_core`
--
INSERT INTO `picto_core` (`id`, `id_pic`, `id_cat_pic`, `coord_x`, `coord_y`,`color`) VALUES
(1, 2982, NULL, 0, 0, NULL), -- yes
(2, 4391, NULL, 0, 1, NULL), -- no
(3, 2284, NULL, 0, 2, NULL), -- please
(4, 2237, NULL, 0, 3, NULL), -- i want
(5, 266, NULL, 0, 4, NULL), -- help
(6, 2891, NULL, 0, 5, NULL), -- sorry
(7, 2179, NULL, 0, 6, NULL), -- hello
(124, 2169,NULL, 0, 7, NULL), -- bye
(189, 2278,NULL, 0, 8, NULL), -- ok
(8, 4436, NULL, 1, 3, '#2E9AFE'), -- Pronouns
(9, 7515, NULL, 1, 4, '#008000'), -- People
(10, 10361, NULL, 1, 5, '#008000'), -- Kinship
(11, 50388, NULL, 1, 6, '#008000'), -- Professions
(125, 376, NULL, 2, 2, '#FF0000'), -- Desiring
(12, 265, NULL, 2, 3, '#FF0000'), -- Possession
(13, 22, NULL, 2, 4, '#FF0000'), -- Ingestion
(14, 4967, NULL, 2, 5, '#FF0000'), -- Senses
(126, 2640, NULL, 2, 6, '#FF0000'), -- Roles
(127, 54270, NULL, 2, 7, '#FF0000'), -- Change
(15, 50343, NULL, 2, 9, '#2E9AFE'), -- Prepositions
(16, 2049, NULL, 3, 4, '#FF00FF'), -- Colors
(17, 5866, NULL, 3, 3, '#FF00FF'), -- Sizes
(18, 4814, NULL, 3, 5, '#FF00FF'), -- Subjectives (feelings)
(19, 609, NULL, 3, 6, '#FF00FF'), -- Tastes
(185, 56262, NULL, 3, 7, '#FF00FF'), -- Aesthetics
(20, 11216, NULL, 4, 3, '#F4FA58'), -- Toys
(21, 52736, NULL, 4, 4, '#F4FA58'), -- Drinks
(22, 10087, NULL, 4, 5, '#F4FA58'), -- Food
(23, 52758, NULL, 4, 6, '#F4FA58'), -- Sweets
(128, 253, NULL, 2, 8, '#FF0000'), -- Motion
(131, 8148,NULL, 1, 2, '#FE9A2E'), -- Places
(154, 11523,NULL, 1, 1, '#FE9A2E'), -- Rooms
(155, 12303,NULL, 4, 1, '#F4FA58'), -- Clasroom items
(156, 5393, NULL, 4, 0, '#F4FA58'), -- Furniture
(157, 11368,NULL, 4, 2, '#F4FA58'), -- Kitchen items
(159, 2547,NULL, 3, 9, '#2E9AFE'), -- Articles and determinants
(190, 4724,NULL, 4, 7, '#F4FA58'), -- Body parts
(191, 50956,NULL, 4, 9, '#F4FA58'), -- Stuff
(192, 51336,NULL, 1, 7, '#008000'), -- Animals_and_plants
(193, 50956,NULL, 4, 8, '#F4FA58'), -- Stuff
(228, 56255,NULL, 3, 0, '#F4FA58'), -- Books, films and tv
(227, 56366,NULL, 4, 8, '#F4FA58'), -- Devices
(25, 676, 376, 2, 2, NULL), -- Desiring.want
(26, 292, 2640, 2, 7, NULL), -- Roles.be
(27, 277, 265, 2, 3, NULL), -- Possession.have
(28, 9907, 2640, 2, 6, NULL), -- Roles.play
(29, 485, 253, 2, 8, NULL), -- Motion.go
(30, 49839, 609, 3, 2, NULL), -- Tastes.stink
(31, 2718, 609, 3, 3, NULL), -- Tastes.spicy
(32, 3753, 609, 3, 4, NULL), -- Tastes.hot
(33, 2910, 609, 3, 5, NULL), -- Tastes.sweet
(34, 319, 609, 3, 6, NULL), -- Tastes.tasty
(35, 4077, 609, 3, 7, NULL), -- Tastes.salty
(36, 2562, 609, 3, 8, NULL), -- Tastes.bitter
(37, 2070, 2049, 3, 1, NULL), -- Colors.purple
(38, 2047, 2049, 3, 2, NULL), -- Colors.brown
(39, 2092, 2049, 3, 3, NULL), -- Colors.yellow
(40, 2043, 2049, 3, 4, NULL), -- Colors.blue
(41, 2073, 2049, 3, 5, NULL), -- Colors.red
(42, 2037, 2049, 3, 6, NULL), -- Colors.black
(43, 2090, 2049, 3, 7, NULL), -- Colors.white
(44, 2065, 2049, 3, 8, NULL), -- Colors.orange
(45, 2061, 2049, 3, 9, NULL), -- Colors.green
(46, 2093, 2049, 3, 0, NULL), -- Colors.pink
(47, 51174, 4436, 1, 2, NULL), -- Pronouns.I
(48, 7730, 4436, 1, 3, NULL), -- Pronouns.you
(49, 12499, 4436, 1, 4, NULL), -- Pronouns.he
(50, 12504, 4436, 1, 5, NULL), -- Pronouns.she
(51, 7698, 4436, 1, 6, NULL), -- Pronouns.we
(52, 54220, 4436, 1, 7, NULL), -- Pronouns.you
(53, 7669, 4436, 1, 8, NULL), -- Pronouns.they
(54, 2980, 4814, 3, 2, NULL), -- Subjectives.wrong
(55, 2844, 4814, 3, 3, NULL), -- Subjectives.good
(56, 50259, 4814, 3, 4, NULL), -- Subjectives.bad
(57, 2552, 4814, 3, 5, NULL), -- Subjectives.silly
(58, 274, 4814, 3, 6, NULL), -- Subjectives.intelligent
(59, 2604, 4814, 3, 7, NULL), -- Subjectives.crazy
(60, 2938, 56262, 3, 9, NULL), -- Aesthetics.ugly
(61, 2865, 56262, 3, 8, NULL), -- Aesthetics.beautiful
(62, 631, 4967, 2, 3, NULL), -- Senses.feel
(63, 49835, 4967, 2, 4, NULL), -- Senses.smell
(64, 493, 4967, 2, 5, NULL), -- Senses.see
(65, 333, 4967, 2, 6, NULL), -- Senses.hear
(66, 610, 4967, 2, 7, NULL), -- Senses.taste
(67, 2559, 5866, 3, 3, NULL), -- Sizes.big
(68, 2870, 5866, 3, 4, NULL), -- Sizes.small
(69, 7287, 10361, 1, 3, NULL), -- Kinship.sister
(70, 7269, 10361, 1, 4, NULL), -- Kinship.brother
(71, 49287, 10361, 1, 5, NULL), -- Kinship.dad
(72, 7476, 10361, 1, 6, NULL), -- Kinship.mom
(73, 7348, 10361, 1, 7, NULL), -- Kinship.grandma
(74, 7350, 10361, 1, 8, NULL), -- Kinship.grandpa
(75, 7265, 10361, 1, 9, NULL), -- Kinship.family
(76, 7329, 7515, 1, 2, NULL), -- People.girl
(77, 7136, 7515, 1, 3, NULL), -- People.boy
(78, 7188, 7515, 1, 4, NULL), -- People.children
(79, 7438, 7515, 1, 5, NULL), -- People.man
(80, 7710, 7515, 1, 6, NULL), -- People.woman
(81, 7118, 7515, 1, 7, NULL), -- People.baby
(82, 10389, 7515, 1, 8, NULL), -- People.friend
(83, 3977, 10087, 3, 1, NULL), -- Foods.pizza
(84, 3739, 10087, 3, 2, NULL), -- Foods.hamburger
(85, 4131, 10087, 3, 3, NULL), -- Foods.meat
(86, 4233, 10087, 3, 4, NULL), -- Foods.fish
(87, 3904, 10087, 3, 5, NULL), -- Foods.orange
(88, 3308, 10087, 3, 6, NULL), -- Foods.banana
(89, 3282, 10087, 3, 7, NULL), -- Foods.apricot
(90, 3937, 10087, 3, 8, NULL), -- Foods.pear
(91, 3261, 10087, 3, 9, NULL), -- Foods.apple
(92, 51151, 10087, 4, 0, NULL), -- Foods.coockie
(93, 4167, 10087, 4, 1, NULL), -- Foods.toast
(94, 4209, 10087, 4, 2, NULL), -- Foods.waffle
(95, 3358, 10087, 4, 3, NULL), -- Foods.bread
(96, 52781, 10087, 4, 4, NULL), -- Foods.yogurt
(97, 3464, 10087, 4, 5, NULL), -- Foods.cheese
(98, 49673, 10087, 4, 6, NULL), -- Foods.chips
(129, 3567, 10087, 4, 7, NULL), -- Foods.corn
(130, 53077, 10087, 4, 8, NULL), -- Foods.beans
(115, 50391, 10087, 2, 4, NULL), -- Food.breakfast
(116, 186, 10087, 2, 5, NULL), -- Food.lunch
(117, 49786, 10087, 2, 6, NULL), -- Food.dinner
(99, 10820, 11216, 4, 1, NULL), -- Toys.block
(100, 11059, 11216, 4, 2, NULL), -- Toys.bubbles
(101, 11080, 11216, 4, 3, NULL), -- Toys.doll
(102, 55704, 11216, 4, 4, NULL), -- Toys.game
(103, 11180, 11216, 4, 5, NULL), -- Toys.puzzle
(104, 11047, 11216, 4, 6, NULL), -- Toys.ball
(105, 11048, 11216, 4, 7, NULL), -- Toys.balloon
(106, 101441, 11216, 4, 8, NULL), -- Toys.figure_toys
(107, 11218, 11216, 4, 9, NULL), -- Toys.tower_toys
(108, 52212, 50343, 2, 9, NULL), -- Prepositions.with
(109, 50266, 50388, 1, 5, NULL), -- Professions.bus_driver
(110, 7658, 50388, 1, 6, NULL), -- Professions.teacher
(111, 7237, 50388, 1, 7, NULL), -- Professions.doctor
(112, 7500, 50388, 1, 8, NULL), -- Professions.nurse
(113, 170, 22, 2, 3, NULL), -- Ingestion.drink
(114, 184, 22, 2, 4, NULL), -- Ingestion.eat
(118, 51192, 52736, 4, 2, NULL), -- Drinks.juice
(119, 4164, 52736, 4, 3, NULL), -- Drinks.tea
(120, 51605, 52736, 4, 4, NULL), -- Drinks.water
(121, 51518, 52758, 4, 5, NULL), -- Sweets.candy
(122, 3699, 52758, 4, 6, NULL), -- Sweets.snack
(123, 52751, 52758, 4, 7, NULL), -- Sweets.popcorn
(132, 10456, 8148,1, 0, NULL), -- Places.School
(133, 7987, 8148, 1, 1, NULL), -- Places.Home
(134, 7989, 8148, 1, 2, NULL), -- Places.Hospital
(135, 8155, 8148, 1, 3, NULL), -- Places.Playground
(136, 8354, 8148, 1, 4, NULL), -- Places.Zoo
(137, 7768, 8148, 1, 5, NULL), -- Places.Beach
(138, 8087, 8148, 1, 6, NULL), -- Places.Mountain
(139, 53111, 8148, 1, 7, NULL), -- Places.Coutry
(140, 7830, 8148, 1, 8, NULL), -- Places.Church
(141, 5250, 11523,1, 2, NULL), -- Rooms.Bedroom
(142, 50070, 11523,1, 3, NULL), -- Rooms.Bathroom
(143, 11297, 11523,1, 4, NULL), -- Rooms.Living room
(144, 8033, 11523,1, 5, NULL), -- Rooms.Kitchen
(145, 51522, 11523,1, 6, NULL), -- Rooms.Classroom
(146, 52800, 11523,1, 7, NULL), -- Rooms.Doctor's office
(147, 49789, 12303,4, 1, NULL), -- Classroom.eraser
(148, 1456, 12303,4, 2, NULL), -- Classroom.pen
(149, 51558, 12303,4, 3, NULL), -- Classroom.pencil sharpener
(150, 11988, 12303,4, 5, NULL), -- Classroom.marker
(151, 1453, 12303,4, 6, NULL), -- Classroom.paper
(152, 8460, 12303,4, 7, NULL), -- Classroom.notebook
(153, 10908, 12303,4, 4, NULL), -- Classroom.book
(160, 51295, 11368, 4, 0, NULL), -- Kitchen.plate
(161, 5394, 11368, 4, 1, NULL), -- Kitchen.glass
(162, 5387, 11368, 4, 2, NULL), -- Kitchen.fork
(163, 11442, 11368, 4, 3, NULL), -- Kitchen.spoon
(164, 11491, 11368, 4, 4, NULL), -- Kitchen.knife
(165, 11257, 11368, 4, 5, NULL), -- Kitchen.bowl
(166, 5390, 11368, 4, 6, NULL), -- Kitchen.frying-pan
(167, 5349, 11368, 4, 7, NULL), -- Kitchen.dishwasher
(168, 11311, 11368, 4, 8, NULL), -- Kitchen.microwave
(169, 11463, 11368, 4, 9, NULL), -- Kitchen.toaster
(170, 5293, 5393, 4, 0, NULL), -- Furniture.chair
(171, 11437, 5393, 4, 1, NULL), -- Furniture.sofa
(172, 11454, 5393, 4, 2, NULL), -- Furniture.table
(173, 5249, 5393, 4, 3, NULL), -- Furniture.bed
(174, 11039, 56366, 4, 4, NULL), -- Devices.television
(175, 11387, 56366, 4, 5, NULL), -- Devices.radio
(176, 11237, 56366, 4, 6, NULL), -- Devices.console
(177, 49654, 56366, 4, 7, NULL), -- Devices.tablet
(178, 9394, 56366, 4, 8, NULL), -- Devices.computer
(179, 1406, 50343, 2,8, NULL), -- Prepositions.of
(180, 1407, 50343, 2,9, NULL), -- Prepositions.in
(181, 102771, 2547, 3,5, NULL), -- Articles and determinants.a
(182, 2935, 2547, 3,6, NULL), -- Articles and determinants.the
(183, 2922, 2547, 3,7, NULL), -- Articles and determinants.these
(184, 2929, 2547, 3,8, NULL), -- Articles and determinants.those
(186, 325, 54270, 2, 6, NULL), -- Change.turn on
(187, 328, 54270, 2, 7, NULL), -- Change.turn off
(188, 52670, 52736, 4, 5, NULL), -- Drinks.milk
(194, 4848,4724, 1, 2, NULL), -- Body parts.hair
(195, 4872,4724, 1, 3, NULL), -- Body parts.head
(196, 50694,4724, 1, 4, NULL), -- Body parts.eye
(197, 4787 ,4724, 1, 5, NULL), -- Body parts.ear
(198, 4933,4724, 1, 6, NULL), -- Body parts.nose
(199, 4921,4724, 1, 7, NULL), -- Body parts.mouth
(200, 5009,4724, 1, 8, NULL), -- Body parts.tooth
(201, 4752,4724, 1, 9, NULL), -- Body parts.cheek
(202, 4756,4724, 2, 1, NULL), -- Body parts.chin
(203, 4929,4724, 2, 2, NULL), -- Body parts.neck
(204, 4974,4724, 2, 3, NULL), -- Body parts.shoulder
(205, 4754,4724, 2, 4, NULL), -- Body parts.chest
(206, 4997 ,4724, 2, 5, NULL), -- Body parts.stomatch
(207, 4699,4724, 2, 6, NULL), -- Body parts.back
(208, 4739 ,4724, 2, 7, NULL), -- Body parts.bottom
(209, 4689,4724, 2, 8, NULL), -- Body parts.arm
(210, 4795,4724, 2, 9, NULL), -- Body parts.elbow
(211, 5053,4724, 3, 2, NULL), -- Body parts.wrist
(212, 4868,4724, 3, 3, NULL), -- Body parts.hand
(213, 4820,4724, 3, 4, NULL), -- Body parts.finger
(214, 4821,4724, 3, 5, NULL), -- Body parts.nail
(215, 4903,4724, 3, 6, NULL), -- Body parts.leg
(216, 4898,4724, 3, 7, NULL), -- Body parts.knee
(217, 4687,4724, 3, 8, NULL), -- Body parts.ankle
(218, 4829,4724, 3, 9, NULL), -- Body parts.foot
(219, 992,51336, 1, 7, NULL), -- Animals_and_plants.dog
(220, 1206,51336, 1, 8, NULL), -- Animals_and_plants.cat
(221, 853,51336, 1, 9, NULL), -- Animals_and_plants.bird
(222, 57236,51336, 1, 5, NULL), -- Animals_and_plants.tree
(223, 57384,51336, 1, 6, NULL), -- Animals_and_plants.plant
(224, 10921,56255, 3, 0, NULL), -- Books, TV and Films.Dibujos animados
(225, 10926,56255, 3, 1, NULL), -- Books, TV and Films.Film
(226, 10908,56255, 3, 2, NULL); -- Books, TV and Films.Book
--
-- Update wrong translations
--
UPDATE picto_exp SET text='yes' WHERE id_pic=2982 and lang='en-us';
UPDATE picto_exp SET text='yes' WHERE id_pic=2982 and lang='en-gb';
UPDATE picto_exp SET text='sí' WHERE id_pic=2982 and lang='es-es';
UPDATE picto_exp SET text='no' WHERE id_pic=4391 and lang='en-us';
UPDATE picto_exp SET text='no' WHERE id_pic=4391 and lang='en-gb';
UPDATE picto_exp SET text='no' WHERE id_pic=4391 and lang='es-es';
UPDATE picto_exp SET text='please' WHERE id_pic=2284 and lang='en-us';
UPDATE picto_exp SET text='please' WHERE id_pic=2284 and lang='en-gb';
UPDATE picto_exp SET text='por favor' WHERE id_pic=2284 and lang='es-es';
UPDATE picto_exp SET text='i want' WHERE id_pic=2237 and lang='en-us';
UPDATE picto_exp SET text='i want' WHERE id_pic=2237 and lang='en-gb';
UPDATE picto_exp SET text='quiero' WHERE id_pic=2237 and lang='es-es';
UPDATE picto_exp SET text='help' WHERE id_pic=266 and lang='en-us';
UPDATE picto_exp SET text='help' WHERE id_pic=266 and lang='en-gb';
UPDATE picto_exp SET text='ayuda' WHERE id_pic=266 and lang='es-es';
UPDATE picto_exp SET text='sorry' WHERE id_pic=2891 and lang='en-us';
UPDATE picto_exp SET text='sorry' WHERE id_pic=2891 and lang='en-gb';
UPDATE picto_exp SET text='perdón' WHERE id_pic=2891 and lang='es-es';
UPDATE picto_exp SET text='ok' WHERE id_pic=2278 and lang='en-us';
UPDATE picto_exp SET text='ok' WHERE id_pic=2278 and lang='en-gb';
UPDATE picto_exp SET text='vale' WHERE id_pic=2278 and lang='es-es';
UPDATE picto_exp SET text='hello' WHERE id_pic=2179 and lang='en-us';
UPDATE picto_exp SET text='hello' WHERE id_pic=2179 and lang='en-gb';
UPDATE picto_exp SET text='hola' WHERE id_pic=2179 and lang='es-es';
UPDATE picto_exp SET text='bye' WHERE id_pic=2169 and lang='en-us';
UPDATE picto_exp SET text='bye' WHERE id_pic=2169 and lang='en-gb';
UPDATE picto_exp SET text='adiós' WHERE id_pic=2169 and lang='es-es';
UPDATE picto_exp SET text='Pronouns' WHERE id_pic=4436 and lang='en-us';
UPDATE picto_exp SET text='Pronouns' WHERE id_pic=4436 and lang='en-gb';
UPDATE picto_exp SET text='Pronombres' WHERE id_pic=4436 and lang='es-es';
UPDATE picto_exp SET text='People ' WHERE id_pic=7515 and lang='en-us';
UPDATE picto_exp SET text='People ' WHERE id_pic=7515 and lang='en-gb';
UPDATE picto_exp SET text='Gente' WHERE id_pic=7515 and lang='es-es';
UPDATE picto_exp SET text='Kinship' WHERE id_pic=10361 and lang='en-us';
UPDATE picto_exp SET text='Kinship' WHERE id_pic=10361 and lang='en-gb';
UPDATE picto_exp SET text='Familia' WHERE id_pic=10361 and lang='es-es';
UPDATE picto_exp SET text='Professions' WHERE id_pic=50388 and lang='en-us';
UPDATE picto_exp SET text='Professions' WHERE id_pic=50388 and lang='en-gb';
UPDATE picto_exp SET text='Profesiones' WHERE id_pic=50388 and lang='es-es';
UPDATE picto_exp SET text='Desiring' WHERE id_pic=376 and lang='en-us';
UPDATE picto_exp SET text='Desiring' WHERE id_pic=376 and lang='en-gb';
UPDATE picto_exp SET text='Desear' WHERE id_pic=376 and lang='es-es';
UPDATE picto_exp SET text='Possession' WHERE id_pic=265 and lang='en-us';
UPDATE picto_exp SET text='Possession' WHERE id_pic=265 and lang='en-gb';
UPDATE picto_exp SET text='Posesión' WHERE id_pic=265 and lang='es-es';
UPDATE picto_exp SET text='Ingestion' WHERE id_pic=22 and lang='en-us';
UPDATE picto_exp SET text='Ingestion' WHERE id_pic=22 and lang='en-gb';
UPDATE picto_exp SET text='Ingerir' WHERE id_pic=22 and lang='es-es';
UPDATE picto_exp SET text='Sense' WHERE id_pic=4967 and lang='en-us';
UPDATE picto_exp SET text='Sense' WHERE id_pic=4967 and lang='en-gb';
UPDATE picto_exp SET text='Sentir' WHERE id_pic=4967 and lang='es-es';
UPDATE picto_exp SET text='Roles' WHERE id_pic=2640 and lang='en-us';
UPDATE picto_exp SET text='Roles' WHERE id_pic=2640 and lang='en-gb';
UPDATE picto_exp SET text='Roles' WHERE id_pic=2640 and lang='es-es';
UPDATE picto_exp SET text='Change' WHERE id_pic=54270 and lang='en-us';
UPDATE picto_exp SET text='Change' WHERE id_pic=54270 and lang='en-gb';
UPDATE picto_exp SET text='Cambiar' WHERE id_pic=54270 and lang='es-es';
UPDATE picto_exp SET text='Prepositions' WHERE id_pic=50343 and lang='en-us';
UPDATE picto_exp SET text='Prepositions' WHERE id_pic=50343 and lang='en-gb';
UPDATE picto_exp SET text='Preposiciones' WHERE id_pic=50343 and lang='es-es';
UPDATE picto_exp SET text='Colors' WHERE id_pic=2049 and lang='en-us';
UPDATE picto_exp SET text='Colors' WHERE id_pic=2049 and lang='en-gb';
UPDATE picto_exp SET text='Colores' WHERE id_pic=2049 and lang='es-es';
UPDATE picto_exp SET text='Sizes' WHERE id_pic=5866 and lang='en-us';
UPDATE picto_exp SET text='Sizes' WHERE id_pic=5866 and lang='en-gb';
UPDATE picto_exp SET text='Tamaños' WHERE id_pic=5866 and lang='es-es';
UPDATE picto_exp SET text='Subjectives (feelings)' WHERE id_pic=4814 and lang='en-us';
UPDATE picto_exp SET text='Subjectives (feelings)' WHERE id_pic=4814 and lang='en-gb';
UPDATE picto_exp SET text='Sentimientos' WHERE id_pic=4814 and lang='es-es';
UPDATE picto_exp SET text='Tastes' WHERE id_pic=609 and lang='en-us';
UPDATE picto_exp SET text='Tastes' WHERE id_pic=609 and lang='en-gb';
UPDATE picto_exp SET text='Gustos' WHERE id_pic=609 and lang='es-es';
UPDATE picto_exp SET text='Aesthetics' WHERE id_pic=56262 and lang='en-us';
UPDATE picto_exp SET text='Aesthetics' WHERE id_pic=56262 and lang='en-gb';
UPDATE picto_exp SET text='Apariencia' WHERE id_pic=56262 and lang='es-es';
UPDATE picto_exp SET text='Toys' WHERE id_pic=11216 and lang='en-us';
UPDATE picto_exp SET text='Toys' WHERE id_pic=11216 and lang='en-gb';
UPDATE picto_exp SET text='Juguetes' WHERE id_pic=11216 and lang='es-es';
UPDATE picto_exp SET text='Drinks' WHERE id_pic=52736 and lang='en-us';
UPDATE picto_exp SET text='Drinks' WHERE id_pic=52736 and lang='en-gb';
UPDATE picto_exp SET text='Bebidas' WHERE id_pic=52736 and lang='es-es';
UPDATE picto_exp SET text='Food' WHERE id_pic=10087 and lang='en-us';
UPDATE picto_exp SET text='Food' WHERE id_pic=10087 and lang='en-gb';
UPDATE picto_exp SET text='Comida' WHERE id_pic=10087 and lang='es-es';
UPDATE picto_exp SET text='Sweets' WHERE id_pic=52758 and lang='en-us';
UPDATE picto_exp SET text='Sweets' WHERE id_pic=52758 and lang='en-gb';
UPDATE picto_exp SET text='Dulces' WHERE id_pic=52758 and lang='es-es';
UPDATE picto_exp SET text='Motion' WHERE id_pic=253 and lang='en-us';
UPDATE picto_exp SET text='Motion' WHERE id_pic=253 and lang='en-gb';
UPDATE picto_exp SET text='Movimiento' WHERE id_pic=253 and lang='es-es';
UPDATE picto_exp SET text='Places' WHERE id_pic=8148 and lang='en-us';
UPDATE picto_exp SET text='Places' WHERE id_pic=8148 and lang='en-gb';
UPDATE picto_exp SET text='Lugares' WHERE id_pic=8148 and lang='es-es';
UPDATE picto_exp SET text='Rooms' WHERE id_pic=11523 and lang='en-us';
UPDATE picto_exp SET text='Rooms' WHERE id_pic=11523 and lang='en-gb';
UPDATE picto_exp SET text='Habitaciones' WHERE id_pic=11523 and lang='es-es';
UPDATE picto_exp SET text='Clasroom items' WHERE id_pic=12303 and lang='en-us';
UPDATE picto_exp SET text='Clasroom items' WHERE id_pic=12303 and lang='en-gb';
UPDATE picto_exp SET text='Utensilios de clase' WHERE id_pic=12303 and lang='es-es';
UPDATE picto_exp SET text='Furniture' WHERE id_pic=5393 and lang='en-us';
UPDATE picto_exp SET text='Furniture' WHERE id_pic=5393 and lang='en-gb';
UPDATE picto_exp SET text='Mobiliario' WHERE id_pic=5393 and lang='es-es';
UPDATE picto_exp SET text='Kitchen items' WHERE id_pic=11368 and lang='en-us';
UPDATE picto_exp SET text='Kitchen items' WHERE id_pic=11368 and lang='en-gb';
UPDATE picto_exp SET text='Utensilios de cocina' WHERE id_pic=11368 and lang='es-es';
UPDATE picto_exp SET text='Articles and determinants' WHERE id_pic=2547 and lang='en-us';
UPDATE picto_exp SET text='Articles and determinants' WHERE id_pic=2547 and lang='en-gb';
UPDATE picto_exp SET text='Artículos y determinantes' WHERE id_pic=2547 and lang='es-es';
UPDATE picto_exp SET text='want' WHERE id_pic=676 and lang='en-us';
UPDATE picto_exp SET text='want' WHERE id_pic=676 and lang='en-gb';
UPDATE picto_exp SET text='querer' WHERE id_pic=676 and lang='es-es';
UPDATE picto_exp SET text='be' WHERE id_pic=292 and lang='en-us';
UPDATE picto_exp SET text='be' WHERE id_pic=292 and lang='en-gb';
UPDATE picto_exp SET text='ser' WHERE id_pic=292 and lang='es-es';
UPDATE picto_exp SET text='have' WHERE id_pic=277 and lang='en-us';
UPDATE picto_exp SET text='have' WHERE id_pic=277 and lang='en-gb';
UPDATE picto_exp SET text='tener' WHERE id_pic=265 and lang='es-es';
UPDATE picto_exp SET text='play' WHERE id_pic=9907 and lang='en-us';
UPDATE picto_exp SET text='play' WHERE id_pic=9907 and lang='en-gb';
UPDATE picto_exp SET text='jugar' WHERE id_pic=9907 and lang='es-es';
UPDATE picto_exp SET text='go' WHERE id_pic=485 and lang='en-us';
UPDATE picto_exp SET text='go' WHERE id_pic=485 and lang='en-gb';
UPDATE picto_exp SET text='ir' WHERE id_pic=485 and lang='es-es';
UPDATE picto_exp SET text='stink' WHERE id_pic=49839 and lang='en-us';
UPDATE picto_exp SET text='stink' WHERE id_pic=49839 and lang='en-gb';
UPDATE picto_exp SET text='hediondo' WHERE id_pic=49839 and lang='es-es';
UPDATE picto_exp SET text='spicy' WHERE id_pic=2718 and lang='en-us';
UPDATE picto_exp SET text='spicy' WHERE id_pic=2718 and lang='en-gb';
UPDATE picto_exp SET text='picante' WHERE id_pic=2718 and lang='es-es';
UPDATE picto_exp SET text='hot' WHERE id_pic=3753 and lang='en-us';
UPDATE picto_exp SET text='hot' WHERE id_pic=3753 and lang='en-gb';
UPDATE picto_exp SET text='caliente' WHERE id_pic=3753 and lang='es-es';
UPDATE picto_exp SET text='sweet' WHERE id_pic=2910 and lang='en-us';
UPDATE picto_exp SET text='sweet' WHERE id_pic=2910 and lang='en-gb';
UPDATE picto_exp SET text='dulce' WHERE id_pic=2910 and lang='es-es';
UPDATE picto_exp SET text='tasty' WHERE id_pic=319 and lang='en-us';
UPDATE picto_exp SET text='tasty' WHERE id_pic=319 and lang='en-gb';
UPDATE picto_exp SET text='rico' WHERE id_pic=319 and lang='es-es';
UPDATE picto_exp SET text='salty' WHERE id_pic=4077 and lang='en-us';
UPDATE picto_exp SET text='salty' WHERE id_pic=4077 and lang='en-gb';
UPDATE picto_exp SET text='salado' WHERE id_pic=4077 and lang='es-es';
UPDATE picto_exp SET text='bitter' WHERE id_pic=2562 and lang='en-us';
UPDATE picto_exp SET text='bitter' WHERE id_pic=2562 and lang='en-gb';
UPDATE picto_exp SET text='amargo' WHERE id_pic=2562 and lang='es-es';
UPDATE picto_exp SET text='purple' WHERE id_pic=2070 and lang='en-us';
UPDATE picto_exp SET text='purple' WHERE id_pic=2070 and lang='en-gb';
UPDATE picto_exp SET text='púrpura' WHERE id_pic=2070 and lang='es-es';
UPDATE picto_exp SET text='brown' WHERE id_pic=2047 and lang='en-us';
UPDATE picto_exp SET text='brown' WHERE id_pic=2047 and lang='en-gb';
UPDATE picto_exp SET text='marrón' WHERE id_pic=2047 and lang='es-es';
UPDATE picto_exp SET text='yellow' WHERE id_pic=2092 and lang='en-us';
UPDATE picto_exp SET text='yellow' WHERE id_pic=2092 and lang='en-gb';
UPDATE picto_exp SET text='amarillo' WHERE id_pic=2092 and lang='es-es';
UPDATE picto_exp SET text='blue' WHERE id_pic=2043 and lang='en-us';
UPDATE picto_exp SET text='blue' WHERE id_pic=2043 and lang='en-gb';
UPDATE picto_exp SET text='azul' WHERE id_pic=2043 and lang='es-es';
UPDATE picto_exp SET text='red' WHERE id_pic=2073 and lang='en-us';
UPDATE picto_exp SET text='red' WHERE id_pic=2073 and lang='en-gb';
UPDATE picto_exp SET text='rojo' WHERE id_pic=2073 and lang='es-es';
UPDATE picto_exp SET text='black' WHERE id_pic=2037 and lang='en-us';
UPDATE picto_exp SET text='black' WHERE id_pic=2037 and lang='en-gb';
UPDATE picto_exp SET text='negro' WHERE id_pic=2037 and lang='es-es';
UPDATE picto_exp SET text='white' WHERE id_pic=2090 and lang='en-us';
UPDATE picto_exp SET text='white' WHERE id_pic=2090 and lang='en-gb';
UPDATE picto_exp SET text='blanco' WHERE id_pic=2090 and lang='es-es';
UPDATE picto_exp SET text='orange' WHERE id_pic=2065 and lang='en-us';
UPDATE picto_exp SET text='orange' WHERE id_pic=2065 and lang='en-gb';
UPDATE picto_exp SET text='naranja' WHERE id_pic=2065 and lang='es-es';
UPDATE picto_exp SET text='green' WHERE id_pic=2061 and lang='en-us';
UPDATE picto_exp SET text='green' WHERE id_pic=2061 and lang='en-gb';
UPDATE picto_exp SET text='verde' WHERE id_pic=2061 and lang='es-es';
UPDATE picto_exp SET text='pink' WHERE id_pic=2093 and lang='en-us';
UPDATE picto_exp SET text='pink' WHERE id_pic=2093 and lang='en-gb';
UPDATE picto_exp SET text='rosa' WHERE id_pic=2093 and lang='es-es';
UPDATE picto_exp SET text='I' WHERE id_pic=51174 and lang='en-us';
UPDATE picto_exp SET text='I' WHERE id_pic=51174 and lang='en-gb';
UPDATE picto_exp SET text='yo' WHERE id_pic=51174 and lang='es-es';
UPDATE picto_exp SET text='you' WHERE id_pic=7730 and lang='en-us';
UPDATE picto_exp SET text='you' WHERE id_pic=7730 and lang='en-gb';
UPDATE picto_exp SET text='tú' WHERE id_pic=7730 and lang='es-es';
UPDATE picto_exp SET text='he' WHERE id_pic=12499 and lang='en-us';
UPDATE picto_exp SET text='he' WHERE id_pic=12499 and lang='en-gb';
UPDATE picto_exp SET text='él' WHERE id_pic=12499 and lang='es-es';
UPDATE picto_exp SET text='she' WHERE id_pic=12504 and lang='en-us';
UPDATE picto_exp SET text='she' WHERE id_pic=12504 and lang='en-gb';
UPDATE picto_exp SET text='ella' WHERE id_pic=12504 and lang='es-es';
UPDATE picto_exp SET text='we' WHERE id_pic=7698 and lang='en-us';
UPDATE picto_exp SET text='we' WHERE id_pic=7698 and lang='en-gb';
UPDATE picto_exp SET text='nosotros' WHERE id_pic=7698 and lang='es-es';
UPDATE picto_exp SET text='you' WHERE id_pic=54220 and lang='en-us';
UPDATE picto_exp SET text='you' WHERE id_pic=54220 and lang='en-gb';
UPDATE picto_exp SET text='vosotros' WHERE id_pic=54220 and lang='es-es';
UPDATE picto_exp SET text='they' WHERE id_pic=7669 and lang='en-us';
UPDATE picto_exp SET text='they' WHERE id_pic=7669 and lang='en-gb';
UPDATE picto_exp SET text='ellos' WHERE id_pic=7669 and lang='es-es';
UPDATE picto_exp SET text='wrong' WHERE id_pic=2980 and lang='en-us';
UPDATE picto_exp SET text='wrong' WHERE id_pic=2980 and lang='en-gb';
UPDATE picto_exp SET text='mal' WHERE id_pic=2980 and lang='es-es';
UPDATE picto_exp SET text='good' WHERE id_pic=2844 and lang='en-us';
UPDATE picto_exp SET text='good' WHERE id_pic=2844 and lang='en-gb';
UPDATE picto_exp SET text='bien' WHERE id_pic=2844 and lang='es-es';
UPDATE picto_exp SET text='bad' WHERE id_pic=50259 and lang='en-us';
UPDATE picto_exp SET text='bad' WHERE id_pic=50259 and lang='en-gb';
UPDATE picto_exp SET text='malo' WHERE id_pic=50259 and lang='es-es';
UPDATE picto_exp SET text='silly' WHERE id_pic=2552 and lang='en-us';
UPDATE picto_exp SET text='silly' WHERE id_pic=2552 and lang='en-gb';
UPDATE picto_exp SET text='tonto' WHERE id_pic=2552 and lang='es-es';
UPDATE picto_exp SET text='intelligent' WHERE id_pic=274 and lang='en-us';
UPDATE picto_exp SET text='intelligent' WHERE id_pic=274 and lang='en-gb';
UPDATE picto_exp SET text='inteligente' WHERE id_pic=274 and lang='es-es';
UPDATE picto_exp SET text='crazy' WHERE id_pic=2604 and lang='en-us';
UPDATE picto_exp SET text='crazy' WHERE id_pic=2604 and lang='en-gb';
UPDATE picto_exp SET text='loco' WHERE id_pic=2604 and lang='es-es';
UPDATE picto_exp SET text='ugly' WHERE id_pic=2938 and lang='en-us';
UPDATE picto_exp SET text='ugly' WHERE id_pic=2938 and lang='en-gb';
UPDATE picto_exp SET text='feo' WHERE id_pic=2938 and lang='es-es';
UPDATE picto_exp SET text='beautiful' WHERE id_pic=2865 and lang='en-us';
UPDATE picto_exp SET text='beautiful' WHERE id_pic=2865 and lang='en-gb';
UPDATE picto_exp SET text='bonito' WHERE id_pic=2865 and lang='es-es';
UPDATE picto_exp SET text='feel' WHERE id_pic=631 and lang='en-us';
UPDATE picto_exp SET text='feel' WHERE id_pic=631 and lang='en-gb';
UPDATE picto_exp SET text='sentir' WHERE id_pic=631 and lang='es-es';
UPDATE picto_exp SET text='smell' WHERE id_pic=49835 and lang='en-us';
UPDATE picto_exp SET text='smell' WHERE id_pic=49835 and lang='en-gb';
UPDATE picto_exp SET text='oler' WHERE id_pic=49835 and lang='es-es';
UPDATE picto_exp SET text='see' WHERE id_pic=493 and lang='en-us';
UPDATE picto_exp SET text='see' WHERE id_pic=493 and lang='en-gb';
UPDATE picto_exp SET text='ver' WHERE id_pic=493 and lang='es-es';
UPDATE picto_exp SET text='hear' WHERE id_pic=333 and lang='en-us';
UPDATE picto_exp SET text='hear' WHERE id_pic=333 and lang='en-gb';
UPDATE picto_exp SET text='oir' WHERE id_pic=333 and lang='es-es';
UPDATE picto_exp SET text='taste' WHERE id_pic=610 and lang='en-us';
UPDATE picto_exp SET text='taste' WHERE id_pic=610 and lang='en-gb';
UPDATE picto_exp SET text='sabor' WHERE id_pic=610 and lang='es-es';
UPDATE picto_exp SET text='big' WHERE id_pic=2559 and lang='en-us';
UPDATE picto_exp SET text='big' WHERE id_pic=2559 and lang='en-gb';
UPDATE picto_exp SET text='grande' WHERE id_pic=2559 and lang='es-es';
UPDATE picto_exp SET text='small' WHERE id_pic=2870 and lang='en-us';
UPDATE picto_exp SET text='small' WHERE id_pic=2870 and lang='en-gb';
UPDATE picto_exp SET text='pequeño' WHERE id_pic=2870 and lang='es-es';
UPDATE picto_exp SET text='sister' WHERE id_pic=7287 and lang='en-us';
UPDATE picto_exp SET text='sister' WHERE id_pic=7287 and lang='en-gb';
UPDATE picto_exp SET text='hermana' WHERE id_pic=7287 and lang='es-es';
UPDATE picto_exp SET text='brother' WHERE id_pic=7269 and lang='en-us';
UPDATE picto_exp SET text='brother' WHERE id_pic=7269 and lang='en-gb';
UPDATE picto_exp SET text='hermano' WHERE id_pic=7269 and lang='es-es';
UPDATE picto_exp SET text='dad' WHERE id_pic=49287 and lang='en-us';
UPDATE picto_exp SET text='dad' WHERE id_pic=49287 and lang='en-gb';
UPDATE picto_exp SET text='papá' WHERE id_pic=49287 and lang='es-es';
UPDATE picto_exp SET text='mom' WHERE id_pic=7476 and lang='en-us';
UPDATE picto_exp SET text='mom' WHERE id_pic=7476 and lang='en-gb';
UPDATE picto_exp SET text='mamá' WHERE id_pic=7476 and lang='es-es';
UPDATE picto_exp SET text='grandpa' WHERE id_pic=7348 and lang='en-us';
UPDATE picto_exp SET text='grandpa' WHERE id_pic=7348 and lang='en-gb';
UPDATE picto_exp SET text='abuelo' WHERE id_pic=7348 and lang='es-es';
UPDATE picto_exp SET text='grandma' WHERE id_pic=7350 and lang='en-us';
UPDATE picto_exp SET text='grandma' WHERE id_pic=7350 and lang='en-gb';
UPDATE picto_exp SET text='abuela' WHERE id_pic=7350 and lang='es-es';
UPDATE picto_exp SET text='girl' WHERE id_pic=7329 and lang='en-us';
UPDATE picto_exp SET text='girl' WHERE id_pic=7329 and lang='en-gb';
UPDATE picto_exp SET text='chica' WHERE id_pic=7329 and lang='es-es';
UPDATE picto_exp SET text='boy' WHERE id_pic=7136 and lang='en-us';
UPDATE picto_exp SET text='boy' WHERE id_pic=7136 and lang='en-gb';
UPDATE picto_exp SET text='chico' WHERE id_pic=7136 and lang='es-es';
UPDATE picto_exp SET text='children' WHERE id_pic=7188 and lang='en-us';
UPDATE picto_exp SET text='children' WHERE id_pic=7188 and lang='en-gb';
UPDATE picto_exp SET text='niños' WHERE id_pic=7188 and lang='es-es';
UPDATE picto_exp SET text='man' WHERE id_pic=7438 and lang='en-us';
UPDATE picto_exp SET text='man' WHERE id_pic=7438 and lang='en-gb';
UPDATE picto_exp SET text='hombre' WHERE id_pic=7438 and lang='es-es';
UPDATE picto_exp SET text='woman' WHERE id_pic=7710 and lang='en-us';
UPDATE picto_exp SET text='woman' WHERE id_pic=7710 and lang='en-gb';
UPDATE picto_exp SET text='mujer' WHERE id_pic=7710 and lang='es-es';
UPDATE picto_exp SET text='baby' WHERE id_pic=7118 and lang='en-us';
UPDATE picto_exp SET text='baby' WHERE id_pic=7118 and lang='en-gb';
UPDATE picto_exp SET text='bebé' WHERE id_pic=7118 and lang='es-es';
UPDATE picto_exp SET text='friend' WHERE id_pic=10389 and lang='en-us';
UPDATE picto_exp SET text='friend' WHERE id_pic=10389 and lang='en-gb';
UPDATE picto_exp SET text='amigo' WHERE id_pic=10389 and lang='es-es';
UPDATE picto_exp SET text='pizza' WHERE id_pic=3977 and lang='en-us';
UPDATE picto_exp SET text='pizza' WHERE id_pic=3977 and lang='en-gb';
UPDATE picto_exp SET text='pizza' WHERE id_pic=3977 and lang='es-es';
UPDATE picto_exp SET text='hamburger' WHERE id_pic=3739 and lang='en-us';
UPDATE picto_exp SET text='hamburger' WHERE id_pic=3739 and lang='en-gb';
UPDATE picto_exp SET text='hamburgesa' WHERE id_pic=3739 and lang='es-es';
UPDATE picto_exp SET text='meat' WHERE id_pic=4131 and lang='en-us';
UPDATE picto_exp SET text='meat' WHERE id_pic=4131 and lang='en-gb';
UPDATE picto_exp SET text='carne' WHERE id_pic=4131 and lang='es-es';
UPDATE picto_exp SET text='fish' WHERE id_pic=4233 and lang='en-us';
UPDATE picto_exp SET text='fish' WHERE id_pic=4233 and lang='en-gb';
UPDATE picto_exp SET text='pescado' WHERE id_pic=4233 and lang='es-es';
UPDATE picto_exp SET text='orange' WHERE id_pic=3904 and lang='en-us';
UPDATE picto_exp SET text='orange' WHERE id_pic=3904 and lang='en-gb';
UPDATE picto_exp SET text='naranja' WHERE id_pic=3904 and lang='es-es';
UPDATE picto_exp SET text='banana' WHERE id_pic=3308 and lang='en-us';
UPDATE picto_exp SET text='banana' WHERE id_pic=3308 and lang='en-gb';
UPDATE picto_exp SET text='plátano' WHERE id_pic=3308 and lang='es-es';
UPDATE picto_exp SET text='apricot' WHERE id_pic=3282 and lang='en-us';
UPDATE picto_exp SET text='apricot' WHERE id_pic=3282 and lang='en-gb';
UPDATE picto_exp SET text='melocotón' WHERE id_pic=3282 and lang='es-es';
UPDATE picto_exp SET text='pear' WHERE id_pic=3937 and lang='en-us';
UPDATE picto_exp SET text='pear' WHERE id_pic=3937 and lang='en-gb';
UPDATE picto_exp SET text='pera' WHERE id_pic=3937 and lang='es-es';
UPDATE picto_exp SET text='apple' WHERE id_pic=3261 and lang='en-us';
UPDATE picto_exp SET text='apple' WHERE id_pic=3261 and lang='en-gb';
UPDATE picto_exp SET text='manzana' WHERE id_pic=3261 and lang='es-es';
UPDATE picto_exp SET text='coockie' WHERE id_pic=51151 and lang='en-us';
UPDATE picto_exp SET text='coockie' WHERE id_pic=51151 and lang='en-gb';
UPDATE picto_exp SET text='galleta' WHERE id_pic=51151 and lang='es-es';
UPDATE picto_exp SET text='toast' WHERE id_pic=4167 and lang='en-us';
UPDATE picto_exp SET text='toast' WHERE id_pic=4167 and lang='en-gb';
UPDATE picto_exp SET text='tostada' WHERE id_pic=4167 and lang='es-es';
UPDATE picto_exp SET text='waffle' WHERE id_pic=4209 and lang='en-us';
UPDATE picto_exp SET text='waffle' WHERE id_pic=4209 and lang='en-gb';
UPDATE picto_exp SET text='gofre' WHERE id_pic=4209 and lang='es-es';
UPDATE picto_exp SET text='bread' WHERE id_pic=3358 and lang='en-us';
UPDATE picto_exp SET text='bread' WHERE id_pic=3358 and lang='en-gb';
UPDATE picto_exp SET text='pan' WHERE id_pic=3358 and lang='es-es';
UPDATE picto_exp SET text='yogurt' WHERE id_pic=52781 and lang='en-us';
UPDATE picto_exp SET text='yogurt' WHERE id_pic=52781 and lang='en-gb';
UPDATE picto_exp SET text='yogur' WHERE id_pic=52781 and lang='es-es';
UPDATE picto_exp SET text='cheese' WHERE id_pic=3464 and lang='en-us';
UPDATE picto_exp SET text='cheese' WHERE id_pic=3464 and lang='en-gb';
UPDATE picto_exp SET text='queso' WHERE id_pic=3464 and lang='es-es';
UPDATE picto_exp SET text='chips' WHERE id_pic=49673 and lang='en-us';
UPDATE picto_exp SET text='chips' WHERE id_pic=49673 and lang='en-gb';
UPDATE picto_exp SET text='patatas' WHERE id_pic=49673 and lang='es-es';
UPDATE picto_exp SET text='corn' WHERE id_pic=3567 and lang='en-us';
UPDATE picto_exp SET text='corn' WHERE id_pic=3567 and lang='en-gb';
UPDATE picto_exp SET text='maíz' WHERE id_pic=3567 and lang='es-es';
UPDATE picto_exp SET text='beans' WHERE id_pic=53077 and lang='en-us';
UPDATE picto_exp SET text='beans' WHERE id_pic=53077 and lang='en-gb';
UPDATE picto_exp SET text='habichuelas' WHERE id_pic=53077 and lang='es-es';
UPDATE picto_exp SET text='eat' WHERE id_pic=50391 and lang='en-us';
UPDATE picto_exp SET text='eat' WHERE id_pic=50391 and lang='en-gb';
UPDATE picto_exp SET text='alimentarse' WHERE id_pic=50391 and lang='es-es';
UPDATE picto_exp SET text='lunch' WHERE id_pic=186 and lang='en-us';
UPDATE picto_exp SET text='lunch' WHERE id_pic=186 and lang='en-gb';
UPDATE picto_exp SET text='almuerzo' WHERE id_pic=186 and lang='es-es';
UPDATE picto_exp SET text='dinner' WHERE id_pic=49786 and lang='en-us';
UPDATE picto_exp SET text='dinner' WHERE id_pic=49786 and lang='en-gb';
UPDATE picto_exp SET text='cena' WHERE id_pic=49786 and lang='es-es';
UPDATE picto_exp SET text='block' WHERE id_pic=10820 and lang='en-us';
UPDATE picto_exp SET text='block' WHERE id_pic=10820 and lang='en-gb';
UPDATE picto_exp SET text='bloque' WHERE id_pic=10820 and lang='es-es';
UPDATE picto_exp SET text='bubbles' WHERE id_pic=11059 and lang='en-us';
UPDATE picto_exp SET text='bubbles' WHERE id_pic=11059 and lang='en-gb';
UPDATE picto_exp SET text='pompas' WHERE id_pic=11059 and lang='es-es';
UPDATE picto_exp SET text='doll' WHERE id_pic=11080 and lang='en-us';
UPDATE picto_exp SET text='doll' WHERE id_pic=11080 and lang='en-gb';
UPDATE picto_exp SET text='muñeco' WHERE id_pic=11080 and lang='es-es';
UPDATE picto_exp SET text='game' WHERE id_pic=55704 and lang='en-us';
UPDATE picto_exp SET text='game' WHERE id_pic=55704 and lang='en-gb';
UPDATE picto_exp SET text='juego' WHERE id_pic=55704 and lang='es-es';
UPDATE picto_exp SET text='puzzle' WHERE id_pic=11180 and lang='en-us';
UPDATE picto_exp SET text='puzzle' WHERE id_pic=11180 and lang='en-gb';
UPDATE picto_exp SET text='puzzle' WHERE id_pic=11180 and lang='es-es';
UPDATE picto_exp SET text='ball' WHERE id_pic=11047 and lang='en-us';
UPDATE picto_exp SET text='ball' WHERE id_pic=11047 and lang='en-gb';
UPDATE picto_exp SET text='pelota' WHERE id_pic=11047 and lang='es-es';
UPDATE picto_exp SET text='balloon' WHERE id_pic=11048 and lang='en-us';
UPDATE picto_exp SET text='balloon' WHERE id_pic=11048 and lang='en-gb';
UPDATE picto_exp SET text='balón' WHERE id_pic=11048 and lang='es-es';
UPDATE picto_exp SET text='figure toys' WHERE id_pic=101441 and lang='en-us';
UPDATE picto_exp SET text='figure toys' WHERE id_pic=101441 and lang='en-gb';
UPDATE picto_exp SET text='muñeco' WHERE id_pic=101441 and lang='es-es';
UPDATE picto_exp SET text='tower toys' WHERE id_pic=11218 and lang='en-us';
UPDATE picto_exp SET text='tower toys' WHERE id_pic=11218 and lang='en-gb';
UPDATE picto_exp SET text='torre' WHERE id_pic=11218 and lang='es-es';
UPDATE picto_exp SET text='with' WHERE id_pic=52212 and lang='en-us';
UPDATE picto_exp SET text='with' WHERE id_pic=52212 and lang='en-gb';
UPDATE picto_exp SET text='con' WHERE id_pic=52212 and lang='es-es';
UPDATE picto_exp SET text='bus driver' WHERE id_pic=50266 and lang='en-us';
UPDATE picto_exp SET text='bus driver' WHERE id_pic=50266 and lang='en-gb';
UPDATE picto_exp SET text='conductor de autobús' WHERE id_pic=50266 and lang='es-es';
UPDATE picto_exp SET text='teacher' WHERE id_pic=7658 and lang='en-us';
UPDATE picto_exp SET text='teacher' WHERE id_pic=7658 and lang='en-gb';
UPDATE picto_exp SET text='profesor' WHERE id_pic=7658 and lang='es-es';
UPDATE picto_exp SET text='doctor' WHERE id_pic=7237 and lang='en-us';
UPDATE picto_exp SET text='doctor' WHERE id_pic=7237 and lang='en-gb';
UPDATE picto_exp SET text='médico' WHERE id_pic=7237 and lang='es-es';
UPDATE picto_exp SET text='nurse' WHERE id_pic=7500 and lang='en-us';
UPDATE picto_exp SET text='nurse' WHERE id_pic=7500 and lang='en-gb';
UPDATE picto_exp SET text='enfermera' WHERE id_pic=7500 and lang='es-es';
UPDATE picto_exp SET text='drink' WHERE id_pic=170 and lang='en-us';
UPDATE picto_exp SET text='drink' WHERE id_pic=170 and lang='en-gb';
UPDATE picto_exp SET text='beber' WHERE id_pic=170 and lang='es-es';
UPDATE picto_exp SET text='eat' WHERE id_pic=184 and lang='en-us';
UPDATE picto_exp SET text='eat' WHERE id_pic=184 and lang='en-gb';
UPDATE picto_exp SET text='comer' WHERE id_pic=184 and lang='es-es';
UPDATE picto_exp SET text='juice' WHERE id_pic=51192 and lang='en-us';
UPDATE picto_exp SET text='juice' WHERE id_pic=51192 and lang='en-gb';
UPDATE picto_exp SET text='zumo' WHERE id_pic=51192 and lang='es-es';
UPDATE picto_exp SET text='tea' WHERE id_pic=4164 and lang='en-us';
UPDATE picto_exp SET text='tea' WHERE id_pic=4164 and lang='en-gb';
UPDATE picto_exp SET text='té' WHERE id_pic=4164 and lang='es-es';
UPDATE picto_exp SET text='water' WHERE id_pic=51605 and lang='en-us';
UPDATE picto_exp SET text='water' WHERE id_pic=51605 and lang='en-gb';
UPDATE picto_exp SET text='agua' WHERE id_pic=51605 and lang='es-es';
UPDATE picto_exp SET text='milk' WHERE id_pic=52670 and lang='en-us';
UPDATE picto_exp SET text='milk' WHERE id_pic=52670 and lang='en-gb';
UPDATE picto_exp SET text='leche' WHERE id_pic=52670 and lang='es-es';
UPDATE picto_exp SET text='candy' WHERE id_pic=51518 and lang='en-us';
UPDATE picto_exp SET text='candy' WHERE id_pic=51518 and lang='en-gb';
UPDATE picto_exp SET text='gominola' WHERE id_pic=51518 and lang='es-es';
UPDATE picto_exp SET text='snack' WHERE id_pic=3699 and lang='en-us';
UPDATE picto_exp SET text='snack' WHERE id_pic=3699 and lang='en-gb';
UPDATE picto_exp SET text='snack' WHERE id_pic=3699 and lang='es-es';
UPDATE picto_exp SET text='popcorn' WHERE id_pic=52751 and lang='en-us';
UPDATE picto_exp SET text='popcorn' WHERE id_pic=52751 and lang='en-gb';
UPDATE picto_exp SET text='palomitas' WHERE id_pic=52751 and lang='es-es';
UPDATE picto_exp SET text='School' WHERE id_pic=10456 and lang='en-us';
UPDATE picto_exp SET text='School' WHERE id_pic=10456 and lang='en-gb';
UPDATE picto_exp SET text='Colegio' WHERE id_pic=10456 and lang='es-es';
UPDATE picto_exp SET text='Home' WHERE id_pic=7987 and lang='en-us';
UPDATE picto_exp SET text='Home' WHERE id_pic=7987 and lang='en-gb';
UPDATE picto_exp SET text='Casa' WHERE id_pic=7987 and lang='es-es';
UPDATE picto_exp SET text='Hospital' WHERE id_pic=7989 and lang='en-us';
UPDATE picto_exp SET text='Hospital' WHERE id_pic=7989 and lang='en-gb';
UPDATE picto_exp SET text='Hospital' WHERE id_pic=7989 and lang='es-es';
UPDATE picto_exp SET text='Playground' WHERE id_pic=8155 and lang='en-us';
UPDATE picto_exp SET text='Playground' WHERE id_pic=8155 and lang='en-gb';
UPDATE picto_exp SET text='Recreo' WHERE id_pic=8155 and lang='es-es';
UPDATE picto_exp SET text='Zoo' WHERE id_pic=8354 and lang='en-us';
UPDATE picto_exp SET text='Zoo' WHERE id_pic=8354 and lang='en-gb';
UPDATE picto_exp SET text='Zoo' WHERE id_pic=8354 and lang='es-es';
UPDATE picto_exp SET text='Beach' WHERE id_pic=7768 and lang='en-us';
UPDATE picto_exp SET text='Beach' WHERE id_pic=7768 and lang='en-gb';
UPDATE picto_exp SET text='Playa' WHERE id_pic=7768 and lang='es-es';
UPDATE picto_exp SET text='Mountain' WHERE id_pic=8087 and lang='en-us';
UPDATE picto_exp SET text='Mountain' WHERE id_pic=8087 and lang='en-gb';
UPDATE picto_exp SET text='Montaña' WHERE id_pic=8087 and lang='es-es';
UPDATE picto_exp SET text='Country' WHERE id_pic=53111 and lang='en-us';
UPDATE picto_exp SET text='Country' WHERE id_pic=53111 and lang='en-gb';
UPDATE picto_exp SET text='Campo' WHERE id_pic=53111 and lang='es-es';
UPDATE picto_exp SET text='Church' WHERE id_pic=7830 and lang='en-us';
UPDATE picto_exp SET text='Church' WHERE id_pic=7830 and lang='en-gb';
UPDATE picto_exp SET text='Iglesia' WHERE id_pic=7830 and lang='es-es';
UPDATE picto_exp SET text='Bedroom' WHERE id_pic=5250 and lang='en-us';
UPDATE picto_exp SET text='Bedroom' WHERE id_pic=5250 and lang='en-gb';
UPDATE picto_exp SET text='Dormitorio' WHERE id_pic=5250 and lang='es-es';
UPDATE picto_exp SET text='Bathroom' WHERE id_pic=50070 and lang='en-us';
UPDATE picto_exp SET text='Bathroom' WHERE id_pic=50070 and lang='en-gb';
UPDATE picto_exp SET text='Baño' WHERE id_pic=50070 and lang='es-es';
UPDATE picto_exp SET text='Living room' WHERE id_pic=11297 and lang='en-us';
UPDATE picto_exp SET text='Living room' WHERE id_pic=11297 and lang='en-gb';
UPDATE picto_exp SET text='Salón' WHERE id_pic=11297 and lang='es-es';
UPDATE picto_exp SET text='Kitchen' WHERE id_pic=8033 and lang='en-us';
UPDATE picto_exp SET text='Kitchen' WHERE id_pic=8033 and lang='en-gb';
UPDATE picto_exp SET text='Cocina' WHERE id_pic=8033 and lang='es-es';
UPDATE picto_exp SET text='Classroom' WHERE id_pic=51522 and lang='en-us';
UPDATE picto_exp SET text='Classroom' WHERE id_pic=51522 and lang='en-gb';
UPDATE picto_exp SET text='Clase' WHERE id_pic=51522 and lang='es-es';
UPDATE picto_exp SET text='Doctor s office' WHERE id_pic=52800 and lang='en-us';
UPDATE picto_exp SET text='Doctor s office' WHERE id_pic=52800 and lang='en-gb';
UPDATE picto_exp SET text='Consulta médica' WHERE id_pic=52800 and lang='es-es';
UPDATE picto_exp SET text='eraser' WHERE id_pic=49789 and lang='en-us';
UPDATE picto_exp SET text='eraser' WHERE id_pic=49789 and lang='en-gb';
UPDATE picto_exp SET text='goma' WHERE id_pic=49789 and lang='es-es';
UPDATE picto_exp SET text='pen' WHERE id_pic=1456 and lang='en-us';
UPDATE picto_exp SET text='pen' WHERE id_pic=1456 and lang='en-gb';
UPDATE picto_exp SET text='lapiz' WHERE id_pic=1456 and lang='es-es';
UPDATE picto_exp SET text='pencil sharpener' WHERE id_pic=51558 and lang='en-us';
UPDATE picto_exp SET text='pencil sharpener' WHERE id_pic=51558 and lang='en-gb';
UPDATE picto_exp SET text='sacapuntas' WHERE id_pic=51558 and lang='es-es';
UPDATE picto_exp SET text='marker' WHERE id_pic=11988 and lang='en-us';
UPDATE picto_exp SET text='marker' WHERE id_pic=11988 and lang='en-gb';
UPDATE picto_exp SET text='rotulador' WHERE id_pic=11988 and lang='es-es';
UPDATE picto_exp SET text='paper' WHERE id_pic=1453 and lang='en-us';
UPDATE picto_exp SET text='paper' WHERE id_pic=1453 and lang='en-gb';
UPDATE picto_exp SET text='papel' WHERE id_pic=1453 and lang='es-es';
UPDATE picto_exp SET text='notebook' WHERE id_pic=8460 and lang='en-us';
UPDATE picto_exp SET text='notebook' WHERE id_pic=8460 and lang='en-gb';
UPDATE picto_exp SET text='portátil' WHERE id_pic=8460 and lang='es-es';
UPDATE picto_exp SET text='book' WHERE id_pic=10908 and lang='en-us';
UPDATE picto_exp SET text='book' WHERE id_pic=10908 and lang='en-gb';
UPDATE picto_exp SET text='libro' WHERE id_pic=10908 and lang='es-es';
UPDATE picto_exp SET text='plate' WHERE id_pic=51295 and lang='en-us';
UPDATE picto_exp SET text='plate' WHERE id_pic=51295 and lang='en-gb';
UPDATE picto_exp SET text='plato' WHERE id_pic=51295 and lang='es-es';
UPDATE picto_exp SET text='glass' WHERE id_pic=5394 and lang='en-us';
UPDATE picto_exp SET text='glass' WHERE id_pic=5394 and lang='en-gb';
UPDATE picto_exp SET text='vaso' WHERE id_pic=5394 and lang='es-es';
UPDATE picto_exp SET text='fork' WHERE id_pic=5387 and lang='en-us';
UPDATE picto_exp SET text='fork' WHERE id_pic=5387 and lang='en-gb';
UPDATE picto_exp SET text='tenedor' WHERE id_pic=5387 and lang='es-es';
UPDATE picto_exp SET text='spoon' WHERE id_pic=11442 and lang='en-us';
UPDATE picto_exp SET text='spoon' WHERE id_pic=11442 and lang='en-gb';
UPDATE picto_exp SET text='cuchara' WHERE id_pic=11442 and lang='es-es';
UPDATE picto_exp SET text='knife' WHERE id_pic=11491 and lang='en-us';
UPDATE picto_exp SET text='knife' WHERE id_pic=11491 and lang='en-gb';
UPDATE picto_exp SET text='cuchillo' WHERE id_pic=11491 and lang='es-es';
UPDATE picto_exp SET text='bowl' WHERE id_pic=11257 and lang='en-us';
UPDATE picto_exp SET text='bowl' WHERE id_pic=11257 and lang='en-gb';
UPDATE picto_exp SET text='cuenco' WHERE id_pic=11257 and lang='es-es';
UPDATE picto_exp SET text='frying-pan' WHERE id_pic=5390 and lang='en-us';
UPDATE picto_exp SET text='frying-pan' WHERE id_pic=5390 and lang='en-gb';
UPDATE picto_exp SET text='sartén' WHERE id_pic=5390 and lang='es-es';
UPDATE picto_exp SET text='dishwasher' WHERE id_pic=5349 and lang='en-us';
UPDATE picto_exp SET text='dishwasher' WHERE id_pic=5349 and lang='en-gb';
UPDATE picto_exp SET text='lava-vajillas' WHERE id_pic=5349 and lang='es-es';
UPDATE picto_exp SET text='microwave' WHERE id_pic=11311 and lang='en-us';
UPDATE picto_exp SET text='microwave' WHERE id_pic=11311 and lang='en-gb';
UPDATE picto_exp SET text='microhondas' WHERE id_pic=11311 and lang='es-es';
UPDATE picto_exp SET text='toaster' WHERE id_pic=11463 and lang='en-us';
UPDATE picto_exp SET text='toaster' WHERE id_pic=11463 and lang='en-gb';
UPDATE picto_exp SET text='tostadora' WHERE id_pic=11463 and lang='es-es';
UPDATE picto_exp SET text='chair' WHERE id_pic=5293 and lang='en-us';
UPDATE picto_exp SET text='chair' WHERE id_pic=5293 and lang='en-gb';
UPDATE picto_exp SET text='silla' WHERE id_pic=5293 and lang='es-es';
UPDATE picto_exp SET text='sofa' WHERE id_pic=11437 and lang='en-us';
UPDATE picto_exp SET text='sofa' WHERE id_pic=11437 and lang='en-gb';
UPDATE picto_exp SET text='sofá' WHERE id_pic=11437 and lang='es-es';
UPDATE picto_exp SET text='table' WHERE id_pic=11454 and lang='en-us';
UPDATE picto_exp SET text='table' WHERE id_pic=11454 and lang='en-gb';
UPDATE picto_exp SET text='mesa' WHERE id_pic=11454 and lang='es-es';
UPDATE picto_exp SET text='bed' WHERE id_pic=5249 and lang='en-us';
UPDATE picto_exp SET text='bed' WHERE id_pic=5249 and lang='en-gb';
UPDATE picto_exp SET text='cama' WHERE id_pic=5249 and lang='es-es';
UPDATE picto_exp SET text='television' WHERE id_pic=11039 and lang='en-us';
UPDATE picto_exp SET text='television' WHERE id_pic=11039 and lang='en-gb';
UPDATE picto_exp SET text='televisión' WHERE id_pic=11039 and lang='es-es';
UPDATE picto_exp SET text='radio' WHERE id_pic=11387 and lang='en-us';
UPDATE picto_exp SET text='radio' WHERE id_pic=11387 and lang='en-gb';
UPDATE picto_exp SET text='radio' WHERE id_pic=11387 and lang='es-es';
UPDATE picto_exp SET text='console' WHERE id_pic=11237 and lang='en-us';
UPDATE picto_exp SET text='console' WHERE id_pic=11237 and lang='en-gb';
UPDATE picto_exp SET text='consola' WHERE id_pic=11237 and lang='es-es';
UPDATE picto_exp SET text='tablet' WHERE id_pic=49654 and lang='en-us';
UPDATE picto_exp SET text='tablet' WHERE id_pic=49654 and lang='en-gb';
UPDATE picto_exp SET text='tablet' WHERE id_pic=49654 and lang='es-es';
UPDATE picto_exp SET text='computer' WHERE id_pic=9394 and lang='en-us';
UPDATE picto_exp SET text='computer' WHERE id_pic=9394 and lang='en-gb';
UPDATE picto_exp SET text='ordenador' WHERE id_pic=9394 and lang='es-es';
UPDATE picto_exp SET text='of' WHERE id_pic=1406 and lang='en-us';
UPDATE picto_exp SET text='of' WHERE id_pic=1406 and lang='en-gb';
UPDATE picto_exp SET text='de' WHERE id_pic=1406 and lang='es-es';
UPDATE picto_exp SET text='in' WHERE id_pic=1407 and lang='en-us';
UPDATE picto_exp SET text='in' WHERE id_pic=1407 and lang='en-gb';
UPDATE picto_exp SET text='en' WHERE id_pic=1407 and lang='es-es';
UPDATE picto_exp SET text='a' WHERE id_pic=102771 and lang='en-us';
UPDATE picto_exp SET text='a' WHERE id_pic=102771 and lang='en-gb';
UPDATE picto_exp SET text='a' WHERE id_pic=102771 and lang='es-es';
UPDATE picto_exp SET text='the' WHERE id_pic=2935 and lang='en-us';
UPDATE picto_exp SET text='the' WHERE id_pic=2935 and lang='en-gb';
UPDATE picto_exp SET text='el' WHERE id_pic=2935 and lang='es-es';
UPDATE picto_exp SET text='these' WHERE id_pic=2922 and lang='en-us';
UPDATE picto_exp SET text='these' WHERE id_pic=2922 and lang='en-gb';
UPDATE picto_exp SET text='esos' WHERE id_pic=2922 and lang='es-es';
UPDATE picto_exp SET text='those' WHERE id_pic=2929 and lang='en-us';
UPDATE picto_exp SET text='those' WHERE id_pic=2929 and lang='en-gb';
UPDATE picto_exp SET text='aquellos' WHERE id_pic=2929 and lang='es-es';
UPDATE picto_exp SET text='turn on' WHERE id_pic=325 and lang='en-us';
UPDATE picto_exp SET text='turn on' WHERE id_pic=325 and lang='en-gb';
UPDATE picto_exp SET text='encender' WHERE id_pic=325 and lang='es-es';
UPDATE picto_exp SET text='turn off' WHERE id_pic=328 and lang='en-us';
UPDATE picto_exp SET text='turn off' WHERE id_pic=328 and lang='en-gb';
UPDATE picto_exp SET text='apagar' WHERE id_pic=328 and lang='es-es';
UPDATE picto_exp SET text='Body' WHERE id_pic=4724 and lang='en-us';
UPDATE picto_exp SET text='Body' WHERE id_pic=4724 and lang='en-gb';
UPDATE picto_exp SET text='Cuerpo' WHERE id_pic=4724 and lang='es-es';
UPDATE picto_exp SET text='Stuff' WHERE id_pic=50956 and lang='en-us';
UPDATE picto_exp SET text='Stuff' WHERE id_pic=50956 and lang='en-gb';
UPDATE picto_exp SET text='Cosas' WHERE id_pic=50956 and lang='es-es';
UPDATE picto_exp SET text='stuff' WHERE id_pic=4491 and lang='en-us';
UPDATE picto_exp SET text='stuff' WHERE id_pic=4491 and lang='en-gb';
UPDATE picto_exp SET text='cosas' WHERE id_pic=4491 and lang='es-es';
UPDATE picto_exp SET text='Animals and plants' WHERE id_pic=51336 and lang='en-us';
UPDATE picto_exp SET text='Animals and plants' WHERE id_pic=51336 and lang='en-gb';
UPDATE picto_exp SET text='Animales y plantas' WHERE id_pic=51336 and lang='es-es';
UPDATE picto_exp SET text='cat' WHERE id_pic=1206 and lang='en-us';
UPDATE picto_exp SET text='cat' WHERE id_pic=1206 and lang='en-gb';
UPDATE picto_exp SET text='gato' WHERE id_pic=1206 and lang='es-es';
UPDATE picto_exp SET text='bird' WHERE id_pic=853 and lang='en-us';
UPDATE picto_exp SET text='bird' WHERE id_pic=853 and lang='en-gb';
UPDATE picto_exp SET text='pájaro' WHERE id_pic=853 and lang='es-es';
UPDATE picto_exp SET text='Books, TV and films' WHERE id_pic=56255 and lang='en-us';
UPDATE picto_exp SET text='Books, TV and films' WHERE id_pic=56255 and lang='en-gb';
UPDATE picto_exp SET text='Libros, TV y películas' WHERE id_pic=56255 and lang='es-es';
UPDATE picto_exp SET text='cartooms' WHERE id_pic=10921 and lang='en-us';
UPDATE picto_exp SET text='cartooms' WHERE id_pic=10921 and lang='en-gb';
UPDATE picto_exp SET text='dibujos animados' WHERE id_pic=10921 and lang='es-es';
UPDATE picto_exp SET text='TV' WHERE id_pic=10926 and lang='en-us';
UPDATE picto_exp SET text='TV' WHERE id_pic=10926 and lang='en-gb';
UPDATE picto_exp SET text='tele' WHERE id_pic=10926 and lang='es-es';
UPDATE picto_exp SET text='book' WHERE id_pic=10908 and lang='en-us';
UPDATE picto_exp SET text='book' WHERE id_pic=10908 and lang='en-gb';
UPDATE picto_exp SET text='libro' WHERE id_pic=10908 and lang='es-es';
UPDATE picto_exp SET text='Electronic devices' WHERE id_pic=56366 and lang='en-us';
UPDATE picto_exp SET text='Dispositivos electrónicos' WHERE id_pic=56366 and lang='en-gb';
UPDATE picto_exp SET text='Dispositivos electrónicos' WHERE id_pic=56366 and lang='es-es';
source pictodb-data-core.sql
source pictodb-data-coreexp.sql
SET foreign_key_checks=1;
sails/roles/mysql/tasks/main.yml
---
- name: Update apt-get cache
apt:
update-cache: yes
when: ansible_distribution == 'Debian' or ansible_distribution == 'Ubuntu'
- name: Set MySQL root password before installing
debconf: name='mysql-server' question='mysql-server/root_password' value='{{database_root_passwd | quote}}' vtype='password'
- name: Install mysql packages
apt:
name: "{{ item }}"
state: present
with_items:
- mysql-server
- mysql-client
- python-mysqldb # required by ansible
when: ansible_distribution == 'Debian' or ansible_distribution == 'Ubuntu'
- name: Confirm MySQL root password before installing
debconf: name='mysql-server' question='mysql-server/root_password_again' value='{{database_root_passwd | quote}}' vtype='password'
- name: Install mysql packages
yum:
name: "{{ item }}"
state: present
- name: Install MySQL
apt: package={{ item }} state=installed force=yes update_cache=yes cache_valid_time=3600
when: ansible_os_family == 'Debian'
with_items:
- mysql-server
- MySQL-python # required by ansible
when: ansible_distribution == 'CentOS' or ansible_distribution == 'Amazon'
- mysql-client
- python-mysqldb
- name: Enable and start mysql service
service:
name: mysql
state: restarted
enabled: yes
when: ansible_distribution == 'Debian' or ansible_distribution == 'Ubuntu'
- name: Enable and start mysql service
service:
name: mysqld
state: restarted
enabled: yes
when: ansible_distribution == 'CentOS' or ansible_distribution == 'Amazon'
- name: Deletes anonymous MySQL server user for localhost
mysql_user: user="" state="absent" login_password='{{ database_root_passwd }}' login_user=root
- name: Set mysql root password
debconf:
name: mysql-server
question: "mysql-server/{{ item }}"
value: "{{ database_root_passwd | quote }}"
vtype: password
- name: Secures the MySQL root user
mysql_user: user="root" password="{{ database_root_passwd }}" host="{{ item }}" login_password="{{database_root_passwd}}" login_user=root
with_items:
- root_password
- root_password_again
when: ansible_distribution == 'Debian' or ansible_distribution == 'Ubuntu'
- name: Reading temporary password
command: bash -c "cat /var/log/mysqld.log | grep \"temporary password\" | sed \"s/.* \\+//g\""
register: tmp_mysql_password
when: ansible_distribution == 'CentOS' or ansible_distribution == 'Amazon'
- 127.0.0.1
- localhost
- ::1
- "{{ ansible_fqdn }}"
- name: Set mysql root password
shell: "/usr/bin/mysqladmin -u root -p\"{{ tmp_mysql_password.stdout }}\" password \"{{ database_root_passwd | quote }}\""
ignore_errors: yes
when: ansible_distribution == 'CentOS' or ansible_distribution == 'Amazon'
- name: Removes the MySQL test database
mysql_db: db=test state=absent login_password="{{ database_root_passwd }}" login_user=root
sails/roles/nodejs/tasks/main.yml
......@@ -21,6 +21,7 @@
- deb
- deb-src
when: ansible_distribution == 'Debian' or ansible_distribution == 'Ubuntu'
- name: Add Nodesource repositories
yum:
name: "https://rpm.nodesource.com/pub_{{ nodejs_major_version }}.x/el/{{ ansible_distribution_major_version }}/{{ ansible_architecture }}/nodesource-release-el{{ ansible_distribution_major_version }}-1.noarch.rpm"
......@@ -37,6 +38,7 @@
name: nodejs
state: present
when: ansible_distribution == 'Debian' or ansible_distribution == 'Ubuntu'
- name: Install NodeJS
yum:
name: nodejs
......
sails/src/api/controllers/SupervisorController.js
......@@ -95,6 +95,8 @@ module.exports = {
if (!supervisor.isSupAdmin && !stuSup)
throw new Error("User without students linked to");
return res.ok({
user: supervisor,
server_time: (new Date()).getTime(),
......@@ -405,6 +407,11 @@ module.exports = {
var students = [];
async.each(stuSups,
function(stuSup, cb) {
// Filter logically deleted students
if (stuSup.student.office == null)
cb();
var student = stuSup.student;
student.supervision = req.token.office ? 2 : 1;
VStuLastInstruction.findOne({student: student.id})
......
sails/src/api/models/StuPicto.js
......@@ -86,7 +86,9 @@ module.exports = {
status: 'invisible',
highlight: false,
color: null,
expression: null
expression: null,
legend: null,
legend_size: 'small'
};
if (typeof attributes === 'object') {
......@@ -117,6 +119,15 @@ module.exports = {
if (!((/^(invisible|enabled|disabled)$/).test(validAttributes.status))) {
delete validAttributes.status;
}
if (typeof validAttributes.expression !== 'string') {
delete validAttributes.expression;
}
if (typeof validAttributes.legend !== 'boolean') {
delete validAttributes.legend;
}
if (!((/^(small|large)$/).test(validAttributes.legend_size))) {
delete validAttributes.legend_size;
}
if (typeof validAttributes.highlight !== 'boolean') {
delete validAttributes.highlight;
}
......@@ -137,7 +148,7 @@ module.exports = {
*/
beforeCreate: function (attrs, next) {
if (typeof attrs.attributes !== 'object') {
attrs.attributes = JSON.parse(attrs.attributes);
attrs.attributes = JSON.parse(attrs.attributes);
}
attrs.attributes = StuPicto.getValidAttributes(attrs.attributes);
next();
......
sails/src/api/models/Student.js
......@@ -169,6 +169,7 @@ module.exports = {
},
legend: false,
legend_size: 'normal',
pic: "defaultAvatar.jpg",
size: 'normal',
picto_background: '#0000ff',
tape_background: '#00ffff',
......@@ -194,6 +195,9 @@ module.exports = {
}
});
}
if (typeof validAttributes.pic !== 'string') {
delete validAttributes.pic;
}
if (typeof validAttributes.input_selection !== 'object') {
delete validAttributes.input_selection;
} else {
......@@ -504,7 +508,6 @@ module.exports = {
if (err || !student)
throw err;
// set office to NULL to unlink it
student.office = null;
student.save(function(err, saved) {
if (err) return cb(err);
......
sails/src/assets/app/i18n/en-gb.json
......@@ -250,6 +250,7 @@
"state_spontaneous": "Spontaneous",
"state_supervised": "Supervised",
"student_added": "Student added",
"student_already_exists": "A student with that username already exists, please try with another one",
"student_deleted": "Student deleted",
"student_not_added": "Student not added",
"student_not_deleted": "Student not deleted",
......
sails/src/assets/app/i18n/es-es.json
......@@ -251,6 +251,7 @@
"state_spontaneous": "Espontáneo",
"state_supervised": "Guiado",
"student_added": "Estudiante añadido",
"student_already_exists": "Ya existe un estudiante con ese nombre de usuario. Por favor, inténtelo de nuevo con algo diferente.",
"student_deleted": "Estudiante eliminado",
"student_not_added": "Estudiante no añadido",
"student_not_deleted": "No se ha podido eliminar el estudiante",
......
sails/src/assets/scripts/modules/student/controllers/collections.js
......@@ -57,7 +57,7 @@ dashboardControllers.controller('StudentCollectionsCtrl', function StudentCollec
$scope.isCategory = function (studentPicto) {
return studentPicto.attributes.id_cat === null &&
studentPicto.attributes.coord_x !== 0 &&
studentPicto.attributes.coord_y !== 0 &&
typeof studentPicto.attributes.free_category_coord_x !== 'number' &&
typeof studentPicto.attributes.free_category_coord_y !== 'number';
};
......
sails/src/assets/scripts/modules/student/views/collections.html
......@@ -37,6 +37,7 @@
popover-trigger="mouseenter"
ng-init="colIndex = $index"
ng-repeat="studentPicto in studentPictoRow track by $index">
<div class="picto-description"> {{ studentData.attributes.legend?studentPicto.expression.text:'' }} </div>
<img
src="/app/img/redcross.png"
class="disabled"
......@@ -108,6 +109,7 @@
ng-repeat="studentPicto in studentPictoRow track by $index"
popover="{{studentPicto.attributes.expression==null ? studentPicto.expression.text : studentPicto.attributes.expression}}"
popover-trigger="mouseenter">
<div class="picto-description"> {{ studentData.attributes.legend?studentPicto.expression.text:'' }} </div>
<img
src="/app/img/redcross.png"
class="disabled"
......@@ -167,6 +169,7 @@
popover-trigger="mouseenter"
ng-init="colIndex = $index"
ng-repeat="studentPicto in studentPictoRow track by $index">
<div class="picto-description"> {{ studentData.attributes.legend?studentPicto.expression.text:'' }} </div>
<img
src="/app/img/redcross.png"
class="disabled"
......
sails/src/assets/scripts/modules/student/views/pictoconfig.html
......@@ -6,7 +6,7 @@
<h4 class="modal-title" id="myModalLabel" translate>pictogram_setup</h4>
</div>
<div class="modal-body">
<ul class="list-group">
<li class="list-group-item">
<p translate>expression</p>
......@@ -25,16 +25,21 @@
<!--
<li class="list-group-item">
<div class="checkbox">
<label><input data-toggle="toggle" type="checkbox" ng-model="studentPicto.attributes.magnify" ng-change="update_properties()"> Aumentado</label>
<label><input data-toggle="toggle" type="checkbox" ng-model="studentPicto.attributes.magnify" ng-change="update_properties()"> Aumentado</label>
</div>
</li>
-->
<li class="list-group-item">
<!-- <li class="list-group-item">
<div class="checkbox">
<label><input data-toggle="toggle" type="checkbox" ng-model="studentPicto.attributes.highlight" ng-change="update_properties()" translate> highlighted</label>
<label><input data-toggle="toggle" type="checkbox" ng-model="studentPicto.attributes.highlight" ng-change="update_properties()" translate> highlighted</label>
</div>
</li>
-->
<li class="list-group-item">
<div class="checkbox">
<input data-toggle="toggle" type="checkbox" ng-model="studentPicto.attributes.legend" ng-change="update_properties()"><label translate>legend</label>
</div>
</ul>
</div>
<!-- End modal-body -->
</div>
\ No newline at end of file
</div>
sails/src/assets/scripts/modules/student/views/setup.html
......@@ -22,10 +22,11 @@
<input type="username" class="form-control" id="setup_username" placeholder="{{ 'username' | translate }}" required ng-model="formUser.username" readonly/>
</div>
<div class="form-group">
<input type="password" class="form-control" id="setup_password1" placeholder="{{ 'password_new_type' | translate }}" ng-model="formUser.password" />
<input style="display:none" type="password" name="fakepasswordremembered"/>
<input type="password" class="form-control" id="setup_password1" placeholder="{{ 'password_new_type' | translate }}" ng-model="formUser.password"/>
</div>
<div class="form-group">
<input type="password" class="form-control" id="setup_password2" placeholder="{{ 'password_confirm' | translate }}" ng-model="formUser.password_confirm" />
<input type="password" class="form-control" id="setup_password2" placeholder="{{ 'password_confirm' | translate }}" ng-model="formUser.password_confirm"/>
</div>
<legend translate>personal_data</legend>
<div class="form-group">
......
sails/src/assets/scripts/modules/supervisor/controllers/students.js
......@@ -24,7 +24,7 @@ dashboardControllers.controller('StudentsCtrl', function StudentsCtrl(
gender: 'F',
lang: 'es-es',
notes: '',
pic: '/app/img/default.jpg',
pic: 'defaultAvatar.jpg',
office: $scope.user.office || { name: '' }
};
......@@ -121,7 +121,7 @@ dashboardControllers.controller('StudentsCtrl', function StudentsCtrl(
// between the new element created and the form fields
$scope.resetForm();
// Show the add form to new adding
// Hide the add form to new adding
$scope.hidestudentadd = true;
// Update counters
......@@ -130,14 +130,17 @@ dashboardControllers.controller('StudentsCtrl', function StudentsCtrl(
})
.error(function (err) {
var errorMessage = 'student_not_added';
console.log(err);
if (typeof err == "string" && err.search("Maximum number of enrolments reached") > 0)
errorMessage = 'max_licenses_reached';
if (typeof err == "string" && err.search("already exists") > 0)
errorMessage = 'student_already_exists';
else if (err && err.status === 400)
errorMessage = 'invalid_fields';
ngToast.danger({ content: $translate.instant(errorMessage) });
$scope.hidestudentadd = true;
});
};
......
sails/src/assets/scripts/modules/supervisor/views/setup.html
......@@ -42,6 +42,7 @@
<fieldset>
<legend translate>change_password</legend>
<div class="form-group">
<input style="display:none" type="password" name="fakepasswordremembered"/>
<input type="password" class="form-control" id="setup_password1" placeholder="{{ 'password_new_type' | translate }}" ng-model="formdata.password" />
</div>
<div class="form-group">
......
sails/src/assets/scripts/modules/supervisor/views/students.html
......@@ -11,8 +11,11 @@
<!-- Add Student button and Search row -->
<div class="row">
<div class="col-xs-3">
<button type="button" class="btn btn-success btn-circle btn-lg" ng-click="resetForm(); hidestudentadd = false" title="{{'add'|translate}}" ng-hide="!user.isSupAdmin || !num_licenses_left"><i class="glyphicon glyphicon-plus"></i></button>
<p class="text-left" ng-hide="!user.isSupAdmin || !num_licenses_left || !hidestudentadd">
<a ng-click="resetForm(); hidestudentadd = false" class="btn btn-success btn-sm" role="button">
<span class="glyphicon glyphicon-plus" aria-hidden="true"></span> {{ 'add_student' | translate }}
</a>
</p>
</div>
<div class="col-xs-6 input-group">
<input type="text" ng-model="search_students" id="search_students" placeholder="{{ 'filter' | translate }}" class="form-control" aria-describedby="basic-addon2">
......@@ -33,7 +36,7 @@
</div>
</td>
<td>
<h4>{{student.name}} {{student.surname}}</h4>
<h4>{{student.surname}}, {{student.name}}</h4>
</td>
<td>
<p> <span> {{student.current_method | translate}} </span> <br /> <span class="text-muted">{{student.current_instruction | translate}}</span> </p>
......
sails/src/assets/styles/main.css
......@@ -451,6 +451,21 @@ textarea.editable{
.picto .picto_options .picto_minus{ position: absolute; top: 2px; right: 2px; }
/* Text above picto */
.picto-description {
position: absolute;
bottom: 0px;
text-align: center;
width: 100%;
background-color: rgba(1, 1, 1, 0.50);
color: white;
margin-left: -2px;
font-weight: 600;
text-transform: uppercase;
font-size: 12px;
word-wrap: break-word;
}
/* In addpicto */
#collections{
height: 400px;
......
sails/src/assets/styles/picto-grid.less
......@@ -62,7 +62,7 @@
&__title {
margin-top: 0;
color: white;
color: black;
text-transform: capitalize;
}
}
sails/src/node_modules/sails-mysql/lib/sql.js
......@@ -468,7 +468,7 @@ function sqlTypeCast(attr) {
break;
case 'datetime':
expandedType = 'DATETIME(3)';
expandedType = 'DATETIME';
break;
case 'time':
......@@ -499,8 +499,7 @@ function toSqlDate(date) {
('00' + date.getDate()).slice(-2) + ' ' +
('00' + date.getHours()).slice(-2) + ':' +
('00' + date.getMinutes()).slice(-2) + ':' +
('00' + date.getSeconds()).slice(-2) + '.' +
('00' + date.getMilliseconds()).slice(-3);
('00' + date.getSeconds()).slice(-2);
return date;
}
......
sails/src/node_modules/sails-mysql/lib/utils.js
......@@ -242,8 +242,7 @@ utils.toSqlDate = function toSqlDate(date) {
('00' + date.getDate()).slice(-2) + ' ' +
('00' + date.getHours()).slice(-2) + ':' +
('00' + date.getMinutes()).slice(-2) + ':' +
('00' + date.getSeconds()).slice(-2) + '.' +
('00' + date.getMilliseconds()).slice(-2);
('00' + date.getSeconds()).slice(-2);
return date;
};
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 sign in to comment