some files rearranged

b36d8668 · Arturo Montejo Ráez · 40d8ad95 · b36d8668 · b36d8668 · b36d8668
Commit b36d8668 authored Feb 03, 2017 by Arturo Montejo Ráez
Showing with 38 additions and 38 deletions
android/Pictogram/supervisor_tablet/supervisor_tablet.iml
android/Pictogram/yotta_tablet/yotta_tablet.iml
sails/src/assets/scripts/app.js
sails/src/assets/scripts/modules/login/controllers/login_admin.js → sails/src/assets/scripts/modules/admin/controllers/login.js
sails/src/assets/scripts/modules/login/views/login_admin.html → sails/src/assets/scripts/modules/admin/views/login.html
sails/src/tasks/config/concat.js
--- a/android/Pictogram/supervisor_tablet/supervisor_tablet.iml
+++ b/android/Pictogram/supervisor_tablet/supervisor_tablet.iml
@@ -62,13 +62,6 @@
      <sourceFolder url="file://$MODULE_DIR$/src/DevFlavor/java" 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/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/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDevFlavor/shaders" isTestSource="true" />
      <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" />
@@ -76,6 +69,13 @@
      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDevFlavor/java" 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/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDevFlavor/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" />
@@ -97,13 +97,6 @@
      <sourceFolder url="file://$MODULE_DIR$/src/main/java" 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/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" />
@@ -111,6 +104,13 @@
      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" 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/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
      <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" />

--- a/android/Pictogram/yotta_tablet/yotta_tablet.iml
+++ b/android/Pictogram/yotta_tablet/yotta_tablet.iml
@@ -41,13 +41,6 @@
      <sourceFolder url="file://$MODULE_DIR$/src/LocalFlavorDebug/java" isTestSource="false" />
      <sourceFolder url="file://$MODULE_DIR$/src/LocalFlavorDebug/rs" isTestSource="false" />
      <sourceFolder url="file://$MODULE_DIR$/src/LocalFlavorDebug/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testLocalFlavorDebug/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testLocalFlavorDebug/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testLocalFlavorDebug/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testLocalFlavorDebug/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testLocalFlavorDebug/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testLocalFlavorDebug/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testLocalFlavorDebug/shaders" isTestSource="true" />
      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/LocalFlavor/debug" isTestSource="true" generated="true" />
      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/LocalFlavor/debug" isTestSource="true" generated="true" />
      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/LocalFlavor/debug" isTestSource="true" generated="true" />
@@ -55,6 +48,13 @@
      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/LocalFlavor/debug" isTestSource="true" generated="true" />
      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/LocalFlavor/debug" type="java-test-resource" />
      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/LocalFlavor/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testLocalFlavorDebug/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testLocalFlavorDebug/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testLocalFlavorDebug/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testLocalFlavorDebug/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testLocalFlavorDebug/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testLocalFlavorDebug/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testLocalFlavorDebug/shaders" isTestSource="true" />
      <sourceFolder url="file://$MODULE_DIR$/src/LocalFlavor/res" type="java-resource" />
      <sourceFolder url="file://$MODULE_DIR$/src/LocalFlavor/resources" type="java-resource" />
      <sourceFolder url="file://$MODULE_DIR$/src/LocalFlavor/assets" type="java-resource" />
@@ -62,13 +62,6 @@
      <sourceFolder url="file://$MODULE_DIR$/src/LocalFlavor/java" isTestSource="false" />
      <sourceFolder url="file://$MODULE_DIR$/src/LocalFlavor/rs" isTestSource="false" />
      <sourceFolder url="file://$MODULE_DIR$/src/LocalFlavor/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestLocalFlavor/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestLocalFlavor/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestLocalFlavor/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestLocalFlavor/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestLocalFlavor/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestLocalFlavor/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestLocalFlavor/shaders" isTestSource="true" />
      <sourceFolder url="file://$MODULE_DIR$/src/testLocalFlavor/res" type="java-test-resource" />
      <sourceFolder url="file://$MODULE_DIR$/src/testLocalFlavor/resources" type="java-test-resource" />
      <sourceFolder url="file://$MODULE_DIR$/src/testLocalFlavor/assets" type="java-test-resource" />
@@ -76,6 +69,13 @@
      <sourceFolder url="file://$MODULE_DIR$/src/testLocalFlavor/java" isTestSource="true" />
      <sourceFolder url="file://$MODULE_DIR$/src/testLocalFlavor/rs" isTestSource="true" />
      <sourceFolder url="file://$MODULE_DIR$/src/testLocalFlavor/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestLocalFlavor/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestLocalFlavor/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestLocalFlavor/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestLocalFlavor/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestLocalFlavor/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestLocalFlavor/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestLocalFlavor/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" />
@@ -97,13 +97,6 @@
      <sourceFolder url="file://$MODULE_DIR$/src/main/java" 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/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" />
@@ -111,6 +104,13 @@
      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" 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/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
      <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" />

--- a/sails/src/assets/scripts/app.js
+++ b/sails/src/assets/scripts/app.js
@@ -174,8 +174,8 @@ dashboardApp.config(function ($stateProvider, $urlRouterProvider) {
    })
    .state('admin_login', {
      url: '/admin/login',
-      templateUrl: 'modules/login/views/login_admin.html', // TODO: habría que mover esta vista a modules/admin/views
+      templateUrl: 'modules/admin/views/login.html',
-      controller: 'LoginAdminCtrl',                        // TODO: y el controlador, también
+      controller: 'LoginAdminCtrl',
    })
    .state('admin_licenses', {
      url: '/admin/licenses',

--- a/sails/src/assets/scripts/modules/login/controllers/login_admin.js
+++ b/sails/src/assets/scripts/modules/login/controllers/login_admin.js
--- a/sails/src/assets/scripts/modules/login/views/login_admin.html
+++ b/sails/src/assets/scripts/modules/login/views/login_admin.html
--- a/sails/src/tasks/config/concat.js
+++ b/sails/src/tasks/config/concat.js
@@ -43,7 +43,7 @@ module.exports = function (grunt) {
    'assets/scripts/modules/login/controllers/login.js',
    'assets/scripts/modules/login/controllers/login_setting_password.js',
    'assets/scripts/modules/login/controllers/signin.js',
-    'assets/scripts/modules/login/controllers/login_admin.js',
+    'assets/scripts/modules/admin/controllers/login.js',
    'assets/scripts/modules/admin/controllers/admin.js',
    'assets/scripts/modules/admin/controllers/licenses.js',
    'assets/scripts/modules/admin/controllers/offices.js',