Merge branch 'develop' of http://gitlab.ujaen.es/yotta/pictogram into develop

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

@@ -192,9 +192,9 @@ public class Device extends SQLiteOpenHelper {
      * @return
      * @throws JSONException
      */
-    public Boolean isSupervisorOnLocal(int id_sup) throws JSONException{
+    public Boolean isSupervisorOnLocal(int id_sup,int id_stu) throws JSONException{
         SQLiteDatabase db = this.getReadableDatabase();
-        Cursor cursor = db.rawQuery(" SELECT * FROM supervisor WHERE id = " + id_sup, null);
+        Cursor cursor = db.rawQuery(" SELECT * FROM users_detail WHERE id_stu = " + id_stu+ " AND id_sup ="+id_sup, null);
         if(cursor.moveToFirst())
             return true;
         cursor.close();
@@ -213,7 +213,7 @@ public class Device extends SQLiteOpenHelper {
         Hashtable<String, String> users = new Hashtable<>(3);
         Cursor cursor = db.rawQuery(" SELECT email_sup, name_sup, surname_sup,id_sup FROM users_detail WHERE id_stu = "+id_stu ,null);
         while (cursor.moveToNext())
-            users.put(cursor.getString(0), cursor.getString(1)+", "+cursor.getString(2)+";"+cursor.getInt(3));
+            users.put(cursor.getString(0), cursor.getString(1) + ", " + cursor.getString(2) + ";" + cursor.getInt(3));
         cursor.close();
         //db.close(); <--no es necesario cerrar la bbdd https://groups.google.com/forum/#!msg/android-developers/NwDRpHUXt0U/jIam4Q8-cqQJ
         return users;

android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/login/StudentFragmentGrid.java

@@ -18,7 +18,6 @@ import com.yottacode.pictogram.dao.User;
 import com.yottacode.pictogram.net.ImgDownloader;
 import com.yottacode.pictogram.tabletlibrary.R;
 import com.yottacode.pictogram.tabletlibrary.gui.communicator.PictogramActivity;
-import com.yottacode.pictogram.tabletlibrary.gui.communicator.cropper.EditPictoActivity;
 import com.yottacode.pictogram.tools.Img;
 import com.yottacode.pictogram.tools.PCBcontext;
 import com.yottacode.tools.GUITools;
@@ -28,9 +27,7 @@ import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.Hashtable;
-import java.util.List;
 import java.util.Vector;
 
 /**
@@ -243,7 +240,7 @@ public class StudentFragmentGrid extends Fragment{
                     try {
                         supervisor = supervisors.getJSONObject(i);
                         idSupervisoresJSON.add(supervisor.getString("email"));
-                        if(!PCBcontext.getDevice().isSupervisorOnLocal((int) supervisor.get("id"))) {//Para comprobar si ya existe en local
+                        if(!PCBcontext.getDevice().isSupervisorOnLocal((int) supervisor.get("id"),stu_id)) {//Para comprobar si ya existe en local
                             User currentUser =  PCBcontext.getPcbdb().getCurrentUser();
                             PCBcontext.getDevice().insertUser(new User(stu_id, currentUser.get_nickname_stu(), currentUser.get_pwd_stu()
                                     , currentUser.get_name_stu(),currentUser.get_surname_stu(),currentUser.get_active_scene(), currentUser.get_url_img_stu()
@@ -322,7 +319,7 @@ public class StudentFragmentGrid extends Fragment{
                         GUITools.show_alert(getActivity(), R.string.loginErrorTxt,getString(R.string.noStudentsError), new GUITools.iOKListener() {
                             @Override
                             public void ok() {
-                                PCBcontext.getNetService().restart_app(false);
+                                PCBcontext.getNetService().restart_app(true);
                             }
                         });
 

android/Pictogram/tabletlibrary/src/main/res/layout/activity_login.xml

@@ -80,6 +80,7 @@
         android:layout_width="match_parent"
         android:layout_height="fill_parent"
         android:layout_below="@+id/loginTopbarLayout"
+        android:background="#eeeeee"
         android:paddingTop="10dp">
 
         <fragment

android/Pictogram/tabletlibrary/src/main/res/layout/activity_splash_screen.xml

@@ -8,17 +8,17 @@
     tools:context="com.yottacode.pictogram.tabletlibrary.gui.login.SplashScreenActivity" >
 
     <ImageView
+        android:id="@+id/imageView2"
         android:layout_width="400px"
         android:layout_height="120px"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentEnd="true"
+        android:layout_marginBottom="44dp"
         android:contentDescription="@string/app_name"
         android:orientation="vertical"
-        android:src="@drawable/yottacode_logo"
         android:scaleX="0.5"
         android:scaleY="0.5"
-        android:id="@+id/imageView2"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentEnd="true"
-        android:layout_marginBottom="44dp" />
+        android:src="@drawable/yottacode_logo" />
 
     <ImageView
         android:layout_width="200px"

android/Pictogram/tabletlibrary/src/main/res/layout/fragment_new_student.xml

@@ -3,5 +3,6 @@
     android:id="@+id/loginStudentGridView"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
+    android:background="#eeeeee"
     android:numColumns="5"
     android:stackFromBottom="false" />

android/Pictogram/tabletlibrary/src/main/res/layout/studentfragment.xml

@@ -4,7 +4,8 @@
     android:layout_height="match_parent">
 
     <ListView
+        android:id="@android:id/list"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:id="@android:id/list" />
+        android:background="#eeeeee" />
 </LinearLayout>

android/Pictogram/tabletlibrary/src/main/res/layout/supervisorfragment.xml

@@ -6,7 +6,8 @@
     android:layout_height="match_parent">
 
     <ListView
+        android:id="@android:id/list"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:id="@android:id/list" />
+        android:background="#eeeeee" />
 </LinearLayout>

sails/roles/database/files/triggers-sessions-integrity-constraints.sql

@@ -264,9 +264,10 @@ thisTrigger: BEGIN
   -- Show and resumesession actions creates new tries
 	CASE NEW.type
 	 WHEN 'Show' THEN
-
+	 	IF (idopentry IS NOT NULL)	THEN
 			INSERT INTO try(`id_ws`)
-      VALUES  (idws);
+      		VALUES  (idws);
+		END IF;
 
    WHEN 'pausesession' THEN
 
@@ -276,7 +277,12 @@ thisTrigger: BEGIN
         result = 'DISCARDED'
       WHERE
         id = idopentry;
-		END IF;
+
+		UPDATE stu_opentry
+		SET id_opentry=NULL
+		WHERE id_ws = idws;
+
+	END IF;
 
   WHEN 'resumesession' THEN
 

sails/src/api/controllers/StudentController.js

@@ -1438,7 +1438,7 @@ module.exports = {
 
       Action.create({
           type: action,
-          timestamp: attributes.timestamp, // it comes already in ISO format
+          timestamp: new Date().toISOString(), // it comes already in ISO format
           supervisor: sup,
           student: attributes.id_stu,
           description: desc

sails/src/assets/scripts/modules/student/controllers/session.js

@@ -235,22 +235,35 @@ dashboardControllers.controller('StudentSessionCtrl', function StudentSessionCtr
     $scope.wsessions[$scope.wsessions.length-1].tries.pop();
    $scope.ws.end = new Date();
 
-   $http
-       .post(
-         config.backend+'/ws/' + $scope.ws.id + '/close',
-         {
-           "id_stu": $scope.studentData.id
-         }
-       )
-       .success(function(data, status, headers, config) {
 
-          // Empty actual WS and actual try
-          $scope.ws = {};
-          $scope.actual_try = {};
-       })
-       .error(function(data, status, headers, config) {
+  $http
+   .post(config.backend+'/action', {
+      "type": "endsession",
+      "student": $scope.studentData.id,
+      "supervisor": $scope.user.id,
+   })
+   .success(function(data, status, headers, _config) {
+      // Adding resume action to the list of actions
+      $scope.actual_try.actions.push({ action: 'endsession'} );
 
-       });
+      $http.post(config.backend+'/ws/' + $scope.ws.id + '/close',
+            {
+              "id_stu": $scope.studentData.id
+            }
+          )
+          .success(function(data, status, headers, config) {
+
+             // Empty actual WS and actual try
+             $scope.ws = {};
+             $scope.actual_try = {};
+          })
+          .error(function(data, status, headers, config) {
+
+          });
+
+   })
+   .error(function(data, status, headers, config) {
+   });
 
        // Cancel the mark of the device connected (with a new session will be connected again)
        //$scope.active_device = null;