Arasaac interface and sql revision

sails/src/assets/arasaac

+/vagrant/arasaac
\ No newline at end of file

sails/src/assets/scripts/directives/directives.js

@@ -242,12 +242,10 @@ dashboardDirectives.directive('popoveraddpicto', function() {
     restrict: 'A',
     link: function (scope, element, attrs) {
 
-      if(element[0].y <= y){
-        y=element[0].y;
-        attrs.popoverPlacement="bottom";
-      }
-      console.log(element[0].y);
-      console.log(angular.element( document.querySelector( '#collections' ) ));
+        if(element[0].y <= y){
+          y=element[0].y;
+          attrs.popoverPlacement="bottom";
+        }
       }
     }
 });

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

@@ -78,6 +78,7 @@ dashboardControllers.controller('AddPictoCtrl', function (
     $http.get(config.backend + '/sup/arasaac_license/' + supervisor.id)
     .success(function () {
       $scope.showArasaacLicense = false;
+      supervisor.arasaacLicense = true;
       $scope.load_arasaac_pictos();
     })
     .error(function () {
@@ -89,7 +90,7 @@ dashboardControllers.controller('AddPictoCtrl', function (
 
   $scope.load_arasaac_pictos = function () {
     $scope.pictos = [];
-
+    $scope.page = 1;
     if(!$scope.showArasaacLicense){
       $scope.loadingCatPictos = true;
       var request = "";
@@ -404,7 +405,7 @@ dashboardControllers.controller('AddPictoCtrl', function (
 
       // Add Search to breadcrumbs
       if (!$scope.onlyOwn){
-        if($scope.breadcrumbs[$scope.breadcrumbs.length-1].id != 999){
+        if($scope.breadcrumbs[$scope.breadcrumbs.length-1].id != 999 && $scope.source == "symbolstx"){
           $scope.breadcrumbs.push({
             id: 999,
             exp: "filter",

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

@@ -330,7 +330,6 @@ dashboardControllers.controller('StudentCollectionsCtrl', function StudentCollec
         new_id_pic: pictoId
       })
       .success(function (studentPicto) {
-        console.log(JSON.stringify(studentPicto));
         $scope.loadPictos();
 
         // notify
@@ -352,7 +351,6 @@ dashboardControllers.controller('StudentCollectionsCtrl', function StudentCollec
   // Adds a new pictogram
   //
   $scope.open_add = function (col, row) {
-    console.log(col + "  " +row);
     var modalInstance = $modal.open({
       animation: true,
       templateUrl: 'modules/student/views/addpicto.html',
@@ -389,7 +387,6 @@ dashboardControllers.controller('StudentCollectionsCtrl', function StudentCollec
         }
       })
       .success(function (studentPicto) {
-        console.log(studentPicto);
         placePicto(studentPicto);
 
         io.socket.post('/stu/vocabulary', {