diff --git a/.gitignore b/.gitignore index eec9469a9b4000f816ec85c177bb3bcdd762532d..45c5be895a8f492cb9f5aae8ba8d9fdf64d58a1a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ node_modules -dist +client-app/dist +client-app/build-report.txt test_reports .gitmodules.old -build-report.txt -*.tar.gz +*.tgz *.log diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b63b34672d3845487dff2ba6bdf5e26287f53dc5..0d10482e9002012b4709a1430c15953290931d8c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,11 +11,11 @@ include: - project: 'redmic-project/gitlab-ci-templates' ref: master file: '/deployment-service/custom-image.yml' - - local: '/.gitlab-ci.scan.yml' - - local: '/.gitlab-ci.test.yml' - - local: '/.gitlab-ci.build.yml' - - local: '/.gitlab-ci.package.yml' - - local: '/.gitlab-ci.deploy.yml' + - local: '/.gitlab-ci/scan.yml' + - local: '/.gitlab-ci/test.yml' + - local: '/.gitlab-ci/build.yml' + - local: '/.gitlab-ci/package.yml' + - local: '/.gitlab-ci/deploy.yml' stages: - pre-build diff --git a/.gitlab-ci.build.yml b/.gitlab-ci/build.yml similarity index 69% rename from .gitlab-ci.build.yml rename to .gitlab-ci/build.yml index be6c3857809f724afdecced877ae06743c68b00b..32519706ef729b72a5612e11b6531a676feb2833 100644 --- a/.gitlab-ci.build.yml +++ b/.gitlab-ci/build.yml @@ -1,23 +1,24 @@ .web-build: image: ${WEB_BUILD_IMAGE_NAME}:${WEB_BUILD_IMAGE_TAG} variables: - GIT_SUBMODULE_STRATEGY: normal + GIT_SUBMODULE_STRATEGY: recursive WEB_BUILD_IMAGE_NAME: registry.gitlab.com/redmic-project/docker/web-build WEB_BUILD_IMAGE_TAG: latest before_script: - - type yarn grunt java - - yarn install + - type npm + - npm install cache: paths: - node_modules/ - - public/javascript/templates/node_modules/ - - public/stylesheets/node_modules/ + - client-app/dep/templates/node_modules/ + - client-app/style/node_modules/ prepare-unbuilt-version: extends: .web-build stage: pre-build script: - - grunt preBuild + - npm -v + - node -v dependencies: [] tags: - custom-runner @@ -26,10 +27,11 @@ prepare-unbuilt-version: expire_in: 1 week paths: - node_modules/ - - public/javascript/templates/dist/ - - public/stylesheets/style.styl - - public/stylesheets/src/ - - public/stylesheets/submodules/ + - package-lock.json + - client-app/dep/templates/dist/ + - client-app/style/style.styl + - client-app/style/src/ + - client-app/style/dep/ rules: - if: $CI_MERGE_REQUEST_ID || $CI_COMMIT_TAG || @@ -42,14 +44,15 @@ prepare-built-version: extends: .web-build stage: build script: - - grunt + - npm pack dependencies: [] artifacts: name: ${CI_JOB_NAME}_${CI_COMMIT_REF_NAME} expire_in: 1 month paths: - - dist*.tar.gz - - build-report.txt + - package-lock.json + - redmic-project-web-*.tgz + - client-app/build-report.txt rules: - if: $CI_MERGE_REQUEST_ID || $CI_PIPELINE_SOURCE == "schedule" diff --git a/.gitlab-ci.deploy.yml b/.gitlab-ci/deploy.yml similarity index 100% rename from .gitlab-ci.deploy.yml rename to .gitlab-ci/deploy.yml diff --git a/.gitlab-ci.package.yml b/.gitlab-ci/package.yml similarity index 100% rename from .gitlab-ci.package.yml rename to .gitlab-ci/package.yml diff --git a/.gitlab-ci.scan.yml b/.gitlab-ci/scan.yml similarity index 100% rename from .gitlab-ci.scan.yml rename to .gitlab-ci/scan.yml diff --git a/.gitlab-ci.test.yml b/.gitlab-ci/test.yml similarity index 85% rename from .gitlab-ci.test.yml rename to .gitlab-ci/test.yml index c01ab987937592fea637c1ac1f395d9d5983a703..efd1d8ff6b803e12fc898e49f293015f8da5527e 100644 --- a/.gitlab-ci.test.yml +++ b/.gitlab-ci/test.yml @@ -44,7 +44,7 @@ run-local-unit-tests: --headless --browser=${TEST_BROWSER} --seleniumVersion=${LOCAL_SELENIUM_VERSION} - --chromeVersion=${LOCAL_CHROME_VERSION} + --chromeDriverVersion=${LOCAL_CHROME_DRIVER_VERSION} | tee test.out .run-remote-unit-tests: @@ -59,8 +59,8 @@ run-local-unit-tests: --ownServerHost="${TEST_OWN_SERVER_HOST}" --remoteHost=${TEST_REMOTE_HOST} --seleniumVersion=${REMOTE_SELENIUM_VERSION} - --chromeVersion=${REMOTE_CHROME_VERSION} - --firefoxVersion=${REMOTE_FIREFOX_VERSION} + --chromeBrowserVersion=${REMOTE_CHROME_BROWSER_VERSION} + --firefoxBrowserVersion=${REMOTE_FIREFOX_BROWSER_VERSION} | tee test.out run-remote-unit-tests-chrome: @@ -90,11 +90,11 @@ run-local-modules-functional-tests: - npm start & - > grunt test-functional-local - --functionalSuites=tests/functional/modules/**/!\(*Script\).js + --functionalSuites=client-app/test/functional/component/**/!\(*Script\).js --headless --browser=${TEST_BROWSER} --seleniumVersion=${LOCAL_SELENIUM_VERSION} - --chromeVersion=${LOCAL_CHROME_VERSION} + --chromeDriverVersion=${LOCAL_CHROME_DRIVER_VERSION} artifacts: *run-functional-tests-artifacts .run-remote-modules-functional-tests: @@ -106,14 +106,14 @@ run-local-modules-functional-tests: - npm start & - > grunt test-functional-remote - --functionalSuites=tests/functional/modules/**/!\(*Script\).js + --functionalSuites=client-app/test/functional/component/**/!\(*Script\).js --headless --browser=${TEST_BROWSER} --ownServerHost="${TEST_OWN_SERVER_HOST}" --remoteHost=${TEST_REMOTE_HOST} --seleniumVersion=${REMOTE_SELENIUM_VERSION} - --chromeVersion=${REMOTE_CHROME_VERSION} - --firefoxVersion=${REMOTE_FIREFOX_VERSION} + --chromeBrowserVersion=${REMOTE_CHROME_BROWSER_VERSION} + --firefoxBrowserVersion=${REMOTE_FIREFOX_BROWSER_VERSION} artifacts: *run-functional-tests-artifacts run-remote-modules-functional-tests-chrome: @@ -144,8 +144,8 @@ run-remote-modules-functional-tests-firefox: --browser=${TEST_BROWSER} --remoteHost=${TEST_REMOTE_HOST} --seleniumVersion=${REMOTE_SELENIUM_VERSION} - --chromeVersion=${REMOTE_CHROME_VERSION} - --firefoxVersion=${REMOTE_FIREFOX_VERSION} + --chromeBrowserVersion=${REMOTE_CHROME_BROWSER_VERSION} + --firefoxBrowserVersion=${REMOTE_FIREFOX_BROWSER_VERSION} dependencies: [] artifacts: *run-functional-tests-artifacts rules: diff --git a/.gitmodules b/.gitmodules index a91961a1ae87c93d327329b2e34507365d9ea604..0f041c9a8d998c5a298c56dc9afe93f031d61744 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,10 +1,10 @@ -[submodule "public/stylesheets"] - path = public/stylesheets +[submodule "client-app/style"] + path = client-app/style url = ../style.git branch = master ignore = dirty -[submodule "public/javascript/templates"] - path = public/javascript/templates +[submodule "client-app/dep/templates"] + path = client-app/dep/templates url = ../templates.git branch = master - ignore = dirty \ No newline at end of file + ignore = dirty diff --git a/Gruntfile.js b/Gruntfile.js index cd004bb413bd113adbed9c430b1bd5e01cb3bdfa..3ca62a894acd521d090c2559e755cc692b20e75f 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -12,9 +12,11 @@ module.exports = function(grunt) { grunt.initConfig({ redmicConfig: { rootPath: __dirname, - srcPath: 'public/javascript', - distPath: 'dist', - destDir: 'javascript' + srcPath: 'client-app/src', + depPath: 'client-app/dep', + testPath: 'client-app/test', + distPath: 'client-app/dist', + destDir: 'js' }, pkg: grunt.file.readJSON('package.json') }); diff --git a/README.md b/README.md index e4ec15afb8b571a352138f716ac637b1991fa7e9..b90fbeffa375cd41bcb67bf7dd27923356cab20c 100644 --- a/README.md +++ b/README.md @@ -9,10 +9,10 @@ Cliente web de REDMIC. ## Entorno de desarrollo -Una vez clonado el repositorio en el entorno local de desarrollo y satisfechas las dependencias base del sistema, es posible instalar las dependencias necesarias que define el proyecto y arrancar el servicio: +Una vez clonado el repositorio del proyecto en el entorno local de desarrollo y satisfechas las dependencias base del sistema (`npm/Node.js` y `grunt-cli`), es posible instalar sus dependencias y arrancar el servicio en modo de desarrollo: ```sh -yarn install +npm install OAUTH_URL=https://redmic.grafcan.es/api/oauth \ OAUTH_CLIENT_ID=app \ @@ -33,12 +33,23 @@ Si todo ha ido correctamente, el servicio *REDMIC web* estará accesible en . +Para facilitar las tareas repetitivas, se han creado una serie de tareas ejecutables mediante **Grunt**, que a su vez se referencian desde comandos de **npm**. Más información en . ## Compilación Para optimizar la ejecución es necesario realizar un proceso de "compilación" de la aplicación. +Se puede generar la salida compilada simplemente lanzando los siguientes comandos (cuidado, es un proceso pesado): + +```sh +npm install +npm pack +``` + +> Internamente se lanzarán otros comandos orquestados mediante **Grunt** (que también podrían ejecutarse de manera concreta si fuera necesario). + +Esto generará un directorio con el código compilado de salida (`client-app/dist/`) junto con un fichero comprimido que contiene dicha salida y otros recursos necesarios para lanzar la aplicación (`redmic-project-web-.tgz`). + Más información en . ## Páginas estáticas @@ -55,7 +66,16 @@ Por defecto, `Prerender` consultará al servicio mediante protocolo HTTP. Si no Se ha preparado una batería de pruebas, tanto unitarias como funcionales, que permiten evaluar el estado del proyecto a medida que se aplican cambios en la base de código. -Más información en . +Se puede comenzar la ejecución de tests lanzando los siguientes comandos: + +```sh +npm install +npm test +``` + +> Internamente se lanzarán otros comandos orquestados mediante **Grunt** (que también podrían ejecutarse de manera concreta si fuera necesario). + +Más información ejecutando `grunt --help` y en . ### Ejemplos de ejecución de tests locales @@ -65,7 +85,7 @@ Como ejemplo de ejecución de tests locales (unitarios y funcionales), veamos lo ```sh grunt test-unit-local \ - --suites=tests/unit/redmic/modules/model/testModelImpl \ + --suites=test/unit/component/model/testModelImpl \ --browser=chrome \ --headless \ --coverage=false @@ -75,7 +95,7 @@ grunt test-unit-local \ ```sh grunt test-functional-local \ - --functionalSuites=tests/functional/modules/**/!(*Script).js \ + --functionalSuites=client-app/test/functional/component/**/!(*Script).js \ --browser=chrome ``` @@ -94,7 +114,7 @@ docker run --rm -d \ --name selenium-hub \ --net selenium-net \ -p 4444:4444 \ - selenium/hub:4.1.3 + selenium/hub:4.8.3 # Lanza un nodo de navegador Chrome docker run --rm -d \ @@ -105,7 +125,7 @@ docker run --rm -d \ -e SE_EVENT_BUS_PUBLISH_PORT=4442 \ -e SE_EVENT_BUS_SUBSCRIBE_PORT=4443 \ -e VNC_NO_PASSWORD=true \ - selenium/node-chrome:99.0 + selenium/node-chrome:111.0 # Lanza un nodo de navegador Firefox docker run --rm -d \ @@ -116,16 +136,16 @@ docker run --rm -d \ -e SE_EVENT_BUS_PUBLISH_PORT=4442 \ -e SE_EVENT_BUS_SUBSCRIBE_PORT=4443 \ -e VNC_NO_PASSWORD=true \ - selenium/node-firefox:98.0 + selenium/node-firefox:111.0 ``` Si todo ha ido correctamente, el servicio *Selenium Hub* estará accesible en con 2 nodos añadidos, formando un *Selenium Grid* funcional. Hay que prestar atención a los tags desplegados para cada imagen. En el ejemplo, se usan: -* `selenium/hub:4.1.3` (versión **4.1.3** de **Selenium Hub**, ver más en ). -* `selenium/node-chrome:99.0` (versión **99.0** de **Google Chrome**, ver más en ). -* `selenium/node-firefox:98.0` (versión **98.0** de **Mozilla Firefox**, ver más en ). +* `selenium/hub:4.8.3` (versión **4.8.3** de **Selenium Hub**, ver más en ). +* `selenium/node-chrome:111.0` (versión **111.0** de **Google Chrome**, ver más en ). +* `selenium/node-firefox:111.0` (versión **111.0** de **Mozilla Firefox**, ver más en ). Existen otras etiquetas más específicas (consultar en los enlaces anteriores) si se quiere fijar con más certeza las versiones usadas, al igual que imágenes para otros navegadores (disponibles en ). También hay disponibles multitud de opciones para configurar el entorno de testeo, consultar documentación en . @@ -137,7 +157,7 @@ Como ejemplo de ejecución de tests remotos (unitarios y funcionales), pero apun ```sh grunt test-unit-remote \ - --suites=tests/unit/redmic/modules/model/testModelImpl \ + --suites=test/unit/component/model/testModelImpl \ --browser=firefox \ --headless \ --coverage=false @@ -147,7 +167,7 @@ grunt test-unit-remote \ ```sh grunt test-functional-remote \ - --functionalSuites=tests/functional/modules/**/!(*Script).js \ + --functionalSuites=client-app/test/functional/component/**/!(*Script).js \ --browser=chrome \ --headless ``` diff --git a/build/.env b/build/.env index 43830917b4ef081cf77c8465161c0b5ee5a2745f..00a41dac736900e3507d6ff0e252d79bcac2479c 100644 --- a/build/.env +++ b/build/.env @@ -1 +1 @@ -NODE_IMAGE_TAG=18.12.1-alpine3.16 +NODE_IMAGE_TAG=20.16.0-alpine3.20 diff --git a/build/Dockerfile b/build/Dockerfile index aca777a777e1f13face62f6e29773181ce3684a2..73483bbbb6846241e49be1592fd954f02a6fc23d 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -1,4 +1,4 @@ -ARG NODE_IMAGE_TAG +ARG NODE_IMAGE_TAG=lts-alpine FROM node:${NODE_IMAGE_TAG} @@ -8,23 +8,20 @@ ENV NODE_ENV="production" EXPOSE 3050 +CMD ["server-app", "-b"] + HEALTHCHECK --interval=30s --timeout=15s --start-period=1m --retries=3 \ CMD wget --spider -q http://localhost:3050 || exit 1 -CMD ["app", "-b"] +ADD redmic-project-web-*.tgz / -WORKDIR /redmic +WORKDIR /package -ADD dist*.tar.gz ./ +COPY package-lock.json . -RUN node -e 'const fs = require("fs"); \ - const pkg = JSON.parse(fs.readFileSync("./package.json", "utf-8")); \ - delete pkg.devDependencies; \ - fs.writeFileSync("./package.json", JSON.stringify(pkg), "utf-8");' && \ - yarn install --production --ignore-optional --ignore-scripts && \ - yarn cache clean && \ - yarn autoclean --init && yarn autoclean --force && \ - rm -f yarn.lock .yarnclean +RUN npm install --ignore-scripts && \ + npm cache clean --force && \ + rm -f package-lock.json ARG VERSION diff --git a/build/Dockerfile.dockerignore b/build/Dockerfile.dockerignore index d0295dc65c4c5ed21d558bfb8ad66a8f74db9bf8..adb84c345088378f58a75be5560e37e794a33b96 100644 --- a/build/Dockerfile.dockerignore +++ b/build/Dockerfile.dockerignore @@ -1,2 +1,3 @@ * -!dist*.tar.gz +!redmic-project-web-*.tgz +!package-lock.json diff --git a/client-app/app.profile.js b/client-app/app.profile.js new file mode 100644 index 0000000000000000000000000000000000000000..1d2792902e84ed05a96ed3b794f2633639be112b --- /dev/null +++ b/client-app/app.profile.js @@ -0,0 +1,577 @@ +var includeLocales = ['es', 'en']; + +var packagesMap = { + 'd3Tip/d3-v6-tip.min': { + 'd3-selection': 'd3' + }, + 'wicket': { + 'wicket': 'wicket/wicket.min' + } +}; + +var amdTagger = function(filename) { + + return /\.js$/.test(filename); +}; + +var copyOnlyTagger = function() { + + return true; +}; + +var ignoreAllButExceptionsTagger = function(desiredModuleId, _filename, mid) { + + if (desiredModuleId instanceof Array) { + return desiredModuleId.indexOf(mid) === -1; + } + + return mid !== desiredModuleId; +}; + +var declarativeTagger = function(filename) { + + return /\.htm(l)?$/.test(filename); +}; + +var profileObj = { + basePath: '.', + releaseDir: 'dist', + releaseName: 'js', + action: 'release', + layerOptimize: 'closure', + optimize: 'closure', + optimizeOptions: { + languageIn: 'ECMASCRIPT_2017', + languageOut: 'ECMASCRIPT_2015', + compilationLevel: 'SIMPLE_OPTIMIZATIONS' + }, + cssOptimize: 'comments', + mini: true, + stripConsole: 'warn', + selectorEngine: 'lite', + useSourceMaps: false, + buildReportDir: '../..', + maxOptimizationProcesses: 1, + + resourceTags: { + amd: amdTagger, + declarative: declarativeTagger + }, + + defaultConfig: { + hasCache:{ + 'dojo-built': 1, + 'dojo-loader': 1, + 'dom': 1, + 'host-browser': 1, + 'config-selectorEngine': 'lite' + }, + + // Configuraciones de dojoConfig, definidas estáticamente en tiempo de compilación ('packages' no funciona) + baseUrl: '/client-app/dist/js', + map: packagesMap, + async: true, + waitSeconds: 5, + requestProvider: 'dojo/request/registry', + selectorEngine: 'lite' + }, + + staticHasFeatures: { + 'config-deferredInstrumentation': 0 + , 'config-dojo-loader-catches': 0 + , 'config-tlmSiblingOfDojo': 0 + , 'dojo-amd-factory-scan': 0 + , 'dojo-combo-api': 0 + , 'dojo-config-api': 1 + , 'dojo-config-require': 0 + , 'dojo-debug-messages': 0 + , 'dojo-dom-ready-api': 0 + , 'dojo-firebug': 0 + , 'dojo-guarantee-console': 0 + , 'dojo-has-api': 1 + , 'dojo-inject-api': 1 + , 'dojo-loader': 1 + , 'dojo-log-api': 0 + , 'dojo-modulePaths': 0 + , 'dojo-moduleUrl': 0 + , 'dojo-publish-privates': 0 + , 'dojo-requirejs-api': 0 + , 'dojo-sniff': 1 + , 'dojo-sync-loader': 0 + , 'dojo-test-sniff': 0 + , 'dojo-timeout-api': 0 + , 'dojo-trace-api': 0 + , 'dojo-undef-api': 0 + , 'dojo-v1x-i18n-Api': 1 + , 'dom': 1 + , 'host-browser': 1 + , 'extend-dojo': 1 + }, + + packages: [{ + name: 'dijit', + location: 'dep/dijit' + },{ + name: 'dojo', + location: 'dep/dojo' + },{ + name: 'dojox', + location: 'dep/dojox' + },{ + name: 'cbtree', + location: 'dep/cbtree', + resourceTags: { + amd: amdTagger, + ignore: ignoreAllButExceptionsTagger.bind(null, [ + 'cbtree/Tree' + , 'cbtree/store/ObjectStore' + , 'cbtree/model/ForestStoreModel' + , 'cbtree/model/_base/BaseStoreModel' + , 'cbtree/model/_base/CheckedStoreModel' + , 'cbtree/model/_base/Parents' + , 'cbtree/model/_base/Prologue' + , 'cbtree/errors/createError' + , 'cbtree/errors/CBTErrors' + , 'cbtree/store/Memory' + , 'cbtree/store/Natural' + , 'cbtree/store/Hierarchy' + , 'cbtree/Evented' + , 'cbtree/CheckBox' + , 'cbtree/util/shim/Array' + , 'cbtree/util/QueryEngine' + , 'cbtree/util/IE8_Event' + ]) + } + },{ + name: 'put-selector', + location: 'dep/put-selector', + main: 'put' + },{ + name: 'wicket', + location: 'dep/wicket', + main: 'wicket-leaflet.min', + resourceTags: { + amd: amdTagger, + ignore: ignoreAllButExceptionsTagger.bind(null, ['wicket/wicket.min', 'wicket/wicket-leaflet.min']) + } + },{ + name: 'mediatorjs', + location: 'dep/mediatorjs', + main: 'mediator.min', + resourceTags: { + amd: amdTagger, + ignore: ignoreAllButExceptionsTagger.bind(null, 'mediatorjs/mediator.min') + } + },{ + name: 'moment', + location: 'dep/moment/min', + main: 'moment.min', + resourceTags: { + amd: amdTagger, + ignore: ignoreAllButExceptionsTagger.bind(null, 'moment/moment.min') + } + },{ + name: 'deepmerge', + location: 'dep/deepmerge/dist', + main: 'umd', + resourceTags: { + amd: amdTagger, + ignore: ignoreAllButExceptionsTagger.bind(null, 'deepmerge/umd') + } + },{ + name: 'leaflet', + location: 'dep/leaflet/dist', + main: 'leaflet', + resourceTags: { + amd: amdTagger, + ignore: ignoreAllButExceptionsTagger.bind(null, 'leaflet/leaflet') + } + },{ + name: 'leaflet-nontiledlayer', + location: 'dep/leaflet-nontiledlayer/dist', + main: 'NonTiledLayer', + resourceTags: { + amd: amdTagger, + ignore: ignoreAllButExceptionsTagger.bind(null, 'leaflet-nontiledlayer/NonTiledLayer') + } + },{ + name: 'awesome-markers', + location: 'dep/leaflet.awesome-markers/dist', + main: 'leaflet.awesome-markers.min', + resourceTags: { + ignore: ignoreAllButExceptionsTagger.bind(null, 'awesome-markers/leaflet.awesome-markers.min') + } + },{ + name: 'L-coordinates', + location: 'dep/leaflet-coordinates/dist', + main: 'Leaflet.Coordinates-0.1.5.min', + resourceTags: { + ignore: ignoreAllButExceptionsTagger.bind(null, 'L-coordinates/Leaflet.Coordinates-0.1.5.min') + } + },{ + name: 'L-draw', + location: 'dep/leaflet-draw/dist', + main: 'leaflet.draw', + resourceTags: { + ignore: ignoreAllButExceptionsTagger.bind(null, 'L-draw/leaflet.draw') + } + },{ + name: 'L-miniMap', + location: 'dep/leaflet-minimap/dist', + main: 'Control.MiniMap.min', + resourceTags: { + amd: amdTagger, + ignore: ignoreAllButExceptionsTagger.bind(null, 'L-miniMap/Control.MiniMap.min') + } + },{ + name: 'L-navBar', + location: 'dep/leaflet-nav', + main: 'index', + resourceTags: { + ignore: ignoreAllButExceptionsTagger.bind(null, 'L-navBar/index') + } + },{ + name: 'L-areaselect', + location: 'dep/leaflet-areaselect/src', + main: 'leaflet-areaselect', + resourceTags: { + ignore: ignoreAllButExceptionsTagger.bind(null, 'L-areaselect/leaflet-areaselect') + } + },{ + name: 'iso8601-js-period', + location: 'dep/iso8601-js-period', + main: 'iso8601', + resourceTags: { + amd: amdTagger, + ignore: ignoreAllButExceptionsTagger.bind(null, 'iso8601-js-period/iso8601') + } + },{ + name: 'L-timeDimension', + location: 'dep/leaflet-timedimension/dist', + main: 'leaflet.timedimension.min', + resourceTags: { + amd: amdTagger, + ignore: ignoreAllButExceptionsTagger.bind(null, 'L-timeDimension/leaflet.timedimension.min') + } + },{ + name: 'leaflet-measure', + location: 'dep/leaflet-measure/dist', + resourceTags: { + copyOnly: copyOnlyTagger, + ignore: ignoreAllButExceptionsTagger.bind(null, [ + 'leaflet-measure/leaflet-measure.es', + 'leaflet-measure/leaflet-measure.en' + ]) + } + },{ + name: 'pruneCluster', + location: 'dep/pruneCluster/dist', + main: 'PruneCluster.amd.min', + resourceTags: { + amd: amdTagger, + ignore: ignoreAllButExceptionsTagger.bind(null, 'pruneCluster/PruneCluster.amd.min') + } + },{ + name: 'sockjs', + location: 'dep/sockjs/dist', + main: 'sockjs.min', + resourceTags: { + amd: amdTagger, + ignore: ignoreAllButExceptionsTagger.bind(null, 'sockjs/sockjs.min') + } + },{ + name: 'stomp-websocket', + location: 'dep/stomp-websocket/lib', + main: 'stomp.min', + resourceTags: { + ignore: ignoreAllButExceptionsTagger.bind(null, 'stomp-websocket/stomp.min') + } + },{ + name: 'alertify', + location: 'dep/alertify/build', + main: 'alertify.min', + resourceTags: { + amd: amdTagger, + ignore: ignoreAllButExceptionsTagger.bind(null, 'alertify/alertify.min') + } + },{ + name: 'd3', + location: 'dep/d3/dist', + main: 'd3.min', + resourceTags: { + amd: amdTagger, + ignore: ignoreAllButExceptionsTagger.bind(null, 'd3/d3.min') + } + },{ + name: 'd3Tip', + location: 'dep/d3-v6-tip/build', + main: 'd3-v6-tip.min', + resourceTags: { + amd: amdTagger, + ignore: ignoreAllButExceptionsTagger.bind(null, 'd3Tip/d3-v6-tip.min') + } + },{ + name: 'uuid', + location: 'dep/uuid/dist/umd', + main: 'uuidv4.min', + resourceTags: { + amd: amdTagger, + ignore: ignoreAllButExceptionsTagger.bind(null, 'uuid/uuidv4.min') + } + },{ + name: 'proj4', + location: 'dep/proj4/dist', + main: 'proj4', + resourceTags: { + amd: amdTagger, + ignore: ignoreAllButExceptionsTagger.bind(null, 'proj4/proj4') + } + },{ + name: 'dropzone', + location: 'dep/dropzone/dist/min', + main: 'dropzone-amd-module.min', + resourceTags: { + amd: amdTagger, + ignore: ignoreAllButExceptionsTagger.bind(null, 'dropzone/dropzone-amd-module.min') + } + },{ + name: 'tv4', + location: 'dep/tv4', + main: 'tv4', + resourceTags: { + amd: amdTagger, + ignore: ignoreAllButExceptionsTagger.bind(null, 'tv4/tv4') + } + },{ + name: 'colorjs', + location: 'dep/color-js', + main: 'color', + resourceTags: { + copyOnly: copyOnlyTagger, + ignore: ignoreAllButExceptionsTagger.bind(null, 'colorjs/color') + } + },{ + name: 'json-schema-ref-parser', + location: 'dep/json-schema-ref-parser/dist', + main: 'ref-parser.min', + resourceTags: { + amd: amdTagger, + ignore: ignoreAllButExceptionsTagger.bind(null, 'json-schema-ref-parser/ref-parser.min') + } + },{ + name: 'packery', + location: 'dep/packery/dist', + main: 'packery.pkgd.min', + resourceTags: { + amd: amdTagger, + ignore: ignoreAllButExceptionsTagger.bind(null, 'packery/packery.pkgd.min') + } + },{ + name: 'draggabilly', + location: 'dep/draggabilly/dist', + main: 'draggabilly.pkgd.min', + resourceTags: { + amd: amdTagger, + ignore: ignoreAllButExceptionsTagger.bind(null, 'draggabilly/draggabilly.pkgd.min') + } + },{ + name: 'handlebars', + location: 'dep/handlebars/dist', + main: 'handlebars.runtime.min', + resourceTags: { + amd: amdTagger, + ignore: ignoreAllButExceptionsTagger.bind(null, 'handlebars/handlebars.runtime.min') + } + },{ + name: 'RWidgets', + location: 'src/util/widgets', + resourceTags: { + amd: amdTagger + } + },{ + name: 'templates', + location: 'dep/templates/dist', + resourceTags: { + amd: amdTagger + } + },{ + name: 'app', + location: 'src/oldapp', + resourceTags: { + amd: amdTagger + } + },{ + name: 'src', + location: 'src', + resourceTags: { + amd: amdTagger + } + }], + + map: packagesMap, + + layers: { + 'dojo/dojo': { + customBase: true, + boot: true, + include: [ + 'dojo/dojo' + , 'dojo/_base/html' + , 'dojo/_base/lang' + , 'dojo/DeferredList' + , 'dojo/dnd/autoscroll' + , 'dojo/dnd/move' + , 'dojo/dnd/Moveable' + , 'dojo/dnd/Mover' + , 'dojo/dnd/TimedMoveable' + , 'dojo/dom' + , 'dojo/dom-attr' + , 'dojo/dom-class' + , 'dojo/domReady' + , 'dojo/_base/declare' + , 'dojo/i18n' + , 'dojo/io-query' + , 'dojo/mouse' + , 'dojo/NodeList-dom' + , 'dojo/NodeList-manipulate' + , 'dojo/NodeList-traverse' + , 'dojo/request/notify' + , 'dojo/request/registry' + , 'dojo/store/Observable' + , 'dojo/touch' + , 'dojo/window' + ] + }, + 'src/app/App': { + includeLocales: includeLocales + } + } +}; + +var viewLayers = { + // especiales + 'src/error/404': {} + , 'src/error/NoSupportBrowser': {} + , 'src/home/HomeView': {} + , 'src/user/ActivateAccount': {} + + // catálogos + , 'src/catalog/activity/ActivityCatalogView': {} + , 'src/catalog/activity/_Edition': {} + , 'src/catalog/animal/AnimalCatalogView': {} + , 'src/catalog/animal/_Edition': {} + , 'src/catalog/bibliography/BibliographyCatalogView': {} + , 'src/catalog/bibliography/_Edition': {} + , 'src/catalog/ogcService/OgcServiceCatalogView': {} + , 'src/catalog/ogcService/_Edition': {} + , 'src/catalog/organisation/OrganisationCatalogView': {} + , 'src/catalog/organisation/_Edition': {} + , 'src/catalog/platform/PlatformCatalogView': {} + , 'src/catalog/platform/_Edition': {} + , 'src/catalog/program/ProgramCatalogView': {} + , 'src/catalog/program/_Edition': {} + , 'src/catalog/project/ProjectCatalogView': {} + , 'src/catalog/project/_Edition': {} + , 'src/catalog/raster/RasterCatalogView': {} + , 'src/catalog/species/SpeciesCatalogView': {} + , 'src/catalog/species/_Edition': {} + + // vistas detalle + , 'src/detail/activity/ActivityDetailView': {} + , 'src/detail/activity/_Edition': {} + , 'src/detail/animal/AnimalDetailView': {} + , 'src/detail/animal/_Edition': {} + , 'src/detail/bibliography/BibliographyDetailView': {} + , 'src/detail/bibliography/_Edition': {} + , 'src/detail/ogcService/OgcServiceDetailView': {} + , 'src/detail/ogcService/_Edition': {} + , 'src/detail/organisation/OrganisationDetailView': {} + , 'src/detail/organisation/_Edition': {} + , 'src/detail/platform/PlatformDetailView': {} + , 'src/detail/platform/_Edition': {} + , 'src/detail/program/ProgramDetailView': {} + , 'src/detail/program/_Edition': {} + , 'src/detail/project/ProjectDetailView': {} + , 'src/detail/project/_Edition': {} + , 'src/detail/species/SpeciesDetailView': {} + , 'src/detail/species/_Edition': {} + + // mantenimiento + , 'src/maintenance/domain/DomainMaintenanceView': {} + + // visores + , 'src/viewer/atlas/AtlasViewerView': {} + , 'src/viewer/marineMonitoring/MarineMonitoringViewerView': {} + + + // ------------------------------------------------------------------------- + + , 'app/administrative/views/ContactView': {} + , 'app/administrative/views/DeviceView': {} + + , 'app/administrative/taxonomy/views/MisIdentificationView': {} + , 'app/administrative/taxonomy/views/GenusView': {} + , 'app/administrative/taxonomy/views/FamilyView': {} + , 'app/administrative/taxonomy/views/OrderView': {} + , 'app/administrative/taxonomy/views/ClassView': {} + , 'app/administrative/taxonomy/views/SubphylumView': {} + , 'app/administrative/taxonomy/views/PhylumView': {} + , 'app/administrative/taxonomy/views/KingdomView': {} + , 'app/administrative/taxonomy/views/TaxonomyView': {} + + , 'app/user/views/RegisterView': {} + , 'app/user/views/ResettingView': {} + , 'app/user/views/WhatIsRedmicView': {} + , 'app/user/views/LoginView': {} + , 'app/user/views/ConfirmResettingView': {} + , 'app/user/views/TermsAndConditionsView': {} + , 'app/user/views/InnerWhatIsRedmicView': {} + , 'app/user/views/InnerTermsAndConditionsView': {} + , 'app/user/views/FeedbackView': {} + , 'app/user/views/UserProfileView': {} + + , 'app/maintenance/views/DomainView': {} + , 'app/maintenance/views/PermissionsView': {} + + , 'app/viewers/views/SpeciesDistributionView': {} + , 'app/viewers/views/TrackingView': {} + , 'app/viewers/views/TrashCollectionView': {} + , 'app/viewers/views/ChartsView': {} + , 'app/viewers/views/RealTimeView': {} + , 'app/viewers/views/RealTimeDashboardView': {} + + , 'app/details/views/ContactDetailsView': {} + + , 'app/edition/views/ActivityEditionView': {} + , 'app/edition/views/DeviceEditionView': {} + , 'app/edition/views/DocumentEditionView': {} + , 'app/edition/views/ProgramEditionView': {} + , 'app/edition/views/ProjectEditionView': {} + , 'app/edition/views/SpeciesEditionView': {} + , 'app/edition/views/ContactEditionView': {} + , 'app/edition/views/OrganisationEditionView': {} + , 'app/edition/views/PlatformEditionView': {} + , 'app/edition/views/UnitEditionView': {} + , 'app/edition/views/MetricsDefinitionEditionView': {} + , 'app/edition/views/ParameterEditionView': {} + , 'app/edition/views/ServiceOGCEditionView': {} + , 'app/edition/views/AnimalEditionView': {} + , 'app/edition/views/PermissionsEditionView': {} + , 'app/edition/views/MisIdentificationEditionView': {} + , 'app/edition/views/LoadDataToActivityEditionView': {} + , 'app/edition/views/LoadDataDocumentEditionView': {} +}; + +var viewLayerDefaultConfig = { + includeLocales: includeLocales +}; + +var profile = (function() { + + for (var viewLayer in viewLayers) { + var viewLayerConfig = viewLayers[viewLayer]; + profileObj.layers[viewLayer] = { ...viewLayerConfig, ...viewLayerDefaultConfig }; + } + + return profileObj; +})(); diff --git a/public/javascript/alertify b/client-app/dep/alertify similarity index 100% rename from public/javascript/alertify rename to client-app/dep/alertify diff --git a/public/javascript/cbtree b/client-app/dep/cbtree similarity index 100% rename from public/javascript/cbtree rename to client-app/dep/cbtree diff --git a/public/javascript/color-js b/client-app/dep/color-js similarity index 100% rename from public/javascript/color-js rename to client-app/dep/color-js diff --git a/public/javascript/d3 b/client-app/dep/d3 similarity index 100% rename from public/javascript/d3 rename to client-app/dep/d3 diff --git a/public/javascript/d3-v6-tip b/client-app/dep/d3-v6-tip similarity index 100% rename from public/javascript/d3-v6-tip rename to client-app/dep/d3-v6-tip diff --git a/public/javascript/deepmerge b/client-app/dep/deepmerge similarity index 100% rename from public/javascript/deepmerge rename to client-app/dep/deepmerge diff --git a/public/javascript/dijit b/client-app/dep/dijit similarity index 100% rename from public/javascript/dijit rename to client-app/dep/dijit diff --git a/public/javascript/dojo b/client-app/dep/dojo similarity index 100% rename from public/javascript/dojo rename to client-app/dep/dojo diff --git a/public/javascript/dojox b/client-app/dep/dojox similarity index 100% rename from public/javascript/dojox rename to client-app/dep/dojox diff --git a/public/javascript/draggabilly b/client-app/dep/draggabilly similarity index 100% rename from public/javascript/draggabilly rename to client-app/dep/draggabilly diff --git a/public/javascript/dropzone b/client-app/dep/dropzone similarity index 100% rename from public/javascript/dropzone rename to client-app/dep/dropzone diff --git a/public/javascript/handlebars b/client-app/dep/handlebars similarity index 100% rename from public/javascript/handlebars rename to client-app/dep/handlebars diff --git a/client-app/dep/iso8601-js-period b/client-app/dep/iso8601-js-period new file mode 120000 index 0000000000000000000000000000000000000000..1a84ac48db50c9dacedbbbb2c689d230a085edb2 --- /dev/null +++ b/client-app/dep/iso8601-js-period @@ -0,0 +1 @@ +../../node_modules/iso8601-js-period/ \ No newline at end of file diff --git a/public/javascript/json-schema-ref-parser b/client-app/dep/json-schema-ref-parser similarity index 100% rename from public/javascript/json-schema-ref-parser rename to client-app/dep/json-schema-ref-parser diff --git a/public/javascript/leaflet b/client-app/dep/leaflet similarity index 100% rename from public/javascript/leaflet rename to client-app/dep/leaflet diff --git a/public/javascript/leaflet-areaselect b/client-app/dep/leaflet-areaselect similarity index 100% rename from public/javascript/leaflet-areaselect rename to client-app/dep/leaflet-areaselect diff --git a/public/javascript/leaflet-coordinates b/client-app/dep/leaflet-coordinates similarity index 100% rename from public/javascript/leaflet-coordinates rename to client-app/dep/leaflet-coordinates diff --git a/public/javascript/leaflet-draw b/client-app/dep/leaflet-draw similarity index 100% rename from public/javascript/leaflet-draw rename to client-app/dep/leaflet-draw diff --git a/public/javascript/leaflet-measure b/client-app/dep/leaflet-measure similarity index 100% rename from public/javascript/leaflet-measure rename to client-app/dep/leaflet-measure diff --git a/public/javascript/leaflet-minimap b/client-app/dep/leaflet-minimap similarity index 100% rename from public/javascript/leaflet-minimap rename to client-app/dep/leaflet-minimap diff --git a/client-app/dep/leaflet-nav b/client-app/dep/leaflet-nav new file mode 120000 index 0000000000000000000000000000000000000000..dca4f937962ed271415d7dea97bda66a2680833e --- /dev/null +++ b/client-app/dep/leaflet-nav @@ -0,0 +1 @@ +../../node_modules/leaflet-nav \ No newline at end of file diff --git a/public/javascript/leaflet-nontiledlayer b/client-app/dep/leaflet-nontiledlayer similarity index 100% rename from public/javascript/leaflet-nontiledlayer rename to client-app/dep/leaflet-nontiledlayer diff --git a/client-app/dep/leaflet-timedimension b/client-app/dep/leaflet-timedimension new file mode 120000 index 0000000000000000000000000000000000000000..919ffd6ade0fd43e50e5eb392bc5d079d9af8615 --- /dev/null +++ b/client-app/dep/leaflet-timedimension @@ -0,0 +1 @@ +../../node_modules/leaflet-timedimension/ \ No newline at end of file diff --git a/client-app/dep/leaflet.awesome-markers b/client-app/dep/leaflet.awesome-markers new file mode 120000 index 0000000000000000000000000000000000000000..1532789a952ae6b1749c3e670cbf95f2d991fdf9 --- /dev/null +++ b/client-app/dep/leaflet.awesome-markers @@ -0,0 +1 @@ +../../node_modules/leaflet.awesome-markers \ No newline at end of file diff --git a/public/javascript/mediatorjs b/client-app/dep/mediatorjs similarity index 100% rename from public/javascript/mediatorjs rename to client-app/dep/mediatorjs diff --git a/public/javascript/moment b/client-app/dep/moment similarity index 100% rename from public/javascript/moment rename to client-app/dep/moment diff --git a/public/javascript/packery b/client-app/dep/packery similarity index 100% rename from public/javascript/packery rename to client-app/dep/packery diff --git a/public/javascript/pdfjs b/client-app/dep/pdfjs similarity index 100% rename from public/javascript/pdfjs rename to client-app/dep/pdfjs diff --git a/public/javascript/proj4 b/client-app/dep/proj4 similarity index 100% rename from public/javascript/proj4 rename to client-app/dep/proj4 diff --git a/public/javascript/pruneCluster b/client-app/dep/pruneCluster similarity index 100% rename from public/javascript/pruneCluster rename to client-app/dep/pruneCluster diff --git a/public/javascript/put-selector b/client-app/dep/put-selector similarity index 100% rename from public/javascript/put-selector rename to client-app/dep/put-selector diff --git a/public/javascript/sockjs b/client-app/dep/sockjs similarity index 100% rename from public/javascript/sockjs rename to client-app/dep/sockjs diff --git a/public/javascript/stomp-websocket b/client-app/dep/stomp-websocket similarity index 100% rename from public/javascript/stomp-websocket rename to client-app/dep/stomp-websocket diff --git a/client-app/dep/templates b/client-app/dep/templates new file mode 160000 index 0000000000000000000000000000000000000000..8d7fa51be440bf8eeedd618a80d1ea5b93877a3e --- /dev/null +++ b/client-app/dep/templates @@ -0,0 +1 @@ +Subproject commit 8d7fa51be440bf8eeedd618a80d1ea5b93877a3e diff --git a/public/javascript/tv4 b/client-app/dep/tv4 similarity index 100% rename from public/javascript/tv4 rename to client-app/dep/tv4 diff --git a/public/javascript/util b/client-app/dep/util similarity index 100% rename from public/javascript/util rename to client-app/dep/util diff --git a/public/javascript/uuid b/client-app/dep/uuid similarity index 100% rename from public/javascript/uuid rename to client-app/dep/uuid diff --git a/public/javascript/wicket b/client-app/dep/wicket similarity index 100% rename from public/javascript/wicket rename to client-app/dep/wicket diff --git a/public/resources/documents/ModeloLogico.pdf b/client-app/res/documents/ModeloLogico.pdf similarity index 100% rename from public/resources/documents/ModeloLogico.pdf rename to client-app/res/documents/ModeloLogico.pdf diff --git a/client-app/res/images/bglogin.png b/client-app/res/images/bglogin.png new file mode 100644 index 0000000000000000000000000000000000000000..c9d8be5268d858c298a11304f02830798a5b3d9d Binary files /dev/null and b/client-app/res/images/bglogin.png differ diff --git a/client-app/res/images/browsers/chrome.png b/client-app/res/images/browsers/chrome.png new file mode 100644 index 0000000000000000000000000000000000000000..2d08a85b9989bb0b85fc02bcd0da93657d90227c Binary files /dev/null and b/client-app/res/images/browsers/chrome.png differ diff --git a/client-app/res/images/browsers/edge.png b/client-app/res/images/browsers/edge.png new file mode 100644 index 0000000000000000000000000000000000000000..cd877be0a68b82084e8d8783513f08345e43b862 Binary files /dev/null and b/client-app/res/images/browsers/edge.png differ diff --git a/client-app/res/images/browsers/firefox.png b/client-app/res/images/browsers/firefox.png new file mode 100644 index 0000000000000000000000000000000000000000..d6b31db7f250ce228e88c2a1047a99f8e29d491f Binary files /dev/null and b/client-app/res/images/browsers/firefox.png differ diff --git a/client-app/res/images/browsers/opera.png b/client-app/res/images/browsers/opera.png new file mode 100644 index 0000000000000000000000000000000000000000..9af1d42d10b23369b6384e2fb70c1e2d1b6614cc Binary files /dev/null and b/client-app/res/images/browsers/opera.png differ diff --git a/public/resources/images/favicon.ico b/client-app/res/images/favicon.ico similarity index 100% rename from public/resources/images/favicon.ico rename to client-app/res/images/favicon.ico diff --git a/client-app/res/images/loading.svg b/client-app/res/images/loading.svg new file mode 100644 index 0000000000000000000000000000000000000000..10909fb10ca897c72c37305097ced73ef324f0de --- /dev/null +++ b/client-app/res/images/loading.svg @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/public/resources/images/logos/gobcan-logos.png b/client-app/res/images/logos/gobcan-logos.png similarity index 100% rename from public/resources/images/logos/gobcan-logos.png rename to client-app/res/images/logos/gobcan-logos.png diff --git a/public/resources/images/logos/logo.svg b/client-app/res/images/logos/logo.svg similarity index 100% rename from public/resources/images/logos/logo.svg rename to client-app/res/images/logos/logo.svg diff --git a/public/resources/images/logos/redmic-logo-1200x1200.jpg b/client-app/res/images/logos/redmic-logo-1200x1200.jpg similarity index 100% rename from public/resources/images/logos/redmic-logo-1200x1200.jpg rename to client-app/res/images/logos/redmic-logo-1200x1200.jpg diff --git a/public/resources/images/logos/redmic-logo-og.jpg b/client-app/res/images/logos/redmic-logo-og.jpg similarity index 100% rename from public/resources/images/logos/redmic-logo-og.jpg rename to client-app/res/images/logos/redmic-logo-og.jpg diff --git a/public/resources/images/logos/redmic-logo-og.png b/client-app/res/images/logos/redmic-logo-og.png similarity index 100% rename from public/resources/images/logos/redmic-logo-og.png rename to client-app/res/images/logos/redmic-logo-og.png diff --git a/public/resources/images/logos/redmicSimple.png b/client-app/res/images/logos/redmicSimple.png similarity index 100% rename from public/resources/images/logos/redmicSimple.png rename to client-app/res/images/logos/redmicSimple.png diff --git a/public/resources/images/logos/twitter-light.png b/client-app/res/images/logos/twitter-light.png similarity index 100% rename from public/resources/images/logos/twitter-light.png rename to client-app/res/images/logos/twitter-light.png diff --git a/public/resources/images/map/layer-eoc-map.png b/client-app/res/images/map/layer-eoc-map.png similarity index 100% rename from public/resources/images/map/layer-eoc-map.png rename to client-app/res/images/map/layer-eoc-map.png diff --git a/public/resources/images/map/layer-ortofoto.png b/client-app/res/images/map/layer-ortofoto.png similarity index 100% rename from public/resources/images/map/layer-ortofoto.png rename to client-app/res/images/map/layer-ortofoto.png diff --git a/public/resources/images/map/layer-redmic.png b/client-app/res/images/map/layer-redmic.png similarity index 100% rename from public/resources/images/map/layer-redmic.png rename to client-app/res/images/map/layer-redmic.png diff --git a/public/resources/images/map/layer-topografico.png b/client-app/res/images/map/layer-topografico.png similarity index 100% rename from public/resources/images/map/layer-topografico.png rename to client-app/res/images/map/layer-topografico.png diff --git a/public/resources/images/noIMG.png b/client-app/res/images/noIMG.png similarity index 100% rename from public/resources/images/noIMG.png rename to client-app/res/images/noIMG.png diff --git a/public/resources/images/redmic_opciones_usuario.JPG b/client-app/res/images/redmic_opciones_usuario.JPG similarity index 100% rename from public/resources/images/redmic_opciones_usuario.JPG rename to client-app/res/images/redmic_opciones_usuario.JPG diff --git a/public/resources/images/redmic_tabla_geometrias.jpg b/client-app/res/images/redmic_tabla_geometrias.jpg similarity index 100% rename from public/resources/images/redmic_tabla_geometrias.jpg rename to client-app/res/images/redmic_tabla_geometrias.jpg diff --git a/public/javascript/redmic/modules/app/App.js b/client-app/src/app/App.js similarity index 84% rename from public/javascript/redmic/modules/app/App.js rename to client-app/src/app/App.js index f0a365a806bccb327673a9fea3443deb6ad1857b..1334955c861b12f2d758402cad84175af8fc030a 100644 --- a/public/javascript/redmic/modules/app/App.js +++ b/client-app/src/app/App.js @@ -1,67 +1,54 @@ define([ - 'app/components/CookieLoader' - , 'app/redmicConfig' - , 'dojo/_base/declare' + 'dojo/_base/declare' , 'dojo/_base/lang' , 'dojo/dom' - , 'dojo/has' - , 'put-selector/put' - , 'redmic/base/CheckBrowser' - , 'redmic/modules/app/innerApp' - , 'redmic/modules/app/ModuleStore' - , 'redmic/modules/app/outerApp' - , 'redmic/modules/app/Router' - , 'redmic/modules/notification/CommunicationCenter' - , 'redmic/modules/notification/Alert' - , 'redmic/modules/base/Credentials' - , 'redmic/modules/base/Analytics' - , 'redmic/modules/metaTags/MetaTags' - , 'redmic/modules/base/_Module' - , 'redmic/modules/base/_Store' - , 'redmic/modules/base/Loading' - , 'redmic/modules/components/ExternalConfig' - , 'redmic/modules/store/RestManagerImpl' + , 'put-selector' + , 'src/app/component/Analytics' + , 'src/app/component/Credentials' + , 'src/app/component/ExternalConfig' + , 'src/app/component/layout/InnerLayoutImpl' + , 'src/app/component/layout/OuterLayoutImpl' + , 'src/app/component/Loading' + , 'src/app/component/meta/MetaTags' + , 'src/app/component/ModuleStore' + , 'src/app/component/Router' + , 'src/app/util/CheckBrowser' + , 'src/component/notification/CommunicationCenter' + , 'src/component/notification/Alert' + , 'src/component/base/_Module' + , 'src/component/base/_Store' + , 'src/component/store/RestManagerImpl' + , 'src/redmicConfig' + , 'src/util/CookieLoader' , 'templates/LoadingCustom' ], function( - CookieLoader - , redmicConfig - , declare + declare , lang , dom - , has , put - , CheckBrowser - , InnerApp + , Analytics + , Credentials + , ExternalConfig + , InnerLayoutImpl + , OuterLayoutImpl + , Loading + , MetaTags , ModuleStore - , OuterApp , Router + , CheckBrowser , CommunicationCenter , Alert - , Credentials - , Analytics - , MetaTags , _Module , _Store - , Loading - , ExternalConfig , RestManagerImpl + , redmicConfig + , CookieLoader , LoadingCustomTemplate ) { var rootNode = dom.byId('rootContainer'), nativeLoadingNode = dom.byId('loadingContainer'); - var getGlobalContext = function() { - - if (has('host-browser')) { - return window; - } else if (has('host-node')) { - return global; - } else { - console.error('Environment not supported'); - } - }; - var hideNativeLoadingNode = function() { if (nativeLoadingNode) { @@ -72,9 +59,9 @@ define([ if (!CheckBrowser.isSupported()) { hideNativeLoadingNode(); - getGlobalContext().location.href = '/noSupportBrowser'; + globalThis.location.href = '/noSupportBrowser'; - return; + return declare(null); } return declare(_Module, { @@ -97,7 +84,7 @@ define([ // Instancia del módulo para gestionar el nodo cargando desde cualquier módulo. // _currLayoutInstance: Object - // Instancia del layout de aplicación actual (innerApp o outerApp). + // Instancia del componente de layout de aplicación actual (InnerLayoutImpl o OuterLayoutImpl). // _currModuleInstance: Object // Instancia del módulo que está activado actualmente. // _currModuleKey: String @@ -108,7 +95,7 @@ define([ constructor: function(args) { // TODO medida temporal de comienzo de migración de identidad - var currDomain = getGlobalContext().location.hostname, + var currDomain = globalThis.location.hostname, ecomarcanDomainPattern = /.*ecomarcan\..+/; this.config = { @@ -116,10 +103,12 @@ define([ events: { GET_CREDENTIALS: 'getCredentials', GET_MODULE: 'getModule', - CLEAR_MODULE: 'clearModule' + CLEAR_MODULE: 'clearModule', + MODULE_CHANGED: 'moduleChanged' }, actions: { - CHANGE_MODULE: 'changeModule' + CHANGE_MODULE: 'changeModule', + MODULE_CHANGED: 'moduleChanged' }, _reconnectTimeout: 10000, @@ -134,8 +123,7 @@ define([ var parentChannel = this.getChannel(); this._router = new Router({ - parentChannel: parentChannel, - globalContext: getGlobalContext() + parentChannel: parentChannel }); new CookieLoader(); @@ -190,6 +178,9 @@ define([ },{ channel : this._credentials.getChannel('REMOVED'), callback: '_subCredentialsRemoved' + },{ + channel : this._credentials.getChannel('ADDED'), + callback: '_subCredentialsAdded' },{ channel : this._credentials.getChannel('REQUEST_FAILED'), callback: '_subCredentialsRequestFailed' @@ -210,6 +201,9 @@ define([ },{ event: 'CLEAR_MODULE', channel: this._moduleStore.getChannel('CLEAR_MODULE') + },{ + event: 'MODULE_CHANGED', + channel: this.getChannel('MODULE_CHANGED') }); }, @@ -220,16 +214,19 @@ define([ _subCredentialsRemoved: function() { - this._publish(this._router.getChannel('GO_TO_ROOT_ROUTE'), { + this._publish(this._router.getChannel('GO_TO_PREV_OR_ROOT_ROUTE'), { userGone: true }); }, + _subCredentialsAdded: function() { + + this._publish(this._router.getChannel('GO_TO_PREV_OR_ROOT_ROUTE')); + }, + _subAvailableCredentials: function(res) { - this._publish(this._router.getChannel('EVALUATE_ROUTE'), { - userFound: res.found - }); + this._publish(this._router.getChannel('EVALUATE_ROUTE')); }, _subCredentialsRequestFailed: function() { @@ -247,12 +244,18 @@ define([ locationQuery = req.locationQuery, routeChanged = this._changeModule(route); - if (routeChanged) { - this._emitEvt('TRACK', { - type: TRACK.type.page, - info: route + locationQuery - }); + if (!routeChanged) { + return; } + + this._emitEvt('TRACK', { + type: TRACK.type.page, + info: route + locationQuery + }); + + this._emitEvt('MODULE_CHANGED', { + route: route + }); }, _showReconnectingMessage: function() { @@ -370,7 +373,7 @@ define([ this._deleteLayout(); - this._currLayoutInstance = new InnerApp({ + this._currLayoutInstance = new InnerLayoutImpl({ parentChannel: this.getChannel(), ecomarcan: this._ecomarcan }); @@ -389,7 +392,7 @@ define([ this._deleteLayout(); - this._currLayoutInstance = new OuterApp({ + this._currLayoutInstance = new OuterLayoutImpl({ parentChannel: this.getChannel(), ecomarcan: this._ecomarcan }); diff --git a/public/javascript/redmic/modules/base/Analytics.js b/client-app/src/app/component/Analytics.js similarity index 99% rename from public/javascript/redmic/modules/base/Analytics.js rename to client-app/src/app/component/Analytics.js index b1e5727c12eaa5d95bf75d9d63929f7c1cb90d52..555903d455fa127f2245a30dbad5ac0b60e70caf 100644 --- a/public/javascript/redmic/modules/base/Analytics.js +++ b/client-app/src/app/component/Analytics.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Module" + , "src/component/base/_Module" ], function( declare , lang @@ -9,7 +9,7 @@ define([ ){ // Constantes para trakear acciones // TODO: sacar a un fichero externo (Necesita ser global) - window.TRACK = { + globalThis.TRACK = { 'type': { 'event': 'event', 'page': 'pageview', diff --git a/public/javascript/redmic/modules/base/Credentials.js b/client-app/src/app/component/Credentials.js similarity index 71% rename from public/javascript/redmic/modules/base/Credentials.js rename to client-app/src/app/component/Credentials.js index 87851ce5dfdea480fd034b68f02aa491386d287f..a39859cec9020f7a652e4fb408af019c7049e84f 100644 --- a/public/javascript/redmic/modules/base/Credentials.js +++ b/client-app/src/app/component/Credentials.js @@ -1,16 +1,16 @@ define([ - 'app/redmicConfig' - , 'dojo/_base/declare' + 'dojo/_base/declare' , 'dojo/_base/lang' - , 'redmic/modules/base/_Module' - , 'redmic/modules/base/_Store' - , 'redmic/base/Credentials' + , 'src/component/base/_Module' + , 'src/component/base/_Store' + , 'src/redmicConfig' + , 'src/util/Credentials' ], function( - redmicConfig - , declare + declare , lang , _Module , _Store + , redmicConfig , Credentials ) { @@ -30,9 +30,12 @@ define([ events: { GET_CREDENTIALS: 'getCredentials', GET_ALLOWED_MODULES: 'getAllowedModules', - REMOVE: 'remove', + REMOVED: 'removed', + ADDED: 'added', ACCEPT_COOKIES: 'acceptCookies', - REQUEST_FAILED: 'requestFailed' + REQUEST_FAILED: 'requestFailed', + USER_HAS_EDITION_CAPABILITIES: 'userHasEditionCapabilities', + GOT_USER_GRANTS_FOR_ACTIVITY: 'gotUserGrantsForActivity' }, actions: { GET_CREDENTIALS: 'getCredentials', @@ -40,10 +43,15 @@ define([ AVAILABLE: 'available', AVAILABLE_ALLOWED_MODULES: 'availableAllowedModules', REMOVED: 'removed', + ADDED: 'added', COOKIES_ACCEPTED: 'cookiesAccepted', ACCEPT_COOKIES: 'acceptCookies', COOKIES_STATE: 'cookiesState', - REQUEST_FAILED: 'requestFailed' + REQUEST_FAILED: 'requestFailed', + HAS_USER_EDITION_CAPABILITIES: 'hasUserEditionCapabilities', + USER_HAS_EDITION_CAPABILITIES: 'userHasEditionCapabilities', + GET_USER_GRANTS_FOR_ACTIVITY: 'getUserGrantsForActivity', + GOT_USER_GRANTS_FOR_ACTIVITY: 'gotUserGrantsForActivity' }, target: redmicConfig.services.profile, @@ -90,6 +98,12 @@ define([ },{ channel : this.getChannel('ACCEPT_COOKIES'), callback: '_subAcceptCookies' + },{ + channel : this.getChannel('HAS_USER_EDITION_CAPABILITIES'), + callback: '_subHasUserEditionCapabilities' + },{ + channel : this.getChannel('GET_USER_GRANTS_FOR_ACTIVITY'), + callback: '_subGetUserGrantsForActivity' }); }, @@ -102,14 +116,23 @@ define([ event: 'GET_ALLOWED_MODULES', channel: this.getChannel('AVAILABLE_ALLOWED_MODULES') },{ - event: 'REMOVE', + event: 'REMOVED', channel: this.getChannel('REMOVED') + },{ + event: 'ADDED', + channel: this.getChannel('ADDED') },{ event: 'ACCEPT_COOKIES', channel: this.getChannel('COOKIES_ACCEPTED') },{ event: 'REQUEST_FAILED', channel: this.getChannel('REQUEST_FAILED') + },{ + event: 'USER_HAS_EDITION_CAPABILITIES', + channel: this.getChannel('USER_HAS_EDITION_CAPABILITIES') + },{ + event: 'GOT_USER_GRANTS_FOR_ACTIVITY', + channel: this.getChannel('GOT_USER_GRANTS_FOR_ACTIVITY') }); }, @@ -148,6 +171,24 @@ define([ Credentials.set('cookiesAccepted', 'true'); }, + _subHasUserEditionCapabilities: function(_req) { + + this._emitEvt('USER_HAS_EDITION_CAPABILITIES', { + editionCapabilities: Credentials.userIsEditor() + }); + }, + + _subGetUserGrantsForActivity: function(req) { + // TODO consultar contra el servidor utilizando id de actividad y usuario + + var activityId = req.activityId, + accessGranted = Credentials.userIsEditor(); + + this._emitEvt('GOT_USER_GRANTS_FOR_ACTIVITY', { + accessGranted: accessGranted + }); + }, + _onAccessTokenChanged: function(evt) { var value = evt.value; @@ -159,19 +200,14 @@ define([ this._setEmptySelectionIds(); - var location = window.location; - if (location.pathname === this._loginPath) { - this._getCredentials(); - } else { - location.reload(); - } + this._emitEvt('ADDED'); }, _onAccessTokenRemoved: function() { this._setEmptySelectionIds(); - this._emitEvt('REMOVE'); + this._emitEvt('REMOVED'); }, _cookiesAccepted: function(evt) { diff --git a/public/javascript/redmic/modules/components/ExternalConfig.js b/client-app/src/app/component/ExternalConfig.js similarity index 96% rename from public/javascript/redmic/modules/components/ExternalConfig.js rename to client-app/src/app/component/ExternalConfig.js index 85198cace153b5075c5a9472f629b3126990af53..4562b2812614ef6b2fe5f84dc0390e21323c7876 100644 --- a/public/javascript/redmic/modules/components/ExternalConfig.js +++ b/client-app/src/app/component/ExternalConfig.js @@ -1,10 +1,10 @@ define([ - 'app/redmicConfig' + 'src/redmicConfig' , 'dojo/_base/declare' , 'dojo/_base/lang' - , 'redmic/modules/base/_Module' - , 'redmic/modules/base/_Store' - , 'redmic/base/Credentials' + , 'src/component/base/_Module' + , 'src/component/base/_Store' + , 'src/util/Credentials' ], function( redmicConfig , declare diff --git a/public/javascript/redmic/modules/base/Loading.js b/client-app/src/app/component/Loading.js similarity index 99% rename from public/javascript/redmic/modules/base/Loading.js rename to client-app/src/app/component/Loading.js index a4f2e3d835d26d17fb6e256c12369813ef79a210..5f2dd190bc6329b2a5845a539e1ccb07000f3e87 100644 --- a/public/javascript/redmic/modules/base/Loading.js +++ b/client-app/src/app/component/Loading.js @@ -2,8 +2,8 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' , 'dojo/query' - , 'put-selector/put' - , 'redmic/modules/base/_Module' + , 'put-selector' + , 'src/component/base/_Module' , 'templates/LoadingArrows' ], function( declare diff --git a/public/javascript/redmic/modules/app/ModuleStore.js b/client-app/src/app/component/ModuleStore.js similarity index 64% rename from public/javascript/redmic/modules/app/ModuleStore.js rename to client-app/src/app/component/ModuleStore.js index 7f16b4d1812ccdf1c0c72c04b1b658720fc8253a..ba9630f80697f886f43901d242c6a6cd12367f43 100644 --- a/public/javascript/redmic/modules/app/ModuleStore.js +++ b/client-app/src/app/component/ModuleStore.js @@ -1,22 +1,23 @@ define([ - "app/base/views/_View" - , "app/redmicConfig" - , "dojo/_base/declare" - , "dojo/_base/lang" - , "dojo/Deferred" - , "dojo/promise/all" - , "dojo/store/Memory" - , "redmic/modules/base/_Module" + 'dojo/_base/declare' + , 'dojo/_base/lang' + , 'dojo/Deferred' + , 'dojo/promise/all' + , 'dojo/store/Memory' + , 'src/app/component/view/_View' + , 'src/component/base/_Module' + , 'src/redmicConfig' ], function( - _View - , redmicConfig - , declare + declare , lang , Deferred , all , Memory + , _View , _Module -){ + , redmicConfig +) { + return declare(_Module, { // summary: // Módulo encargado de almacenar los módulos de la aplicación. @@ -42,42 +43,41 @@ define([ this.config = { moduleStore: new Memory(), actions: { - GET_ALLOWED_MODULES: "getAllowedModules", - AVAILABLE_ALLOWED_MODULES: "availableAllowedModules", - GET_MODULE: "getModule", - AVAILABLE_MODULE: "availableModule", + AVAILABLE_ALLOWED_MODULES: 'availableAllowedModules', + HAS_USER_EDITION_CAPABILITIES: 'hasUserEditionCapabilities', + USER_HAS_EDITION_CAPABILITIES: 'userHasEditionCapabilities', + GET_MODULE: 'getModule', + AVAILABLE_MODULE: 'availableModule', CLEAR_MODULE: 'clearModule' }, events: { - GET_ALLOWED_MODULES: "getAllowedModules", - GET_MODULE: "getModule" + GET_MODULE: 'getModule' }, // mediator params - ownChannel: "moduleStore", + ownChannel: 'moduleStore', maxInstances: 10, - viewSeparator: "/", + viewSeparator: '/', - parameterRegExp: "([\-a-zA-Z0-9_\+=]+)", - parameterDelimiter: "{id}" + parameterRegExp: '([\-a-zA-Z0-9_\+=]+)', + parameterDelimiter: '{id}' }; lang.mixin(this, this.config, args); }, - _defineSubscriptions: function () { + _defineSubscriptions: function() { this.subscriptionsConfig.push({ - channel : this._buildChannel(this.credentialsChannel, - this.actions.AVAILABLE_ALLOWED_MODULES), - callback: "_subAllowedModules", + channel : this._buildChannel(this.credentialsChannel, 'AVAILABLE_ALLOWED_MODULES'), + callback: '_subAllowedModules', options: { predicate: lang.hitch(this, this._chkPublicationIsForMe) } },{ - channel : this.getChannel("GET_MODULE"), - callback: "_subGetModule" + channel : this.getChannel('GET_MODULE'), + callback: '_subGetModule' },{ channel : this.getChannel('CLEAR_MODULE'), callback: '_subClearModule' @@ -87,21 +87,8 @@ define([ _definePublications: function() { this.publicationsConfig.push({ - event: 'GET_ALLOWED_MODULES', - channel: this._buildChannel(this.credentialsChannel, - this.actions.GET_ALLOWED_MODULES) - },{ event: 'GET_MODULE', - channel: this.getChannel("AVAILABLE_MODULE") - }); - }, - - postCreate: function() { - - this.inherited(arguments); - - this._emitEvt('GET_ALLOWED_MODULES', { - id: this.getOwnChannel() + channel: this.getChannel('AVAILABLE_MODULE') }); }, @@ -164,20 +151,20 @@ define([ if (category.modules) { for (var j = 0; j < category.modules.length; j++) { var moduleItem = category.modules[j]; - if (moduleItem.perms && moduleItem.enable) { - this._addModule(category.name + "/" + moduleItem.name, moduleItem.name, - moduleItem.internPath, moduleItem.perms); + if (moduleItem.enable) { + this._addModule(category.name + '/' + moduleItem.name, moduleItem.name, + moduleItem.internPath); } } } - if (category.perms && category.enable) { - this._addModule(category.name, category.name, category.internPath, category.perms); + if (category.enable) { + this._addModule(category.name, category.name, category.internPath); } } }, - _addModule: function(/*String*/ id, /*String*/ name, /*String*/ internPath, /*Integer*/ perms) { + _addModule: function(/*String*/ id, /*String*/ name, /*String*/ internPath) { // summary: // Añade el item con la información básica al store // tags: @@ -188,16 +175,15 @@ define([ // nombre o path parcial del módulo // internPath: // ubicación del js de la vista - // perms: - // permisos del usuario en la vista - if (this._moduleExists(id)) return; + if (this._moduleExists(id)) { + return; + } this.moduleStore.put({ id: id, name: name, internPath: internPath, - perms: perms, instance: null, timeStamp: null }); @@ -244,28 +230,29 @@ define([ arrayAux = regex.exec(item.id); while (arrayAux[3] !== undefined) { - copyPath = copyPath.replace("{" + arrayAux[3] + "}", this.parameterRegExp); + copyPath = copyPath.replace('{' + arrayAux[3] + '}', this.parameterRegExp); results[arrayAux[3]] = true; arrayAux = regex.exec(item.id); } - var reg = new RegExp("^" + copyPath + "$"); + var reg = new RegExp('^' + copyPath + '$'); if (reg.test(path)) { var i = 1; for (var key in results) { - results[key] = path.replace(reg, "$" + i).replace("\/",""); + results[key] = path.replace(reg, '$' + i).replace('\/',''); this.pathVariableId = results[key]; i++; } var lengthResults = Object.keys(results).length; - if (lengthResults > 1) + if (lengthResults > 1) { this.pathVariableId = results; - else if (lengthResults === 0) + } else if (lengthResults === 0) { this.pathVariableId = null; + } return item; } @@ -299,57 +286,107 @@ define([ moduleItem.timeStamp = new Date().getTime(); this.moduleStore.put(moduleItem); - this._publish(moduleItem.instance.getChannel("CONNECT")); + this._publish(moduleItem.instance.getChannel('CONNECT')); this._publish(moduleItem.instance.getChannel('SET_PROPS'), { - pathVariableId: this.pathVariableId !== "$1" ? this.pathVariableId : null + pathVariableId: this.pathVariableId !== '$1' ? this.pathVariableId : null }); var dfd = new Deferred(); dfd.resolve(moduleItem.instance); - return dfd; // return Object + return dfd; // return Object }, - _createModule: function(/*Object*/ moduleItem) { + _createModule: function(/*Object*/ moduleStoreItem) { // summary: // Crea la instancia de un módulo de la aplicación. // tags: // private - // moduleItem: - // Módulo a crear + // moduleStoreItem: + // Elemento de configuración del módulo a crear // returns: // Promesa de la instancia del módulo - var dfd = new Deferred(), - parentChannel = redmicConfig.isOuterPath(moduleItem.id) ? this.outerAppChannel : this.innerAppChannel, - moduleDefinitionPath = 'app' + moduleItem.internPath + 'View'; + var instanceDfd = new Deferred(), + viewDefinitionPath = moduleStoreItem.internPath; + + // TODO parche para compatibilidad con antiguas rutas parciales, las nuevas ya han de empezar con 'src/' e + // incluir la terminación 'View' para ser totalmente explícitos + if (viewDefinitionPath.indexOf('src/') !== 0) { + viewDefinitionPath = 'app' + viewDefinitionPath + 'View'; + } + + var channelToSubscribe = this._buildChannel(this.credentialsChannel, 'USER_HAS_EDITION_CAPABILITIES'); + this._once(channelToSubscribe, lang.hitch(this, this._requireViewDefinition, { + moduleStoreItem: moduleStoreItem, + viewDefinitionPath: viewDefinitionPath, + instanceDfd: instanceDfd, + viewBaseDefinition: _View + })); + + var channelToPublish = this._buildChannel(this.credentialsChannel, 'HAS_USER_EDITION_CAPABILITIES'); + this._publish(channelToPublish); + + return instanceDfd; // return Object + }, + + _requireViewDefinition: function(/*Object*/ args, /*Object*/ res) { - require([moduleDefinitionPath], lang.hitch(this, function(moduleObj, ModuleView) { + var viewDefinitionPath = args.viewDefinitionPath, + pathsToRequire = [viewDefinitionPath]; - var moduleDefinition = declare([ModuleView, _View]); + if (res.editionCapabilities) { + var viewDefinitionPathSplitted = viewDefinitionPath.split(this.viewSeparator), + viewDefinitionParentPath = viewDefinitionPathSplitted.slice(0, -1); - // Creamos el módulo - var moduleInstance = new moduleDefinition({ - parentChannel: parentChannel, - ownChannel: this.viewSeparator + moduleObj.id, - perms: moduleObj.perms, - pathVariableId: this.pathVariableId !== "$1" ? this.pathVariableId : null - }); + viewDefinitionParentPath.push('_Edition'); + var viewEditionDefinitionPath = viewDefinitionParentPath.join(this.viewSeparator); + pathsToRequire.push(viewEditionDefinitionPath); + } + + require(pathsToRequire, lang.hitch(this, this._onViewDefinitionRequired, { + moduleStoreItem: args.moduleStoreItem, + instanceDfd: args.instanceDfd, + viewBaseDefinition: args.viewBaseDefinition + })); + }, - // Añadimos al store la instancia del módulo - moduleObj.instance = moduleInstance; - moduleObj.timeStamp = new Date().getTime(); - this.moduleStore.put(moduleObj); + _onViewDefinitionRequired: function( + /*Object*/ args, + /*Object*/ ViewDefinition, + /*Object?*/ EditionDefinition + ) { + + var moduleStoreItem = args.moduleStoreItem, + instanceDfd = args.instanceDfd, + viewBaseDefinition = args.viewBaseDefinition, + isOuterView = redmicConfig.isOuterPath(moduleStoreItem.id), + pathsToDeclare = [ViewDefinition]; + + // Si existe y fue posible obtener la extensión de edición para la vista, se añade + if (EditionDefinition && EditionDefinition !== 'not-a-module' && typeof EditionDefinition !== 'number') { + pathsToDeclare.push(EditionDefinition); + } + pathsToDeclare.push(viewBaseDefinition); + + // Creamos el módulo + var viewInstance = new declare(pathsToDeclare)({ + parentChannel: isOuterView ? this.outerAppChannel : this.innerAppChannel, + ownChannel: this.viewSeparator + moduleStoreItem.id, + pathVariableId: this.pathVariableId !== '$1' ? this.pathVariableId : null + }); - // Resolvemos para devolver la instancia creada - dfd.resolve(moduleInstance); + // Añadimos al store la instancia del módulo + moduleStoreItem.instance = viewInstance; + moduleStoreItem.timeStamp = new Date().getTime(); + this.moduleStore.put(moduleStoreItem); - // Limpiamos las instancias antiguas - this._clearOldInstances(); - }, moduleItem)); + // Resolvemos para devolver la instancia creada + instanceDfd.resolve(viewInstance); - return dfd; // return Object + // Limpiamos las instancias antiguas + this._clearOldInstances(); }, _subClearModule: function(/*Object*/ req) { @@ -376,7 +413,7 @@ define([ return item.instance !== null; }, { sort: [{ - attribute: "timeStamp" + attribute: 'timeStamp' }] }); diff --git a/public/javascript/redmic/modules/app/Router.js b/client-app/src/app/component/Router.js similarity index 56% rename from public/javascript/redmic/modules/app/Router.js rename to client-app/src/app/component/Router.js index 2782b6edc14cb694d090d9593036557f1cc494ee..ff414c6252452f8fc7e03135fd5fe7853439b7cb 100644 --- a/public/javascript/redmic/modules/app/Router.js +++ b/client-app/src/app/component/Router.js @@ -3,17 +3,13 @@ define([ , 'dojo/_base/lang' , 'dojo/dom-attr' , 'dojo/io-query' - , 'dojo/mouse' - , 'redmic/modules/base/_Module' - , 'redmic/modules/base/_Store' + , 'src/component/base/_Module' ], function( declare , lang , domAttr , ioQuery - , mouse , _Module - , _Store ) { return declare(_Module, { @@ -25,22 +21,20 @@ define([ // paths: Object // Constantes de rutas base - // globalContext: Object - // Contexto provisto por App para gestionar el entorno de ejecución - // _userFound: Boolean - // Indica si hay presente algún token de usuario. constructor: function(args) { this.config = { ownChannel: 'router', events: { - GET_QUERY_PARAMS: 'getQueryParams' + GET_QUERY_PARAMS: 'getQueryParams', + CHANGE_MODULE: 'changeModule' }, actions: { CHANGE_MODULE: 'changeModule', + MODULE_CHANGED: 'moduleChanged', EVALUATE_ROUTE: 'evaluateRoot', - GO_TO_ROOT_ROUTE: 'goToRootRoute', + GO_TO_PREV_OR_ROOT_ROUTE: 'goToPrevOrRootRoute', GO_TO_ERROR_ROUTE: 'goToErrorRoute', GET_QUERY_PARAMS: 'getQueryParams', GOT_QUERY_PARAMS: 'gotQueryParams' @@ -68,14 +62,20 @@ define([ channel : this.getChannel('EVALUATE_ROUTE'), callback: '_subEvaluateRoute' },{ - channel : this.getChannel('GO_TO_ROOT_ROUTE'), - callback: '_subGoToRootRoute' + channel : this.getChannel('GO_TO_PREV_OR_ROOT_ROUTE'), + callback: '_subGoToPrevOrRootRoute' },{ channel : this.getChannel('GO_TO_ERROR_ROUTE'), callback: '_subGoToErrorRoute' },{ channel : this.getChannel('GET_QUERY_PARAMS'), callback: '_subGetQueryParams' + },{ + channel : this._buildChannel(this.rootChannel, 'MODULE_CHANGED'), + callback: '_subModuleChanged', + options: { + predicate: lang.hitch(this, this._chkModuleChanged) + } }); }, @@ -84,6 +84,9 @@ define([ this.publicationsConfig.push({ event: 'GET_QUERY_PARAMS', channel: this.getChannel('GOT_QUERY_PARAMS') + },{ + event: 'CHANGE_MODULE', + channel: this._buildChannel(this.rootChannel, 'CHANGE_MODULE') }); }, @@ -94,20 +97,11 @@ define([ // tags: // private - var gCtx = this.globalContext, - dCtx = gCtx.document, - listenMethod, eventPrefix; + globalThis.addEventListener.call(globalThis, 'click', lang.hitch(this, this._evaluateClickEvt)); - if (gCtx.addEventListener) { - listenMethod = dCtx.addEventListener; - eventPrefix = ''; - } else { - listenMethod = dCtx.attachEvent; - eventPrefix = 'on'; - } - - listenMethod.call(dCtx, eventPrefix + 'click', lang.hitch(this, this._evaluateClickEvt)); - listenMethod.call(gCtx, eventPrefix + 'popstate', lang.hitch(this, this._evaluatePopStateEvt)); + globalThis.addEventListener.call(globalThis, 'popstate', lang.hitch(this, this._evaluatePopStateEvt), { + passive: true + }); }, _evaluateClickEvt: function(evt) { @@ -116,8 +110,7 @@ define([ // tags: // private - var event = evt || this.globalContext.event, - targets = this._getClickTargets(event); + var targets = this._getClickTargets(evt); for (var i = 0; i < targets.length; i++) { var target = targets[i], @@ -127,55 +120,58 @@ define([ continue; } - this._handleAppHref(event, target); + this._handleAppHref(evt, target); break; } }, - _handleAppHref: function(event, target) { + _handleAppHref: function(evt, target) { - var url = target.pathname + target.search + target.hash; + var mustOmitEventHandle = evt.ctrlKey || evt.shiftKey; - if (mouse.isMiddle(event)) { - var gCtx = this.globalContext, - newPageUrl = target.protocol + '//' + target.hostname + url; + if (mustOmitEventHandle) { + return; + } - gCtx.open(newPageUrl, '_blank'); - } else { - this._addHistory(url); + var locationObj = globalThis.location, + currentPath = locationObj.pathname, + nextPath = target.pathname; + + if (nextPath !== currentPath) { + var nextUrl = target.pathname + target.search + target.hash; + this._addHistory(nextUrl); this._onRouteChange(); } - if (event.preventDefault) { - event.preventDefault(); - } else { - event.returnValue = false; - } + evt.preventDefault(); }, _addHistory: function(value) { - this.globalContext.history.pushState(null, null, value); + globalThis.history.pushState(null, null, value); + }, + + _replaceHistory: function(value) { + + globalThis.history.replaceState(null, null, value); }, _onRouteChange: function() { - var locationObj = this.globalContext.location, + var locationObj = globalThis.location, locationPath = locationObj.pathname, - route = locationPath.substr(1), - routeIsEmpty = !route || route === '' || route === this.paths.ROOT, - loginWasSuccessful = route === this.paths.LOGIN && this._userFound; + route = locationPath.slice(1); - if (routeIsEmpty || loginWasSuccessful) { + var routeIsEmpty = !route || route === '' || route === this.paths.ROOT; + if (routeIsEmpty) { route = this.paths.HOME; - this._addHistory(route); + this._replaceHistory(route); } var locationQuery = locationObj.search; + this._handleQueryParameters(locationQuery.slice(1)); - this._handleQueryParameters(locationQuery.substr(1)); - - this._publish(this.getParentChannel('CHANGE_MODULE'), { + this._emitEvt('CHANGE_MODULE', { route: route, locationQuery: locationQuery }); @@ -190,20 +186,18 @@ define([ this._onRouteChange(); }, - _subEvaluateRoute: function(req) { - - this._userFound = req.userFound; + _subEvaluateRoute: function() { this._onRouteChange(); }, - _subGoToRootRoute: function(req) { + _subGoToPrevOrRootRoute: function(req) { - if (req.userGone) { - delete this._userFound; + if (req.userGone || !this._prevRoute) { + this._goToRootPage(); + } else { + this._goToPreviousPage(); } - - this._goToRootPage(); }, _subGoToErrorRoute: function() { @@ -219,21 +213,42 @@ define([ }); }, + _chkModuleChanged: function(res) { + + var route = res.route; + + return route !== this.paths.HOME && route !== this.paths.LOGIN && this._prevRoute !== route; + }, + + _subModuleChanged: function(res) { + + var route = res.route; + + this._prevRoute = route; + }, + _goToRootPage: function() { - this.globalContext.location.href = this.paths.ROOT; + globalThis.location.href = this.paths.ROOT; + }, + + _goToPreviousPage: function() { + + globalThis.location.href = this._prevRoute; }, _goToErrorPage: function() { - this.globalContext.location.href = this.paths.ERROR; + globalThis.location.href = this.paths.ERROR; }, _handleQueryParameters: function(queryString) { this._currentQueryParams = this._getQueryParameters(queryString); - this._removeQueryParametersFromHref(); + if (Object.keys(this._currentQueryParams).length) { + this._removeQueryParametersFromHref(); + } }, _getQueryParameters: function(queryString) { @@ -243,13 +258,10 @@ define([ _removeQueryParametersFromHref: function() { - var locationObj = this.globalContext.location, - locationPort = locationObj.port, - isNotStandardPort = locationPort !== '80', - hrefPort = isNotStandardPort ? (':' + locationPort) : '', - href = locationObj.protocol + '//' + locationObj.hostname + hrefPort + locationObj.pathname + locationObj.hash; + var locationObj = globalThis.location, + href = locationObj.origin + locationObj.pathname + locationObj.hash; - this.globalContext.history.replaceState(null, null, href); + this._replaceHistory(href); } }); }); diff --git a/public/javascript/redmic/modules/components/Topbar.js b/client-app/src/app/component/Topbar.js similarity index 73% rename from public/javascript/redmic/modules/components/Topbar.js rename to client-app/src/app/component/Topbar.js index 2fcf3ebe66a60f8f6f222297e6c5e36fa6e90638..fe70f0f419241bf6ba150713be3edf8451f8da67 100644 --- a/public/javascript/redmic/modules/components/Topbar.js +++ b/client-app/src/app/component/Topbar.js @@ -1,30 +1,29 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' - , 'put-selector/put' - , 'redmic/modules/base/_Module' - , 'redmic/modules/base/_Show' - , 'redmic/modules/base/Manager' - , 'redmic/modules/user/FullscreenToggle' - , 'redmic/modules/user/LanguageSelector' - , 'redmic/modules/user/UserArea' + , 'put-selector' + , 'src/component/base/_Module' + , 'src/component/base/_Show' + , 'src/component/user/FullscreenToggle' + , 'src/component/user/LanguageSelector' + , 'src/component/user/UserArea' + , 'src/redmicConfig' ], function( declare , lang , put , _Module , _Show - , Manager , FullscreenToggle , LanguageSelector , UserArea + , redmicConfig ) { return declare([_Module, _Show], { // summary: - // Widget que controla la barra superior, siempre visible y compartida. - // description: - // Zona común que comparten todos los módulos. + // Componente que controla la barra superior, siempre visible y compartida para toda la aplicación (salvo + // para la zona externa). constructor: function(args) { @@ -36,7 +35,9 @@ define([ logoClass: 'topbarLogo', logoHref: '/home', - logoImgSrc: '/resources/images/logos/logo.svg' + logoImgSrc: '/res/images/logos/logo.svg', + + _isProductionEnvironment: (/true/i).test(redmicConfig.getEnvVariableValue('envProduction')) }; if (args && args.ecomarcan) { @@ -94,20 +95,24 @@ define([ _createContentNode: function() { var contentNode = put(this.domNode, 'div.topbarContent'), - managerNode = put(contentNode, 'div.manager'), + centerNode = put(contentNode, 'div.center'), buttonsNode = put(contentNode, 'div.buttons'); - this._createManagerNode(managerNode); + this._addGobCanLogos(centerNode); + + if (!this._isProductionEnvironment) { + put(contentNode, '.appDev'); + put(centerNode, 'span.fontExo2', this.i18n.messageAppDev); + } + this._showModules(buttonsNode); }, - _createManagerNode: function(containerNode) { + _addGobCanLogos: function(containerNode) { + + var logosContainer = put(containerNode, 'div.gobcan-logos'); - // TODO integrar manager con topbar, manager está desfasado casi por completo - this._manager = new Manager({ - //parentChannel: this.getChannel() - parentChannel: this.getParentChannel() - }, containerNode); + put(logosContainer, 'img[src=/res/images/logos/gobcan-logos.png]'); }, _showModules: function(containerNode) { diff --git a/public/javascript/redmic/modules/app/innerApp.js b/client-app/src/app/component/layout/InnerLayoutImpl.js similarity index 86% rename from public/javascript/redmic/modules/app/innerApp.js rename to client-app/src/app/component/layout/InnerLayoutImpl.js index d95f9b53aa187d2fceffe72ff5e0fb5e2162ba61..9cfdcec78ea88a84152cb3a11408eae7e9f4e57b 100644 --- a/public/javascript/redmic/modules/app/innerApp.js +++ b/client-app/src/app/component/layout/InnerLayoutImpl.js @@ -3,18 +3,15 @@ define([ , 'dojo/_base/lang' , 'dojo/aspect' , 'dojo/dom-class' - , 'put-selector/put' - , 'redmic/base/Credentials' - , 'redmic/modules/app/_app' - , 'redmic/modules/components/Sidebar/MainSidebarImpl' - , 'redmic/modules/components/Topbar' - , 'redmic/modules/notification/Notification' - , 'redmic/modules/selection/Selector' - , 'redmic/modules/socket/_IngestData' - , 'redmic/modules/socket/_Report' - , 'redmic/modules/socket/_Worms' - , 'redmic/modules/socket/Socket' - , 'redmic/modules/socket/Task' + , 'put-selector' + , 'src/util/Credentials' + , 'src/app/component/layout/Layout' + , 'src/app/component/sidebar/MainSidebarImpl' + , 'src/app/component/Topbar' + , 'src/component/notification/Notification' + , 'src/component/selection/Selector' + , 'src/component/socket/Socket' + , 'src/component/socket/Task' ], function( declare , lang @@ -22,21 +19,19 @@ define([ , domClass , put , Credentials - , App + , Layout , MainSidebarImpl , Topbar , Notification , Selector - , _IngestData - , _Report - , _Worms , Socket , Task ) { - return declare(App, { + return declare(Layout, { // Summary: - // Implementación del módulo App, encargada de mostrar las vistas de la parte interna de la aplicación + // Implementación del componente Layout, encargada de mostrar las vistas de la parte interna de la + // aplicación. // // Description: // Inicialmente, crea los módulos y estructuras necesarias para la parte interna de la app. También se @@ -189,8 +184,7 @@ define([ parentChannel: this.getChannel() }); - var userRole = Credentials.get('userRole'); - if (userRole !== 'ROLE_GUEST') { + if (!Credentials.userIsGuest()) { new Notification({ parentChannel: this.getChannel() }); @@ -198,18 +192,12 @@ define([ new Socket({ parentChannel: this.getChannel() }); - } - - var definitionTask = declare([Task, _Report, _Worms]); - if (userRole === 'ROLE_ADMINISTRATOR' || userRole === 'ROLE_OAG') { - definitionTask = declare([definitionTask, _IngestData]); + new Task({ + parentChannel: this.getChannel() + }); } - new definitionTask({ - parentChannel: this.getChannel() - }); - this.topbar = new Topbar({ parentChannel: this.getChannel(), collapseButtonClass: this.collapseButtonClass, diff --git a/public/javascript/redmic/modules/app/_app.js b/client-app/src/app/component/layout/Layout.js similarity index 75% rename from public/javascript/redmic/modules/app/_app.js rename to client-app/src/app/component/layout/Layout.js index b80967d352a6e068ce9b1d57ddfedc6f7e8a402a..c058707896bfae7ada3ad26f0bcc1f8e5eb3ecfc 100644 --- a/public/javascript/redmic/modules/app/_app.js +++ b/client-app/src/app/component/layout/Layout.js @@ -1,23 +1,22 @@ define([ - 'redmic/modules/base/_Module' - , 'redmic/modules/base/_Show' - , 'dojo/_base/declare' + 'dojo/_base/declare' , 'dojo/_base/lang' - , './_appItfc' + , 'src/app/component/layout/_LayoutItfc' + , 'src/component/base/_Module' + , 'src/component/base/_Show' ], function( - _Module - , _Show - , declare + declare , lang - , _appItfc + , _LayoutItfc + , _Module + , _Show ) { - return declare([_Module, _Show, _appItfc], { + return declare([_Module, _Show, _LayoutItfc], { // Summary: - // Módulo App para gestionar la aplicación - // + // Componente de layout para estructurar la aplicación, tanto a nivel interno como externo. // Description: - // Recibe módulos desde Router, pertenecientes a la parte externa o interna, para mostrar en pantalla + // Recibe órdenes para mostrar en pantalla los diferentes módulos de la aplicación. constructor: function(args) { diff --git a/public/javascript/redmic/modules/app/outerApp.js b/client-app/src/app/component/layout/OuterLayoutImpl.js similarity index 64% rename from public/javascript/redmic/modules/app/outerApp.js rename to client-app/src/app/component/layout/OuterLayoutImpl.js index 65581940d11bcf29dc7c6fa1507a3be6d094ea1f..4ffb11698937bf8de2ebb0318ff19549fac5ed14 100644 --- a/public/javascript/redmic/modules/app/outerApp.js +++ b/client-app/src/app/component/layout/OuterLayoutImpl.js @@ -1,16 +1,17 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' - , 'redmic/modules/app/_app' + , 'src/app/component/layout/Layout' ], function( declare , lang - , App + , Layout ) { - return declare(App, { + return declare(Layout, { // Summary: - // Implementación del módulo App, encargada de mostrar las vistas de la parte externa de la aplicación + // Implementación del componente Layout, encargada de mostrar las vistas de la parte externa de la + // aplicación. constructor: function(args) { diff --git a/public/javascript/redmic/modules/app/_appItfc.js b/client-app/src/app/component/layout/_LayoutItfc.js similarity index 63% rename from public/javascript/redmic/modules/app/_appItfc.js rename to client-app/src/app/component/layout/_LayoutItfc.js index 00ddb1a77597232ac50b25bd0b8fc50e554bb761..8adaaa6d7748738963018918ab96c8b9706ecef2 100644 --- a/public/javascript/redmic/modules/app/_appItfc.js +++ b/client-app/src/app/component/layout/_LayoutItfc.js @@ -1,24 +1,25 @@ define([ - "dojo/_base/declare" - , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + 'dojo/_base/declare' + , 'dojo/_base/lang' + , 'src/component/base/_Itfc' ], function( declare , lang , _Itfc -){ +) { + return declare(_Itfc, { // summary: - // Interfaz de _app. + // Interfaz de _Layout. // description: // Define los métodos que debe poseer el módulo o la implementación. _getMethodsToImplement: function() { return lang.mixin(this.inherited(arguments), { - "_doResize": {}, - "_getNode": {}, - "_onAppHide": {} + '_doResize': {}, + '_getNode': {}, + '_onAppHide': {} }); } }); diff --git a/public/javascript/redmic/modules/metaTags/MetaTags.js b/client-app/src/app/component/meta/MetaTags.js similarity index 96% rename from public/javascript/redmic/modules/metaTags/MetaTags.js rename to client-app/src/app/component/meta/MetaTags.js index a9e9d97e12faa092864acbd75823cab77f9888bb..c409149ff68a63840e65f7a051f5a18afc737216 100644 --- a/public/javascript/redmic/modules/metaTags/MetaTags.js +++ b/client-app/src/app/component/meta/MetaTags.js @@ -2,14 +2,14 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' , 'dojo/query' - , 'redmic/modules/base/_Module' - , './metaTagsContent' + , 'src/app/component/meta/metaTagsContent' + , 'src/component/base/_Module' ], function( declare , lang , query - , _Module , metaTagsContent + , _Module ) { return declare(_Module, { @@ -37,7 +37,7 @@ define([ ogDescriptionLimit: 200, twitterDescriptionLimit: 200, - _headNode: document.getElementsByTagName('head')[0], + _headNode: globalThis.document.getElementsByTagName('head')[0], _defaultKey: 'default' }; @@ -74,7 +74,7 @@ define([ return; } - var currUrl = window.location.href, + var currUrl = globalThis.location.href, hostname = new URL(currUrl).hostname; viewData.hostname = hostname; @@ -115,7 +115,7 @@ define([ var customTitle = this._getMetaTagValue('title', viewLocaleMetaTags, viewData); // Title nativo - document.title = customTitle + ' | ' + this.nativeTitleSuffix; + globalThis.document.title = customTitle + ' | ' + this.nativeTitleSuffix; // Open Graph var ogTag = 'og:title', @@ -285,7 +285,7 @@ define([ metaTagNode = metaTagNodes[0]; metaTagNode.content = tagContent; } else { - metaTagNode = document.createElement('meta'); + metaTagNode = globalThis.document.createElement('meta'); metaTagNode.setAttribute(tagIdProperty, tagIdValue); metaTagNode.content = tagContent; this._headNode.appendChild(metaTagNode); diff --git a/public/javascript/redmic/modules/metaTags/metaTagsContent.js b/client-app/src/app/component/meta/metaTagsContent.js similarity index 52% rename from public/javascript/redmic/modules/metaTags/metaTagsContent.js rename to client-app/src/app/component/meta/metaTagsContent.js index 2ec5683357822964260b2fc9d573c212774a7052..6934a6c21fb7a1c2783bbbc9bdd789512d890800 100644 --- a/public/javascript/redmic/modules/metaTags/metaTagsContent.js +++ b/client-app/src/app/component/meta/metaTagsContent.js @@ -2,7 +2,7 @@ define({ "default": { "title": "{i18n.metaDefaultTitle}", "description": "{i18n.metaDefaultDescription}.", - "image": "https://{hostname}/resources/images/logos/redmic-logo-og.jpg", + "image": "https://{hostname}/res/images/logos/redmic-logo-og.jpg", "image:alt": "{i18n.metaDefaultImageAlt}.", "image:type": "image/jpeg", "image:width": "1200", @@ -12,53 +12,81 @@ define({ "title": "{i18n.metaHomeTitle}", "description": "{i18n.metaHomeDescription}." }, - "/catalog/activities-catalog": { - "title": "{i18n.metaCatalogActivitiesCatalogTitle}", - "description": "{i18n.metaCatalogActivitiesCatalogDescription}." + "/catalog/activity-catalog": { + "title": "{i18n.metaActivityCatalogTitle}", + "description": "{i18n.metaActivityCatalogDescription}." }, "/catalog/activity-info/{id}": { - "title": "{i18n.metaCatalogActivityInfoIdTitle} '{name}'", - "description": "{i18n.metaCatalogActivityInfoIdDescription} '{name}'. {activityType.name}. {description}." + "title": "{i18n.metaActivityInfoTitle} '{name}'", + "description": "{i18n.metaActivityInfoDescription} '{name}'. {activityType.name}. {description}." }, - "/catalog/project-catalog": { - "title": "{i18n.metaCatalogProjectCatalogTitle}", - "description": "{i18n.metaCatalogProjectCatalogDescription}." + "/catalog/animal-catalog": { + "title": "{i18n.metaAnimalCatalogTitle}", + "description": "{i18n.metaAnimalCatalogDescription}." }, - "/catalog/project-info/{id}": { - "title": "{i18n.metaCatalogProjectInfoIdTitle} '{name}'", - "description": "{i18n.metaCatalogProjectInfoIdDescription} '{name}'. {projectGroup.name}. {description}." + "/catalog/animal-info/{id}": { + "title": "{i18n.metaAnimalInfoTitle} '{name}'", + "description": "{i18n.metaAnimalInfoDescription} '{name}'. {description}." }, - "/catalog/program-catalog": { - "title": "{i18n.metaCatalogProgramCatalogTitle}", - "description": "{i18n.metaCatalogProgramCatalogDescription}." + "/bibliography": { + "title": "{i18n.metaBibliographyCatalogTitle}", + "description": "{i18n.metaBibliographyCatalogDescription}" }, - "/catalog/program-info/{id}": { - "title": "{i18n.metaCatalogProgramInfoIdTitle} '{name}'", - "description": "{i18n.metaCatalogProgramInfoIdDescription} '{name}'. {description}." + "/bibliography/document-info/{id}": { + "title": "{i18n.metaBibliographyInfoTitle} '{title}'", + "description": "{i18n.metaBibliographyInfoDescription1} '{title}'. {documentType.name}, {i18n.metaBibliographyInfoDescription2} '{author}' {i18n.metaBibliographyInfoDescription3} {year}. [{keyword}]" + }, + "/service-ogc-catalog": { + "title": "{i18n.metaOgcServiceCatalogTitle}", + "description": "{i18n.metaOgcServiceCatalogDescription}." + }, + "/service-ogc-catalog/service-ogc-info/{id}": { + "title": "{i18n.metaOgcServiceInfoTitle} '{title}'", + "description": "{i18n.metaOgcServiceInfoDescription} '{title}'. {abstractLayer} [{keywords}]" }, "/catalog/organisation-catalog": { - "title": "{i18n.metaCatalogOrganizationCatalogTitle}", - "description": "{i18n.metaCatalogOrganizationCatalogDescription}." + "title": "{i18n.metaOrganizationCatalogTitle}", + "description": "{i18n.metaOrganizationCatalogDescription}." }, "/catalog/organisation-info/{id}": { - "title": "{i18n.metaCatalogOrganizationInfoIdTitle} '{name}'", - "description": "{i18n.metaCatalogOrganizationInfoIdDescription} '{name} ({acronym})'. {organisationType.name}. {description}." + "title": "{i18n.metaOrganizationInfoTitle} '{name}'", + "description": "{i18n.metaOrganizationInfoDescription} '{name} ({acronym})'. {organisationType.name}. {description}." }, "/catalog/platform-catalog": { - "title": "{i18n.metaCatalogPlatformCatalogTitle}", - "description": "{i18n.metaCatalogPlatformCatalogDescription}." + "title": "{i18n.metaPlatformCatalogTitle}", + "description": "{i18n.metaPlatformCatalogDescription}." }, "/catalog/platform-info/{id}": { - "title": "{i18n.metaCatalogPlatformInfoIdTitle} '{name}'", - "description": "{i18n.metaCatalogPlatformInfoIdDescription} '{name}'. {platformType.name}. {description}." + "title": "{i18n.metaPlatformInfoTitle} '{name}'", + "description": "{i18n.metaPlatformInfoDescription} '{name}'. {platformType.name}. {description}." + }, + "/catalog/program-catalog": { + "title": "{i18n.metaProgramCatalogTitle}", + "description": "{i18n.metaProgramCatalogDescription}." + }, + "/catalog/program-info/{id}": { + "title": "{i18n.metaProgramInfoTitle} '{name}'", + "description": "{i18n.metaProgramInfoDescription} '{name}'. {description}." + }, + "/catalog/project-catalog": { + "title": "{i18n.metaProjectCatalogTitle}", + "description": "{i18n.metaProjectCatalogDescription}." + }, + "/catalog/project-info/{id}": { + "title": "{i18n.metaProjectInfoTitle} '{name}'", + "description": "{i18n.metaProjectInfoDescription} '{name}'. {projectGroup.name}. {description}." + }, + "/catalog/raster-catalog": { + "title": "{i18n.metaRasterCatalogTitle}", + "description": "{i18n.metaRasterCatalogDescription}." }, "/catalog/species-catalog": { - "title": "{i18n.metaCatalogSpeciesCatalogTitle}", - "description": "{i18n.metaCatalogSpeciesCatalogDescription}." + "title": "{i18n.metaSpeciesCatalogTitle}", + "description": "{i18n.metaSpeciesCatalogDescription}." }, "/catalog/species-info/{id}": { - "title": "{i18n.metaCatalogSpeciesInfoIdTitle} '{scientificName} {authorship}'", - "description": "{i18n.metaCatalogSpeciesInfoIdDescription} '{scientificName} {authorship}'. {commonName}." + "title": "{i18n.metaSpeciesInfoTitle} '{scientificName} {authorship}'", + "description": "{i18n.metaSpeciesInfoDescription} '{scientificName} {authorship}'. {commonName}." }, "/viewer/species-distribution": { "title": "{i18n.metaViewerSpeciesDistributionTitle}", @@ -84,30 +112,14 @@ define({ "title": "{i18n.metaViewerRealTimeDashboardIdTitle} '{properties.site.name}'", "description": "{i18n.metaViewerRealTimeDashboardIdDescription} '{properties.site.name}'. {properties.site.description}." }, - "/viewer/stac-browser": { - "title": "{i18n.metaViewerStacBrowserTitle}", - "description": "{i18n.metaViewerStacBrowserDescription}." + "/viewer/marine-monitoring": { + "title": "{i18n.metaViewerMarineMonitoringTitle}", + "description": "{i18n.metaViewerMarineMonitoringDescription}." }, "/atlas": { "title": "{i18n.metaAtlasTitle}", "description": "{i18n.metaAtlasDescription}." }, - "/service-ogc-catalog": { - "title": "{i18n.metaServiceOgcCatalogTitle}", - "description": "{i18n.metaServiceOgcCatalogDescription}." - }, - "/service-ogc-catalog/service-ogc-info/{id}": { - "title": "{i18n.metaServiceOgcCatalogServiceOgcInfoIdTitle} '{title}'", - "description": "{i18n.metaServiceOgcCatalogDescription} '{title}'. {abstractLayer} [{keywords}]" - }, - "/bibliography": { - "title": "{i18n.metaBibliographyTitle}", - "description": "{i18n.metaBibliographyDescription}" - }, - "/bibliography/document-info/{id}": { - "title": "{i18n.metaBibliographyDocumentInfoIdTitle} '{title}'", - "description": "{i18n.metaBibliographyDocumentInfoIdDescription1} '{title}'. {documentType.name}, {i18n.metaBibliographyDocumentInfoIdDescription2} '{author}' {i18n.metaBibliographyDocumentInfoIdDescription3} {year}. [{keyword}]" - }, "/login": { "title": "{i18n.metaLoginTitle}", "description": "{i18n.metaLoginDescription}." diff --git a/public/javascript/redmic/modules/components/Sidebar/MainSidebarImpl.js b/client-app/src/app/component/sidebar/MainSidebarImpl.js similarity index 89% rename from public/javascript/redmic/modules/components/Sidebar/MainSidebarImpl.js rename to client-app/src/app/component/sidebar/MainSidebarImpl.js index 95c0e86e3714da146335d41f3cbdd1ad2f52f27f..8951eb6d7743d640b07a908736a79cd33cdcf0c6 100644 --- a/public/javascript/redmic/modules/components/Sidebar/MainSidebarImpl.js +++ b/client-app/src/app/component/sidebar/MainSidebarImpl.js @@ -1,13 +1,9 @@ define([ "dojo/_base/declare" - , "dojo/_base/lang" - , "dojo/aspect" - , "redmic/modules/components/Sidebar/_Secondary" - , "redmic/modules/components/Sidebar/Sidebar" + , "src/app/component/sidebar/_Secondary" + , "src/app/component/sidebar/Sidebar" ], function( declare - , lang - , aspect , _Secondary , Sidebar ) { diff --git a/public/javascript/redmic/modules/components/Sidebar/Sidebar.js b/client-app/src/app/component/sidebar/Sidebar.js similarity index 98% rename from public/javascript/redmic/modules/components/Sidebar/Sidebar.js rename to client-app/src/app/component/sidebar/Sidebar.js index 51e1a6ca38d97af7c288718d9e48f4a8436220a4..90ef89604d3f5c77324346b6c6fa4e4653a82224 100644 --- a/public/javascript/redmic/modules/components/Sidebar/Sidebar.js +++ b/client-app/src/app/component/sidebar/Sidebar.js @@ -4,9 +4,9 @@ define([ , "dojo/dom-class" , "dojo/on" , "dojo/query" - , "put-selector/put" - , "redmic/modules/base/_Module" - , "redmic/modules/base/_Show" + , 'put-selector' + , "src/component/base/_Module" + , "src/component/base/_Show" , "dojo/NodeList-dom" , "dojo/NodeList-traverse" @@ -259,7 +259,7 @@ define([ } }, - _getNodeToShow: function() { + getNodeToShow: function() { return this.domNode; } diff --git a/public/javascript/redmic/modules/components/Sidebar/_Secondary.js b/client-app/src/app/component/sidebar/_Secondary.js similarity index 99% rename from public/javascript/redmic/modules/components/Sidebar/_Secondary.js rename to client-app/src/app/component/sidebar/_Secondary.js index c5f7d8c4b299c30196ab20e5cdb2af2122d1d8b6..e6bb75cfbb83b6c389eeaeb847872d940972304e 100644 --- a/public/javascript/redmic/modules/components/Sidebar/_Secondary.js +++ b/client-app/src/app/component/sidebar/_Secondary.js @@ -1,17 +1,15 @@ define([ - "dijit/registry" - , "dojo/_base/declare" + "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" , "dojo/dom-class" , "dojo/on" , "dojo/query" - , "put-selector/put" + , 'put-selector' , "dojo/NodeList-dom" , "dojo/NodeList-traverse" ], function( - registry - , declare + declare , lang , aspect , domClass diff --git a/client-app/src/app/component/view/_MetaTagsHandler.js b/client-app/src/app/component/view/_MetaTagsHandler.js new file mode 100644 index 0000000000000000000000000000000000000000..81e2704a2bf8637871b5775802709c48a47c2a05 --- /dev/null +++ b/client-app/src/app/component/view/_MetaTagsHandler.js @@ -0,0 +1,73 @@ +define([ + 'dojo/_base/declare' + , 'dojo/_base/lang' + , 'dojo/aspect' +], function( + declare + , lang + , aspect +) { + + return declare(null, { + // summary: + // Gestiona la publicación de meta tags de la vista actual, preparando lo necesario para trabajar con + // ellas. + + constructor: function(args) { + + this.config = { + metaTagsHandlerActions: { + PUT_META_TAGS: 'putMetaTags' + }, + metaTagsHandlerEvents: { + PUT_META_TAGS: 'putMetaTags' + } + }; + + lang.mixin(this, this.config, args); + + aspect.before(this, '_mixEventsAndActions', this._mixMetaTagsHandlerEventsAndActionsView); + aspect.after(this, '_definePublications', this._defineMetaTagsHandlerPublications); + aspect.before(this, '_afterShow', this._afterShowMetaTagsHandler); + }, + + _mixMetaTagsHandlerEventsAndActionsView: function() { + + lang.mixin(this.events, this.metaTagsHandlerEvents); + lang.mixin(this.actions, this.metaTagsHandlerActions); + delete this.metaTagsHandlerEvents; + delete this.metaTagsHandlerActions; + }, + + _defineMetaTagsHandlerPublications: function() { + + this.publicationsConfig.push({ + event: 'PUT_META_TAGS', + channel: this._buildChannel(this.metaTagsChannel, 'PUT_META_TAGS') + }); + }, + + _afterShowMetaTagsHandler: function() { + + var callback = this._putMetaTags || this._putDefaultMetaTags; + + lang.hitch(this, callback)(); + }, + + _putDefaultMetaTags: function() { + // summary: + // Manda a publicar la información necesaria para que se generen las meta-tags + // de la vista actual. Debe ejecutarse después del show de la vista, ya que este + // indica mediante el flag 'metaTags' si debe o no generarse. + // *** Función por defecto (posibilidad de sobreescribir para enviar más datos) *** + // tags: + // private + + if (this.metaTags) { + this._emitEvt('PUT_META_TAGS', { + view: this.ownChannel + }); + } + } + }); +}); diff --git a/public/javascript/app/base/views/_ListenRequestError.js b/client-app/src/app/component/view/_RequestErrorHandler.js similarity index 60% rename from public/javascript/app/base/views/_ListenRequestError.js rename to client-app/src/app/component/view/_RequestErrorHandler.js index c88968a2c5545a7c3142fdd94b3e3b9fb6a1b510..b2e7452c9e2b4dccd6d1b8700b292b37fa37b765 100644 --- a/public/javascript/app/base/views/_ListenRequestError.js +++ b/client-app/src/app/component/view/_RequestErrorHandler.js @@ -1,14 +1,13 @@ define([ - "dojo/_base/declare" + 'dojo/_base/declare' ], function( declare -){ +) { + return declare(null, { // summary: - // Gestiona los errores de los request - // description: - // Permite gestionar los errores de las peticiones a la API + // Gestiona los errores de los request hacia la API _errorAvailable: function(error, status) { @@ -17,6 +16,11 @@ function( } /*else if (status === 500) { this._goTo500(); }*/ + }, + + _goTo404: function() { + + globalThis.location.href = '/404'; } }); }); diff --git a/public/javascript/app/base/views/_SettingsHandler.js b/client-app/src/app/component/view/_SettingsHandler.js similarity index 95% rename from public/javascript/app/base/views/_SettingsHandler.js rename to client-app/src/app/component/view/_SettingsHandler.js index 6eba6e49dac4e91530b605e567240e38cb653533..271fa292f0a1cc549863019626957485ac7e22ce 100644 --- a/public/javascript/app/base/views/_SettingsHandler.js +++ b/client-app/src/app/component/view/_SettingsHandler.js @@ -2,8 +2,8 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' , 'dojo/aspect' - , 'redmic/modules/base/_ListenQueryParams' - , 'redmic/modules/base/_Selection' + , 'src/component/base/_ListenQueryParams' + , 'src/component/base/_Selection' ], function( declare , lang diff --git a/client-app/src/app/component/view/_View.js b/client-app/src/app/component/view/_View.js new file mode 100644 index 0000000000000000000000000000000000000000..75942943b34833557c88a94797fadb250952f18e --- /dev/null +++ b/client-app/src/app/component/view/_View.js @@ -0,0 +1,20 @@ +define([ + 'dojo/_base/declare' + , 'src/app/component/view/_MetaTagsHandler' + , 'src/app/component/view/_RequestErrorHandler' + , 'src/app/component/view/_SettingsHandler' +], function( + declare + , _MetaTagsHandler + , _RequestErrorHandler + , _SettingsHandler +) { + + return declare([_MetaTagsHandler, _RequestErrorHandler, _SettingsHandler], { + // summary: + // Extensión común para todas los componentes usados como vistas, es decir, aquellos que con instanciados + // tras reconocer un valor concreto en la ruta actual. Cuando la navegación a través de la app requiere que + // se instancie un nuevo componente, esta extensión se adjunta automáticamente a la lista de dependencias + // del mismo. + }); +}); diff --git a/client-app/src/app/util/CheckBrowser.js b/client-app/src/app/util/CheckBrowser.js new file mode 100644 index 0000000000000000000000000000000000000000..6aeb6bbb5dc8f5574b7f3e1e4b38dce74b04fb38 --- /dev/null +++ b/client-app/src/app/util/CheckBrowser.js @@ -0,0 +1,59 @@ +define([ + 'dojo/_base/lang' + , 'dojo/sniff' +], function( + lang + , has +) { + + return { + _supportedBrowsersAndMinVersion: [{ + name: 'chrome', + version: 86 + },{ + name: 'ff', + version: 78 + },{ + name: 'edge', + version: 86 + },{ + name: 'safari', + version: 14 + },{ + name: 'opr', + version: 72 + }], + + _allowedBots: [ + 'googlebot' + , 'duckduckgo' + , 'bingbot' + , 'slurp' + , 'applebot' + ], + + isSupported: function() { + + var userAgent = navigator && navigator.userAgent; + + if (userAgent && this._allowedBots.find(lang.hitch(this, this._findBotAgent, userAgent))) { + return true; + } + + return !!this._supportedBrowsersAndMinVersion.find(lang.hitch(this, this._findSupportedBrowser)); + }, + + _findBotAgent: function(userAgent, allowedBotFragment) { + + + return userAgent.toLowerCase().includes(allowedBotFragment); + }, + + _findSupportedBrowser: function(item) { + + var browserVersion = has(item.name); + + return browserVersion && browserVersion >= item.version; + } + }; +}); diff --git a/client-app/src/catalog/_GenerateReport.js b/client-app/src/catalog/_GenerateReport.js new file mode 100644 index 0000000000000000000000000000000000000000..15c64ea6ed3244d99a1e2a7f7963a6315e5ffccd --- /dev/null +++ b/client-app/src/catalog/_GenerateReport.js @@ -0,0 +1,84 @@ +define([ + 'dijit/form/Button' + , 'dojo/_base/declare' + , 'dojo/_base/lang' + , 'dojo/aspect' + , 'src/component/taskAction/Report' +], function( + Button + , declare + , lang + , aspect + , Report +) { + + return declare(null, { + // summary: + // Extensión de vistas de catálogo para añadir funcionalidad relativa a la generación y descarga de + // informes. + + constructor: function(args) { + + this.config = { + _generateReportButtonConfig: { + 'class': 'primary', + iconClass: 'fa-print', + title: this.i18n.createReport, + onClick: lang.hitch(this, this._generateReportCallback) + } + }; + + lang.mixin(this, this.config, args); + + aspect.before(this, '_initialize', lang.hitch(this, this._initializeGenerateReport)); + }, + + _initializeGenerateReport: function() { + + this._reportTaskAction = new Report({ + parentChannel: this.getChannel() + }); + }, + + postCreate: function() { + + this.inherited(arguments); + + if (!this.reportService) { + console.warn('Tried to add report download button, but "reportService" was not defined at view "%s"', + this.getChannel()); + + return; + } + + var placementNode = this._getReportButtonPlacementNode(); + + if (!placementNode) { + console.warn('Tried to add report download button, but container node was not found at view "%s"', + this.getChannel()); + + return; + } + + this._generateReportButton = new Button(this._generateReportButtonConfig).placeAt(placementNode); + }, + + _getReportButtonPlacementNode: function() { + + return this.buttonsNode; + }, + + _generateReportCallback: function() { + + this._publish(this._reportTaskAction.getChannel('GENERATE_REPORT'), { + selectionTarget: this._getReportSelectionTarget(), + reportService: this.reportService + }); + }, + + _getReportSelectionTarget: function() { + + return this.selectionTarget || this.target; + } + }); +}); diff --git a/public/javascript/app/designs/textSearchFacetsList/main/Activity.js b/client-app/src/catalog/activity/ActivityCatalogView.js similarity index 50% rename from public/javascript/app/designs/textSearchFacetsList/main/Activity.js rename to client-app/src/catalog/activity/ActivityCatalogView.js index ffc9c1dbab32dd3886cbebf4184cad47d5054ae0..ef17ee784099cd6e99ca21183bb0ae4ca31cdb04 100644 --- a/public/javascript/app/designs/textSearchFacetsList/main/Activity.js +++ b/client-app/src/catalog/activity/ActivityCatalogView.js @@ -1,41 +1,47 @@ define([ - "app/designs/base/_Main" + 'app/designs/base/_Main' , 'app/base/views/extensions/_AddCompositeSearchInTooltipFromTextSearch' - , "app/designs/textSearchFacetsList/Controller" - , "app/designs/textSearchFacetsList/Layout" - , 'app/redmicConfig' - , "dojo/_base/declare" - , "dojo/_base/lang" - , "templates/ActivityList" - , "redmic/modules/browser/_Select" - , "redmic/modules/browser/bars/SelectionBox" - , "redmic/modules/browser/bars/Order" - , "redmic/modules/browser/bars/Total" + , 'app/designs/textSearchFacetsList/Controller' + , 'app/designs/textSearchFacetsList/Layout' + , 'dojo/_base/declare' + , 'dojo/_base/lang' + , 'src/catalog/_GenerateReport' + , 'src/component/browser/_Select' + , 'src/component/browser/bars/Order' + , 'src/component/browser/bars/SelectionBox' + , 'src/component/browser/bars/Total' + , 'src/redmicConfig' + , 'templates/ActivityList' ], function( _Main , _AddComposite , Controller , Layout - , redmicConfig , declare , lang - , templateList + , _GenerateReport , _Select - , SelectionBox , Order + , SelectionBox , Total -){ - return declare([Layout, Controller, _Main, _AddComposite], { + , redmicConfig + , templateList +) { + + return declare([Layout, Controller, _Main, _AddComposite, _GenerateReport], { // summary: - // Extensión para establecer la configuración de las vistas de activity. - // description: - // + // Vista de catálogo de actividades. constructor: function(args) { this.config = { + title: this.i18n.activityCatalogView, + ownChannel: 'activitiesCatalog', + target: redmicConfig.services.activity, + browserExts: [_Select], - title: this.i18n.activities + + reportService: 'activity' }; lang.mixin(this, this.config, args); @@ -51,6 +57,16 @@ define([ this.browserConfig = this._merge([{ template: templateList, + rowConfig: { + buttonsConfig: { + listButton: [{ + icon: 'fa-info-circle', + btnId: 'details', + title: 'info', + href: this.viewPaths.activityDetails + }] + } + }, bars: [{ instance: Total },{ @@ -61,12 +77,12 @@ define([ }], orderConfig: { options: [ - {value: "name"}, - {value: "code"}, - {value: "activityType.name", label: this.i18n.activityType}, - {value: "startDate"}, - {value: "endDate"}, - {value: "updated"} + {value: 'name'}, + {value: 'code'}, + {value: 'activityType.name', label: this.i18n.activityType}, + {value: 'startDate'}, + {value: 'endDate'}, + {value: 'updated'} ] } }, this.browserConfig || {}]); diff --git a/client-app/src/catalog/activity/_Edition.js b/client-app/src/catalog/activity/_Edition.js new file mode 100644 index 0000000000000000000000000000000000000000..012ee3abe3c3d1b6996758bfc1a09fcecab15ca3 --- /dev/null +++ b/client-app/src/catalog/activity/_Edition.js @@ -0,0 +1,115 @@ +define([ + 'dojo/_base/declare' + , 'dojo/_base/lang' + , 'dojo/aspect' + , 'app/base/views/extensions/_EditionWizardView' +], function( + declare + , lang + , aspect + , _EditionWizardView +) { + + return declare(_EditionWizardView, { + // summary: + // Extensión de vista de catálogo de actividades para añadir funcionalidad relativa a la edición de + // registros. + + constructor: function(args) { + + this.config = { + addPath: this.viewPaths.activityAdd + }; + + lang.mixin(this, this.config, args); + + aspect.after(this, '_setConfigurations', lang.hitch(this, this._setActivityEditionConfigurations)); + aspect.before(this, '_setBrowserButtons', lang.hitch(this, this._setActivityEditionBrowserButtons)); + }, + + _setActivityEditionConfigurations: function() { + + if (!this.listButtonsEdition) { + console.warn('Tried to add activity load data button, but edition buttons config was not found!'); + return; + } + + this.listButtonsEdition.push({ + icon: 'fa-keyboard-o', + btnId: 'goToChildren', + href: [ + lang.replace(this.viewPaths.activityGeoDataAdd, { + activityid: '{id}', + id: 'new' + }), + this.viewPaths.activityCitation, + this.viewPaths.activitySurveyStation, + this.viewPaths.activityObjectCollection, + this.viewPaths.activityTracking, + this.viewPaths.activityInfrastructure, + this.viewPaths.activityArea + ], + chooseHref: function(item) { + + var activityTypeId = item.activityType.id, + activityCategory = item.activityCategory, + validActivityTypeCitation = [2, 10]; + + if (activityCategory === 'ci' || validActivityTypeCitation.indexOf(activityTypeId) !== -1) { + return 1; + } + if (activityCategory === 'ft') { + return 2; + } + if (activityCategory === 'oc') { + return 3; + } + if (['at', 'pt', 'tr'].indexOf(activityCategory) !== -1) { + return 4; + } + if (activityCategory === 'if') { + return 5; + } + if (activityCategory === 'ar') { + return 6; + } + + return 0; + }, + title: 'data-loader' + }); + }, + + _setActivityEditionBrowserButtons: function() { + + if (!this.listButtonsEdition) { + console.warn('Tried to add activity edition buttons, but edition buttons config was not found!'); + return; + } + + var findIndexCallback = lang.hitch(this, function(button) { + + return button.groupId && button.groupId === this._editionGroupId; + }); + + var editionButtonIndex = this.listButtonsEdition.findIndex(findIndexCallback); + + if (editionButtonIndex !== -1) { + this.listButtonsEdition[editionButtonIndex].icons.push({ + icon: 'fa-edit', + btnId: 'edit', + title: 'edit', + option: 'default', + href: this.viewPaths.activityEdit + },{ + icon: 'fa-copy', + btnId: 'copy', + title: 'copy', + href: this.viewPaths.activityAdd + }); + } else { + console.warn('Tried to add activity edition buttons, but edition button group config was not found!'); + } + } + }); +}); diff --git a/public/javascript/app/designs/textSearchFacetsList/main/Project.js b/client-app/src/catalog/animal/AnimalCatalogView.js similarity index 53% rename from public/javascript/app/designs/textSearchFacetsList/main/Project.js rename to client-app/src/catalog/animal/AnimalCatalogView.js index 80988830914c45dc7769344301ab3936422f3f77..c2c2c6964915a41541530e12a813a6795b94650e 100644 --- a/public/javascript/app/designs/textSearchFacetsList/main/Project.js +++ b/client-app/src/catalog/animal/AnimalCatalogView.js @@ -2,14 +2,14 @@ define([ "app/designs/base/_Main" , "app/designs/textSearchFacetsList/Controller" , "app/designs/textSearchFacetsList/Layout" - , 'app/redmicConfig' + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" - , "templates/ProjectList" - , "redmic/modules/browser/_Select" - , "redmic/modules/browser/bars/SelectionBox" - , "redmic/modules/browser/bars/Order" - , "redmic/modules/browser/bars/Total" + , "src/component/browser/_Select" + , "src/component/browser/bars/SelectionBox" + , "src/component/browser/bars/Order" + , "src/component/browser/bars/Total" + , "templates/AnimalList" ], function( _Main , Controller @@ -17,36 +17,53 @@ define([ , redmicConfig , declare , lang - , templateList , _Select , SelectionBox , Order , Total -){ + , AnimalListTemplate +) { + return declare([Layout, Controller, _Main], { // summary: - // Extensión para establecer la configuración de las vistas de project. + // Extensión para establecer la configuración de las vistas de dominios con facets. // description: // constructor: function(args) { this.config = { - browserExts: [_Select], - title: this.i18n.projects + title: this.i18n.animalCatalogView, + ownChannel: 'animalCatalog', + target: redmicConfig.services.animal, + + browserExts: [_Select] }; lang.mixin(this, this.config, args); }, - _setMainConfigurations: function() { - - this.filterConfig = this._merge([{ - returnFields: redmicConfig.returnFields.project - }, this.filterConfig || {}]); + _setConfigurations: function() { this.browserConfig = this._merge([{ - template: templateList, + template: AnimalListTemplate, + rowConfig: { + buttonsConfig: { + listButton: [{ + icon: "fa-info-circle", + btnId: "details", + title: "info", + href: this.viewPaths.animalDetails + }] + } + }, + orderConfig: { + options: [ + {value: "name"}, + {value: "scientificName"}, + {value: "updated"} + ] + }, bars: [{ instance: Total },{ @@ -54,22 +71,18 @@ define([ },{ instance: Order, config: 'orderConfig' - }], - orderConfig: { - options: [ - {value: "name"}, - {value: "code"}, - {value: "projectGroup.name", label: this.i18n.projectGroup}, - {value: "startDate"}, - {value: "endDate"}, - {value: "updated"} - ] - } + }] }, this.browserConfig || {}]); this.facetsConfig = this._merge([{ - aggs: redmicConfig.aggregations.project + aggs: redmicConfig.aggregations.animal }, this.facetsConfig || {}]); + }, + + _setMainConfigurations: function() { + + this.browserConfig = this._merge([{ + }, this.browserConfig || {}]); } }); }); diff --git a/client-app/src/catalog/animal/_Edition.js b/client-app/src/catalog/animal/_Edition.js new file mode 100644 index 0000000000000000000000000000000000000000..a1a59627fa6489f00d03d0f630a5db122064da1d --- /dev/null +++ b/client-app/src/catalog/animal/_Edition.js @@ -0,0 +1,56 @@ +define([ + 'dojo/_base/declare' + , 'dojo/_base/lang' + , 'dojo/aspect' + , 'app/base/views/extensions/_EditionWizardView' +], function( + declare + , lang + , aspect + , _EditionWizardView +) { + + return declare(_EditionWizardView, { + // summary: + // Extensión de vista de catálogo de animales para añadir funcionalidad relativa a la edición de + // registros. + + constructor: function(args) { + + this.config = { + addPath: this.viewPaths.animalAdd + }; + + lang.mixin(this, this.config, args); + + aspect.before(this, '_setBrowserButtons', lang.hitch(this, this._setAnimalEditionBrowserButtons)); + }, + + _setAnimalEditionBrowserButtons: function() { + + if (!this.listButtonsEdition) { + console.warn('Tried to add animal edition buttons, but edition buttons config was not found!'); + return; + } + + var findIndexCallback = lang.hitch(this, function(button) { + + return button.groupId && button.groupId === this._editionGroupId; + }); + + var editionButtonIndex = this.listButtonsEdition.findIndex(findIndexCallback); + + if (editionButtonIndex !== -1) { + this.listButtonsEdition[editionButtonIndex].icons.push({ + icon: 'fa-edit', + btnId: 'edit', + title: 'edit', + option: 'default', + href: this.viewPaths.animalEdit + }); + } else { + console.warn('Tried to add animal edition buttons, but edition button group config was not found!'); + } + } + }); +}); diff --git a/public/javascript/app/designs/textSearchFacetsList/main/Bibliography.js b/client-app/src/catalog/bibliography/BibliographyCatalogView.js similarity index 61% rename from public/javascript/app/designs/textSearchFacetsList/main/Bibliography.js rename to client-app/src/catalog/bibliography/BibliographyCatalogView.js index 51ccdbf4953ef4189847767ef8010a531a76bb6b..d0b2edc2e643150e2548fe4d93e0ae9405c8acee 100644 --- a/public/javascript/app/designs/textSearchFacetsList/main/Bibliography.js +++ b/client-app/src/catalog/bibliography/BibliographyCatalogView.js @@ -2,13 +2,14 @@ define([ 'app/designs/base/_Main' , 'app/designs/textSearchFacetsList/Controller' , 'app/designs/textSearchFacetsList/Layout' - , 'app/redmicConfig' + , 'src/redmicConfig' , 'dojo/_base/declare' , 'dojo/_base/lang' - , 'redmic/modules/browser/_Select' - , 'redmic/modules/browser/bars/SelectionBox' - , 'redmic/modules/browser/bars/Order' - , 'redmic/modules/browser/bars/Total' + , 'src/catalog/_GenerateReport' + , 'src/component/browser/_Select' + , 'src/component/browser/bars/SelectionBox' + , 'src/component/browser/bars/Order' + , 'src/component/browser/bars/Total' , 'templates/DocumentList' ], function ( _Main @@ -17,6 +18,7 @@ define([ , redmicConfig , declare , lang + , _GenerateReport , _Select , SelectionBox , Order @@ -24,7 +26,7 @@ define([ , templateList ) { - return declare([Layout, Controller, _Main], { + return declare([Layout, Controller, _Main, _GenerateReport], { // summary: // Base de vista de Bibliography/Document. @@ -34,14 +36,39 @@ define([ constructor: function (args) { this.config = { + title: this.i18n.canarianMarineBibliography, + ownChannel: 'bibliography', + target: redmicConfig.services.document, + idDetails: null, browserExts: [_Select], - title: this.i18n.canarianMarineBibliography + reportService: 'document' }; lang.mixin(this, this.config, args); }, + _setConfigurations: function() { + + this.browserConfig = this._merge([{ + rowConfig: { + buttonsConfig: { + listButton: [{ + icon: 'fa-external-link', + btnId: 'url', + condition: this._urlCondition, + href: '{url}' + },{ + icon: 'fa-info-circle', + btnId: 'details', + title: 'info', + href: this.viewPaths.bibliographyDetails + }] + } + } + }, this.browserConfig || {}]); + }, + _setMainConfigurations: function() { this.filterConfig = this._merge([{ diff --git a/client-app/src/catalog/bibliography/_Edition.js b/client-app/src/catalog/bibliography/_Edition.js new file mode 100644 index 0000000000000000000000000000000000000000..f7804f8ae24f2d6a2559363fa0478f017e99db2d --- /dev/null +++ b/client-app/src/catalog/bibliography/_Edition.js @@ -0,0 +1,88 @@ +define([ + 'dojo/_base/declare' + , 'dojo/_base/lang' + , 'dojo/aspect' + , 'app/base/views/extensions/_EditionWizardView' + , 'RWidgets/Button' +], function( + declare + , lang + , aspect + , _EditionWizardView + , Button +) { + + return declare(_EditionWizardView, { + // summary: + // Extensión de vista de catálogo de bibliografía para añadir funcionalidad relativa a la edición de + // registros. + + constructor: function(args) { + + this.config = { + addPath: this.viewPaths.bibliographyAdd, + loadPath: this.viewPaths.bibliographyLoad + }; + + lang.mixin(this, this.config, args); + + aspect.before(this, '_afterSetConfigurations', lang.hitch(this, this._setBibliographyEditionConfigurations)); + aspect.before(this, '_setBrowserButtons', lang.hitch(this, this._setBibliographyEditionBrowserButtons)); + }, + + _setBibliographyEditionConfigurations: function() { + + this.browserConfig = this._merge([{ + rowConfig: { + shownOptionTemplate: { + code: true + } + } + }, this.browserConfig || {}]); + }, + + _setBibliographyEditionBrowserButtons: function() { + + if (!this.listButtonsEdition) { + console.warn('Tried to add bibliography edition buttons, but edition buttons config was not found!'); + return; + } + + var findIndexCallback = lang.hitch(this, function(button) { + + return button.groupId && button.groupId === this._editionGroupId; + }); + + var editionButtonIndex = this.listButtonsEdition.findIndex(findIndexCallback); + + if (editionButtonIndex !== -1) { + this.listButtonsEdition[editionButtonIndex].icons.push({ + icon: 'fa-edit', + btnId: 'edit', + title: 'edit', + option: 'default', + href: this.viewPaths.bibliographyEdit + },{ + icon: 'fa-copy', + btnId: 'copy', + title: 'copy', + href: this.viewPaths.bibliographyAdd + }); + } else { + console.warn('Tried to add bibliography edition buttons, but edition button group config was not found!'); + } + }, + + postCreate: function() { + + this.inherited(arguments); + + this.loadButton = new Button({ + iconClass: 'fa fa-upload', + 'class': 'warning', + 'title': this.i18n.loadDocument, + 'href': this.loadPath + }).placeAt(this.buttonsNode); + } + }); +}); diff --git a/public/javascript/app/designs/textSearchList/main/ServiceOGC.js b/client-app/src/catalog/ogcService/OgcServiceCatalogLite.js similarity index 58% rename from public/javascript/app/designs/textSearchList/main/ServiceOGC.js rename to client-app/src/catalog/ogcService/OgcServiceCatalogLite.js index b8af15d01bd80ae2c7981b0a76b7cf7823c61b06..5dd3020396833b584eb713d9636876793daae58a 100644 --- a/public/javascript/app/designs/textSearchList/main/ServiceOGC.js +++ b/client-app/src/catalog/ogcService/OgcServiceCatalogLite.js @@ -1,33 +1,33 @@ define([ - "app/base/views/extensions/_OnShownAndRefresh" - , "app/designs/base/_Main" - , "app/designs/base/_ServiceOGC" - , "app/designs/textSearchList/Controller" - , "app/designs/textSearchList/layout/BasicTopZone" - , "dojo/_base/declare" - , "dojo/_base/lang" - , "redmic/modules/browser/HierarchicalImpl" - , "templates/ServiceOGCList" + 'app/base/views/extensions/_OnShownAndRefresh' + , 'app/designs/base/_Main' + , 'src/catalog/ogcService/_OgcService' + , 'app/designs/textSearchList/Controller' + , 'app/designs/textSearchList/layout/BasicTopZone' + , 'dojo/_base/declare' + , 'dojo/_base/lang' + , 'src/component/browser/HierarchicalImpl' + , 'templates/ServiceOGCList' ], function( _OnShownAndRefresh , _Main - , _ServiceOGC + , _OgcService , Controller , Layout , declare , lang , HierarchicalImpl , templateList -){ - return declare([Layout, Controller, _Main, _ServiceOGC, _OnShownAndRefresh], { +) { + + return declare([Layout, Controller, _Main, _OgcService, _OnShownAndRefresh], { // summary: - // Vista principal de ServiceOGC bajo este diseño. + // Vista de catálogo de servicios OGC con diseño reducido (sin filtro por facets). constructor: function(args) { this.config = { - ownChannel: "catalogOGC", - perms: null, + ownChannel: 'catalogOGC', title: this.i18n.layersCatalog }; diff --git a/client-app/src/catalog/ogcService/OgcServiceCatalogView.js b/client-app/src/catalog/ogcService/OgcServiceCatalogView.js new file mode 100644 index 0000000000000000000000000000000000000000..56aef4819d16aac441e15bd92c5cb74808a6341a --- /dev/null +++ b/client-app/src/catalog/ogcService/OgcServiceCatalogView.js @@ -0,0 +1,110 @@ +define([ + 'app/designs/base/_Main' + , 'src/catalog/ogcService/_OgcService' + , 'app/base/views/extensions/_AddCompositeSearchInTooltipFromTextSearch' + , 'app/designs/textSearchFacetsList/Controller' + , 'app/designs/textSearchFacetsList/Layout' + , 'src/redmicConfig' + , 'dojo/_base/declare' + , 'dojo/_base/lang' + , 'src/component/browser/HierarchicalImpl' + , 'src/component/browser/bars/Order' + , 'templates/ServiceOGCList' +], function( + _Main + , _OgcService + , _AddComposite + , Controller + , Layout + , redmicConfig + , declare + , lang + , HierarchicalImpl + , Order + , templateList +) { + + return declare([Layout, Controller, _Main, _OgcService, _AddComposite], { + // summary: + // Vista de catálogo de servicios OGC. + + constructor: function(args) { + + this.config = { + title: this.i18n.ogcServiceCatalogView, + ownChannel: 'ogcServiceCatalog', + target: redmicConfig.services.atlasLayer + }; + + lang.mixin(this, this.config, args); + }, + + _setConfigurations: function() { + + this.browserConfig = this._merge([{ + rowConfig: { + buttonsConfig: { + listButton: [{ + icon: 'fa-info-circle', + btnId: 'details', + href: this.viewPaths.ogcServiceDetails, + condition: 'urlSource', + title: 'info' + }] + } + }, + bars: [] + }, this.browserConfig || {}]); + + this.filterConfig = this._merge([{ + initQuery: { + size: null, + from: null/*, + sorts: [{ + field: 'alias', + order: 'ASC' + }]*/ + } + }, this.filterConfig || {}]); + }, + + _setMainConfigurations: function() { + + this.inherited(arguments); + + this.browserBase.shift(); + this.browserBase.unshift(HierarchicalImpl); + + this.browserConfig = this._merge([{ + template: templateList, + target: this._atlasDataTarget, + rowConfig: { + selectionIdProperty: this.pathProperty + }, + idProperty: this.pathProperty, + pathSeparator: this.pathSeparator, + bars: [{ + instance: Order, + config: 'orderConfig' + }], + orderConfig: { + options: [ + {value: 'name'}, + {value: 'title'}, + {value: 'themeInspire'}, + {value: 'protocols'}/*, + {value: 'updated'}*/ + ] + } + }, this.browserConfig || {}]); + + this.facetsConfig = this._merge([{ + aggs: redmicConfig.aggregations.atlasLayer + }, this.facetsConfig || {}]); + + this.textSearchConfig = this._merge([{ + showExpandIcon: true + }, this.textSearchConfig || {}]); + } + }); +}); diff --git a/public/javascript/app/base/views/extensions/_EditionLayerView.js b/client-app/src/catalog/ogcService/_Edition.js similarity index 72% rename from public/javascript/app/base/views/extensions/_EditionLayerView.js rename to client-app/src/catalog/ogcService/_Edition.js index f74a05a69915e192842de074669ff40e5fda6ea5..ca6be0345a3613e4a221c05f91064a3590ccb39d 100644 --- a/public/javascript/app/base/views/extensions/_EditionLayerView.js +++ b/client-app/src/catalog/ogcService/_Edition.js @@ -1,10 +1,10 @@ define([ - "app/base/views/extensions/_EditionWizardView" - , "app/base/views/extensions/_FormInDialogView" - , "app/redmicConfig" - , "dojo/_base/declare" - , "dojo/_base/lang" - , "dojo/aspect" + 'app/base/views/extensions/_EditionWizardView' + , 'app/base/views/extensions/_FormInDialogView' + , 'src/redmicConfig' + , 'dojo/_base/declare' + , 'dojo/_base/lang' + , 'dojo/aspect' ], function( _EditionWizardView , _FormInDialogView @@ -12,64 +12,63 @@ define([ , declare , lang , aspect -){ +) { + return declare([_EditionWizardView, _FormInDialogView], { // summary: - // Extensión para las vistas de edición de datos relativos a capas. - // description: - // Añade funcionalidades de edición a la vista. - // Ha de declararse junto con una extensión que aporte los métodos - // en los que se apoya. + // Extensión de vista de catálogo de servicios OGC para añadir funcionalidad relativa a la edición de + // registros. constructor: function(args) { this.config = { + addPath: this.viewPaths.ogcServiceEdit, editionLayerEvents: { - UPDATE: "update" + UPDATE: 'update' }, editionLayerActions: {} }; - lang.mixin(this, this.config); + lang.mixin(this, this.config, args); - aspect.before(this, "_mixEventsAndActions", lang.hitch(this, this._mixEditionLayerEventsAndActions)); - aspect.before(this, "_afterSetConfigurations", lang.hitch(this, this._setEditionLayerConfigurations)); + aspect.before(this, '_mixEventsAndActions', lang.hitch(this, this._mixEditionLayerEventsAndActions)); + aspect.before(this, '_afterSetConfigurations', lang.hitch(this, this._setEditionLayerConfigurations)); }, _setEditionLayerConfigurations: function() { this.formConfig = this._merge([{ - template: "maintenance/views/templates/forms/CategoryLayer", + template: 'maintenance/views/templates/forms/CategoryLayer', modelTarget: redmicConfig.services.atlasCategoryEdition }, this.formConfig || {}]); this.listButtonsEdition = [{ - groupId: "edition", + groupId: 'edition', icons:[{ - icon: "fa-refresh", - btnId: "update", - title: "update", + icon: 'fa-refresh', + btnId: 'update', + title: 'update', returnItem: true, - option: "default", - condition: "urlSource" + option: 'default', + condition: 'urlSource' },{ - icon: "fa-edit", - btnId: "edit", - title: "edit", - href: this.viewPaths.serviceOGCEdit, - option: "default", - condition: "urlSource" + icon: 'fa-edit', + btnId: 'edit', + title: 'edit', + href: this.viewPaths.ogcServiceEdit, + option: 'default', + condition: 'urlSource' },{ - icon: "fa-edit", - btnId: "categoryEdit", - title: "edit", + icon: 'fa-edit', + btnId: 'categoryEdit', + title: 'edit', returnItem: true, - option: "default", + option: 'default', condition: this._checkItemIsCategory },{ - icon: "fa-trash-o", - btnId: "remove", - title: "remove", + icon: 'fa-trash-o', + btnId: 'remove', + title: 'remove', returnItem: true }] }]; @@ -90,8 +89,8 @@ define([ if (this.editor) { this.subscriptionsConfig.push({ - channel: this.editor.getChannel("SUBMITTED"), - callback: "_subSubmitted" + channel: this.editor.getChannel('SUBMITTED'), + callback: '_subSubmitted' }); } }, @@ -103,10 +102,10 @@ define([ if (this.editor) { this.publicationsConfig.push({ event: 'SAVED', - channel: this.editor.getChannel("SAVED") + channel: this.editor.getChannel('SAVED') },{ event: 'SHOW_FORM', - channel: this.editor.getChannel("SHOW") + channel: this.editor.getChannel('SHOW') }); } }, diff --git a/public/javascript/app/designs/base/_ServiceOGC.js b/client-app/src/catalog/ogcService/_OgcService.js similarity index 86% rename from public/javascript/app/designs/base/_ServiceOGC.js rename to client-app/src/catalog/ogcService/_OgcService.js index c6605794abff17cfd7c234547856de471f6cd68b..d9cee4d58af39fd25bfdf33b9171fc1ed39875ab 100644 --- a/public/javascript/app/designs/base/_ServiceOGC.js +++ b/client-app/src/catalog/ogcService/_OgcService.js @@ -1,7 +1,7 @@ define([ - "dojo/_base/declare" - , "dojo/_base/lang" - , "redmic/modules/store/RequestJoiner/AtlasDataImpl" + 'dojo/_base/declare' + , 'dojo/_base/lang' + , 'src/component/store/RequestJoiner/AtlasDataImpl' , 'templates/FilterServiceOGCForm' ], function( declare @@ -12,13 +12,13 @@ define([ return declare(null, { // summary: - // Base de vistas principales de ServiceOGC (varios diseños). + // Base de vistas principales de servicios OGC (varios diseños). constructor: function(args) { this.config = { - pathProperty: "path", - pathSeparator: ".", + pathProperty: 'path', + pathSeparator: '.', _atlasDataTarget: 'atlasData', compositeConfig: { @@ -71,7 +71,7 @@ define([ _requestAtlasDataOnRefresh: function() { - this._publish(this._buildChannel(this.queryChannel, "serialize")); + this._publish(this._buildChannel(this.queryChannel, 'serialize')); }, _requestAtlasData: function(queryObj) { diff --git a/client-app/src/catalog/organisation/OrganisationCatalogView.js b/client-app/src/catalog/organisation/OrganisationCatalogView.js new file mode 100644 index 0000000000000000000000000000000000000000..8605784095eb22c18a66cc19bd1ad056eb34f075 --- /dev/null +++ b/client-app/src/catalog/organisation/OrganisationCatalogView.js @@ -0,0 +1,85 @@ +define([ + 'app/designs/base/_Main' + , 'app/designs/textSearchFacetsList/Controller' + , 'app/designs/textSearchFacetsList/Layout' + , 'src/redmicConfig' + , 'dojo/_base/declare' + , 'dojo/_base/lang' + , 'templates/OrganisationList' + , 'src/component/browser/_Select' + , 'src/component/browser/bars/SelectionBox' + , 'src/component/browser/bars/Order' + , 'src/component/browser/bars/Total' +], function( + _Main + , Controller + , Layout + , redmicConfig + , declare + , lang + , templateList + , _Select + , SelectionBox + , Order + , Total +) { + + return declare([Layout, Controller, _Main], { + // summary: + // Vista de catálogo de organizaciones. + + constructor: function(args) { + + this.config = { + title: this.i18n.organisationCatalogView, + ownChannel: 'organisationCatalog', + target: redmicConfig.services.organisation, + + browserExts: [_Select] + }; + + lang.mixin(this, this.config, args); + }, + + _setMainConfigurations: function() { + + this.filterConfig = this._merge([{ + returnFields: redmicConfig.returnFields.organisation + }, this.filterConfig || {}]); + + this.browserConfig = this._merge([{ + template: templateList, + rowConfig: { + buttonsConfig: { + listButton: [{ + icon: 'fa-info-circle', + btnId: 'details', + title: 'info', + href: this.viewPaths.organisationDetails + }] + } + }, + bars: [{ + instance: Total + },{ + instance: SelectionBox + },{ + instance: Order, + config: 'orderConfig' + }], + orderConfig: { + options: [ + {value: 'name'}, + {value: 'organisationType.name', label: this.i18n.organisationType}, + {value: 'acronym'}, + {value: 'updated'} + ] + } + }, this.browserConfig || {}]); + + this.facetsConfig = this._merge([{ + aggs: redmicConfig.aggregations.organisation + }, this.facetsConfig || {}]); + } + }); +}); diff --git a/client-app/src/catalog/organisation/_Edition.js b/client-app/src/catalog/organisation/_Edition.js new file mode 100644 index 0000000000000000000000000000000000000000..725e3dd0b1a349a5fadd777b28b95bb935ba17df --- /dev/null +++ b/client-app/src/catalog/organisation/_Edition.js @@ -0,0 +1,56 @@ +define([ + 'dojo/_base/declare' + , 'dojo/_base/lang' + , 'dojo/aspect' + , 'app/base/views/extensions/_EditionWizardView' +], function( + declare + , lang + , aspect + , _EditionWizardView +) { + + return declare(_EditionWizardView, { + // summary: + // Extensión de vista de catálogo de organizaciones para añadir funcionalidad relativa a la edición de + // registros. + + constructor: function(args) { + + this.config = { + addPath: this.viewPaths.organisationAdd + }; + + lang.mixin(this, this.config, args); + + aspect.before(this, '_setBrowserButtons', lang.hitch(this, this._setOrganisationEditionBrowserButtons)); + }, + + _setOrganisationEditionBrowserButtons: function() { + + if (!this.listButtonsEdition) { + console.warn('Tried to add organisation edition buttons, but edition buttons config was not found!'); + return; + } + + var findIndexCallback = lang.hitch(this, function(button) { + + return button.groupId && button.groupId === this._editionGroupId; + }); + + var editionButtonIndex = this.listButtonsEdition.findIndex(findIndexCallback); + + if (editionButtonIndex !== -1) { + this.listButtonsEdition[editionButtonIndex].icons.push({ + icon: 'fa-edit', + btnId: 'edit', + title: 'edit', + option: 'default', + href: this.viewPaths.organisationEdit + }); + } else { + console.warn('Tried to add organisation edition buttons, but edition button group config was not found!'); + } + } + }); +}); diff --git a/client-app/src/catalog/platform/PlatformCatalogView.js b/client-app/src/catalog/platform/PlatformCatalogView.js new file mode 100644 index 0000000000000000000000000000000000000000..b723de167c8392dabd15a84e95cded346e0a342f --- /dev/null +++ b/client-app/src/catalog/platform/PlatformCatalogView.js @@ -0,0 +1,79 @@ +define([ + 'app/designs/base/_Main' + , 'app/designs/textSearchFacetsList/Controller' + , 'app/designs/textSearchFacetsList/Layout' + , 'src/redmicConfig' + , 'dojo/_base/declare' + , 'dojo/_base/lang' + , 'templates/PlatformList' + , 'src/component/browser/_Select' + , 'src/component/browser/bars/SelectionBox' + , 'src/component/browser/bars/Order' + , 'src/component/browser/bars/Total' +], function( + _Main + , Controller + , Layout + , redmicConfig + , declare + , lang + , templateList + , _Select + , SelectionBox + , Order + , Total +) { + + return declare([Layout, Controller, _Main], { + // summary: + // Vista de catálogo de plataformas. + + constructor: function(args) { + + this.config = { + title: this.i18n.platformCatalogView, + ownChannel: 'platformCatalog', + target: redmicConfig.services.platform, + + browserExts: [_Select] + }; + + lang.mixin(this, this.config, args); + }, + + _setConfigurations: function() { + + this.browserConfig = this._merge([{ + template: templateList, + rowConfig: { + buttonsConfig: { + listButton: [{ + icon: 'fa-info-circle', + btnId: 'details', + title: 'info', + href: this.viewPaths.platformDetails + }] + } + }, + bars: [{ + instance: Total + },{ + instance: SelectionBox + },{ + instance: Order, + config: 'orderConfig' + }], + orderConfig: { + options: [ + {value: 'name'}, + {value: 'updated'} + ] + } + }, this.browserConfig || {}]); + + this.facetsConfig = this._merge([{ + aggs: redmicConfig.aggregations.platform + }, this.facetsConfig || {}]); + } + }); +}); diff --git a/client-app/src/catalog/platform/_Edition.js b/client-app/src/catalog/platform/_Edition.js new file mode 100644 index 0000000000000000000000000000000000000000..4d97b06baf96229b3a5ea40606930ae7fa420e19 --- /dev/null +++ b/client-app/src/catalog/platform/_Edition.js @@ -0,0 +1,56 @@ +define([ + 'dojo/_base/declare' + , 'dojo/_base/lang' + , 'dojo/aspect' + , 'app/base/views/extensions/_EditionWizardView' +], function( + declare + , lang + , aspect + , _EditionWizardView +) { + + return declare(_EditionWizardView, { + // summary: + // Extensión de vista de catálogo de plataformas para añadir funcionalidad relativa a la edición de + // registros. + + constructor: function(args) { + + this.config = { + addPath: this.viewPaths.platformAdd + }; + + lang.mixin(this, this.config, args); + + aspect.before(this, '_setBrowserButtons', lang.hitch(this, this._setPlatformEditionBrowserButtons)); + }, + + _setPlatformEditionBrowserButtons: function() { + + if (!this.listButtonsEdition) { + console.warn('Tried to add platform edition buttons, but edition buttons config was not found!'); + return; + } + + var findIndexCallback = lang.hitch(this, function(button) { + + return button.groupId && button.groupId === this._editionGroupId; + }); + + var editionButtonIndex = this.listButtonsEdition.findIndex(findIndexCallback); + + if (editionButtonIndex !== -1) { + this.listButtonsEdition[editionButtonIndex].icons.push({ + icon: 'fa-edit', + btnId: 'edit', + title: 'edit', + option: 'default', + href: this.viewPaths.platformEdit + }); + } else { + console.warn('Tried to add platform edition buttons, but edition button group config was not found!'); + } + } + }); +}); diff --git a/client-app/src/catalog/program/ProgramCatalogView.js b/client-app/src/catalog/program/ProgramCatalogView.js new file mode 100644 index 0000000000000000000000000000000000000000..5840cd829a0b2ad9eb855856fb0348c8fd778b7f --- /dev/null +++ b/client-app/src/catalog/program/ProgramCatalogView.js @@ -0,0 +1,90 @@ +define([ + 'app/designs/base/_Main' + , 'app/designs/textSearchFacetsList/Controller' + , 'app/designs/textSearchFacetsList/Layout' + , 'src/redmicConfig' + , 'dojo/_base/declare' + , 'dojo/_base/lang' + , 'templates/ProgramList' + , 'src/catalog/_GenerateReport' + , 'src/component/browser/_Select' + , 'src/component/browser/bars/SelectionBox' + , 'src/component/browser/bars/Order' + , 'src/component/browser/bars/Total' +], function( + _Main + , Controller + , Layout + , redmicConfig + , declare + , lang + , templateList + , _GenerateReport + , _Select + , SelectionBox + , Order + , Total +) { + + return declare([Layout, Controller, _Main, _GenerateReport], { + // summary: + // Vista de catálogo de programas. + + constructor: function(args) { + + this.config = { + title: this.i18n.programCatalogView, + ownChannel: 'programCatalog', + target: redmicConfig.services.program, + + browserExts: [_Select], + + reportService: 'program' + }; + + lang.mixin(this, this.config, args); + }, + + _setMainConfigurations: function() { + + this.filterConfig = this._merge([{ + returnFields: redmicConfig.returnFields.program + }, this.filterConfig || {}]); + + this.browserConfig = this._merge([{ + template: templateList, + rowConfig: { + buttonsConfig: { + listButton: [{ + icon: 'fa-info-circle', + btnId: 'details', + title: 'info', + href: this.viewPaths.programDetails + }] + } + }, + bars: [{ + instance: Total + },{ + instance: SelectionBox + },{ + instance: Order, + config: 'orderConfig' + }], + orderConfig: { + options: [ + {value: 'name'}, + {value: 'code'}, + {value: 'startDate'}, + {value: 'endDate'}, + {value: 'updated'} + ] + } + }, this.browserConfig || {}]); + + this.facetsConfig = this._merge([{ + aggs: redmicConfig.aggregations.program + }, this.facetsConfig || {}]); + } + }); +}); diff --git a/client-app/src/catalog/program/_Edition.js b/client-app/src/catalog/program/_Edition.js new file mode 100644 index 0000000000000000000000000000000000000000..dfe7afc27a49ec698c6c848b03b5133214081077 --- /dev/null +++ b/client-app/src/catalog/program/_Edition.js @@ -0,0 +1,61 @@ +define([ + 'dojo/_base/declare' + , 'dojo/_base/lang' + , 'dojo/aspect' + , 'app/base/views/extensions/_EditionWizardView' +], function( + declare + , lang + , aspect + , _EditionWizardView +) { + + return declare(_EditionWizardView, { + // summary: + // Extensión de vista de catálogo de programas para añadir funcionalidad relativa a la edición de + // registros. + + constructor: function(args) { + + this.config = { + addPath: this.viewPaths.programAdd + }; + + lang.mixin(this, this.config, args); + + aspect.before(this, '_setBrowserButtons', lang.hitch(this, this._setProgramEditionBrowserButtons)); + }, + + _setProgramEditionBrowserButtons: function() { + + if (!this.listButtonsEdition) { + console.warn('Tried to add program edition buttons, but edition buttons config was not found!'); + return; + } + + var findIndexCallback = lang.hitch(this, function(button) { + + return button.groupId && button.groupId === this._editionGroupId; + }); + + var editionButtonIndex = this.listButtonsEdition.findIndex(findIndexCallback); + + if (editionButtonIndex !== -1) { + this.listButtonsEdition[editionButtonIndex].icons.push({ + icon: 'fa-edit', + btnId: 'edit', + title: 'edit', + option: 'default', + href: this.viewPaths.programEdit + },{ + icon: 'fa-copy', + btnId: 'copy', + title: 'copy', + href: this.viewPaths.programAdd + }); + } else { + console.warn('Tried to add program edition buttons, but edition button group config was not found!'); + } + } + }); +}); diff --git a/client-app/src/catalog/project/ProjectCatalogView.js b/client-app/src/catalog/project/ProjectCatalogView.js new file mode 100644 index 0000000000000000000000000000000000000000..aa635de5b84db69db83fef21c3a1f91c7c153015 --- /dev/null +++ b/client-app/src/catalog/project/ProjectCatalogView.js @@ -0,0 +1,91 @@ +define([ + 'app/designs/base/_Main' + , 'app/designs/textSearchFacetsList/Controller' + , 'app/designs/textSearchFacetsList/Layout' + , 'src/redmicConfig' + , 'dojo/_base/declare' + , 'dojo/_base/lang' + , 'templates/ProjectList' + , 'src/catalog/_GenerateReport' + , 'src/component/browser/_Select' + , 'src/component/browser/bars/SelectionBox' + , 'src/component/browser/bars/Order' + , 'src/component/browser/bars/Total' +], function( + _Main + , Controller + , Layout + , redmicConfig + , declare + , lang + , templateList + , _GenerateReport + , _Select + , SelectionBox + , Order + , Total +) { + + return declare([Layout, Controller, _Main, _GenerateReport], { + // summary: + // Vista de catálogo de proyectos. + + constructor: function(args) { + + this.config = { + title: this.i18n.projectCatalogView, + ownChannel: 'projectCatalog', + target: redmicConfig.services.project, + + browserExts: [_Select], + + reportService: 'project' + }; + + lang.mixin(this, this.config, args); + }, + + _setMainConfigurations: function() { + + this.filterConfig = this._merge([{ + returnFields: redmicConfig.returnFields.project + }, this.filterConfig || {}]); + + this.browserConfig = this._merge([{ + rowConfig: { + buttonsConfig: { + listButton: [{ + icon: 'fa-info-circle', + btnId: 'details', + title: 'info', + href: this.viewPaths.projectDetails + }] + } + }, + template: templateList, + bars: [{ + instance: Total + },{ + instance: SelectionBox + },{ + instance: Order, + config: 'orderConfig' + }], + orderConfig: { + options: [ + {value: 'name'}, + {value: 'code'}, + {value: 'projectGroup.name', label: this.i18n.projectGroup}, + {value: 'startDate'}, + {value: 'endDate'}, + {value: 'updated'} + ] + } + }, this.browserConfig || {}]); + + this.facetsConfig = this._merge([{ + aggs: redmicConfig.aggregations.project + }, this.facetsConfig || {}]); + } + }); +}); diff --git a/client-app/src/catalog/project/_Edition.js b/client-app/src/catalog/project/_Edition.js new file mode 100644 index 0000000000000000000000000000000000000000..c7141acc43ffa6359feb829f00b01cd66957a8e3 --- /dev/null +++ b/client-app/src/catalog/project/_Edition.js @@ -0,0 +1,61 @@ +define([ + 'dojo/_base/declare' + , 'dojo/_base/lang' + , 'dojo/aspect' + , 'app/base/views/extensions/_EditionWizardView' +], function( + declare + , lang + , aspect + , _EditionWizardView +) { + + return declare(_EditionWizardView, { + // summary: + // Extensión de vista de catálogo de proyectos para añadir funcionalidad relativa a la edición de + // registros. + + constructor: function(args) { + + this.config = { + addPath: this.viewPaths.projectAdd + }; + + lang.mixin(this, this.config, args); + + aspect.before(this, '_setBrowserButtons', lang.hitch(this, this._setProjectEditionBrowserButtons)); + }, + + _setProjectEditionBrowserButtons: function() { + + if (!this.listButtonsEdition) { + console.warn('Tried to add project edition buttons, but edition buttons config was not found!'); + return; + } + + var findIndexCallback = lang.hitch(this, function(button) { + + return button.groupId && button.groupId === this._editionGroupId; + }); + + var editionButtonIndex = this.listButtonsEdition.findIndex(findIndexCallback); + + if (editionButtonIndex !== -1) { + this.listButtonsEdition[editionButtonIndex].icons.push({ + icon: 'fa-edit', + btnId: 'edit', + title: 'edit', + option: 'default', + href: this.viewPaths.projectEdit + },{ + icon: 'fa-copy', + btnId: 'copy', + title: 'copy', + href: this.viewPaths.projectAdd + }); + } else { + console.warn('Tried to add project edition buttons, but edition button group config was not found!'); + } + } + }); +}); diff --git a/public/javascript/app/viewers/views/StacBrowserView.js b/client-app/src/catalog/raster/RasterCatalogView.js similarity index 79% rename from public/javascript/app/viewers/views/StacBrowserView.js rename to client-app/src/catalog/raster/RasterCatalogView.js index 0e70d20063aea926af6dec54ca555ecbce92b3d9..2c09842fffc0eff47b2949021e000b65bd38211d 100644 --- a/public/javascript/app/viewers/views/StacBrowserView.js +++ b/client-app/src/catalog/raster/RasterCatalogView.js @@ -3,7 +3,7 @@ define([ , 'app/designs/embeddedContent/Layout' , 'dojo/_base/declare' , 'dojo/_base/lang' - , 'redmic/modules/base/_ExternalConfig' + , 'src/component/base/_ExternalConfig' ], function( Controller , Layout @@ -14,15 +14,15 @@ define([ return declare([Layout, Controller, _ExternalConfig], { // summary: - // Vista de STAC Browser incrustado. + // Vista de catálogo de recursos ráster. // description: - // Permite integrar la herramienta externa. + // Permite integrar la herramienta externa STAC Browser como contenido incrustado. constructor: function (args) { this.config = { embeddedContentUrl: null, - embeddedContentUrlPropertyName: 'stacBrowserViewEmbeddedContentUrl' + embeddedContentUrlPropertyName: 'rasterCatalogViewEmbeddedContentUrl' }; lang.mixin(this, this.config, args); diff --git a/public/javascript/app/designs/textSearchFacetsList/main/Species.js b/client-app/src/catalog/species/SpeciesCatalogView.js similarity index 50% rename from public/javascript/app/designs/textSearchFacetsList/main/Species.js rename to client-app/src/catalog/species/SpeciesCatalogView.js index a166bf27aba1b6dfa1506f31360e19f35ab88626..414727b8434ddabd4bef104e0af9c4458a866172 100644 --- a/public/javascript/app/designs/textSearchFacetsList/main/Species.js +++ b/client-app/src/catalog/species/SpeciesCatalogView.js @@ -1,18 +1,19 @@ define([ - "app/designs/base/_Main" - , "app/designs/textSearchFacetsList/Controller" - , "app/designs/textSearchFacetsList/Layout" - , "app/redmicConfig" - , "dojo/_base/declare" - , "dojo/_base/lang" - , "templates/SpeciesList" - , "redmic/modules/browser/_Select" - , "redmic/modules/browser/bars/SelectionBox" - , "redmic/modules/browser/bars/Order" - , "redmic/modules/browser/bars/Total" - , "redmic/modules/tree/_HierarchicalFilter" - , "redmic/modules/tree/_LazyLoad" - , "redmic/modules/tree/CbtreeImpl" + 'app/designs/base/_Main' + , 'app/designs/textSearchFacetsList/Controller' + , 'app/designs/textSearchFacetsList/Layout' + , 'src/redmicConfig' + , 'dojo/_base/declare' + , 'dojo/_base/lang' + , 'templates/SpeciesList' + , 'src/catalog/_GenerateReport' + , 'src/component/browser/_Select' + , 'src/component/browser/bars/SelectionBox' + , 'src/component/browser/bars/Order' + , 'src/component/browser/bars/Total' + , 'src/component/tree/_HierarchicalFilter' + , 'src/component/tree/_LazyLoad' + , 'src/component/tree/CbtreeImpl' ], function( _Main , Controller @@ -21,6 +22,7 @@ define([ , declare , lang , templateList + , _GenerateReport , _Select , SelectionBox , Order @@ -28,25 +30,30 @@ define([ , _HierarchicalFilter , _LazyLoad , CbtreeImpl -){ - return declare([Layout, Controller, _Main], { +) { + + return declare([Layout, Controller, _Main, _GenerateReport], { // summary: - // - // description: - // + // Vista de catálogo de especies. - constructor: function (args) { + constructor: function(args) { this.config = { + title: this.i18n.speciesCatalogView, + ownChannel: 'speciesCatalog', + target: redmicConfig.services.species, + + filtersInTabs: true, + layoutAdditionalClasses: 'layoutTextSearchFacetsListDesign speciesMainTextSearchFacetsListDesign', browserExts: [_Select], - title: this.i18n.species, - layoutAdditionalClasses: 'layoutTextSearchFacetsListDesign speciesMainTextSearchFacetsListDesign' + + reportService: 'species' }; lang.mixin(this, this.config, args); }, - _setMainConfigurations: function() { + _setConfigurations: function() { this.filterConfig = this._merge([{ returnFields: redmicConfig.returnFields.species @@ -55,11 +62,11 @@ define([ this.browserConfig = this._merge([{ orderConfig: { options: [ - {value: "scientificName"}, - {value: "authorship"}, - {value: "status.name", label: this.i18n.status}, - {value: "commonName"}, - {value: "updated"} + {value: 'scientificName'}, + {value: 'authorship'}, + {value: 'status.name', label: this.i18n.status}, + {value: 'commonName'}, + {value: 'updated'} ] }, template: templateList, @@ -73,7 +80,12 @@ define([ }], rowConfig: { buttonsConfig: { - listButton: [] + listButton: [{ + icon: 'fa-info-circle', + btnId: 'details', + title: 'info', + href: this.viewPaths.speciesDetails + }] } } }, this.browserConfig || {}]); @@ -84,23 +96,23 @@ define([ }, this.facetsConfig || {}]); }, - _initializeMain: function() { + _initialize: function() { - var tree = declare([CbtreeImpl, _LazyLoad, _HierarchicalFilter]); - this.tree = new tree({ + var TreeDefinition = declare([CbtreeImpl, _LazyLoad, _HierarchicalFilter]); + this.tree = new TreeDefinition({ parentChannel: this.getChannel(), selectorChannel: this.getChannel(), queryExternalChannel: this.queryChannel, target: redmicConfig.services.taxons, - idProperty: "path", - itemLabel: "{rank.name} - {scientificName} ({leaves})", + idProperty: 'path', + itemLabel: '{rank.name} - {scientificName} ({leaves})', createQuery: function(item) { var query = { returnFields: redmicConfig.returnFields.taxonsTree, regexp: [{ - field: "path", - exp: "root.[0-9]+" + field: 'path', + exp: 'root.[0-9]+' }] }; @@ -108,7 +120,7 @@ define([ return query; } - query.regexp[0].exp = item.path + ".[0-9]+"; + query.regexp[0].exp = item.path + '.[0-9]+'; return query; }, @@ -117,7 +129,6 @@ define([ return item.rank.name === 'Genus'; } }); - }, _setMainOwnCallbacksForEvents: function() { @@ -129,12 +140,12 @@ define([ this.inherited(arguments); - this._publish(this.tree.getChannel("SHOW"), { + this._publish(this.tree.getChannel('SHOW'), { node: this.filter2.domNode }); - this.filter1.set("title", this.i18n.attributes); - this.filter2.set("title", this.i18n.taxonTree); + this.filter1.set('title', this.i18n.attributes); + this.filter2.set('title', this.i18n.taxonTree); }, _onSpeciesMainShown: function() { diff --git a/client-app/src/catalog/species/_Edition.js b/client-app/src/catalog/species/_Edition.js new file mode 100644 index 0000000000000000000000000000000000000000..01f98b0a47d22a12d924479cec618887c8bb1d29 --- /dev/null +++ b/client-app/src/catalog/species/_Edition.js @@ -0,0 +1,58 @@ +define([ + 'dojo/_base/declare' + , 'dojo/_base/lang' + , 'dojo/aspect' + , 'app/administrative/taxonomy/views/_AddCompositeTaxon' + , 'app/base/views/extensions/_EditionWizardView' +], function( + declare + , lang + , aspect + , _AddCompositeTaxon + , _EditionWizardView +) { + + return declare([_AddCompositeTaxon, _EditionWizardView], { + // summary: + // Extensión de vista de catálogo de especies para añadir funcionalidad relativa a la edición de + // registros. + + constructor: function(args) { + + this.config = { + addPath: this.viewPaths.speciesAdd + }; + + lang.mixin(this, this.config, args); + + aspect.before(this, '_setBrowserButtons', lang.hitch(this, this._setSpeciesEditionBrowserButtons)); + }, + + _setSpeciesEditionBrowserButtons: function() { + + if (!this.listButtonsEdition) { + console.warn('Tried to add species edition buttons, but edition buttons config was not found!'); + return; + } + + var findIndexCallback = lang.hitch(this, function(button) { + + return button.groupId && button.groupId === this._editionGroupId; + }); + + var editionButtonIndex = this.listButtonsEdition.findIndex(findIndexCallback); + + if (editionButtonIndex !== -1) { + this.listButtonsEdition[editionButtonIndex].icons.push({ + icon: 'fa-edit', + btnId: 'edit', + title: 'edit', + option: 'default', + href: this.viewPaths.speciesEdit + }); + } else { + console.warn('Tried to add species edition buttons, but edition button group config was not found!'); + } + } + }); +}); diff --git a/public/javascript/redmic/modules/atlas/Atlas.js b/client-app/src/component/atlas/Atlas.js similarity index 51% rename from public/javascript/redmic/modules/atlas/Atlas.js rename to client-app/src/component/atlas/Atlas.js index 465282777458f6c1e462a0c616eed985ae21cffc..986d311a7110abb880e9927cbaa2afd1790d2a62 100644 --- a/public/javascript/redmic/modules/atlas/Atlas.js +++ b/client-app/src/component/atlas/Atlas.js @@ -1,56 +1,55 @@ define([ - 'alertify/alertify.min' - ,'app/designs/list/Controller' - , 'app/designs/list/layout/Layout' - , 'app/designs/textSearchList/main/ServiceOGC' - , 'app/redmicConfig' + 'alertify' + , 'src/catalog/ogcService/OgcServiceCatalogLite' + , 'src/redmicConfig' , 'dojo/_base/declare' , 'dojo/_base/lang' + , 'dojo/aspect' , 'dojo/Deferred' - , 'redmic/modules/base/_Module' - , 'redmic/modules/base/_Selection' - , 'redmic/modules/base/_Show' - , 'redmic/modules/base/_ShowInTooltip' - , 'redmic/modules/base/_Store' - , 'redmic/modules/browser/_DragAndDrop' - , 'redmic/modules/browser/_HierarchicalSelect' - , 'redmic/modules/browser/bars/SelectionBox' - , 'redmic/modules/browser/bars/Total' - , 'redmic/modules/layout/templateDisplayer/TemplateDisplayer' - , 'templates/AtlasList' + , 'src/component/base/_Module' + , 'src/component/base/_Selection' + , 'src/component/base/_Show' + , 'src/component/base/_ShowInTooltip' + , 'src/component/base/_Store' + , 'src/component/atlas/_AtlasDimensionsManagement' + , 'src/component/atlas/_AtlasLayersManagement' + , 'src/component/atlas/_AtlasLegendManagement' + , 'src/component/atlas/_AtlasThemesManagement' + , 'src/component/browser/_HierarchicalSelect' + , 'src/component/browser/bars/SelectionBox' + , 'src/component/layout/templateDisplayer/TemplateDisplayer' , 'templates/LoadingCustom' , 'templates/ServiceOGCAtlasList' , 'templates/ServiceOGCAtlasDetails' - , './_AtlasLayersManagement' - , './_AtlasLegendManagement' ], function( alertify - , Controller - , Layout - , ServiceOGC + , OgcServiceCatalogLite , redmicConfig , declare , lang + , aspect , Deferred , _Module , _Selection , _Show , _ShowInTooltip , _Store - , _DragAndDrop + , _AtlasDimensionsManagement + , _AtlasLayersManagement + , _AtlasLegendManagement + , _AtlasThemesManagement , _HierarchicalSelect , SelectionBox - , Total , TemplateDisplayer - , ListTemplate , LoadingCustom , serviceOGCList , templateDetails - , _AtlasLayersManagement - , _AtlasLegendManagement ) { - return declare([_Module, _Show, _Store, _Selection, _AtlasLayersManagement, _AtlasLegendManagement], { + return declare([ + _Module, _Show, _Store, _Selection, _AtlasDimensionsManagement, _AtlasLayersManagement, _AtlasLegendManagement, + _AtlasThemesManagement + ], { // summary: // Módulo de Atlas, con un catálogo de capas para añadir al mapa y un listado de gestión de las añadidas. @@ -69,52 +68,33 @@ define([ target: redmicConfig.services.atlasLayer, selectionTarget: redmicConfig.services.atlasLayerSelection, pathSeparator: '.', - parentProperty: 'parent', - _layerInstances: {}, // capas de las que hemos creado instancia (no se borran, se reciclan) _layerIdsById: {}, // correspondencia entre ids de las capas con sus layerIds _lastOrder: 0 // order de la última capa añadida (para saber donde añadir la siguiente) }; lang.mixin(this, this.config, args); + + aspect.before(this, '_createAtlasMapLayerInstance', + lang.hitch(this, this._beforeCreateAtlasMapLayerInstance)); }, _setConfigurations: function() { this.themesBrowserConfig = this._merge([{ - parentChannel: this.getChannel(), title: this.i18n.selectedLayers, target: this.localTarget, - classByList: '.borderList', - browserExts: [_DragAndDrop], browserConfig: { - template: ListTemplate, - bars: [{ - instance: Total - }], rowConfig: { buttonsConfig: { listButton: [{ - icon: 'fa-map-o', - btnId: 'legend', - title: 'legend', - returnItem: true - },{ - icon: 'fa-map-marker', - title: 'mapCentering', - btnId: 'fitBounds', - returnItem: true - },{ - icon: 'fa-toggle-on', - altIcon: 'fa-toggle-off', - btnId: 'addLayer', - title: 'layer', - state: true, - returnItem: true - },{ icon: 'fa-trash-o', btnId: 'remove', title: 'remove', + condition: function(atlasLayerItem) { + + return !!atlasLayerItem.atlasItem.atlas; + }, returnItem: true }] } @@ -127,18 +107,18 @@ define([ } } } - }, this.themesBrowserConfig || {}]); + }, this.themesBrowserConfig || {}], { + arrayMergingStrategy: 'concatenate' + }); this.catalogConfig = this._merge([{ parentChannel: this.getChannel(), browserExts: [_HierarchicalSelect], selectionTarget: this.selectionTarget, target: this.target, - perms: this.perms, classByList: '.borderList', browserConfig: { template: serviceOGCList, - //noSelectParent: true, rowConfig: { buttonsConfig: { listButton: [{ @@ -176,15 +156,12 @@ define([ target: 'tooltipDetails', 'class': 'descriptionTooltip', timeClose: 200 - }, this.atlasConfig || {}]); + }, this.detailsConfig || {}]); }, _initialize: function() { - var ThemesBrowser = declare([Layout, Controller]); - this.themesBrowser = new ThemesBrowser(this.themesBrowserConfig); - - this.catalogView = new ServiceOGC(this.catalogConfig); + this.catalogView = new OgcServiceCatalogLite(this.catalogConfig); var LayerDetailsTooltip = declare(TemplateDisplayer).extend(_ShowInTooltip); this.templateDisplayerDetails = new LayerDetailsTooltip(this.detailsConfig); @@ -199,12 +176,6 @@ define([ this.subscriptionsConfig.push({ channel : this.getMapChannel('LAYER_REMOVED'), callback: '_subLayerRemoved' - },{ - channel: this.themesBrowser.getChildChannel('browser', 'BUTTON_EVENT'), - callback: '_subThemesBrowserButtonEvent' - },{ - channel: this.themesBrowser.getChildChannel('browser', 'DRAG_AND_DROP'), - callback: '_subThemesBrowserDragAndDrop' },{ channel : this.catalogView.getChildChannel('browser', 'BUTTON_EVENT'), callback: '_subCatalogViewButtonEvent' @@ -239,32 +210,26 @@ define([ this.inherited(arguments); - this._addTabs(this.addTabChannel); + this._addTabs(); }, - _getNodeToShow: function() { + getNodeToShow: function() { return this._atlasContainer; }, - _addTabs: function(addTabChannel) { + _addTabs: function() { - if (!addTabChannel) { + if (!this.addTabChannel) { console.error('Missing channel to add tabs at Atlas module "%s"', this.getChannel()); return; } - this._publish(addTabChannel, { + this._publish(this.addTabChannel, { title: this.i18n.layersCatalog, iconClass: 'fr fr-world', channel: this.catalogView.getChannel() }); - - this._publish(addTabChannel, { - title: this.i18n.selectedLayers, - iconClass: 'fa fa-map-o', - channel: this.themesBrowser.getChannel() - }); }, _checkSelectionAfterShown: function() { @@ -275,6 +240,14 @@ define([ } }, + _beforeCreateAtlasMapLayerInstance: function(atlasLayerItem) { + + var id = atlasLayerItem.id, + layerId = atlasLayerItem.mapLayerId; + + this._layerIdsById[id] = layerId; + }, + _select: function(path, total) { var id = path.split(this.pathSeparator).pop(); @@ -314,27 +287,13 @@ define([ _reportDeselection: function(id) { - this._publish(this.themesBrowser.getChildChannel('browser', 'REMOVE'), { - ids: [id] - }); - - this._removeLayerInstance(id); - - this._lastOrder--; - }, - - _removeLayerInstance: function(id) { - var layerId = this._layerIdsById[id]; - this._emitEvt('REMOVE_LAYER', { - layer: layerId - }); - - this._removeSubsAndPubsForLayer(this._layerInstances[layerId]); + this._removeLayerInstance(layerId); - delete this._layerInstances[layerId]; delete this._layerIdsById[id]; + + this._lastOrder--; }, _clearSelection: function() { @@ -353,12 +312,12 @@ define([ this._clearSelectionPending = false; - this._publish(this.themesBrowser.getChildChannel('browser', 'CLEAR')); - for (var key in this._layerIdsById) { - this._removeLayerInstance(key); + this._removeLayerInstance(this._layerIdsById[key]); } + this._layerIdsById = []; + this._lastOrder = 0; }, @@ -383,50 +342,36 @@ define([ _itemAvailable: function(response) { - var item = response.data; + var atlasItem = response.data; - if (item.leaves) { + if (atlasItem.leaves) { return; } - var itemId = this._getAtlasLayerId(item); + var itemId = this._getAtlasItemId(atlasItem); if (this._layerIdsById[itemId]) { return; } - var layerDefinition = this._getAtlasLayerDefinition(), - layerConfiguration = this._getAtlasLayerConfiguration(item), - layerLabel = layerConfiguration.layerLabel; - - layerConfiguration.mapChannel = this.getMapChannel(); - - var data = { - id: itemId, - label: layerLabel, - originalItem: item, - layer: { - definition: layerDefinition, - props: layerConfiguration - } - }; - this._emitEvt('TRACK', { type: TRACK.type.event, info: { category: TRACK.category.layer, action: TRACK.action.click, - label: 'Layer loaded: ' + item.name + label: 'Layer loaded: ' + atlasItem.name } }); + var atlasLayerItem = this._getAtlasLayerItemToInject(atlasItem); + this._emitEvt('INJECT_ITEM', { - data: data, + data: atlasLayerItem, target: this.localTarget }); this._lastOrder++; - this._activateLayer(data, this._lastOrder); + this._activateLayer(atlasLayerItem, this._lastOrder); }, _subLayerRemoved: function(res) { @@ -436,24 +381,6 @@ define([ this._removeLegendOfRemovedLayer(layerId); }, - _subThemesBrowserDragAndDrop: function(response) { - - var item = response.item, - total = response.total, - indexOld = response.indexOld, - indexList = response.indexList; - - if (!item && !total && !indexOld && !indexList) { - return; - } - - this._publish(this.getMapChannel('REORDER_LAYERS'), { - layerId: this._createLayerId(response.item.originalItem), - newPosition: response.total - response.indexList, - oldPosition: response.total - response.indexOld - }); - }, - _subCatalogViewButtonEvent: function(res) { this._publish(this.templateDisplayerDetails.getChannel('HIDE')); @@ -461,7 +388,7 @@ define([ var node = res.iconNode, item = res.item; - item.href = lang.replace(redmicConfig.viewPaths.serviceOGCCatalogDetails, item); + item.href = lang.replace(redmicConfig.viewPaths.ogcServiceDetails, item); this._emitEvt('INJECT_ITEM', { data: item, @@ -471,123 +398,6 @@ define([ this._publish(this.templateDisplayerDetails.getChannel('SHOW'), { node: node }); - }, - - _activateLayer: function(/*Object*/ item, order) { - - if (!item || !item.layer) { - return; - } - - var definition = item.layer.definition, - props = item.layer.props, - id = item.id, - layerId = this._createLayerId(item.originalItem), - layer = this._getLayerInstance(id, layerId, definition, props); - - this._emitEvt('ADD_LAYER', { - layer: layer, - layerId: layerId, - layerLabel: item.label, - atlasItem: item.originalItem, - order: order - }); - }, - - _getLayerInstance: function(id, layerId, definition, props) { - - var layer = this._layerInstances[layerId]; - - if (!layer) { - layer = new definition(props); - this._layerInstances[layerId] = layer; - this._layerIdsById[id] = layerId; - this._createSubsAndPubsForLayer(layer); - } - - return layer; - }, - - _createSubsAndPubsForLayer: function(layerInstance) { - - this._createLegendSubsAndPubsForLayer(layerInstance); - }, - - _deactivateLayer: function(/*Object*/ item, order) { - - if (!item.layer) { - return; - } - - var layerId = this._createLayerId(item.originalItem), - layer = this._layerInstances[layerId]; - - if (layer) { - this._emitEvt('REMOVE_LAYER', { - layer: layer, - order: order, - keepInstance: true - }); - } - }, - - _removeSubsAndPubsForLayer: function(layerInstance) { - - this._removeLegendSubsAndPubsForLayer(layerInstance); - - this._publish(layerInstance.getChannel('DISCONNECT')); - }, - - _subThemesBrowserButtonEvent: function(objReceived) { - - var btnId = objReceived.btnId, - item = objReceived.item; - - if (btnId === 'addLayer') { - this._onAddLayerBrowserButtonClick(objReceived); - } else if (btnId === 'remove') { - var parentItem = item.originalItem[this.parentProperty], - path = 'r' + this.pathSeparator + parentItem.id + this.pathSeparator + item.id; - - this._emitEvt('DESELECT', [path]); - } else if (btnId === 'legend') { - this._showLayerLegend(objReceived); - } else if (btnId === 'fitBounds') { - this._fitBounds(item); - } - }, - - _fitBounds: function(item) { - - if (!item.originalItem.geometry) { - return; - } - - var coordinates = item.originalItem.geometry.coordinates[0], - southWest = this._getLatLng(coordinates[0]), - northEast = this._getLatLng(coordinates[2]); - - this._publish(this.getMapChannel('FIT_BOUNDS'), { - bounds: L.latLngBounds(southWest, northEast) - }); - }, - - _getLatLng: function(coord) { - - return [coord[1], coord[0]]; - }, - - _onAddLayerBrowserButtonClick: function(obj) { - - var item = obj.item, - state = obj.state, - order = obj.total - obj.indexList; - - if (!state) { - this._deactivateLayer(item, order); - } else { - this._activateLayer(item, order); - } } }); }); diff --git a/client-app/src/component/atlas/_AtlasDimensionsManagement.js b/client-app/src/component/atlas/_AtlasDimensionsManagement.js new file mode 100644 index 0000000000000000000000000000000000000000..9c6e8ddc1e02286350070c28c265b301ab2aa905 --- /dev/null +++ b/client-app/src/component/atlas/_AtlasDimensionsManagement.js @@ -0,0 +1,178 @@ +define([ + 'dojo/_base/declare' + , 'dojo/_base/lang' + , 'dojo/aspect' + , 'dojo/dom-class' + , 'src/component/layout/TagList' +], function( + declare + , lang + , aspect + , domClass + , TagList +) { + + return declare(null, { + // summary: + // Gestión de dimensiones de capas (como tiempo y elevación) para el módulo Atlas. + + constructor: function(args) { + + this.config = { + _elevationTagsContainerClass: 'tagListBottomContentContainer', + _elevationTagListByLayerId: {}, + _elevationShownByLayerId: {} + }; + + lang.mixin(this, this.config, args); + + aspect.before(this, '_deactivateLayer', lang.hitch(this, this._atlasDimensionsDeactivateLayer)); + aspect.before(this, '_cleanRowSecondaryContainer', lang.hitch(this, + this._atlasDimensionsCleanRowSecondaryContainer)); + }, + + _getAtlasLayerDimensions: function(atlasItem) { + + var dimensions = {}; + + var time = atlasItem.timeDefinition || atlasItem.timeDimension, + elevation = atlasItem.elevationDimension; + + if (time) { + dimensions.time = time; + } + + if (elevation) { + dimensions.elevation = elevation; + } + + return dimensions; + }, + + _removeElevationOfRemovedLayer: function(layerId) { + + this._hideLayerElevationTagList(layerId); + }, + + _showLayerElevation: function(browserButtonObj) { + + var atlasLayerItem = browserButtonObj.item, + layerId = atlasLayerItem.mapLayerId; + + if (!this._activeLayers[layerId]) { + this._emitEvt('COMMUNICATION', { + description: this.i18n.addLayerFirst + }); + + return; + } + + var container = browserButtonObj.node, + elevationContainer = container.children[1], + item = atlasLayerItem.atlasItem, + elevationTagListInstance = this._getLayerElevationTagList(layerId, item), + elevationShown = this._elevationShownByLayerId[layerId] || false; + + if (!elevationShown) { + this._cleanRowSecondaryContainer(layerId, elevationContainer); + this._showLayerElevationTagList(elevationTagListInstance, elevationContainer); + this._elevationShownByLayerId[layerId] = true; + } else { + this._hideLayerElevationTagList(layerId); + } + }, + + _getLayerElevationTagList: function(layerId, item) { + + if (this._elevationTagListByLayerId[layerId]) { + return this._elevationTagListByLayerId[layerId]; + } + + var elevationDefinition = item.elevationDimension; + + var instance = new TagList({ + parentChannel: this.getChannel(), + tagsString: elevationDefinition.value, + simpleSelection: true, + getSelectedTags: function(_tagValue, tagIndex) { + + return tagIndex === 0; + }, + getTagLabel: lang.partial(function(unit, tagValue) { + + return tagValue + ' ' + unit; + }, elevationDefinition.unitSymbol) + }); + + this._subscribe(instance.getChannel('TAG_CLICKED'), lang.hitch(this, this._onElevationTagClicked, layerId)); + + this._elevationTagListByLayerId[layerId] = instance; + + return instance; + }, + + _showLayerElevationTagList: function(elevationInstance, elevationContainer) { + + domClass.add(elevationContainer, this._elevationTagsContainerClass); + + this._once(elevationInstance.getChannel('HIDDEN'), lang.hitch(this, function(container) { + + domClass.remove(container, this._elevationTagsContainerClass); + }, elevationContainer)); + + this._publish(elevationInstance.getChannel('SHOW'), { + node: elevationContainer + }); + }, + + _hideLayerElevationTagList: function(layerId) { + + var elevationTagListInstance = this._elevationTagListByLayerId[layerId]; + + if (!elevationTagListInstance) { + return; + } + + this._publish(elevationTagListInstance.getChannel('HIDE')); + this._elevationShownByLayerId[layerId] = false; + }, + + _onElevationTagClicked: function(layerId, res) { + + var layerInstance = this._layerInstances[layerId]; + + if (!layerInstance) { + return; + } + + this._publish(layerInstance.getChannel('SET_LAYER_DIMENSION'), { + elevation: { + value: res.value, + label: res.label + } + }); + }, + + _atlasDimensionsDeactivateLayer: function(atlasLayerItem) { + + if (!atlasLayerItem) { + return; + } + + var mapLayerId = atlasLayerItem.mapLayerId; + + if (!this._elevationShownByLayerId[mapLayerId]) { + return; + } + + this._hideLayerElevationTagList(mapLayerId); + }, + + _atlasDimensionsCleanRowSecondaryContainer: function(mapLayerId) { + + if (this._elevationShownByLayerId[mapLayerId]) { + this._hideLayerElevationTagList(mapLayerId); + } + } + }); +}); diff --git a/public/javascript/redmic/modules/atlas/_AtlasLayersManagement.js b/client-app/src/component/atlas/_AtlasLayersManagement.js similarity index 67% rename from public/javascript/redmic/modules/atlas/_AtlasLayersManagement.js rename to client-app/src/component/atlas/_AtlasLayersManagement.js index d1ed978b27ab5be69ac080e9af49e9ecb26da22e..1598f04e3aa91c6b634da8f76e7566604aea10e9 100644 --- a/public/javascript/redmic/modules/atlas/_AtlasLayersManagement.js +++ b/client-app/src/component/atlas/_AtlasLayersManagement.js @@ -1,8 +1,8 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' - , 'redmic/modules/map/layer/_PublishInfo' - , 'redmic/modules/map/layer/WmsLayerImpl' + , 'src/component/map/layer/_PublishInfo' + , 'src/component/map/layer/WmsLayerImpl' ], function( declare , lang @@ -19,7 +19,9 @@ define([ this.config = { layerIdSeparator: '_', - themeSeparator: '-' + themeSeparator: '-', + _layerInstances: {}, // capas de las que hemos creado instancia (no se borran, se reciclan) + defaultLayerItemState: true }; lang.mixin(this, this.config, args); @@ -251,30 +253,49 @@ define([ } }, - _getAtlasLayerDefinition: function() { + _getMapLayerComponentDefinition: function() { return declare([WmsLayerImpl, _PublishInfo]); }, - _getAtlasLayerConfiguration: function(layerItem) { + _getMapLayerComponentConfiguration: function(atlasItem) { - var layerId = this._createLayerId(layerItem), - layerLabel = this._createLayerLabel(layerItem), - layerDefinition = this._getLayerDefinitionByProtocol(layerItem); + var layerId = this._createLayerId(atlasItem), + layerLabel = this._createLayerLabel(atlasItem), + innerLayerDefinition = this._getLayerDefinitionByProtocol(atlasItem); return { parentChannel: this.getChannel(), - layerDefinition: layerDefinition, + mapChannel: this.getMapChannel ? this.getMapChannel() : null, + innerLayerDefinition: innerLayerDefinition, layerId: layerId, layerLabel: layerLabel, - queryable: layerItem.queryable, - refresh: layerItem.refresh + queryable: atlasItem.queryable, + refresh: atlasItem.refresh, + dimensions: this._getAtlasLayerDimensions(atlasItem) }; }, - _getAtlasLayerId: function(layerItem) { + _getAtlasLayerItemToInject: function(atlasItem) { - return layerItem && layerItem.id; + var itemId = this._getAtlasItemId(atlasItem), + mapLayerDefinition = this._getMapLayerComponentDefinition(), + mapLayerConfig = this._getMapLayerComponentConfiguration(atlasItem); + + return { + id: itemId, + label: mapLayerConfig.layerLabel, + state: this.defaultLayerItemState, + mapLayerId: mapLayerConfig.layerId, + mapLayerDefinition: mapLayerDefinition, + mapLayerConfig: mapLayerConfig, + atlasItem: atlasItem + }; + }, + + _getAtlasItemId: function(atlasItem) { + + return atlasItem && atlasItem.id; }, _createLayerId: function(layerItem) { @@ -287,6 +308,92 @@ define([ _createLayerLabel: function(layerItem) { return layerItem.alias || layerItem.title; + }, + + _removeLayerInstance: function(layerId) { + + this._emitEvt('REMOVE_LAYER', { + layer: layerId + }); + + this._removeSubsAndPubsForLayer(this._layerInstances[layerId]); + + delete this._layerInstances[layerId]; + }, + + _createSubsAndPubsForLayer: function(layerInstance) { + + this._createLegendSubsAndPubsForLayer(layerInstance); + }, + + _removeSubsAndPubsForLayer: function(layerInstance) { + + this._removeLegendSubsAndPubsForLayer(layerInstance); + + this._publish(layerInstance.getChannel('DISCONNECT')); + }, + + _getAtlasMapLayerInstance: function(atlasLayerItem) { + + var mapLayerId = atlasLayerItem.mapLayerId, + layerInstance = this._layerInstances[mapLayerId]; + + if (layerInstance) { + return layerInstance; + } + + return this._createAtlasMapLayerInstance(atlasLayerItem); + }, + + _createAtlasMapLayerInstance: function(atlasLayerItem) { + + var MapLayerDefinition = atlasLayerItem.mapLayerDefinition, + mapLayerConfig = atlasLayerItem.mapLayerConfig, + mapLayerId = atlasLayerItem.mapLayerId; + + var mapLayerInstance = new MapLayerDefinition(mapLayerConfig); + + this._layerInstances[mapLayerId] = mapLayerInstance; + + this._createSubsAndPubsForLayer(mapLayerInstance); + + return mapLayerInstance; + }, + + _activateLayer: function(/*Object*/ atlasLayerItem, order) { + + if (!atlasLayerItem) { + return; + } + + var mapLayerId = atlasLayerItem.mapLayerId, + layer = this._getAtlasMapLayerInstance(atlasLayerItem); + + this._emitEvt('ADD_LAYER', { + layer: layer, + layerId: mapLayerId, + layerLabel: atlasLayerItem.label, + atlasItem: atlasLayerItem.atlasItem, + order: order + }); + }, + + _deactivateLayer: function(/*Object*/ atlasLayerItem, order) { + + if (!atlasLayerItem) { + return; + } + + var mapLayerId = atlasLayerItem.mapLayerId, + layer = this._layerInstances[mapLayerId]; + + if (layer) { + this._emitEvt('REMOVE_LAYER', { + layer: layer, + order: order, + keepInstance: true + }); + } } }); }); diff --git a/public/javascript/redmic/modules/atlas/_AtlasLegendManagement.js b/client-app/src/component/atlas/_AtlasLegendManagement.js similarity index 55% rename from public/javascript/redmic/modules/atlas/_AtlasLegendManagement.js rename to client-app/src/component/atlas/_AtlasLegendManagement.js index f1b0d5260a7e0239ae1531cf06a8012dfb5cb15c..1c3f09b745363c99c52ba3302c00e71c5233ff9f 100644 --- a/public/javascript/redmic/modules/atlas/_AtlasLegendManagement.js +++ b/client-app/src/component/atlas/_AtlasLegendManagement.js @@ -1,10 +1,12 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' - , 'put-selector/put' + , 'dojo/aspect' + , 'put-selector' ], function( declare , lang + , aspect , put ) { @@ -21,6 +23,10 @@ define([ }; lang.mixin(this, this.config, args); + + aspect.before(this, '_deactivateLayer', lang.hitch(this, this._atlasLegendDeactivateLayer)); + aspect.before(this, '_cleanRowSecondaryContainer', lang.hitch(this, + this._atlasLegendCleanRowSecondaryContainer)); }, _removeLegendOfRemovedLayer: function(layerId) { @@ -59,12 +65,21 @@ define([ } }, - _showLayerLegend: function(browserButtonObj) { + _toggleShowLayerLegend: function(browserButtonObj) { + + var atlasLayerItem = browserButtonObj.item, + layerId = atlasLayerItem.mapLayerId; + + if (!this._activeLayers[layerId]) { + this._emitEvt('COMMUNICATION', { + description: this.i18n.addLayerFirst + }); + + return; + } var container = browserButtonObj.node, legendContainer = container.children[1], - item = browserButtonObj.item.originalItem, - layerId = this._createLayerId(item), legend = this._legendByLayerId[layerId], legendShown = this._legendShownByLayerId[layerId]; @@ -81,11 +96,41 @@ define([ } if (!legendShown) { - put(legendContainer, legend); - this._legendShownByLayerId[layerId] = true; + this._showLayerLegend(layerId, legendContainer, legend); } else { - put('!', legend); - this._legendShownByLayerId[layerId] = false; + this._hideLayerLegend(layerId); + } + }, + + _showLayerLegend: function(layerId, legendContainer, legend) { + + this._cleanRowSecondaryContainer(layerId, legendContainer); + + put(legendContainer, legend); + this._legendShownByLayerId[layerId] = true; + }, + + _hideLayerLegend: function(layerId) { + + put('!', this._legendByLayerId[layerId]); + this._legendShownByLayerId[layerId] = false; + }, + + _atlasLegendDeactivateLayer: function(atlasLayerItem) { + + if (!atlasLayerItem) { + return; + } + + var mapLayerId = atlasLayerItem.mapLayerId; + + this._legendShownByLayerId[mapLayerId] = false; + }, + + _atlasLegendCleanRowSecondaryContainer: function(layerId) { + + if (this._legendShownByLayerId[layerId]) { + this._hideLayerLegend(layerId); } } }); diff --git a/client-app/src/component/atlas/_AtlasThemesManagement.js b/client-app/src/component/atlas/_AtlasThemesManagement.js new file mode 100644 index 0000000000000000000000000000000000000000..c16c7ab01feb426702bab86b3368048f84d2923b --- /dev/null +++ b/client-app/src/component/atlas/_AtlasThemesManagement.js @@ -0,0 +1,258 @@ +define([ + 'dojo/_base/declare' + , 'dojo/_base/lang' + , 'dojo/aspect' + , 'app/designs/list/Controller' + , 'app/designs/list/layout/Layout' + , 'src/component/browser/_DragAndDrop' + , 'src/component/browser/bars/Total' + , 'src/redmicConfig' + , 'templates/AtlasList' +], function( + declare + , lang + , aspect + , Controller + , Layout + , _DragAndDrop + , Total + , redmicConfig + , ListTemplate +) { + + return declare(null, { + // summary: + // Gestión de capas temáticas de atlas cargadas en el mapa. + + constructor: function(args) { + + this.config = { + pathSeparator: '.', + parentProperty: 'parent', + addThemesBrowserFirst: false, + omitThemesBrowser: false, + + _activeLayers: {}, // indicador sobre si la capa está activada en el mapa o no + }; + + lang.mixin(this, this.config, args); + + if (this.omitThemesBrowser) { + return; + } + + this._prepareThemesBrowserCallbacks(); + }, + + _prepareThemesBrowserCallbacks: function() { + + aspect.before(this, '_afterSetConfigurations', lang.hitch(this, this._themesBrowserAfterSetConfigurations)); + aspect.before(this, '_initialize', lang.hitch(this, this._initializeThemesBrowser)); + aspect.before(this, '_defineSubscriptions', lang.hitch(this, this._defineThemesBrowserSubscriptions)); + + var aspectMethod = this.addThemesBrowserFirst ? 'before' : 'after'; + aspect[aspectMethod](this, '_addTabs', lang.hitch(this, this._addThemesBrowserTabs)); + + aspect.before(this, '_reportDeselection', lang.hitch(this, this._themesBrowserReportDeselection)); + aspect.before(this, '_reportClearSelection', lang.hitch(this, this._themesBrowserReportClearSelection)); + }, + + _themesBrowserAfterSetConfigurations: function() { + + this.themesBrowserConfig = this._merge([{ + parentChannel: this.getChannel(), + classByList: '.borderList', + browserExts: [_DragAndDrop], + browserConfig: { + template: ListTemplate, + bars: [{ + instance: Total + }], + insertInFront: true, + rowConfig: { + buttonsConfig: { + listButton: [{ + icon: 'fa-info-circle', + btnId: 'details', + title: this.i18n.navigateToLayerInfo, + href: redmicConfig.viewPaths.ogcServiceDetails + },{ + icon: 'fa-arrows-v', + btnId: 'elevation', + title: 'showElevation', + condition: function(atlasLayerItem) { + + return !!atlasLayerItem.atlasItem.elevationDimension; + }, + returnItem: true + },{ + icon: 'fa-map-o', + btnId: 'legend', + title: 'showLegend', + returnItem: true + },{ + icon: 'fa-map-marker', + title: 'mapCentering', + btnId: 'fitBounds', + returnItem: true + },{ + icon: 'fa-toggle-on', + altIcon: 'fa-toggle-off', + btnId: 'addLayer', + title: 'toggleLayerVisibility', + state: true, + returnItem: true + }] + } + } + } + }, this.themesBrowserConfig || {}], { + arrayMergingStrategy: 'concatenate' + }); + }, + + _initializeThemesBrowser: function() { + + var ThemesBrowser = declare([Layout, Controller]); + this._themesBrowser = new ThemesBrowser(this.themesBrowserConfig); + }, + + _defineThemesBrowserSubscriptions: function() { + + this.subscriptionsConfig.push({ + channel: this._themesBrowser.getChildChannel('browser', 'BUTTON_EVENT'), + callback: '_subThemesBrowserButtonEvent' + },{ + channel: this._themesBrowser.getChildChannel('browser', 'DRAG_AND_DROP'), + callback: '_subThemesBrowserDragAndDrop' + }); + }, + + _addThemesBrowserTabs: function() { + + if (!this.addTabChannel) { + console.error('Missing channel to add themes tab at module "%s"', this.getChannel()); + return; + } + + this._publish(this.addTabChannel, { + title: this.i18n.selectedLayers, + iconClass: 'fa fa-map-o', + channel: this._themesBrowser.getChannel() + }); + }, + + _subThemesBrowserButtonEvent: function(objReceived) { + + var btnId = objReceived.btnId, + item = objReceived.item; + + if (btnId === 'addLayer') { + this._onThemesBrowserAddLayerButtonClick(objReceived); + } else if (btnId === 'remove') { + this._onThemesBrowserRemoveLayerButtonClick(item); + } else if (btnId === 'elevation') { + this._onThemesBrowserElevationButtonClick(objReceived); + } else if (btnId === 'legend') { + this._onThemesBrowserLegendButtonClick(objReceived); + } else if (btnId === 'fitBounds') { + this._onThemesBrowserFitBoundsButtonClick(item); + } + }, + + _subThemesBrowserDragAndDrop: function(response) { + + var item = response.item, + total = response.total, + indexOld = response.indexOld, + indexList = response.indexList; + + if (!item && !total && !indexOld && !indexList) { + return; + } + + this._publish(this.getMapChannel('REORDER_LAYERS'), { + layerId: this._createLayerId(response.item.atlasItem), + newPosition: response.total - response.indexList, + oldPosition: response.total - response.indexOld + }); + }, + + _onThemesBrowserAddLayerButtonClick: function(obj) { + + var atlasLayerItem = obj.item, + mapLayerId = atlasLayerItem.mapLayerId, + state = obj.state, + order = obj.total - obj.indexList; + + if (!state) { + this._deactivateLayer(atlasLayerItem, order); + this._activeLayers[mapLayerId] = false; + } else { + this._activateLayer(atlasLayerItem, order); + this._activeLayers[mapLayerId] = true; + } + }, + + _onThemesBrowserRemoveLayerButtonClick: function(atlasLayerItem) { + + var parentItem = atlasLayerItem.atlasItem[this.parentProperty], + path = 'r' + this.pathSeparator + parentItem.id + this.pathSeparator + atlasLayerItem.id; + + this._emitEvt('DESELECT', [path]); + }, + + _onThemesBrowserElevationButtonClick: function(obj) { + + this._showLayerElevation(obj); + }, + + _onThemesBrowserLegendButtonClick: function(obj) { + + this._toggleShowLayerLegend(obj); + }, + + _onThemesBrowserFitBoundsButtonClick: function(item) { + + this._fitBounds(item); + }, + + _fitBounds: function(atlasLayerItem) { + + var geometry = atlasLayerItem.atlasItem.geometry; + if (!geometry) { + return; + } + + var coordinates = geometry.coordinates[0], + southWest = this._getLatLng(coordinates[0]), + northEast = this._getLatLng(coordinates[2]); + + this._publish(this.getMapChannel('FIT_BOUNDS'), { + bounds: L.latLngBounds(southWest, northEast) + }); + }, + + _getLatLng: function(coord) { + + return [coord[1], coord[0]]; + }, + + _themesBrowserReportDeselection: function(id) { + + this._publish(this._themesBrowser.getChildChannel('browser', 'REMOVE'), { + ids: [id] + }); + }, + + _themesBrowserReportClearSelection: function() { + + this._publish(this._themesBrowser.getChildChannel('browser', 'CLEAR')); + }, + + _cleanRowSecondaryContainer: function(layerId, container) { + + // TODO se usa para conectar con aspect desde las otras extensiones + } + }); +}); diff --git a/public/javascript/redmic/modules/base/_ChkCollection.js b/client-app/src/component/base/_ChkCollection.js similarity index 100% rename from public/javascript/redmic/modules/base/_ChkCollection.js rename to client-app/src/component/base/_ChkCollection.js diff --git a/public/javascript/redmic/modules/base/_CommunicationCenter.js b/client-app/src/component/base/_CommunicationCenter.js similarity index 100% rename from public/javascript/redmic/modules/base/_CommunicationCenter.js rename to client-app/src/component/base/_CommunicationCenter.js diff --git a/public/javascript/redmic/modules/base/_ExternalConfig.js b/client-app/src/component/base/_ExternalConfig.js similarity index 96% rename from public/javascript/redmic/modules/base/_ExternalConfig.js rename to client-app/src/component/base/_ExternalConfig.js index f60c5ac8132a9639ef049b78cb38ae229506dd60..4ed10c600c58180c6eb2123fafa046dcdb7750ec 100644 --- a/public/javascript/redmic/modules/base/_ExternalConfig.js +++ b/client-app/src/component/base/_ExternalConfig.js @@ -2,10 +2,12 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' , 'dojo/aspect' + , 'RWidgets/Utilities' ], function( declare , lang , aspect + , Utilities ) { return declare(null, { @@ -97,7 +99,7 @@ define([ if (configProp) { configToEmit = {}; - configToEmit[configProp] = config[configProp]; + configToEmit[configProp] = Utilities.getDeepProp(config, configProp); } else { configToEmit = config; } diff --git a/public/javascript/redmic/modules/base/_Filter.js b/client-app/src/component/base/_Filter.js similarity index 99% rename from public/javascript/redmic/modules/base/_Filter.js rename to client-app/src/component/base/_Filter.js index d611a1bf69b92c58335887d66b5c4fba5aa929ee..9f5c7dc1cb57b6f26d8a3c37c84d711883828064 100644 --- a/public/javascript/redmic/modules/base/_Filter.js +++ b/client-app/src/component/base/_Filter.js @@ -2,7 +2,7 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' , 'dojo/aspect' - , 'redmic/modules/filter/Filter' + , 'src/component/filter/Filter' , './_FilterItfc' ], function( declare diff --git a/public/javascript/redmic/modules/base/_FilterItfc.js b/client-app/src/component/base/_FilterItfc.js similarity index 93% rename from public/javascript/redmic/modules/base/_FilterItfc.js rename to client-app/src/component/base/_FilterItfc.js index 30c8936dca63ceefa8f83ec6e7acaa277c9742bd..b52707beb4132f61291b3268f41a63c8a6576033 100644 --- a/public/javascript/redmic/modules/base/_FilterItfc.js +++ b/client-app/src/component/base/_FilterItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/public/javascript/redmic/modules/base/_Itfc.js b/client-app/src/component/base/_Itfc.js similarity index 93% rename from public/javascript/redmic/modules/base/_Itfc.js rename to client-app/src/component/base/_Itfc.js index 38d64e776d029022a45ec11e6c9f2bb29c0fe6cc..5f3f8d9d5d945d6ef07488054289490137439332 100644 --- a/public/javascript/redmic/modules/base/_Itfc.js +++ b/client-app/src/component/base/_Itfc.js @@ -1,5 +1,5 @@ define([ - 'app/redmicConfig' + 'src/redmicConfig' , 'dojo/_base/declare' , 'dojo/_base/lang' ], function( @@ -42,7 +42,7 @@ define([ _onNotImplementedMethod: function(method, props) { - if (redmicConfig.getEnvVariableValue('envDebug') === 'true') { + if ((/true/i).test(redmicConfig.getEnvVariableValue('envDebug'))) { // TODO demasiado ruido y no aporta casi nada, quitar si no se echa en falta //this._showNotImplementedMethodWarning(method, props); } diff --git a/public/javascript/redmic/modules/base/_ListenQueryParams.js b/client-app/src/component/base/_ListenQueryParams.js similarity index 100% rename from public/javascript/redmic/modules/base/_ListenQueryParams.js rename to client-app/src/component/base/_ListenQueryParams.js diff --git a/public/javascript/redmic/modules/base/_ListenQueryParamsItfc.js b/client-app/src/component/base/_ListenQueryParamsItfc.js similarity index 93% rename from public/javascript/redmic/modules/base/_ListenQueryParamsItfc.js rename to client-app/src/component/base/_ListenQueryParamsItfc.js index 8d7b35ca2636bac799409a83f3fc3b846663fd6b..a3b5de143f8f9cffe6b59903eeedb636a4cf4bdc 100644 --- a/public/javascript/redmic/modules/base/_ListenQueryParamsItfc.js +++ b/client-app/src/component/base/_ListenQueryParamsItfc.js @@ -1,7 +1,7 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' - , 'redmic/modules/base/_Itfc' + , 'src/component/base/_Itfc' ], function( declare , lang diff --git a/public/javascript/redmic/modules/base/_ListenWindowResize.js b/client-app/src/component/base/_ListenWindowResize.js similarity index 75% rename from public/javascript/redmic/modules/base/_ListenWindowResize.js rename to client-app/src/component/base/_ListenWindowResize.js index 56c1a16c5cdbe5d8a2a0cac4e0cf4d334ae38671..fff1c6d0e8a877e9f0df5280d700aa5b7300374e 100644 --- a/public/javascript/redmic/modules/base/_ListenWindowResize.js +++ b/client-app/src/component/base/_ListenWindowResize.js @@ -2,12 +2,10 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' , 'dojo/aspect' - , 'dojo/has' ], function( declare , lang , aspect - , has ) { return declare(null, { @@ -40,13 +38,12 @@ define([ _doListenWindowResizeEvtFacade: function() { - var globalCtx = this._getGlobalContext(), - resizeMethod = lang.hitch(this, this._groupEventArgs, 'WINDOW_RESIZE'); + var resizeMethod = lang.hitch(this, this._groupEventArgs, 'WINDOW_RESIZE'); - if (!globalCtx.onresize) { - globalCtx.onresize = resizeMethod; + if (!globalThis.onresize) { + globalThis.onresize = resizeMethod; } else { - aspect.after(globalCtx, 'onresize', resizeMethod); + aspect.after(globalThis, 'onresize', resizeMethod); } }, @@ -72,7 +69,7 @@ define([ _evaluateCurrentWindowSize: function() { - this._setLowWidth(this._getGlobalContext().innerWidth < this.lowWidthValue); + this._setLowWidth(globalThis.innerWidth < this.lowWidthValue); }, _getLowWidth: function() { @@ -83,17 +80,6 @@ define([ _setLowWidth: function(value) { this.statusFlags.lowWidth = value; - }, - - _getGlobalContext: function() { - - if (has('host-browser')) { - return window; - } else if (has('host-node')) { - return global; - } else { - console.error('Environment not supported'); - } } }); }); diff --git a/public/javascript/redmic/modules/base/_ManageClickEvent.js b/client-app/src/component/base/_ManageClickEvent.js similarity index 100% rename from public/javascript/redmic/modules/base/_ManageClickEvent.js rename to client-app/src/component/base/_ManageClickEvent.js diff --git a/public/javascript/redmic/modules/base/_Module.js b/client-app/src/component/base/_Module.js similarity index 92% rename from public/javascript/redmic/modules/base/_Module.js rename to client-app/src/component/base/_Module.js index 873db2557323b3e49ef5fc1bb6e2956ea75985d7..827b6fe56df81fb1d858dce73de112b517183773 100644 --- a/public/javascript/redmic/modules/base/_Module.js +++ b/client-app/src/component/base/_Module.js @@ -1,5 +1,5 @@ define([ - 'deepmerge/umd' + 'deepmerge' , "dijit/_WidgetBase" , "dojo/_base/declare" , "dojo/_base/lang" @@ -10,7 +10,7 @@ define([ , "dojo/on" , "dojo/promise/all" , "RWidgets/Utilities" - , "redmic/base/Mediator" + , "src/util/Mediator" , "./_ChkCollection" , "./_CommunicationCenter" , "./_ManageClickEvent" @@ -93,7 +93,6 @@ define([ ROUTER: "router", STORE: "data", SELECTOR: "selection", - MANAGER: "manager", CREDENTIALS: "credentials", EXTERNAL_CONFIG: "externalConfig", ANALYTICS: "analytics", @@ -164,9 +163,6 @@ define([ // Nombre del canal por donde se van a recibir los datos. // selectorChannel: String // Nombre del canal por donde se van a seleccionar los items. - // managerChannel: String - // Nombre del canal por donde se realiza la comunicación con Manager (recibir - // acciones de botones). // credentialsChannel: String // Nombre del canal por donde se va a controlar la cajita de seleccionados // analyticsChannel: String @@ -216,7 +212,6 @@ define([ this.innerAppChannel = this._buildChannel(this.rootChannel, this.innerAppOwnChannel); this.selectorChannel = this._buildChannel(this.innerAppChannel, this.globalOwnChannels.SELECTOR); - this.managerChannel = this._buildChannel(this.innerAppChannel, this.globalOwnChannels.MANAGER); this.taskChannel = this._buildChannel(this.innerAppChannel, this.globalOwnChannels.TASK); this.socketChannel = this._buildChannel(this.innerAppChannel, this.globalOwnChannels.SOCKET); this.notificationChannel = this._buildChannel(this.innerAppChannel, this.globalOwnChannels.NOTIFICATION); @@ -235,6 +230,8 @@ define([ this._mixModuleEventsAndActions(); this._mixEventsAndActions(); + this._actionsPropNames = Object.keys(this.actions); + if (this.getOwnChannel() !== this.rootChannel && !this.parentChannel) { console.error("The module '%s' does not have a parent", this.getChannel()); } @@ -349,7 +346,7 @@ define([ alwaysOn: true },{ event: 'TRACK', - channel: this._buildChannel(this.analyticsChannel, this.actions.TRACK), + channel: this._buildChannel(this.analyticsChannel, 'TRACK'), alwaysOn: true },{ event: 'DESTROY', @@ -375,39 +372,67 @@ define([ return this.ownChannel; }, + _getActionValue: function(/*String*/ actionPropName) { + + return this.actions[actionPropName]; + }, + checkAction: function(/*String*/ action) { - return !(action && (action === action.toUpperCase() && isNaN(parseInt(action, 10))) && - !this.actions[action]); + if (action === undefined || action === null || action === '') { + return false; + } + + var actionIsUpperCase = action === action.toUpperCase(); + + if (actionIsUpperCase) { + var actionIsPropName = this._getActionValue(action) !== undefined; + return actionIsPropName; + } + + var actionPropName = this._getActionPropName(action); + + return actionPropName && !!actionPropName.length; }, - getChannel: function(/*String?*/ action) { + _getActionPropName: function(/*String*/ actionValue) { - var channel = this.getParentChannel(this.ownChannel); + var actionPropNameFound = this._actionsPropNames.filter( + lang.hitch(this, function(actionValueToCheck, actionPropName) { - this._checkActionExistence(action); + return this.actions[actionPropName] === actionValueToCheck; + }, actionValue)); - if (!action) { - return this._buildChannel(channel); + return actionPropNameFound.length && actionPropNameFound[0]; + }, + + getChannel: function(/*String?*/ action) { + + var channel = this._buildChannel(this.getParentChannel(), this.getOwnChannel()); + + if (action === undefined || action === null) { + return channel || ''; } - return this._buildChannel(channel, this.actions[action] || action); + this._checkActionExistence(action); + + return this._buildChannel(channel, action); }, getParentChannel: function(/*String?*/ action) { var channel = this.parentChannel; - this._checkActionExistence(action); - - if (!action) { - return this._buildChannel(channel); + if (action === undefined || action === null) { + return channel || ''; } - return this._buildChannel(channel, this.actions[action] || action); + this._checkActionExistence(action); + + return this._buildChannel(channel, action); }, - _checkActionExistence: function(/*String?*/ action) { + _checkActionExistence: function(/*String*/ action) { if (!this.checkAction(action)) { console.error("The action '%s' does not exist at module '%s'", action, @@ -415,22 +440,25 @@ define([ } }, - _buildChannel: function(/*String*/ channel, /*String?*/ action) { + _buildChannel: function(/*String*/ channel, /*String?*/ channelSuffix) { var channelBuilt = channel || ""; - if (arguments.length > 1 && !action) { - console.error("Tried to build a channel '%s' with invalid action at module '%s'", channel, + if (arguments.length > 1 && !channelSuffix) { + console.error("Tried to build a channel '%s' with invalid suffix at module '%s'", channel, this.parentChannel + this.channelSeparator + this.ownChannel); return channelBuilt; } - if (action) { + if (channelSuffix) { + var actionValue = this.actions && this._getActionValue(channelSuffix), + suffixValue = actionValue || channelSuffix; + if (channelBuilt.length) { channelBuilt += this.channelSeparator; } - channelBuilt += action; + channelBuilt += suffixValue; } return channelBuilt; @@ -660,8 +688,8 @@ define([ _connectAction: function(actionToReconnect) { - var action = this.actions[actionToReconnect]; - delete this.actionsPaused[action]; + var actionValue = this._getActionValue(actionToReconnect); + delete this.actionsPaused[actionValue]; }, _getPaused: function() { @@ -708,8 +736,8 @@ define([ _disconnectAction: function(actionToDisconnect) { - var action = this.actions[actionToDisconnect]; - this.actionsPaused[action] = true; + var actionValue = this._getActionValue(actionToDisconnect); + this.actionsPaused[actionValue] = true; }, _pause: function() { @@ -719,7 +747,9 @@ define([ _disconnectModule: function() { - var actionOnChildrenDfdsName = '_' + this.actions.DISCONNECTED + this._childrenActionDfdsNameSuffix; + var actionOnChildrenDfdsName = '_' + this._getActionValue('DISCONNECTED') + + this._childrenActionDfdsNameSuffix; + delete this[actionOnChildrenDfdsName]; this._pause(); @@ -818,7 +848,7 @@ define([ childModuleOwnChannel = this._getActionFromChannel(childModuleChannel); this._childrenModules[childModuleOwnChannel] = false; - this._resolvePendingChildrenActionDfds(childModuleChannel, this.actions.DISCONNECTED); + this._resolvePendingChildrenActionDfds(childModuleChannel, this._getActionValue('DISCONNECTED')); }, _onChildDestroyed: function(res) { @@ -827,7 +857,7 @@ define([ childModuleOwnChannel = this._getActionFromChannel(childModuleChannel); delete this._childrenModules[childModuleOwnChannel]; - this._resolvePendingChildrenActionDfds(childModuleChannel, this.actions.DESTROYED); + this._resolvePendingChildrenActionDfds(childModuleChannel, this._getActionValue('DESTROYED')); }, _resolvePendingChildrenActionDfds: function(childModuleChannel, action) { @@ -1136,10 +1166,10 @@ define([ _prepareModuleActionAfterChildrenActionsAreDone: function(args) { - var action = this.actions[args.action], + var actionValue = this._getActionValue(args.action); cbk = args.cbk, waitForDisconnected = args.waitForDisconnected || false, - actionOnChildrenDfdsName = '_' + action + this._childrenActionDfdsNameSuffix, + actionOnChildrenDfdsName = '_' + actionValue + this._childrenActionDfdsNameSuffix, currentModuleChannel = this.getChannel(); this[actionOnChildrenDfdsName] = {}; @@ -1160,11 +1190,9 @@ define([ _propagateActionToChildren: function(action, req) { - var actionValue = this.actions[action]; - for (var childOwnChannel in this._childrenModules) { var childChannel = this._buildChannel(this.getChannel(), childOwnChannel), - childActionChannel = this._buildChannel(childChannel, actionValue); + childActionChannel = this._buildChannel(childChannel, action); this._publish(childActionChannel, req); } @@ -1173,7 +1201,7 @@ define([ _destroyModule: function() { var currentModuleChannel = this.getChannel(), - actionOnChildrenDfdsName = '_' + this.actions.DESTROYED + this._childrenActionDfdsNameSuffix; + actionOnChildrenDfdsName = '_' + this._getActionValue('DESTROYED') + this._childrenActionDfdsNameSuffix; delete this[actionOnChildrenDfdsName]; diff --git a/public/javascript/redmic/modules/base/_ModuleItfc.js b/client-app/src/component/base/_ModuleItfc.js similarity index 95% rename from public/javascript/redmic/modules/base/_ModuleItfc.js rename to client-app/src/component/base/_ModuleItfc.js index cf0463472c74b1d9b92fcc92785eef3e537c253b..d5fc6ea4b4724848b92f033746232bc1cc9f3b7b 100644 --- a/public/javascript/redmic/modules/base/_ModuleItfc.js +++ b/client-app/src/component/base/_ModuleItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/public/javascript/redmic/modules/base/_Persistence.js b/client-app/src/component/base/_Persistence.js similarity index 100% rename from public/javascript/redmic/modules/base/_Persistence.js rename to client-app/src/component/base/_Persistence.js diff --git a/public/javascript/redmic/modules/base/_PersistenceItfc.js b/client-app/src/component/base/_PersistenceItfc.js similarity index 94% rename from public/javascript/redmic/modules/base/_PersistenceItfc.js rename to client-app/src/component/base/_PersistenceItfc.js index 2d68a0e5a4918e0f4c445cc365beaf12eac628cb..2f56604218ff32e382c7887d9240ff336cbc47d9 100644 --- a/public/javascript/redmic/modules/base/_PersistenceItfc.js +++ b/client-app/src/component/base/_PersistenceItfc.js @@ -1,7 +1,7 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' - , 'redmic/modules/base/_Itfc' + , 'src/component/base/_Itfc' ], function( declare , lang diff --git a/public/javascript/redmic/modules/base/_Selection.js b/client-app/src/component/base/_Selection.js similarity index 99% rename from public/javascript/redmic/modules/base/_Selection.js rename to client-app/src/component/base/_Selection.js index 044843099abcc26c3167f174e6d4b8c038ca5ab1..4438ca9e536a326d7ee833d198f5b3ab1f08f76e 100644 --- a/public/javascript/redmic/modules/base/_Selection.js +++ b/client-app/src/component/base/_Selection.js @@ -2,8 +2,8 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "redmic/modules/base/_SelectionBase" - , "redmic/modules/base/_SelectionItfc" + , "src/component/base/_SelectionBase" + , "src/component/base/_SelectionItfc" ], function( declare , lang diff --git a/public/javascript/redmic/modules/base/_SelectionBase.js b/client-app/src/component/base/_SelectionBase.js similarity index 100% rename from public/javascript/redmic/modules/base/_SelectionBase.js rename to client-app/src/component/base/_SelectionBase.js diff --git a/public/javascript/redmic/modules/base/_SelectionItfc.js b/client-app/src/component/base/_SelectionItfc.js similarity index 94% rename from public/javascript/redmic/modules/base/_SelectionItfc.js rename to client-app/src/component/base/_SelectionItfc.js index 486984339accc674ac6e646d4630b3e6b35ac1de..38d33f983b66a120487de1d49118b95b1aade1bf 100644 --- a/public/javascript/redmic/modules/base/_SelectionItfc.js +++ b/client-app/src/component/base/_SelectionItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/public/javascript/redmic/modules/base/_Show.js b/client-app/src/component/base/_Show.js similarity index 98% rename from public/javascript/redmic/modules/base/_Show.js rename to client-app/src/component/base/_Show.js index 67ff20ba8c6d284f512a68c1763472665fa2a556..f4c6841e5aeaa3103703043eef91b58f3e96618f 100644 --- a/public/javascript/redmic/modules/base/_Show.js +++ b/client-app/src/component/base/_Show.js @@ -4,9 +4,9 @@ define([ , "dojo/aspect" , "dojo/Deferred" , "dojo/query" - , "put-selector/put" - , "redmic/modules/base/_ListenWindowResize" - , "redmic/modules/base/_ShowItfc" + , 'put-selector' + , "src/component/base/_ListenWindowResize" + , "src/component/base/_ShowItfc" ], function( declare , lang @@ -411,7 +411,7 @@ define([ _getNodeToShowWrapper: function() { - var nodeToShow = this._moduleOwnNode || this._getNodeToShow() || this.domNode; + var nodeToShow = this._moduleOwnNode || this.getNodeToShow() || this.domNode; if (!nodeToShow) { console.error('Node to show not found at module "%s"', this.getChannel()); @@ -455,7 +455,9 @@ define([ dfd.resolve(); }), this.animationSafetyTimeout); - this._moduleOwnNode.firstChild.addEventListener('animationend', this._afterAnimationCallback); + this._moduleOwnNode.firstChild.addEventListener('animationend', this._afterAnimationCallback, { + passive: true + }); this._addClass(currentAnimationClass); diff --git a/public/javascript/redmic/modules/base/_ShowInPopup.js b/client-app/src/component/base/_ShowInPopup.js similarity index 96% rename from public/javascript/redmic/modules/base/_ShowInPopup.js rename to client-app/src/component/base/_ShowInPopup.js index b123d30467f47893600a20e2b4ea094af99a94ae..90f68ff376b3562d01dededcba72da6d2f1a52f0 100644 --- a/public/javascript/redmic/modules/base/_ShowInPopup.js +++ b/client-app/src/component/base/_ShowInPopup.js @@ -3,9 +3,9 @@ define([ , 'dojo/_base/lang' , 'dojo/Deferred' , 'dojo/promise/all' - , 'redmic/layout/DialogComplex' - , 'redmic/layout/DialogSimple' - , 'put-selector/put' + , 'RWidgets/layout/DialogComplex' + , 'RWidgets/layout/DialogSimple' + , 'put-selector' ], function( ContentPane , lang diff --git a/public/javascript/redmic/modules/base/_ShowInTooltip.js b/client-app/src/component/base/_ShowInTooltip.js similarity index 98% rename from public/javascript/redmic/modules/base/_ShowInTooltip.js rename to client-app/src/component/base/_ShowInTooltip.js index 50da8bf29632d1d796a398e611ee4335557c8b6f..79a249d9b2ea4c0a5cd1a1357083e86d9563ab08 100644 --- a/public/javascript/redmic/modules/base/_ShowInTooltip.js +++ b/client-app/src/component/base/_ShowInTooltip.js @@ -4,7 +4,7 @@ define([ , 'dojo/_base/lang' , 'dojo/Deferred' , 'dojo/promise/all' - , 'put-selector/put' + , 'put-selector' ], function( _WidgetBase , popup @@ -155,8 +155,8 @@ define([ _calculateOrientation: function() { - var middleWidth = window.innerWidth / 2, - middleHeight = window.innerHeight / 2, + var middleWidth = globalThis.innerWidth / 2, + middleHeight = globalThis.innerHeight / 2, sourceBounding = this._tooltipSourceNode.getBoundingClientRect(), sourceMiddleWidth = sourceBounding.left + sourceBounding.width / 2, diff --git a/public/javascript/redmic/modules/base/_ShowItfc.js b/client-app/src/component/base/_ShowItfc.js similarity index 91% rename from public/javascript/redmic/modules/base/_ShowItfc.js rename to client-app/src/component/base/_ShowItfc.js index 79d9feaab36e7e060cc6aa0a485d5b75049f7dae..72f03e6e2d4197cf03cf98f74ecb142c139e3992 100644 --- a/public/javascript/redmic/modules/base/_ShowItfc.js +++ b/client-app/src/component/base/_ShowItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang @@ -17,7 +17,7 @@ define([ _getMethodsToImplement: function() { return lang.mixin(this.inherited(arguments), { - "_getNodeToShow": {}, + "getNodeToShow": {}, "_getNodeToShowLoading": {}, "_beforeShow": {}, "_afterShow": {}, diff --git a/public/javascript/redmic/modules/base/_ShowOnEvt.js b/client-app/src/component/base/_ShowOnEvt.js similarity index 100% rename from public/javascript/redmic/modules/base/_ShowOnEvt.js rename to client-app/src/component/base/_ShowOnEvt.js diff --git a/public/javascript/redmic/modules/base/_Store.js b/client-app/src/component/base/_Store.js similarity index 99% rename from public/javascript/redmic/modules/base/_Store.js rename to client-app/src/component/base/_Store.js index 78310e2c709104051446f43523476ab3eb36b256..b3b7701388038a98356845e6c162059cc4b84691 100644 --- a/public/javascript/redmic/modules/base/_Store.js +++ b/client-app/src/component/base/_Store.js @@ -2,7 +2,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "redmic/modules/base/_StoreItfc" + , "src/component/base/_StoreItfc" ], function( declare , lang diff --git a/public/javascript/redmic/modules/base/_StoreItfc.js b/client-app/src/component/base/_StoreItfc.js similarity index 95% rename from public/javascript/redmic/modules/base/_StoreItfc.js rename to client-app/src/component/base/_StoreItfc.js index 48ac38f44231e80b82c1cf7f1bf4d2050aec658a..7e1fa26f6f2fe5a9d85762cc38744b87e4024362 100644 --- a/public/javascript/redmic/modules/base/_StoreItfc.js +++ b/client-app/src/component/base/_StoreItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/public/javascript/redmic/modules/base/_Window.js b/client-app/src/component/base/_Window.js similarity index 86% rename from public/javascript/redmic/modules/base/_Window.js rename to client-app/src/component/base/_Window.js index 723a5ccb829e53591ca28248bb55c0a729ad60e0..f5cb5751039d022dbcc4fadbb6fcce4bcb9af486 100644 --- a/public/javascript/redmic/modules/base/_Window.js +++ b/client-app/src/component/base/_Window.js @@ -5,7 +5,7 @@ define([ , 'dojo/dom-class' , 'dojo/dom-style' , 'dojo/on' - , 'put-selector/put' + , 'put-selector' ], function( lang , Deferred @@ -43,12 +43,16 @@ define([ hiddenClass: 'hidden', titleHeight: 2, - minWidth: 200, + minWidth: 300, widthByColsAttr: 'data-cols', minWidthCols: 1, maxWidthCols: 6, + _heightFitContentValue: 'fitContent', + heightByRowsAttr: 'data-rows', + maxHeightRows: 6, + resizableBottomPadding: 15, resizableActionableThreshold: 15, @@ -59,6 +63,7 @@ define([ omitTitleCloseButton: false, resizable: true, scrollSensitive: true, + fitHeightToContent: false, _resizableForcedMinWidth: 100, _validSizeInterval: 100, @@ -71,6 +76,7 @@ define([ this.inherited(arguments); this._onEvt('ANCESTOR_SHOW', lang.hitch(this, this._onWindowAncestorShown)); + this._onEvt('LOADED', lang.hitch(this, this._onWindowLoaded)); }, _onWindowAncestorShown: function() { @@ -78,6 +84,11 @@ define([ this._prepareToResizeModuleWindow(); }, + _onWindowLoaded: function() { + + this._prepareToResizeModuleWindow(); + }, + _beforeShow: function(req) { if (this._getShown()) { @@ -98,6 +109,7 @@ define([ if (node) { this._originalWidthByCols = domAttr.get(node, this.widthByColsAttr); + this._originalHeightByRows = domAttr.get(node, this.heightByRowsAttr); this._createWindow(node); } @@ -132,7 +144,11 @@ define([ _limitMaxHeightToAvailableHeight: function() { - var currMaxHeight = window.innerHeight; + if (this.fitHeightToContent) { + return; + } + + var currMaxHeight = globalThis.innerHeight; if (this._lastMaxHeight !== currMaxHeight) { this._lastMaxHeight = currMaxHeight; @@ -149,12 +165,10 @@ define([ _createWindowContent: function() { - var contentClass = this.windowContentClass, - contentHeightReduction = this.titleHeight; + var contentClass = this.windowContentClass; if (this.omitTitleBar) { contentClass += '.' + this.windowWithoutTitleContentClass; - contentHeightReduction = 0; } if (this.classWindowContent) { @@ -163,28 +177,36 @@ define([ this._windowContentNode = put(this._windowNode, 'div.' + contentClass); - var contentHeight = 'calc(100% - ' + contentHeightReduction + 'rem)'; - domStyle.set(this._windowContentNode, 'height', contentHeight); + domStyle.set(this._windowContentNode, 'height', this._getWindowContentHeight()); + }, + + _getWindowContentHeight: function() { + + var contentHeightReduction = this.omitTitleBar ? 0 : this.titleHeight; + + return 'calc(100% - ' + contentHeightReduction + 'rem)'; }, _addNodeListeners: function() { + var listenerOpts = { passive: true }; + if (!this._transitionEndCallback) { this._transitionEndCallback = lang.hitch(this, this._onWindowTransitionEnd); } - this._windowContentNode.addEventListener('transitionend', this._transitionEndCallback); - this._windowNode.parentNode.addEventListener('transitionend', this._transitionEndCallback); + this._windowContentNode.addEventListener('transitionend', this._transitionEndCallback, listenerOpts); + this._windowNode.parentNode.addEventListener('transitionend', this._transitionEndCallback, listenerOpts); if (this.scrollSensitive) { - this._windowNode.parentNode.parentNode.addEventListener('scroll', lang.hitch(this, - this._onGrandParentScroll)); + this._windowNode.parentNode.parentNode.addEventListener('scrollend', lang.hitch(this, + this._onGrandParentScroll), listenerOpts); } if (this.resizable) { var startCallback = lang.hitch(this, this._onWindowUserResizeStart); - this._windowNode.addEventListener('mousedown', startCallback); - this._windowNode.addEventListener('touchstart', startCallback); + this._windowNode.addEventListener('mousedown', startCallback, listenerOpts); + this._windowNode.addEventListener('touchstart', startCallback, listenerOpts); } }, @@ -225,13 +247,10 @@ define([ windowBottom = windowTop + parent.offsetHeight, windowTopAboveVisibleBottom = gParentVisibleBottom >= windowTop, - windowBottomUnderVisibleTop = gParentVisibleTop <= windowBottom; + windowBottomUnderVisibleTop = gParentVisibleTop <= windowBottom, + windowIsVisible = windowBottomUnderVisibleTop && windowTopAboveVisibleBottom; - if (windowBottomUnderVisibleTop && windowTopAboveVisibleBottom) { - this._setVisibleIntoParent(true); - } else { - this._setVisibleIntoParent(false); - } + this._setVisibleIntoParent(windowIsVisible); }, _unsetWindowParentNodeSize: function() { @@ -370,7 +389,6 @@ define([ _onWindowValidSize: function() { this._emitEvt('LOADED'); - this._prepareToResizeModuleWindow(); }, _decorateTitleNode: function() { @@ -388,14 +406,16 @@ define([ _getWindowTitleIdValue: function() { - return this.windowTitle || this.getOwnChannel(); + return this.windowId || this.getOwnChannel(); }, - _getWindowTitleTextValue: function() { + _getWindowTitleTextValue: function(newValue) { - var windowTitle = this.windowTitle || this.getOwnChannel(); + var windowTitle = newValue || this.windowTitle || this.title || this._getWindowTitleIdValue(); - return this.i18n[windowTitle] || this.title || this.getOwnChannel(); + this.windowTitle = this.i18n[windowTitle] || windowTitle; + + return this.windowTitle; }, _createWindowButtons: function() { @@ -427,7 +447,7 @@ define([ this._prevMinimizeWindowHeight = this._windowNode.clientHeight; - domStyle.set(this._moduleOwnNode, 'height', 0); + domStyle.set(this._windowContentNode, 'height', 0); domStyle.set(this._windowNode.parentNode, 'height', this.titleHeight + 'rem'); }, @@ -439,7 +459,7 @@ define([ this._minimizeButton.onclick = lang.hitch(this, this._minimizeModule); } - domStyle.set(this._moduleOwnNode, 'height', null); + domStyle.set(this._windowContentNode, 'height', this._getWindowContentHeight()); var prevHeight = this._prevMinimizeWindowHeight ? this._prevMinimizeWindowHeight + 'px' : null; domStyle.set(this._windowNode.parentNode, 'height', prevHeight); @@ -465,13 +485,25 @@ define([ this._updateMaximizeButtonIcon(true); } - domAttr.set(this._windowNode.parentNode, this.widthByColsAttr, this.maxWidthCols); + this._setWindowParentNodeAttrsToMaximize(); + this._unsetWindowParentNodeSize(); this._unsetWindowNodeSize(); this._undoMinimizeModule(); }, + _setWindowParentNodeAttrsToMaximize: function() { + + var node = this._windowNode.parentNode; + + domAttr.set(node, this.widthByColsAttr, this.maxWidthCols); + + if (domAttr.get(node, this.heightByRowsAttr) !== this._heightFitContentValue) { + domAttr.set(node, this.heightByRowsAttr, this.maxHeightRows); + } + }, + _maximizeModuleReturn: function() { this._resizeAfterMaximizeToggle(); @@ -481,11 +513,22 @@ define([ this._updateMaximizeButtonIcon(false); } - domAttr.set(this._windowNode.parentNode, this.widthByColsAttr, this._originalWidthByCols); + this._setWindowParentNodeAttrsToUndoMaximize(); this._undoMinimizeModule(); }, + _setWindowParentNodeAttrsToUndoMaximize: function() { + + var node = this._windowNode.parentNode; + + domAttr.set(node, this.widthByColsAttr, this._originalWidthByCols); + + if (this._originalHeightByRows !== this._heightFitContentValue) { + domAttr.set(node, this.heightByRowsAttr, this._originalHeightByRows); + } + }, + _prepareMaximizeForUndoUserResize: function() { if (!this._maximizeButton) { @@ -641,22 +684,16 @@ define([ this._updateWindowTitleValue(this.title); }, - _onWindowTitlePropSet: function() { - - var windowId = this._getWindowTitleIdValue(); - domAttr.set(this._windowNode, 'id', windowId); - - this._updateWindowTitleValue(this._getWindowTitleTextValue()); - }, - _updateWindowTitleValue: function(newValue) { + var titleTextValue = this._getWindowTitleTextValue(newValue); + if (this.omitTitleBar) { return; } - domAttr.set(this._windowTitleTextNode, 'title', newValue); - this._windowTitleTextNode.innerHTML = newValue; + domAttr.set(this._windowTitleTextNode, 'title', titleTextValue); + this._windowTitleTextNode.innerHTML = titleTextValue; } }; }); diff --git a/public/javascript/redmic/modules/browser/Browser.js b/client-app/src/component/browser/Browser.js similarity index 98% rename from public/javascript/redmic/modules/browser/Browser.js rename to client-app/src/component/browser/Browser.js index 20a75d66b0bbef520e9caa83c3c2333f37ae8bdb..c702e815b9a0a1723201f4b5960328339757d4a7 100644 --- a/public/javascript/redmic/modules/browser/Browser.js +++ b/client-app/src/component/browser/Browser.js @@ -2,10 +2,10 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "redmic/modules/base/_Module" - , "redmic/modules/base/_Show" - , "redmic/modules/base/_Store" - , "put-selector/put" + , "src/component/base/_Module" + , "src/component/base/_Show" + , "src/component/base/_Store" + , 'put-selector' , "./_BrowserItfc" , "./_NoDataTemplate" , "./row/Row" @@ -344,7 +344,7 @@ define([ this.template = template; }, - _getNodeToShow: function() { + getNodeToShow: function() { return this.domNode; }, diff --git a/public/javascript/redmic/modules/browser/HierarchicalImpl.js b/client-app/src/component/browser/HierarchicalImpl.js similarity index 99% rename from public/javascript/redmic/modules/browser/HierarchicalImpl.js rename to client-app/src/component/browser/HierarchicalImpl.js index 321f18a5e53d9514d95244a5f900dde1bbbbddbe..b80abf17b39baa1da8429f0632014acc5dc48156 100644 --- a/public/javascript/redmic/modules/browser/HierarchicalImpl.js +++ b/client-app/src/component/browser/HierarchicalImpl.js @@ -2,7 +2,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "put-selector/put" + , 'put-selector' , "./Browser" , "./row/_Hierarchical" ], function( diff --git a/public/javascript/redmic/modules/browser/ListImpl.js b/client-app/src/component/browser/ListImpl.js similarity index 100% rename from public/javascript/redmic/modules/browser/ListImpl.js rename to client-app/src/component/browser/ListImpl.js diff --git a/public/javascript/redmic/modules/browser/_BrowserItfc.js b/client-app/src/component/browser/_BrowserItfc.js similarity index 92% rename from public/javascript/redmic/modules/browser/_BrowserItfc.js rename to client-app/src/component/browser/_BrowserItfc.js index f1e14b440e97b18e3ca239f3a64270a3f1bdaa4b..d963d254653b384528ce315fe8d05ee214399df1 100644 --- a/public/javascript/redmic/modules/browser/_BrowserItfc.js +++ b/client-app/src/component/browser/_BrowserItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/public/javascript/redmic/modules/browser/_ButtonsInRow.js b/client-app/src/component/browser/_ButtonsInRow.js similarity index 100% rename from public/javascript/redmic/modules/browser/_ButtonsInRow.js rename to client-app/src/component/browser/_ButtonsInRow.js diff --git a/public/javascript/redmic/modules/browser/_DataTypeParser.js b/client-app/src/component/browser/_DataTypeParser.js similarity index 100% rename from public/javascript/redmic/modules/browser/_DataTypeParser.js rename to client-app/src/component/browser/_DataTypeParser.js diff --git a/public/javascript/redmic/modules/browser/_DragAndDrop.js b/client-app/src/component/browser/_DragAndDrop.js similarity index 99% rename from public/javascript/redmic/modules/browser/_DragAndDrop.js rename to client-app/src/component/browser/_DragAndDrop.js index f0982428a5ba7979e96a160cdf27140b4bcb18c1..0fc321be2125ed87e170d34bf8b49dc1c5c8052e 100644 --- a/public/javascript/redmic/modules/browser/_DragAndDrop.js +++ b/client-app/src/component/browser/_DragAndDrop.js @@ -5,7 +5,7 @@ define([ , "dojo/dom-class" , "dojo/query" , "RWidgets/Utilities" - , "put-selector/put" + , 'put-selector' ], function( declare , lang diff --git a/public/javascript/redmic/modules/browser/_EditionTable.js b/client-app/src/component/browser/_EditionTable.js similarity index 89% rename from public/javascript/redmic/modules/browser/_EditionTable.js rename to client-app/src/component/browser/_EditionTable.js index d98057f827dc661ad7ac2bc172c1ca6aeb0a11a4..ed5252141679d5294ce447f83128dc0531f1edab 100644 --- a/public/javascript/redmic/modules/browser/_EditionTable.js +++ b/client-app/src/component/browser/_EditionTable.js @@ -3,13 +3,13 @@ define([ , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "redmic/modules/base/_Persistence" - , "redmic/modules/form/_ShowInTableList" - , "redmic/modules/form/FormContainerImpl" - , "redmic/modules/form/_ListenModelHasChanged" + , "src/component/base/_Persistence" + , "src/component/form/_ShowInTableList" + , "src/component/form/FormContainerImpl" + , "src/component/form/_ListenModelHasChanged" , "app/base/views/extensions/_Edition" , "RWidgets/Button" - , "put-selector/put" + , 'put-selector' , "./_ButtonsInRow" , "./_Table" ], function( @@ -57,21 +57,19 @@ define([ aspect.after(this, "_defineSubscriptions", lang.hitch(this, this._defineEditionViewSubscriptions)); }, - _existListButton: function() { + _getBrowserButtons: function() { - if (this.rowConfig && this.rowConfig.buttonsConfig && this.rowConfig.buttonsConfig.listButton) { - return true; - } - - return null; - }, + var buttonsConfig = this.rowConfig && this.rowConfig.buttonsConfig, + buttonsList = buttonsConfig && buttonsConfig.listButton; - _getListButton: function() { + if (buttonsList) { + return buttonsList; + } - return this.rowConfig.buttonsConfig.listButton; + return []; }, - _setListButton: function(listButton) { + _setBrowserButtons: function(listButton) { this.rowConfig = this._merge([{ buttonsConfig: { diff --git a/public/javascript/redmic/modules/browser/_Framework.js b/client-app/src/component/browser/_Framework.js similarity index 98% rename from public/javascript/redmic/modules/browser/_Framework.js rename to client-app/src/component/browser/_Framework.js index 018929f1e464dc7075675ebe42033ac79c3fca52..beb0b084081fae0a5ceb3e2b7feaca6966f195d3 100644 --- a/public/javascript/redmic/modules/browser/_Framework.js +++ b/client-app/src/component/browser/_Framework.js @@ -2,7 +2,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "put-selector/put" + , 'put-selector' ], function( declare , lang @@ -112,7 +112,6 @@ define([ queryChannel: this.queryChannel, target: this._getTarget(), selectionTarget: this.selectionTarget, - perms: this.perms, selectorChannel: this.selectorChannel, storeChannel: this.storeChannel, browserChannel: this.getChannel(), diff --git a/public/javascript/redmic/modules/browser/_GeoJsonParser.js b/client-app/src/component/browser/_GeoJsonParser.js similarity index 100% rename from public/javascript/redmic/modules/browser/_GeoJsonParser.js rename to client-app/src/component/browser/_GeoJsonParser.js diff --git a/public/javascript/redmic/modules/browser/_HierarchicalDragAndDrop.js b/client-app/src/component/browser/_HierarchicalDragAndDrop.js similarity index 99% rename from public/javascript/redmic/modules/browser/_HierarchicalDragAndDrop.js rename to client-app/src/component/browser/_HierarchicalDragAndDrop.js index 5779a31c92e674897303ea87457c46010259d3b3..5658ef07deef73d4a54b33132c987eaa526a4667 100644 --- a/public/javascript/redmic/modules/browser/_HierarchicalDragAndDrop.js +++ b/client-app/src/component/browser/_HierarchicalDragAndDrop.js @@ -3,7 +3,7 @@ define([ , "dojo/_base/lang" , "dojo/aspect" , "dojo/dom-class" - , "put-selector/put" + , 'put-selector' , "./_DragAndDrop" ], function( declare diff --git a/public/javascript/redmic/modules/browser/_HierarchicalLazyLoad.js b/client-app/src/component/browser/_HierarchicalLazyLoad.js similarity index 100% rename from public/javascript/redmic/modules/browser/_HierarchicalLazyLoad.js rename to client-app/src/component/browser/_HierarchicalLazyLoad.js diff --git a/public/javascript/redmic/modules/browser/_HierarchicalSelect.js b/client-app/src/component/browser/_HierarchicalSelect.js similarity index 100% rename from public/javascript/redmic/modules/browser/_HierarchicalSelect.js rename to client-app/src/component/browser/_HierarchicalSelect.js diff --git a/public/javascript/redmic/modules/browser/_HierarchicalTable.js b/client-app/src/component/browser/_HierarchicalTable.js similarity index 92% rename from public/javascript/redmic/modules/browser/_HierarchicalTable.js rename to client-app/src/component/browser/_HierarchicalTable.js index c766a5a49a59e014c53712bcda20e9667b849c49..ee66ad74e7dbcd4a966ff5d57f791457b2856f00 100644 --- a/public/javascript/redmic/modules/browser/_HierarchicalTable.js +++ b/client-app/src/component/browser/_HierarchicalTable.js @@ -35,9 +35,9 @@ define([ this.inherited(arguments); - this._hierarchicalTableStyle = document.createElement("style"); + this._hierarchicalTableStyle = globalThis.document.createElement("style"); - document.head.appendChild(this._hierarchicalTableStyle); + globalThis.document.head.appendChild(this._hierarchicalTableStyle); this._hierarchicalTableStyle = this._hierarchicalTableStyle.sheet; }, diff --git a/public/javascript/redmic/modules/browser/_MultiTemplate.js b/client-app/src/component/browser/_MultiTemplate.js similarity index 99% rename from public/javascript/redmic/modules/browser/_MultiTemplate.js rename to client-app/src/component/browser/_MultiTemplate.js index a4387b6c7abb42b2a81e9cf8ba88df9f6b12f910..7be2f322dd10cc3d4266279aa6096f6b5c1c9508 100644 --- a/public/javascript/redmic/modules/browser/_MultiTemplate.js +++ b/client-app/src/component/browser/_MultiTemplate.js @@ -2,7 +2,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "put-selector/put" + , 'put-selector' ], function( declare , lang diff --git a/public/javascript/redmic/modules/browser/_NoDataTemplate.js b/client-app/src/component/browser/_NoDataTemplate.js similarity index 99% rename from public/javascript/redmic/modules/browser/_NoDataTemplate.js rename to client-app/src/component/browser/_NoDataTemplate.js index 6e2f4d5354f6f8e9fc4ae6747bb73b64a02cfa62..8e6599afdca1824607b9a338ed5ffb0683d8c49d 100644 --- a/public/javascript/redmic/modules/browser/_NoDataTemplate.js +++ b/client-app/src/component/browser/_NoDataTemplate.js @@ -2,7 +2,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "put-selector/put" + , 'put-selector' , "templates/LoadingEmpty" ], function( declare diff --git a/public/javascript/redmic/modules/browser/_Select.js b/client-app/src/component/browser/_Select.js similarity index 99% rename from public/javascript/redmic/modules/browser/_Select.js rename to client-app/src/component/browser/_Select.js index 98dac949165ee03e391475b121f86c24760123a1..4ba80578abaceed2e309cffcee6b885f31b16bfb 100644 --- a/public/javascript/redmic/modules/browser/_Select.js +++ b/client-app/src/component/browser/_Select.js @@ -2,7 +2,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "redmic/modules/base/_Selection" + , "src/component/base/_Selection" , "./row/_Select" ], function( declare diff --git a/public/javascript/redmic/modules/browser/_Table.js b/client-app/src/component/browser/_Table.js similarity index 97% rename from public/javascript/redmic/modules/browser/_Table.js rename to client-app/src/component/browser/_Table.js index d239be3b211c20e9a90d54490f8a0bd61ad3585b..3fae72e92b4741b126fcef58879fe99a7edac70a 100644 --- a/public/javascript/redmic/modules/browser/_Table.js +++ b/client-app/src/component/browser/_Table.js @@ -2,10 +2,10 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "redmic/modules/base/_ShowInTooltip" - , "redmic/modules/base/_ShowOnEvt" - , "redmic/modules/layout/listMenu/ListMenu" - , "put-selector/put" + , "src/component/base/_ShowInTooltip" + , "src/component/base/_ShowOnEvt" + , "src/component/layout/listMenu/ListMenu" + , 'put-selector' , "./row/_Table" ], function( declare @@ -128,9 +128,9 @@ define([ this.inherited(arguments); - this._tableStyle = document.createElement("style"); + this._tableStyle = globalThis.document.createElement("style"); - document.head.appendChild(this._tableStyle); + globalThis.document.head.appendChild(this._tableStyle); this._tableStyle = this._tableStyle.sheet; }, diff --git a/client-app/src/component/browser/bars/Order.js b/client-app/src/component/browser/bars/Order.js new file mode 100644 index 0000000000000000000000000000000000000000..2b15f50872b279a166d24427619b6a87ff4a3711 --- /dev/null +++ b/client-app/src/component/browser/bars/Order.js @@ -0,0 +1,208 @@ +define([ + 'dojo/_base/declare' + , 'dojo/_base/lang' + , 'put-selector' + , 'src/component/base/_Module' + , 'src/component/base/_Show' +], function( + declare + , lang + , put + , _Module + , _Show +) { + + return declare([_Module, _Show], { + // summary: + // Componente que aporta un selector de campo de ordenación y dirección. + + constructor: function(args) { + + this.config = { + 'class': 'orderZone', + hiddenClass: 'hidden', + optionDefault: 'default', + ascIcon: 'fa-sort-amount-asc', + descIcon: 'fa-sort-amount-desc', + defaultOrderField: 'updated', + defaultOrderDirection: 'DESC', + + actions: { + ADD_TO_QUERY: 'addToQuery', + UPDATE_OPTIONS: 'updateOptions' + } + }; + + lang.mixin(this, this.config); + }, + + _defineSubscriptions: function () { + + this.subscriptionsConfig.push({ + channel : this.getChannel('UPDATE_OPTIONS'), + callback: '_subUpdateOptions' + }); + }, + + postCreate: function() { + + this.inherited(arguments); + + this._createOrder(); + + if (this.defaultOrderField !== this.optionDefault) { + this._publishOrder(); + } + }, + + _subUpdateOptions: function(req) { + + var options = req.options; + + if (!options) { + return; + } + + this.options = options; + + this.selectOrderNode && put(this.selectOrderNode, '!'); + + this._createSelectOrderOption(); + }, + + _createOrder: function() { + + put(this.domNode, 'span', this.i18n.sort + ':'); + + this.orderNode = put(this.domNode, 'div.containerOrder'); + + this._createDirectionOrder(); + + if (!this.options) { + return; + } + + this._createSelectOrderOption(); + }, + + _createSelectOrderOption: function() { + + this._currentOrderField = this.defaultOrderField; + + this.options.unshift({ + value: this.optionDefault + }); + + this.selectOrderNode = put(this.orderNode, 'select.form-control'); + + this.selectOrderNode.onchange = lang.hitch(this, this._eventOrderOptionClick); + + + for (var i = 0; i < this.options.length; i++ ) { + var item = this.options[i], + selected = ''; + + if (item.value === this.defaultOrderField) { + selected = '[selected]'; + } + + put(this.selectOrderNode, 'option' + selected + '[value=$]', item.value, + item.label || this.i18n[item.value] || item.value); + } + + this._changeDirectionIcon(); + }, + + _createDirectionOrder: function() { + + this._currentOrderDirection = this.defaultOrderDirection; + + this.directionOrderNode = put(this.orderNode, 'span.' + this.hiddenClass); + this.directionOrderNode.onclick = lang.hitch(this, this._eventDirectionClick); + + this._changeDirectionIcon(); + }, + + _changeDirectionIcon: function() { + + var directionIconClass = 'fa ' + (this._currentOrderDirection === 'ASC' ? this.ascIcon : this.descIcon); + + this.directionOrderNode.setAttribute('class', directionIconClass); + + if (this._currentOrderField === this.optionDefault) { + this._hideDirectionIcon(); + } else { + this._showDirectionIcon(); + } + }, + + _hideDirectionIcon: function() { + + put(this.directionOrderNode, '.' + this.hiddenClass); + }, + + _showDirectionIcon: function() { + + put(this.directionOrderNode, '!' + this.hiddenClass); + }, + + _eventOrderOptionClick: function(evt) { + + var optionSelect = this.selectOrderNode.options[this.selectOrderNode.selectedIndex].value; + + if (optionSelect !== this._currentOrderField) { + this._currentOrderField = optionSelect; + this._applyCurrentOrderDirection(); + } + }, + + _eventDirectionClick: function() { + + this._toggleCurrentOrderDirection(); + this._applyCurrentOrderDirection(); + }, + + _toggleCurrentOrderDirection: function() { + + if (this._currentOrderDirection === 'ASC') { + this._currentOrderDirection = 'DESC'; + } else { + this._currentOrderDirection = 'ASC'; + } + }, + + _applyCurrentOrderDirection: function() { + + this._changeDirectionIcon(); + this._publishOrder(); + }, + + _publishOrder: function() { + + if (!this.queryChannel) { + return; + } + + this._publish(this._buildChannel(this.queryChannel, this.actions.ADD_TO_QUERY), { + query: { + sorts: this._createSorts(), + target: this.target + } + }); + }, + + _createSorts: function() { + + var sorts = []; + + if (this._currentOrderField !== this.optionDefault) { + sorts.push({ + field: this._currentOrderField, + order: this._currentOrderDirection + }); + } + + return sorts; + } + }); +}); diff --git a/public/javascript/redmic/modules/browser/bars/Pagination.js b/client-app/src/component/browser/bars/Pagination.js similarity index 95% rename from public/javascript/redmic/modules/browser/bars/Pagination.js rename to client-app/src/component/browser/bars/Pagination.js index 0928bb878d4dffffe565d539b0239919a99634eb..a9248a4ef29ea0fb340a5e1fed9ac7af1ba48508 100644 --- a/public/javascript/redmic/modules/browser/bars/Pagination.js +++ b/client-app/src/component/browser/bars/Pagination.js @@ -2,10 +2,10 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "put-selector/put" - , "redmic/modules/base/_Module" - , "redmic/modules/base/_Show" - , "redmic/modules/base/_Store" + , 'put-selector' + , "src/component/base/_Module" + , "src/component/base/_Show" + , "src/component/base/_Store" ], function( declare , lang @@ -81,6 +81,11 @@ define([ selectNode.onchange = lang.hitch(this, this._eventOptionClick, selectNode); + if (!this.pageSizeOptions.includes(this.rowPerPage)) { + this.pageSizeOptions.push(this.rowPerPage); + this.pageSizeOptions.sort(function(a, b) { return a - b; }); + } + for (var i = 0; i < this.pageSizeOptions.length; i++ ) { this._addOption(selectNode, this.pageSizeOptions[i]); } @@ -346,7 +351,7 @@ define([ return obj; }, - _getNodeToShow: function() { + getNodeToShow: function() { return this.domNode; }, diff --git a/public/javascript/redmic/modules/browser/bars/SelectionBox.js b/client-app/src/component/browser/bars/SelectionBox.js similarity index 91% rename from public/javascript/redmic/modules/browser/bars/SelectionBox.js rename to client-app/src/component/browser/bars/SelectionBox.js index 5791eb25c3533567094cbf14452424f63e12b081..6a69eda4f5302967536f4b58e04af285f404cdee 100644 --- a/public/javascript/redmic/modules/browser/bars/SelectionBox.js +++ b/client-app/src/component/browser/bars/SelectionBox.js @@ -1,13 +1,13 @@ define([ - 'alertify/alertify.min' + 'alertify' , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/base/Credentials" - , "redmic/modules/base/_Module" - , "redmic/modules/base/_Show" - , "redmic/modules/selection/SelectionBox" - , "redmic/modules/browser/bars/_SelectBox" - , "put-selector/put" + , "src/util/Credentials" + , "src/component/base/_Module" + , "src/component/base/_Show" + , "src/component/selection/SelectionBox" + , "src/component/browser/bars/_SelectBox" + , 'put-selector' ], function( alertify , declare @@ -66,7 +66,6 @@ define([ this.selectionBoxConfig = this._merge([{ parentChannel: this.getChannel(), selectionTarget: this.selectionTarget || this.target, - perms: this.perms, selectorChannel: this.selectorChannel }, this.selectionBoxConfig || {}]); }, @@ -90,7 +89,7 @@ define([ return this.domNode; }, - _getNodeToShow: function() { + getNodeToShow: function() { return this.domNode; }, @@ -171,8 +170,7 @@ define([ var target = this.selectionTarget ? this.selectionTarget : this.target; this._publish(this.selectionBox.getChannel("REFRESH"), { - selectionTarget: target, - perms: this.perms + selectionTarget: target }); } }); diff --git a/public/javascript/redmic/modules/browser/bars/Total.js b/client-app/src/component/browser/bars/Total.js similarity index 93% rename from public/javascript/redmic/modules/browser/bars/Total.js rename to client-app/src/component/browser/bars/Total.js index 202839f76a1403ca85fc72412e15628e8570c6de..6d3a4d4591000902d4d379cd1ac1f3bf538b04e8 100644 --- a/public/javascript/redmic/modules/browser/bars/Total.js +++ b/client-app/src/component/browser/bars/Total.js @@ -2,10 +2,10 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "put-selector/put" - , "redmic/modules/base/_Module" - , "redmic/modules/base/_Show" - , "redmic/modules/base/_Store" + , 'put-selector' + , "src/component/base/_Module" + , "src/component/base/_Show" + , "src/component/base/_Store" ], function( declare , lang @@ -92,7 +92,7 @@ define([ this._setTotal(this.total - 1); }, - _getNodeToShow: function() { + getNodeToShow: function() { return this.domNode; }, diff --git a/public/javascript/redmic/modules/browser/bars/_SelectBox.js b/client-app/src/component/browser/bars/_SelectBox.js similarity index 98% rename from public/javascript/redmic/modules/browser/bars/_SelectBox.js rename to client-app/src/component/browser/bars/_SelectBox.js index 3c888ff2091e83348d20ad8d0bac79a3e0d0a789..0c0774c1a94894a4ecbc26ae9f8e36d2bb2126c0 100644 --- a/public/javascript/redmic/modules/browser/bars/_SelectBox.js +++ b/client-app/src/component/browser/bars/_SelectBox.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "put-selector/put" + , 'put-selector' ], function( declare , lang diff --git a/public/javascript/redmic/modules/browser/buttons/Buttons.js b/client-app/src/component/browser/buttons/Buttons.js similarity index 97% rename from public/javascript/redmic/modules/browser/buttons/Buttons.js rename to client-app/src/component/browser/buttons/Buttons.js index 512b016b364f2acfb51d7db91bf7c1a0c1e7d5fd..599653249e47a6431d251ca50ef3294a24fb5bc0 100644 --- a/public/javascript/redmic/modules/browser/buttons/Buttons.js +++ b/client-app/src/component/browser/buttons/Buttons.js @@ -2,10 +2,10 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "dojo/dom-class" - , "redmic/modules/base/_Module" - , "redmic/modules/base/_Show" + , "src/component/base/_Module" + , "src/component/base/_Show" , 'RWidgets/Utilities' - , "put-selector/put" + , 'put-selector' , "./_ButtonsItfc" ], function( declare @@ -216,7 +216,7 @@ define([ node.setAttribute('title', this.i18n[title]); } - put(node, '!occult'); + put(node, '!hidden'); if (href) { this._updateHref(item, config, node); @@ -228,7 +228,7 @@ define([ _incorrectConditionButton: function(item, config, node) { - put(node, '.occult'); + put(node, '.hidden'); node.setAttribute('title', null); @@ -279,7 +279,7 @@ define([ return condition && !!item[condition]; }, - _getNodeToShow: function() { + getNodeToShow: function() { return this.domNode; }, diff --git a/public/javascript/redmic/modules/browser/buttons/_ButtonsItfc.js b/client-app/src/component/browser/buttons/_ButtonsItfc.js similarity index 91% rename from public/javascript/redmic/modules/browser/buttons/_ButtonsItfc.js rename to client-app/src/component/browser/buttons/_ButtonsItfc.js index d8acd2b88284032b283912bac5b1d290febec9d4..370a97a14537eb4ad6d9fef6b63447714c4f028a 100644 --- a/public/javascript/redmic/modules/browser/buttons/_ButtonsItfc.js +++ b/client-app/src/component/browser/buttons/_ButtonsItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/public/javascript/redmic/modules/browser/buttons/_GroupButtons.js b/client-app/src/component/browser/buttons/_GroupButtons.js similarity index 98% rename from public/javascript/redmic/modules/browser/buttons/_GroupButtons.js rename to client-app/src/component/browser/buttons/_GroupButtons.js index f9bfa4200e7bb0aa43921ec6dde8662f431b077a..f44755c7996974c1770fac7fb90eb5e34c879c81 100644 --- a/public/javascript/redmic/modules/browser/buttons/_GroupButtons.js +++ b/client-app/src/component/browser/buttons/_GroupButtons.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "put-selector/put" + , 'put-selector' , 'RWidgets/ComboButton' ], function( declare diff --git a/public/javascript/redmic/modules/browser/row/Row.js b/client-app/src/component/browser/row/Row.js similarity index 97% rename from public/javascript/redmic/modules/browser/row/Row.js rename to client-app/src/component/browser/row/Row.js index 14c3d05714aca7f5337d35dfa4ca2e16b5789104..63b3e84305e2e6ae7508a2fc66efa2fe95c6e39c 100644 --- a/public/javascript/redmic/modules/browser/row/Row.js +++ b/client-app/src/component/browser/row/Row.js @@ -1,10 +1,10 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Module" - , "redmic/modules/base/_Show" + , "src/component/base/_Module" + , "src/component/base/_Show" , "RWidgets/Utilities" - , "put-selector/put" + , 'put-selector' , "./_RowItfc" ], function( declare @@ -182,7 +182,7 @@ define([ return this.template && this.template(dataObj); }, - _getNodeToShow: function() { + getNodeToShow: function() { return this.domNode; }, diff --git a/public/javascript/redmic/modules/browser/row/_Buttons.js b/client-app/src/component/browser/row/_Buttons.js similarity index 95% rename from public/javascript/redmic/modules/browser/row/_Buttons.js rename to client-app/src/component/browser/row/_Buttons.js index 17b7323ea7ccb620fddb9cdbd054d6c51d815992..62ff8d46d7774b0278e262813d2c7a489fb21d59 100644 --- a/public/javascript/redmic/modules/browser/row/_Buttons.js +++ b/client-app/src/component/browser/row/_Buttons.js @@ -2,8 +2,8 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "redmic/modules/browser/buttons/Buttons" - , "redmic/modules/browser/buttons/_GroupButtons" + , "src/component/browser/buttons/Buttons" + , "src/component/browser/buttons/_GroupButtons" ], function( declare , lang diff --git a/public/javascript/redmic/modules/browser/row/_Hierarchical.js b/client-app/src/component/browser/row/_Hierarchical.js similarity index 99% rename from public/javascript/redmic/modules/browser/row/_Hierarchical.js rename to client-app/src/component/browser/row/_Hierarchical.js index 9da4ff3a15308c135449bf362937d98780486ffd..6a4e2d649a5922d6b1fbed194a6b573088bca91b 100644 --- a/public/javascript/redmic/modules/browser/row/_Hierarchical.js +++ b/client-app/src/component/browser/row/_Hierarchical.js @@ -2,7 +2,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "put-selector/put" + , 'put-selector' ], function( declare , lang diff --git a/public/javascript/redmic/modules/browser/row/_HierarchicalSelect.js b/client-app/src/component/browser/row/_HierarchicalSelect.js similarity index 98% rename from public/javascript/redmic/modules/browser/row/_HierarchicalSelect.js rename to client-app/src/component/browser/row/_HierarchicalSelect.js index fc8929f5c0ff32fa0dfac1d8fd619462d7eceded..552b3035c3306199adbc4f09993a58155c83b3cb 100644 --- a/public/javascript/redmic/modules/browser/row/_HierarchicalSelect.js +++ b/client-app/src/component/browser/row/_HierarchicalSelect.js @@ -3,7 +3,7 @@ define([ , "dojo/_base/lang" , "dojo/aspect" , "dojo/dom-class" - , "put-selector/put" + , 'put-selector' , "./_Select" ], function( declare diff --git a/public/javascript/redmic/modules/browser/row/_HierarchicalTable.js b/client-app/src/component/browser/row/_HierarchicalTable.js similarity index 97% rename from public/javascript/redmic/modules/browser/row/_HierarchicalTable.js rename to client-app/src/component/browser/row/_HierarchicalTable.js index 3b3f75c0bafa7c8993ce596ab42c727965a4e161..0843ad2251abc5493e0d2aeae3a1e907693fc446 100644 --- a/public/javascript/redmic/modules/browser/row/_HierarchicalTable.js +++ b/client-app/src/component/browser/row/_HierarchicalTable.js @@ -2,7 +2,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "put-selector/put" + , 'put-selector' , "./_Table" ], function( declare diff --git a/public/javascript/redmic/modules/browser/row/_RowItfc.js b/client-app/src/component/browser/row/_RowItfc.js similarity index 91% rename from public/javascript/redmic/modules/browser/row/_RowItfc.js rename to client-app/src/component/browser/row/_RowItfc.js index d8acd2b88284032b283912bac5b1d290febec9d4..370a97a14537eb4ad6d9fef6b63447714c4f028a 100644 --- a/public/javascript/redmic/modules/browser/row/_RowItfc.js +++ b/client-app/src/component/browser/row/_RowItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/public/javascript/redmic/modules/browser/row/_Select.js b/client-app/src/component/browser/row/_Select.js similarity index 99% rename from public/javascript/redmic/modules/browser/row/_Select.js rename to client-app/src/component/browser/row/_Select.js index f6167f31712266d91ab7dc485cd9067236bebb39..54e12a8373cc42491cc49cc6557e04d883f3cb71 100644 --- a/public/javascript/redmic/modules/browser/row/_Select.js +++ b/client-app/src/component/browser/row/_Select.js @@ -2,7 +2,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "put-selector/put" + , 'put-selector' ], function( declare , lang diff --git a/public/javascript/redmic/modules/browser/row/_Table.js b/client-app/src/component/browser/row/_Table.js similarity index 99% rename from public/javascript/redmic/modules/browser/row/_Table.js rename to client-app/src/component/browser/row/_Table.js index e04b4eaa56e3f614e4e2a0bcb2ec4b1fc8b236c8..ac65c1f0d94424a5584aa5d9862e759558885f97 100644 --- a/public/javascript/redmic/modules/browser/row/_Table.js +++ b/client-app/src/component/browser/row/_Table.js @@ -3,7 +3,7 @@ define([ , "dojo/_base/lang" , "dojo/aspect" , 'RWidgets/Utilities' - , "put-selector/put" + , 'put-selector' ], function( declare , lang diff --git a/public/javascript/redmic/modules/chart/ChartsContainer/ChartsContainer.js b/client-app/src/component/chart/ChartsContainer/ChartsContainer.js similarity index 99% rename from public/javascript/redmic/modules/chart/ChartsContainer/ChartsContainer.js rename to client-app/src/component/chart/ChartsContainer/ChartsContainer.js index 0f09a6bcb83e0448e10d83f16e7f79b766fd97c4..c0602b3829c33b94a7d336bace8c98a0255c511e 100644 --- a/public/javascript/redmic/modules/chart/ChartsContainer/ChartsContainer.js +++ b/client-app/src/component/chart/ChartsContainer/ChartsContainer.js @@ -1,12 +1,12 @@ define([ - 'd3/d3.min' + 'd3' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/Deferred" - , "put-selector/put" + , 'put-selector' , "RWidgets/Utilities" - , "redmic/modules/base/_Module" - , "redmic/modules/base/_Show" + , "src/component/base/_Module" + , "src/component/base/_Show" , "./_ChartsContainerItfc" ], function( d3 @@ -350,7 +350,7 @@ define([ delete this._layersLimits[layerId]; }, - _getNodeToShow: function() { + getNodeToShow: function() { return this.chartsContainerNode; }, diff --git a/public/javascript/redmic/modules/chart/ChartsContainer/InfoChartsContainerImpl.js b/client-app/src/component/chart/ChartsContainer/InfoChartsContainerImpl.js similarity index 100% rename from public/javascript/redmic/modules/chart/ChartsContainer/InfoChartsContainerImpl.js rename to client-app/src/component/chart/ChartsContainer/InfoChartsContainerImpl.js diff --git a/public/javascript/redmic/modules/chart/ChartsContainer/SliderChartsContainerImpl.js b/client-app/src/component/chart/ChartsContainer/SliderChartsContainerImpl.js similarity index 98% rename from public/javascript/redmic/modules/chart/ChartsContainer/SliderChartsContainerImpl.js rename to client-app/src/component/chart/ChartsContainer/SliderChartsContainerImpl.js index a9c1b4e96c284ea0f2549dc051a43f55f9eacdc1..bf5a6781fe2ccbfb26f1df945d9e258abf04b392 100644 --- a/public/javascript/redmic/modules/chart/ChartsContainer/SliderChartsContainerImpl.js +++ b/client-app/src/component/chart/ChartsContainer/SliderChartsContainerImpl.js @@ -1,13 +1,13 @@ define([ - 'd3/d3.min' - , 'd3Tip/d3-v6-tip.min' + 'd3' + , 'd3Tip' , 'dojo/_base/declare' , 'dojo/_base/lang' , 'dojo/_base/kernel' , 'dojo/aspect' , 'dojo/Deferred' - , 'moment/moment.min' - , 'redmic/modules/chart/ChartsContainer/_TemporalAxisDrawing' + , 'moment' + , 'src/component/chart/ChartsContainer/_TemporalAxisDrawing' , './ChartsContainer' ], function( d3 diff --git a/public/javascript/redmic/modules/chart/ChartsContainer/_AngularAxisDrawing.js b/client-app/src/component/chart/ChartsContainer/_AngularAxisDrawing.js similarity index 98% rename from public/javascript/redmic/modules/chart/ChartsContainer/_AngularAxisDrawing.js rename to client-app/src/component/chart/ChartsContainer/_AngularAxisDrawing.js index b2ca19a4afa34d6838c41212415b251ef01deca9..9c49068210377a540450a9f858389ac2b735c4fc 100644 --- a/public/javascript/redmic/modules/chart/ChartsContainer/_AngularAxisDrawing.js +++ b/client-app/src/component/chart/ChartsContainer/_AngularAxisDrawing.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/chart/layer/Axis/AngularAxisImpl" + , "src/component/chart/layer/Axis/AngularAxisImpl" , "./_AxesDrawing" ], function( declare diff --git a/public/javascript/redmic/modules/chart/ChartsContainer/_AngularAxisWithGridDrawing.js b/client-app/src/component/chart/ChartsContainer/_AngularAxisWithGridDrawing.js similarity index 96% rename from public/javascript/redmic/modules/chart/ChartsContainer/_AngularAxisWithGridDrawing.js rename to client-app/src/component/chart/ChartsContainer/_AngularAxisWithGridDrawing.js index 5c0e9c19820c5b6ae4b070e47115685dafc3e9e1..3856e222308cc7e77429c934347260eec5ebcb02 100644 --- a/public/javascript/redmic/modules/chart/ChartsContainer/_AngularAxisWithGridDrawing.js +++ b/client-app/src/component/chart/ChartsContainer/_AngularAxisWithGridDrawing.js @@ -1,8 +1,8 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/chart/ChartsContainer/_AngularAxisDrawing" - , "redmic/modules/chart/layer/Axis/RadialGridAxisImpl" + , "src/component/chart/ChartsContainer/_AngularAxisDrawing" + , "src/component/chart/layer/Axis/RadialGridAxisImpl" ], function( declare , lang diff --git a/public/javascript/redmic/modules/chart/ChartsContainer/_AxesDrawing.js b/client-app/src/component/chart/ChartsContainer/_AxesDrawing.js similarity index 100% rename from public/javascript/redmic/modules/chart/ChartsContainer/_AxesDrawing.js rename to client-app/src/component/chart/ChartsContainer/_AxesDrawing.js diff --git a/public/javascript/redmic/modules/chart/ChartsContainer/_AxesDrawingItfc.js b/client-app/src/component/chart/ChartsContainer/_AxesDrawingItfc.js similarity index 95% rename from public/javascript/redmic/modules/chart/ChartsContainer/_AxesDrawingItfc.js rename to client-app/src/component/chart/ChartsContainer/_AxesDrawingItfc.js index 3750911e8f46514a2789188ff720e2939de583da..95d6cab7f96b6979e667ac2333cbe854af08bda5 100644 --- a/public/javascript/redmic/modules/chart/ChartsContainer/_AxesDrawingItfc.js +++ b/client-app/src/component/chart/ChartsContainer/_AxesDrawingItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/public/javascript/redmic/modules/chart/ChartsContainer/_BreadcrumbsBar.js b/client-app/src/component/chart/ChartsContainer/_BreadcrumbsBar.js similarity index 99% rename from public/javascript/redmic/modules/chart/ChartsContainer/_BreadcrumbsBar.js rename to client-app/src/component/chart/ChartsContainer/_BreadcrumbsBar.js index d3be7de324239db75c4d82659884b9529b257870..fa25abc7df6a99429a94d2a41fa565c0d7b772a2 100644 --- a/public/javascript/redmic/modules/chart/ChartsContainer/_BreadcrumbsBar.js +++ b/client-app/src/component/chart/ChartsContainer/_BreadcrumbsBar.js @@ -1,6 +1,6 @@ define([ - 'd3/d3.min' - , 'd3Tip/d3-v6-tip.min' + 'd3' + , 'd3Tip' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" diff --git a/public/javascript/redmic/modules/chart/ChartsContainer/_ChartsContainerItfc.js b/client-app/src/component/chart/ChartsContainer/_ChartsContainerItfc.js similarity index 96% rename from public/javascript/redmic/modules/chart/ChartsContainer/_ChartsContainerItfc.js rename to client-app/src/component/chart/ChartsContainer/_ChartsContainerItfc.js index 098cde3a6ad1b81efa4bb4abfc286e10e15bdfe7..82c3163871edcd193d6a24259c142cd548ed6668 100644 --- a/public/javascript/redmic/modules/chart/ChartsContainer/_ChartsContainerItfc.js +++ b/client-app/src/component/chart/ChartsContainer/_ChartsContainerItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/public/javascript/redmic/modules/chart/ChartsContainer/_ColorSelection.js b/client-app/src/component/chart/ChartsContainer/_ColorSelection.js similarity index 99% rename from public/javascript/redmic/modules/chart/ChartsContainer/_ColorSelection.js rename to client-app/src/component/chart/ChartsContainer/_ColorSelection.js index bd84bf3878327b34d9a86ed6bfd31961b9c37d36..16fec72f0c6f8202c8d6c8f7489f4bd0cd41153a 100644 --- a/public/javascript/redmic/modules/chart/ChartsContainer/_ColorSelection.js +++ b/client-app/src/component/chart/ChartsContainer/_ColorSelection.js @@ -5,7 +5,7 @@ define([ , "RWidgets/Utilities" , "./_ColorSelectionItfc" - , 'colorjs/color' + , 'colorjs' ], function( declare , lang diff --git a/public/javascript/redmic/modules/chart/ChartsContainer/_ColorSelectionItfc.js b/client-app/src/component/chart/ChartsContainer/_ColorSelectionItfc.js similarity index 92% rename from public/javascript/redmic/modules/chart/ChartsContainer/_ColorSelectionItfc.js rename to client-app/src/component/chart/ChartsContainer/_ColorSelectionItfc.js index 8b1246e1b8d93aeefec89331a0ab79acb314bcec..53f878de5e4795c9c656cfc975e15cab84b0ebcf 100644 --- a/public/javascript/redmic/modules/chart/ChartsContainer/_ColorSelectionItfc.js +++ b/client-app/src/component/chart/ChartsContainer/_ColorSelectionItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/public/javascript/redmic/modules/chart/ChartsContainer/_DomainHistoryNavigation.js b/client-app/src/component/chart/ChartsContainer/_DomainHistoryNavigation.js similarity index 99% rename from public/javascript/redmic/modules/chart/ChartsContainer/_DomainHistoryNavigation.js rename to client-app/src/component/chart/ChartsContainer/_DomainHistoryNavigation.js index 04906574c1a465c1da24383cf57fbd5537a136e2..1021b0d0ad45524275ff3c4e84e7ea8aefcc5a83 100644 --- a/public/javascript/redmic/modules/chart/ChartsContainer/_DomainHistoryNavigation.js +++ b/client-app/src/component/chart/ChartsContainer/_DomainHistoryNavigation.js @@ -3,8 +3,8 @@ define([ , "dojo/_base/lang" , "dojo/aspect" , "dojo/dom-class" - , 'moment/moment.min' - , "put-selector/put" + , 'moment' + , 'put-selector' ], function( declare , lang diff --git a/public/javascript/redmic/modules/chart/ChartsContainer/_GroupedLegendBar.js b/client-app/src/component/chart/ChartsContainer/_GroupedLegendBar.js similarity index 100% rename from public/javascript/redmic/modules/chart/ChartsContainer/_GroupedLegendBar.js rename to client-app/src/component/chart/ChartsContainer/_GroupedLegendBar.js diff --git a/public/javascript/redmic/modules/chart/ChartsContainer/_InfoOnEmptyData.js b/client-app/src/component/chart/ChartsContainer/_InfoOnEmptyData.js similarity index 100% rename from public/javascript/redmic/modules/chart/ChartsContainer/_InfoOnEmptyData.js rename to client-app/src/component/chart/ChartsContainer/_InfoOnEmptyData.js diff --git a/public/javascript/redmic/modules/chart/ChartsContainer/_InfoOnLayerEvent.js b/client-app/src/component/chart/ChartsContainer/_InfoOnLayerEvent.js similarity index 99% rename from public/javascript/redmic/modules/chart/ChartsContainer/_InfoOnLayerEvent.js rename to client-app/src/component/chart/ChartsContainer/_InfoOnLayerEvent.js index 80726ef6692ee6e3ba7e4238adc52e622dffa225..7d2f6d27784b343ab2baf7c1ad4b17ebbd96e1eb 100644 --- a/public/javascript/redmic/modules/chart/ChartsContainer/_InfoOnLayerEvent.js +++ b/client-app/src/component/chart/ChartsContainer/_InfoOnLayerEvent.js @@ -1,5 +1,5 @@ define([ - 'd3/d3.min' + 'd3' , "dojo/_base/declare" , "dojo/_base/lang" , "./_InfoOnLayerEventItfc" diff --git a/public/javascript/redmic/modules/chart/ChartsContainer/_InfoOnLayerEventItfc.js b/client-app/src/component/chart/ChartsContainer/_InfoOnLayerEventItfc.js similarity index 92% rename from public/javascript/redmic/modules/chart/ChartsContainer/_InfoOnLayerEventItfc.js rename to client-app/src/component/chart/ChartsContainer/_InfoOnLayerEventItfc.js index e3f33050977a6b2abf08748cceb60014b241d5dd..106d749f5137bfac3dedcf103cdff5ef4739a5b7 100644 --- a/public/javascript/redmic/modules/chart/ChartsContainer/_InfoOnLayerEventItfc.js +++ b/client-app/src/component/chart/ChartsContainer/_InfoOnLayerEventItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/public/javascript/redmic/modules/chart/ChartsContainer/_InfoOnMouseOver.js b/client-app/src/component/chart/ChartsContainer/_InfoOnMouseOver.js similarity index 99% rename from public/javascript/redmic/modules/chart/ChartsContainer/_InfoOnMouseOver.js rename to client-app/src/component/chart/ChartsContainer/_InfoOnMouseOver.js index 6342bdb25210eed704739686fcf51c4c809364f4..a4d5486ecd77127987af3a459bb63031c016797d 100644 --- a/public/javascript/redmic/modules/chart/ChartsContainer/_InfoOnMouseOver.js +++ b/client-app/src/component/chart/ChartsContainer/_InfoOnMouseOver.js @@ -1,5 +1,5 @@ define([ - 'd3/d3.min' + 'd3' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" diff --git a/public/javascript/redmic/modules/chart/ChartsContainer/_InfoOnZeroValueData.js b/client-app/src/component/chart/ChartsContainer/_InfoOnZeroValueData.js similarity index 100% rename from public/javascript/redmic/modules/chart/ChartsContainer/_InfoOnZeroValueData.js rename to client-app/src/component/chart/ChartsContainer/_InfoOnZeroValueData.js diff --git a/public/javascript/redmic/modules/chart/ChartsContainer/_InfoTooltipManagement.js b/client-app/src/component/chart/ChartsContainer/_InfoTooltipManagement.js similarity index 98% rename from public/javascript/redmic/modules/chart/ChartsContainer/_InfoTooltipManagement.js rename to client-app/src/component/chart/ChartsContainer/_InfoTooltipManagement.js index dbc8f35d551007d62e894c3ed6a9d80d49af1ff0..c16169aa0722a150e7ff7a2d78c51a6b662ca956 100644 --- a/public/javascript/redmic/modules/chart/ChartsContainer/_InfoTooltipManagement.js +++ b/client-app/src/component/chart/ChartsContainer/_InfoTooltipManagement.js @@ -1,6 +1,6 @@ define([ - 'd3/d3.min' - , 'd3Tip/d3-v6-tip.min' + 'd3' + , 'd3Tip' , "dojo/_base/declare" , "dojo/_base/lang" , "templates/ChartCategoryTooltip" diff --git a/public/javascript/redmic/modules/chart/ChartsContainer/_LayerColorSelection.js b/client-app/src/component/chart/ChartsContainer/_LayerColorSelection.js similarity index 98% rename from public/javascript/redmic/modules/chart/ChartsContainer/_LayerColorSelection.js rename to client-app/src/component/chart/ChartsContainer/_LayerColorSelection.js index e548d6f99757b920ad4b330105920d80430b383c..c31d3c49f5e703e62f7c578651c11687fbe09e02 100644 --- a/public/javascript/redmic/modules/chart/ChartsContainer/_LayerColorSelection.js +++ b/client-app/src/component/chart/ChartsContainer/_LayerColorSelection.js @@ -3,7 +3,7 @@ define([ , "dojo/_base/lang" , "dojo/aspect" , "RWidgets/Utilities" - , "redmic/modules/chart/ChartsContainer/_ColorSelection" + , "src/component/chart/ChartsContainer/_ColorSelection" ], function( declare , lang diff --git a/public/javascript/redmic/modules/chart/ChartsContainer/_LegendBar.js b/client-app/src/component/chart/ChartsContainer/_LegendBar.js similarity index 99% rename from public/javascript/redmic/modules/chart/ChartsContainer/_LegendBar.js rename to client-app/src/component/chart/ChartsContainer/_LegendBar.js index 6764acd91e0b872bda79f80d453085656c81d221..86345268fba49fd5c81f15429e8d4473419b347a 100644 --- a/public/javascript/redmic/modules/chart/ChartsContainer/_LegendBar.js +++ b/client-app/src/component/chart/ChartsContainer/_LegendBar.js @@ -1,5 +1,5 @@ define([ - 'd3/d3.min' + 'd3' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" diff --git a/public/javascript/redmic/modules/chart/ChartsContainer/_LegendBarCommons.js b/client-app/src/component/chart/ChartsContainer/_LegendBarCommons.js similarity index 99% rename from public/javascript/redmic/modules/chart/ChartsContainer/_LegendBarCommons.js rename to client-app/src/component/chart/ChartsContainer/_LegendBarCommons.js index 955e1ab5807e487cdef102be7e912993f9efd1d0..ec63a40f80ac805fec516306a4d06b38b8a8d573 100644 --- a/public/javascript/redmic/modules/chart/ChartsContainer/_LegendBarCommons.js +++ b/client-app/src/component/chart/ChartsContainer/_LegendBarCommons.js @@ -1,9 +1,9 @@ define([ - 'd3Tip/d3-v6-tip.min' + 'd3Tip' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "put-selector/put" + , 'put-selector' , "RWidgets/Utilities" , "./_LegendBarCommonsItfc" ], function( diff --git a/public/javascript/redmic/modules/chart/ChartsContainer/_LegendBarCommonsItfc.js b/client-app/src/component/chart/ChartsContainer/_LegendBarCommonsItfc.js similarity index 93% rename from public/javascript/redmic/modules/chart/ChartsContainer/_LegendBarCommonsItfc.js rename to client-app/src/component/chart/ChartsContainer/_LegendBarCommonsItfc.js index dcfc59840c4e8edbea46e92626725974b8c66b46..803fc90dda9fc0117ef4cd1e43e5555e72c9b402 100644 --- a/public/javascript/redmic/modules/chart/ChartsContainer/_LegendBarCommonsItfc.js +++ b/client-app/src/component/chart/ChartsContainer/_LegendBarCommonsItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/public/javascript/redmic/modules/chart/ChartsContainer/_RadialAxisDrawing.js b/client-app/src/component/chart/ChartsContainer/_RadialAxisDrawing.js similarity index 98% rename from public/javascript/redmic/modules/chart/ChartsContainer/_RadialAxisDrawing.js rename to client-app/src/component/chart/ChartsContainer/_RadialAxisDrawing.js index cf7d3cc34aa0d8d511b44a7ed151f80a1f7f3628..c72755378ff99d52147f35e51bd0f14562f0cda9 100644 --- a/public/javascript/redmic/modules/chart/ChartsContainer/_RadialAxisDrawing.js +++ b/client-app/src/component/chart/ChartsContainer/_RadialAxisDrawing.js @@ -1,8 +1,8 @@ define([ - 'd3/d3.min' + 'd3' , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/chart/layer/Axis/RadialAxisImpl" + , "src/component/chart/layer/Axis/RadialAxisImpl" , "./_AxesDrawing" ], function( d3 diff --git a/public/javascript/redmic/modules/chart/ChartsContainer/_RadialAxisWithGridDrawing.js b/client-app/src/component/chart/ChartsContainer/_RadialAxisWithGridDrawing.js similarity index 96% rename from public/javascript/redmic/modules/chart/ChartsContainer/_RadialAxisWithGridDrawing.js rename to client-app/src/component/chart/ChartsContainer/_RadialAxisWithGridDrawing.js index b9bd86486b37f9329dd03bd5109d979ada10271b..f668cbd343a8128a9b67333a57cec86442a2ff92 100644 --- a/public/javascript/redmic/modules/chart/ChartsContainer/_RadialAxisWithGridDrawing.js +++ b/client-app/src/component/chart/ChartsContainer/_RadialAxisWithGridDrawing.js @@ -1,8 +1,8 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/chart/ChartsContainer/_RadialAxisDrawing" - , "redmic/modules/chart/layer/Axis/AngularGridAxisImpl" + , "src/component/chart/ChartsContainer/_RadialAxisDrawing" + , "src/component/chart/layer/Axis/AngularGridAxisImpl" ], function( declare , lang diff --git a/public/javascript/redmic/modules/chart/ChartsContainer/_SummaryBox.js b/client-app/src/component/chart/ChartsContainer/_SummaryBox.js similarity index 100% rename from public/javascript/redmic/modules/chart/ChartsContainer/_SummaryBox.js rename to client-app/src/component/chart/ChartsContainer/_SummaryBox.js diff --git a/public/javascript/redmic/modules/chart/ChartsContainer/_TemporalAxisDrawing.js b/client-app/src/component/chart/ChartsContainer/_TemporalAxisDrawing.js similarity index 97% rename from public/javascript/redmic/modules/chart/ChartsContainer/_TemporalAxisDrawing.js rename to client-app/src/component/chart/ChartsContainer/_TemporalAxisDrawing.js index 56a5b245c9c01935fa21b08cf57771ea54dc542a..0f623d3ffa083fc364cdcdf40cec5729a40ad4f9 100644 --- a/public/javascript/redmic/modules/chart/ChartsContainer/_TemporalAxisDrawing.js +++ b/client-app/src/component/chart/ChartsContainer/_TemporalAxisDrawing.js @@ -1,10 +1,10 @@ define([ - 'd3/d3.min' + 'd3' , "dojo/_base/declare" , "dojo/_base/lang" - , 'moment/moment.min' - , "redmic/modules/chart/ChartsContainer/_DomainHistoryNavigation" - , "redmic/modules/chart/layer/Axis/TemporalAxisImpl" + , 'moment' + , "src/component/chart/ChartsContainer/_DomainHistoryNavigation" + , "src/component/chart/layer/Axis/TemporalAxisImpl" , "./_AxesDrawing" ], function( d3 diff --git a/public/javascript/redmic/modules/chart/ChartsContainer/_TemporalAxisWithGridDrawing.js b/client-app/src/component/chart/ChartsContainer/_TemporalAxisWithGridDrawing.js similarity index 96% rename from public/javascript/redmic/modules/chart/ChartsContainer/_TemporalAxisWithGridDrawing.js rename to client-app/src/component/chart/ChartsContainer/_TemporalAxisWithGridDrawing.js index 826b2f0ba18ff43f2de8c4f5434ad0de7c82bbdf..deb20bc0bce0b681a03f7976e0cb5b1541057cae 100644 --- a/public/javascript/redmic/modules/chart/ChartsContainer/_TemporalAxisWithGridDrawing.js +++ b/client-app/src/component/chart/ChartsContainer/_TemporalAxisWithGridDrawing.js @@ -1,8 +1,8 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/chart/ChartsContainer/_TemporalAxisDrawing" - , "redmic/modules/chart/layer/Axis/VerticalGridAxisImpl" + , "src/component/chart/ChartsContainer/_TemporalAxisDrawing" + , "src/component/chart/layer/Axis/VerticalGridAxisImpl" ], function( declare , lang diff --git a/public/javascript/redmic/modules/chart/ChartsContainer/_VerticalAxesDrawing.js b/client-app/src/component/chart/ChartsContainer/_VerticalAxesDrawing.js similarity index 99% rename from public/javascript/redmic/modules/chart/ChartsContainer/_VerticalAxesDrawing.js rename to client-app/src/component/chart/ChartsContainer/_VerticalAxesDrawing.js index 24b54f0b79256be00194c1efb00b3d052a1a2016..a05325609208a90e8eee4b903822a77d944f452c 100644 --- a/public/javascript/redmic/modules/chart/ChartsContainer/_VerticalAxesDrawing.js +++ b/client-app/src/component/chart/ChartsContainer/_VerticalAxesDrawing.js @@ -1,8 +1,8 @@ define([ - 'd3/d3.min' + 'd3' , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/chart/layer/Axis/VerticalAxisImpl" + , "src/component/chart/layer/Axis/VerticalAxisImpl" , "./_AxesDrawing" ], function( d3 diff --git a/public/javascript/redmic/modules/chart/ChartsContainer/_VerticalAxesWithGridDrawing.js b/client-app/src/component/chart/ChartsContainer/_VerticalAxesWithGridDrawing.js similarity index 96% rename from public/javascript/redmic/modules/chart/ChartsContainer/_VerticalAxesWithGridDrawing.js rename to client-app/src/component/chart/ChartsContainer/_VerticalAxesWithGridDrawing.js index e6cc13aeb05210d1047e23cbdbb1561da4e6f3c2..d7f9a8005b489fc269a5d1346c838128008e918b 100644 --- a/public/javascript/redmic/modules/chart/ChartsContainer/_VerticalAxesWithGridDrawing.js +++ b/client-app/src/component/chart/ChartsContainer/_VerticalAxesWithGridDrawing.js @@ -1,8 +1,8 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/chart/ChartsContainer/_VerticalAxesDrawing" - , "redmic/modules/chart/layer/Axis/HorizontalGridAxisImpl" + , "src/component/chart/ChartsContainer/_VerticalAxesDrawing" + , "src/component/chart/layer/Axis/HorizontalGridAxisImpl" ], function( declare , lang diff --git a/public/javascript/redmic/modules/chart/ChartsContainer/_ZoomByDragging.js b/client-app/src/component/chart/ChartsContainer/_ZoomByDragging.js similarity index 99% rename from public/javascript/redmic/modules/chart/ChartsContainer/_ZoomByDragging.js rename to client-app/src/component/chart/ChartsContainer/_ZoomByDragging.js index 73951ab92bb6b8871b4d76269937281504be04e8..bda0975782858aa33b4bdf319bd873ac7cc39b15 100644 --- a/public/javascript/redmic/modules/chart/ChartsContainer/_ZoomByDragging.js +++ b/client-app/src/component/chart/ChartsContainer/_ZoomByDragging.js @@ -1,5 +1,5 @@ define([ - 'd3/d3.min' + 'd3' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" diff --git a/public/javascript/redmic/modules/chart/SmartLegend/SmartLegend.js b/client-app/src/component/chart/SmartLegend/SmartLegend.js similarity index 97% rename from public/javascript/redmic/modules/chart/SmartLegend/SmartLegend.js rename to client-app/src/component/chart/SmartLegend/SmartLegend.js index 542f1190461a21c0ea07f2881dd7ab44eecc578b..809756f34dae1bd959e1a81dc1f2548bd465f344 100644 --- a/public/javascript/redmic/modules/chart/SmartLegend/SmartLegend.js +++ b/client-app/src/component/chart/SmartLegend/SmartLegend.js @@ -4,17 +4,17 @@ define([ , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/query" - , 'put-selector/put' + , 'put-selector' , "RWidgets/Utilities" - , "redmic/modules/base/_Module" - , "redmic/modules/base/_Show" - , "redmic/modules/base/_Store" - , "redmic/modules/base/_ShowInTooltip" - , "redmic/modules/browser/_ButtonsInRow" - , "redmic/modules/browser/_Framework" - , "redmic/modules/browser/HierarchicalImpl" - , "redmic/modules/layout/listMenu/ListMenu" - , "redmic/modules/form/input/ColorPickerImpl" + , "src/component/base/_Module" + , "src/component/base/_Show" + , "src/component/base/_Store" + , "src/component/base/_ShowInTooltip" + , "src/component/browser/_ButtonsInRow" + , "src/component/browser/_Framework" + , "src/component/browser/HierarchicalImpl" + , "src/component/layout/listMenu/ListMenu" + , "src/component/form/input/ColorPickerImpl" , "./_SmartLegendItfc" ], function( ListController @@ -243,7 +243,7 @@ define([ }); }, - _getNodeToShow: function() { + getNodeToShow: function() { return this.legendNode; }, diff --git a/public/javascript/redmic/modules/chart/SmartLegend/TimeSeriesSmartLegendImpl.js b/client-app/src/component/chart/SmartLegend/TimeSeriesSmartLegendImpl.js similarity index 97% rename from public/javascript/redmic/modules/chart/SmartLegend/TimeSeriesSmartLegendImpl.js rename to client-app/src/component/chart/SmartLegend/TimeSeriesSmartLegendImpl.js index 434d0c2cd91931d36846656324a647b0d632b17e..81410b47c554b568d99ede75c1991c55900ce472 100644 --- a/public/javascript/redmic/modules/chart/SmartLegend/TimeSeriesSmartLegendImpl.js +++ b/client-app/src/component/chart/SmartLegend/TimeSeriesSmartLegendImpl.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/chart/SmartLegend/SmartLegend" + , "src/component/chart/SmartLegend/SmartLegend" , "RWidgets/Utilities" , "templates/ChartListHierarchical" , "templates/ChartList" diff --git a/public/javascript/redmic/modules/chart/SmartLegend/_SmartLegendItfc.js b/client-app/src/component/chart/SmartLegend/_SmartLegendItfc.js similarity index 94% rename from public/javascript/redmic/modules/chart/SmartLegend/_SmartLegendItfc.js rename to client-app/src/component/chart/SmartLegend/_SmartLegendItfc.js index 8e4628daa572a2ead12f27db9a8da2d9416db240..aea7816bfc46955d24a6d849006f0c3d03738bda 100644 --- a/public/javascript/redmic/modules/chart/SmartLegend/_SmartLegendItfc.js +++ b/client-app/src/component/chart/SmartLegend/_SmartLegendItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/public/javascript/redmic/modules/chart/Toolbar/AggregationToolImpl.js b/client-app/src/component/chart/Toolbar/AggregationToolImpl.js similarity index 97% rename from public/javascript/redmic/modules/chart/Toolbar/AggregationToolImpl.js rename to client-app/src/component/chart/Toolbar/AggregationToolImpl.js index 746f16b95998f6031b3a6ca908ab7971fccc24c8..48fb42a7a67b65d548a2f05e776ae8652f10a584 100644 --- a/public/javascript/redmic/modules/chart/Toolbar/AggregationToolImpl.js +++ b/client-app/src/component/chart/Toolbar/AggregationToolImpl.js @@ -4,10 +4,10 @@ define([ , "dojo/_base/lang" , "dojo/aspect" , "RWidgets/Utilities" - , "redmic/modules/base/_ShowInTooltip" - , "redmic/modules/base/_ShowOnEvt" - , "redmic/modules/layout/listMenu/ListMenu" - , "put-selector/put" + , "src/component/base/_ShowInTooltip" + , "src/component/base/_ShowOnEvt" + , "src/component/layout/listMenu/ListMenu" + , 'put-selector' , "./Toolbar" ], function( _ProcessInterval diff --git a/public/javascript/redmic/modules/chart/Toolbar/DataSelectorImpl.js b/client-app/src/component/chart/Toolbar/DataSelectorImpl.js similarity index 94% rename from public/javascript/redmic/modules/chart/Toolbar/DataSelectorImpl.js rename to client-app/src/component/chart/Toolbar/DataSelectorImpl.js index 47ea30ddf7bbf45479dfc674261b67f5f8a5d875..6dc5fd6b052c0472fb3ca48298c9c944f897aee9 100644 --- a/public/javascript/redmic/modules/chart/Toolbar/DataSelectorImpl.js +++ b/client-app/src/component/chart/Toolbar/DataSelectorImpl.js @@ -3,10 +3,10 @@ define([ , "dojo/_base/lang" , "dojo/aspect" , "RWidgets/Utilities" - , "redmic/modules/base/_ShowInTooltip" - , "redmic/modules/base/_ShowOnEvt" - , "redmic/modules/layout/listMenu/ListMenu" - , "put-selector/put" + , "src/component/base/_ShowInTooltip" + , "src/component/base/_ShowOnEvt" + , "src/component/layout/listMenu/ListMenu" + , 'put-selector' , "./Toolbar" ], function( declare diff --git a/public/javascript/redmic/modules/chart/Toolbar/DateFilterImpl.js b/client-app/src/component/chart/Toolbar/DateFilterImpl.js similarity index 93% rename from public/javascript/redmic/modules/chart/Toolbar/DateFilterImpl.js rename to client-app/src/component/chart/Toolbar/DateFilterImpl.js index 63cb9de5fbb91e783fbec0cf83f9160392b3cc3a..2505a3ba2141db09b6e4cab898604c81cbc1ab66 100644 --- a/public/javascript/redmic/modules/chart/Toolbar/DateFilterImpl.js +++ b/client-app/src/component/chart/Toolbar/DateFilterImpl.js @@ -3,10 +3,10 @@ define([ , "dojo/_base/lang" , "dojo/aspect" , "RWidgets/Utilities" - , "redmic/modules/base/_ShowInTooltip" - , "redmic/modules/base/_ShowOnEvt" - , "redmic/modules/form/input/DateRangeComplexImpl" - , "put-selector/put" + , "src/component/base/_ShowInTooltip" + , "src/component/base/_ShowOnEvt" + , "src/component/form/input/DateRangeComplexImpl" + , 'put-selector' , "./Toolbar" ], function( declare diff --git a/public/javascript/redmic/modules/chart/Toolbar/GridManagementImpl.js b/client-app/src/component/chart/Toolbar/GridManagementImpl.js similarity index 97% rename from public/javascript/redmic/modules/chart/Toolbar/GridManagementImpl.js rename to client-app/src/component/chart/Toolbar/GridManagementImpl.js index 5fa559902b1e9936f02be8d74882eaf4c37c1250..9f90421161d5d7cde0b812f374abe05d9cd8e091 100644 --- a/public/javascript/redmic/modules/chart/Toolbar/GridManagementImpl.js +++ b/client-app/src/component/chart/Toolbar/GridManagementImpl.js @@ -3,10 +3,10 @@ define([ , "dojo/_base/lang" , "dojo/aspect" , "RWidgets/Utilities" - , "redmic/modules/base/_ShowInTooltip" - , "redmic/modules/base/_ShowOnEvt" - , "redmic/modules/layout/listMenu/ListMenu" - , "put-selector/put" + , "src/component/base/_ShowInTooltip" + , "src/component/base/_ShowOnEvt" + , "src/component/layout/listMenu/ListMenu" + , 'put-selector' , "./Toolbar" ], function( declare diff --git a/public/javascript/redmic/modules/chart/Toolbar/SliderSelectorImpl.js b/client-app/src/component/chart/Toolbar/SliderSelectorImpl.js similarity index 94% rename from public/javascript/redmic/modules/chart/Toolbar/SliderSelectorImpl.js rename to client-app/src/component/chart/Toolbar/SliderSelectorImpl.js index bbae70c7b8413612aa1eb1ba9e0f41eca9a6f85b..8f54997f0ee4a81f4646d90ffb78ec4f1284cce3 100644 --- a/public/javascript/redmic/modules/chart/Toolbar/SliderSelectorImpl.js +++ b/client-app/src/component/chart/Toolbar/SliderSelectorImpl.js @@ -3,10 +3,10 @@ define([ , "dojo/_base/lang" , "dojo/aspect" , "RWidgets/Utilities" - , "redmic/modules/base/_ShowInTooltip" - , "redmic/modules/base/_ShowOnEvt" - , "redmic/modules/form/input/SliderImpl" - , "put-selector/put" + , "src/component/base/_ShowInTooltip" + , "src/component/base/_ShowOnEvt" + , "src/component/form/input/SliderImpl" + , 'put-selector' , "./Toolbar" ], function( declare diff --git a/public/javascript/redmic/modules/chart/Toolbar/Toolbar.js b/client-app/src/component/chart/Toolbar/Toolbar.js similarity index 89% rename from public/javascript/redmic/modules/chart/Toolbar/Toolbar.js rename to client-app/src/component/chart/Toolbar/Toolbar.js index 2d1121ed6b9d0f94ccf6f6ca5ab2e8ede2d015df..9f46a6b894ee4b726636b75e279de0a671c20a4d 100644 --- a/public/javascript/redmic/modules/chart/Toolbar/Toolbar.js +++ b/client-app/src/component/chart/Toolbar/Toolbar.js @@ -1,8 +1,8 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Module" - , "redmic/modules/base/_Show" + , "src/component/base/_Module" + , "src/component/base/_Show" , "./_ToolbarItfc" ], function( declare @@ -40,7 +40,7 @@ define([ }); }, - _getNodeToShow: function() { + getNodeToShow: function() { return this.domNode; } diff --git a/public/javascript/redmic/modules/chart/Toolbar/_ToolbarItfc.js b/client-app/src/component/chart/Toolbar/_ToolbarItfc.js similarity index 92% rename from public/javascript/redmic/modules/chart/Toolbar/_ToolbarItfc.js rename to client-app/src/component/chart/Toolbar/_ToolbarItfc.js index 2c4498003d8fe70208ee0c24aa6394a0931b9a2c..ed419ac93732cee1b6449cae22397d1d0849d212 100644 --- a/public/javascript/redmic/modules/chart/Toolbar/_ToolbarItfc.js +++ b/client-app/src/component/chart/Toolbar/_ToolbarItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/public/javascript/redmic/modules/chart/layer/Axis/AngularAxisImpl.js b/client-app/src/component/chart/layer/Axis/AngularAxisImpl.js similarity index 98% rename from public/javascript/redmic/modules/chart/layer/Axis/AngularAxisImpl.js rename to client-app/src/component/chart/layer/Axis/AngularAxisImpl.js index 53b167f7aef5f3066c49865fd1f26eb994d045b4..01ad1530b2cc985fe0003d19be72cc8d2f88fae3 100644 --- a/public/javascript/redmic/modules/chart/layer/Axis/AngularAxisImpl.js +++ b/client-app/src/component/chart/layer/Axis/AngularAxisImpl.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/chart/layer/_PolarLayerCommons" + , "src/component/chart/layer/_PolarLayerCommons" , "./Axis" ], function( declare diff --git a/public/javascript/redmic/modules/chart/layer/Axis/AngularGridAxisImpl.js b/client-app/src/component/chart/layer/Axis/AngularGridAxisImpl.js similarity index 100% rename from public/javascript/redmic/modules/chart/layer/Axis/AngularGridAxisImpl.js rename to client-app/src/component/chart/layer/Axis/AngularGridAxisImpl.js diff --git a/public/javascript/redmic/modules/chart/layer/Axis/Axis.js b/client-app/src/component/chart/layer/Axis/Axis.js similarity index 96% rename from public/javascript/redmic/modules/chart/layer/Axis/Axis.js rename to client-app/src/component/chart/layer/Axis/Axis.js index 027f5633ee09939cbea25b8b70d3e9333a6d4e4b..08e382444575d4e85aca674107653e2899bbe2f4 100644 --- a/public/javascript/redmic/modules/chart/layer/Axis/Axis.js +++ b/client-app/src/component/chart/layer/Axis/Axis.js @@ -1,10 +1,10 @@ define([ - 'd3/d3.min' + 'd3' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/Deferred" - , "redmic/modules/base/_Module" - , "redmic/modules/chart/layer/_LayerCommons" + , "src/component/base/_Module" + , "src/component/chart/layer/_LayerCommons" , "./_AxisItfc" ], function( d3 diff --git a/public/javascript/redmic/modules/chart/layer/Axis/HorizontalGridAxisImpl.js b/client-app/src/component/chart/layer/Axis/HorizontalGridAxisImpl.js similarity index 98% rename from public/javascript/redmic/modules/chart/layer/Axis/HorizontalGridAxisImpl.js rename to client-app/src/component/chart/layer/Axis/HorizontalGridAxisImpl.js index 8714cf29f601f0070e4bd8f7f18d5573de7ab485..e28754ef2c68742b98c1ecebe1801918325e1ac6 100644 --- a/public/javascript/redmic/modules/chart/layer/Axis/HorizontalGridAxisImpl.js +++ b/client-app/src/component/chart/layer/Axis/HorizontalGridAxisImpl.js @@ -1,5 +1,5 @@ define([ - 'd3/d3.min' + 'd3' , "dojo/_base/declare" , "dojo/_base/lang" , "./Axis" diff --git a/public/javascript/redmic/modules/chart/layer/Axis/RadialAxisImpl.js b/client-app/src/component/chart/layer/Axis/RadialAxisImpl.js similarity index 100% rename from public/javascript/redmic/modules/chart/layer/Axis/RadialAxisImpl.js rename to client-app/src/component/chart/layer/Axis/RadialAxisImpl.js diff --git a/public/javascript/redmic/modules/chart/layer/Axis/RadialGridAxisImpl.js b/client-app/src/component/chart/layer/Axis/RadialGridAxisImpl.js similarity index 99% rename from public/javascript/redmic/modules/chart/layer/Axis/RadialGridAxisImpl.js rename to client-app/src/component/chart/layer/Axis/RadialGridAxisImpl.js index dfd5c5c6594a961186fcb255701215dfb5ba982c..98f46f5eca3c4e9d8d67404fd5e70366c13ebdc9 100644 --- a/public/javascript/redmic/modules/chart/layer/Axis/RadialGridAxisImpl.js +++ b/client-app/src/component/chart/layer/Axis/RadialGridAxisImpl.js @@ -1,5 +1,5 @@ define([ - 'd3/d3.min' + 'd3' , "dojo/_base/declare" , "dojo/_base/lang" , "./Axis" diff --git a/public/javascript/redmic/modules/chart/layer/Axis/TemporalAxisImpl.js b/client-app/src/component/chart/layer/Axis/TemporalAxisImpl.js similarity index 99% rename from public/javascript/redmic/modules/chart/layer/Axis/TemporalAxisImpl.js rename to client-app/src/component/chart/layer/Axis/TemporalAxisImpl.js index dbdb72fd194905158ddb66deabf5bfdc2e830c94..61da65a5c07d8b79a36ad8b94bad251a947d0eac 100644 --- a/public/javascript/redmic/modules/chart/layer/Axis/TemporalAxisImpl.js +++ b/client-app/src/component/chart/layer/Axis/TemporalAxisImpl.js @@ -1,5 +1,5 @@ define([ - 'd3/d3.min' + 'd3' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/_base/kernel" diff --git a/public/javascript/redmic/modules/chart/layer/Axis/VerticalAxisImpl.js b/client-app/src/component/chart/layer/Axis/VerticalAxisImpl.js similarity index 100% rename from public/javascript/redmic/modules/chart/layer/Axis/VerticalAxisImpl.js rename to client-app/src/component/chart/layer/Axis/VerticalAxisImpl.js diff --git a/public/javascript/redmic/modules/chart/layer/Axis/VerticalGridAxisImpl.js b/client-app/src/component/chart/layer/Axis/VerticalGridAxisImpl.js similarity index 98% rename from public/javascript/redmic/modules/chart/layer/Axis/VerticalGridAxisImpl.js rename to client-app/src/component/chart/layer/Axis/VerticalGridAxisImpl.js index 38f2d7f735b40f31d3a2eb2c46245e6c82b20ffd..77f243bf440d320189f987289550fed7dfcac0f5 100644 --- a/public/javascript/redmic/modules/chart/layer/Axis/VerticalGridAxisImpl.js +++ b/client-app/src/component/chart/layer/Axis/VerticalGridAxisImpl.js @@ -1,5 +1,5 @@ define([ - 'd3/d3.min' + 'd3' , "dojo/_base/declare" , "dojo/_base/lang" , "./Axis" diff --git a/public/javascript/redmic/modules/chart/layer/Axis/_AxisItfc.js b/client-app/src/component/chart/layer/Axis/_AxisItfc.js similarity index 93% rename from public/javascript/redmic/modules/chart/layer/Axis/_AxisItfc.js rename to client-app/src/component/chart/layer/Axis/_AxisItfc.js index b9850e7283cf65275c24be5d3c49784c70ed1046..740fed6b7fd6a37363e5b5c13c0d41b5549eac41 100644 --- a/public/javascript/redmic/modules/chart/layer/Axis/_AxisItfc.js +++ b/client-app/src/component/chart/layer/Axis/_AxisItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/public/javascript/redmic/modules/chart/layer/Axis/_HorizontalCommons.js b/client-app/src/component/chart/layer/Axis/_HorizontalCommons.js similarity index 98% rename from public/javascript/redmic/modules/chart/layer/Axis/_HorizontalCommons.js rename to client-app/src/component/chart/layer/Axis/_HorizontalCommons.js index c5d5e269d2b7cd36ef3d9b3b71f6a38adc5498a0..86eba0d8fb239a4ac47771fb6f1067e43dc4c8fe 100644 --- a/public/javascript/redmic/modules/chart/layer/Axis/_HorizontalCommons.js +++ b/client-app/src/component/chart/layer/Axis/_HorizontalCommons.js @@ -1,9 +1,9 @@ define([ - 'd3/d3.min' + 'd3' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , 'moment/moment.min' + , 'moment' , "RWidgets/Utilities" ], function( d3 diff --git a/public/javascript/redmic/modules/chart/layer/Axis/_VerticalCommons.js b/client-app/src/component/chart/layer/Axis/_VerticalCommons.js similarity index 99% rename from public/javascript/redmic/modules/chart/layer/Axis/_VerticalCommons.js rename to client-app/src/component/chart/layer/Axis/_VerticalCommons.js index cfd3075041ce9a6d3ac92f2645e9b7d6a0b54ebe..bdd7bca61051fd922c1629d39c88c3cadb877bd0 100644 --- a/public/javascript/redmic/modules/chart/layer/Axis/_VerticalCommons.js +++ b/client-app/src/component/chart/layer/Axis/_VerticalCommons.js @@ -1,5 +1,5 @@ define([ - 'd3/d3.min' + 'd3' , "dojo/_base/declare" , "dojo/_base/lang" ], function( diff --git a/public/javascript/redmic/modules/chart/layer/Axis/_VerticalCommonsItfc.js b/client-app/src/component/chart/layer/Axis/_VerticalCommonsItfc.js similarity index 93% rename from public/javascript/redmic/modules/chart/layer/Axis/_VerticalCommonsItfc.js rename to client-app/src/component/chart/layer/Axis/_VerticalCommonsItfc.js index d82bc806eabad918c2f029e22fc7ec883d61d406..47f90d98991e88a079300d749950e9b6aa7eae66 100644 --- a/public/javascript/redmic/modules/chart/layer/Axis/_VerticalCommonsItfc.js +++ b/client-app/src/component/chart/layer/Axis/_VerticalCommonsItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/public/javascript/redmic/modules/chart/layer/ChartLayer/ChartLayer.js b/client-app/src/component/chart/layer/ChartLayer/ChartLayer.js similarity index 98% rename from public/javascript/redmic/modules/chart/layer/ChartLayer/ChartLayer.js rename to client-app/src/component/chart/layer/ChartLayer/ChartLayer.js index b0e2087c365ef6921e262eb8a49fd79e0ada016a..09a4e818bc541035ac22598c6f5a5fcd907cb41f 100644 --- a/public/javascript/redmic/modules/chart/layer/ChartLayer/ChartLayer.js +++ b/client-app/src/component/chart/layer/ChartLayer/ChartLayer.js @@ -2,10 +2,10 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "put-selector/put" + , 'put-selector' , "RWidgets/Utilities" - , "redmic/modules/base/_Module" - , "redmic/modules/chart/layer/_LayerCommons" + , "src/component/base/_Module" + , "src/component/chart/layer/_LayerCommons" , "./_ChartLayerItfc" ], function( declare diff --git a/public/javascript/redmic/modules/chart/layer/ChartLayer/LinearChartImpl.js b/client-app/src/component/chart/layer/ChartLayer/LinearChartImpl.js similarity index 99% rename from public/javascript/redmic/modules/chart/layer/ChartLayer/LinearChartImpl.js rename to client-app/src/component/chart/layer/ChartLayer/LinearChartImpl.js index 687b7098227aa7e06e4dab5fd4483585940e5a6b..3c61d2dfd5e7c294ba0376ec5611b26561a1b593 100644 --- a/public/javascript/redmic/modules/chart/layer/ChartLayer/LinearChartImpl.js +++ b/client-app/src/component/chart/layer/ChartLayer/LinearChartImpl.js @@ -1,5 +1,5 @@ define([ - 'd3/d3.min' + 'd3' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/Deferred" diff --git a/public/javascript/redmic/modules/chart/layer/ChartLayer/MultiPieChartImpl.js b/client-app/src/component/chart/layer/ChartLayer/MultiPieChartImpl.js similarity index 99% rename from public/javascript/redmic/modules/chart/layer/ChartLayer/MultiPieChartImpl.js rename to client-app/src/component/chart/layer/ChartLayer/MultiPieChartImpl.js index c3a5cc90e85764c4108e2ab7b5fe449aa918ad99..731a1439ff396e3d98994473a70f43b5b734f609 100644 --- a/public/javascript/redmic/modules/chart/layer/ChartLayer/MultiPieChartImpl.js +++ b/client-app/src/component/chart/layer/ChartLayer/MultiPieChartImpl.js @@ -1,5 +1,5 @@ define([ - 'd3/d3.min' + 'd3' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" diff --git a/public/javascript/redmic/modules/chart/layer/ChartLayer/PieChartImpl.js b/client-app/src/component/chart/layer/ChartLayer/PieChartImpl.js similarity index 99% rename from public/javascript/redmic/modules/chart/layer/ChartLayer/PieChartImpl.js rename to client-app/src/component/chart/layer/ChartLayer/PieChartImpl.js index 78e59c3bbca8227e134789dadf825f92b786a5c5..c78dcfe5f30bbb3e28abae1d3dc18accd8a26a47 100644 --- a/public/javascript/redmic/modules/chart/layer/ChartLayer/PieChartImpl.js +++ b/client-app/src/component/chart/layer/ChartLayer/PieChartImpl.js @@ -1,5 +1,5 @@ define([ - 'd3/d3.min' + 'd3' , "dojo/_base/declare" , "dojo/_base/lang" , "./_PieCommons" diff --git a/public/javascript/redmic/modules/chart/layer/ChartLayer/WindRoseChartImpl.js b/client-app/src/component/chart/layer/ChartLayer/WindRoseChartImpl.js similarity index 98% rename from public/javascript/redmic/modules/chart/layer/ChartLayer/WindRoseChartImpl.js rename to client-app/src/component/chart/layer/ChartLayer/WindRoseChartImpl.js index 03386b160198ffb9b1118404e9d0af4851513544..38bfef3958b9e8713ceb24f99963b52ca83e332d 100644 --- a/public/javascript/redmic/modules/chart/layer/ChartLayer/WindRoseChartImpl.js +++ b/client-app/src/component/chart/layer/ChartLayer/WindRoseChartImpl.js @@ -1,9 +1,9 @@ define([ - 'd3/d3.min' + 'd3' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "redmic/modules/chart/layer/_PolarLayerCommons" + , "src/component/chart/layer/_PolarLayerCommons" , "./_CategoryLayerCommons" , "./_CircularLayerCommons" , "./_MultipleWindRose" diff --git a/public/javascript/redmic/modules/chart/layer/ChartLayer/_CategoryLayerCommons.js b/client-app/src/component/chart/layer/ChartLayer/_CategoryLayerCommons.js similarity index 99% rename from public/javascript/redmic/modules/chart/layer/ChartLayer/_CategoryLayerCommons.js rename to client-app/src/component/chart/layer/ChartLayer/_CategoryLayerCommons.js index f980a850c7444e9b23952f3bd16b7ca83aff3219..c9b86708695dc4c9195a68d4a7fe5f16dbe90696 100644 --- a/public/javascript/redmic/modules/chart/layer/ChartLayer/_CategoryLayerCommons.js +++ b/client-app/src/component/chart/layer/ChartLayer/_CategoryLayerCommons.js @@ -1,5 +1,5 @@ define([ - 'd3/d3.min' + 'd3' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" diff --git a/public/javascript/redmic/modules/chart/layer/ChartLayer/_CategoryLayerCommonsItfc.js b/client-app/src/component/chart/layer/ChartLayer/_CategoryLayerCommonsItfc.js similarity index 94% rename from public/javascript/redmic/modules/chart/layer/ChartLayer/_CategoryLayerCommonsItfc.js rename to client-app/src/component/chart/layer/ChartLayer/_CategoryLayerCommonsItfc.js index 6c4efd429f921ba6cdf8df09b117458089386a17..ecc1bb68d824ede6edd0befd722f31ea40806f18 100644 --- a/public/javascript/redmic/modules/chart/layer/ChartLayer/_CategoryLayerCommonsItfc.js +++ b/client-app/src/component/chart/layer/ChartLayer/_CategoryLayerCommonsItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/public/javascript/redmic/modules/chart/layer/ChartLayer/_ChartHoleManagement.js b/client-app/src/component/chart/layer/ChartLayer/_ChartHoleManagement.js similarity index 99% rename from public/javascript/redmic/modules/chart/layer/ChartLayer/_ChartHoleManagement.js rename to client-app/src/component/chart/layer/ChartLayer/_ChartHoleManagement.js index 40e518d66fef9de92662b989a8a7c3af1c41e90b..98ecaa4df2911b6b8ad23cee31fa91a489115888 100644 --- a/public/javascript/redmic/modules/chart/layer/ChartLayer/_ChartHoleManagement.js +++ b/client-app/src/component/chart/layer/ChartLayer/_ChartHoleManagement.js @@ -1,5 +1,5 @@ define([ - 'd3/d3.min' + 'd3' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" diff --git a/public/javascript/redmic/modules/chart/layer/ChartLayer/_ChartLayerItfc.js b/client-app/src/component/chart/layer/ChartLayer/_ChartLayerItfc.js similarity index 95% rename from public/javascript/redmic/modules/chart/layer/ChartLayer/_ChartLayerItfc.js rename to client-app/src/component/chart/layer/ChartLayer/_ChartLayerItfc.js index 88171f2eaed77dbd8bd214e0c8abff1ffca02a41..eb80d2a13caa8a4f5b580ab61c535d1b270ebd64 100644 --- a/public/javascript/redmic/modules/chart/layer/ChartLayer/_ChartLayerItfc.js +++ b/client-app/src/component/chart/layer/ChartLayer/_ChartLayerItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/public/javascript/redmic/modules/chart/layer/ChartLayer/_CircularLayerCommons.js b/client-app/src/component/chart/layer/ChartLayer/_CircularLayerCommons.js similarity index 99% rename from public/javascript/redmic/modules/chart/layer/ChartLayer/_CircularLayerCommons.js rename to client-app/src/component/chart/layer/ChartLayer/_CircularLayerCommons.js index 07bb1b3c1d7cb2fcae8c388785553e59d8997eb4..514dab184002260828b330d1021b79b7b2b6456d 100644 --- a/public/javascript/redmic/modules/chart/layer/ChartLayer/_CircularLayerCommons.js +++ b/client-app/src/component/chart/layer/ChartLayer/_CircularLayerCommons.js @@ -1,5 +1,5 @@ define([ - 'd3/d3.min' + 'd3' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/Deferred" diff --git a/public/javascript/redmic/modules/chart/layer/ChartLayer/_CircularLayerCommonsItfc.js b/client-app/src/component/chart/layer/ChartLayer/_CircularLayerCommonsItfc.js similarity index 94% rename from public/javascript/redmic/modules/chart/layer/ChartLayer/_CircularLayerCommonsItfc.js rename to client-app/src/component/chart/layer/ChartLayer/_CircularLayerCommonsItfc.js index d1e256da7fe0e2e9c1102a58f2d27f5920b88ca1..fba20b90112271ef4695c21bc28e36fe5ce45465 100644 --- a/public/javascript/redmic/modules/chart/layer/ChartLayer/_CircularLayerCommonsItfc.js +++ b/client-app/src/component/chart/layer/ChartLayer/_CircularLayerCommonsItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/public/javascript/redmic/modules/chart/layer/ChartLayer/_ColorHierarchyGeneration.js b/client-app/src/component/chart/layer/ChartLayer/_ColorHierarchyGeneration.js similarity index 99% rename from public/javascript/redmic/modules/chart/layer/ChartLayer/_ColorHierarchyGeneration.js rename to client-app/src/component/chart/layer/ChartLayer/_ColorHierarchyGeneration.js index 8c0d9d78f2e9cfc6914abee493f436a3b58d3a18..744bba3705c4468ec36c0e8717b3218f11e39d7e 100644 --- a/public/javascript/redmic/modules/chart/layer/ChartLayer/_ColorHierarchyGeneration.js +++ b/client-app/src/component/chart/layer/ChartLayer/_ColorHierarchyGeneration.js @@ -2,7 +2,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , 'colorjs/color' + , 'colorjs' ], function( declare , lang diff --git a/public/javascript/redmic/modules/chart/layer/ChartLayer/_LevelNavigation.js b/client-app/src/component/chart/layer/ChartLayer/_LevelNavigation.js similarity index 98% rename from public/javascript/redmic/modules/chart/layer/ChartLayer/_LevelNavigation.js rename to client-app/src/component/chart/layer/ChartLayer/_LevelNavigation.js index 5fb840e4f210e64bebdf9dfef1c6f7cf1eb870c2..ff42aa91af17f70f63c5b868bda254740cee1451 100644 --- a/public/javascript/redmic/modules/chart/layer/ChartLayer/_LevelNavigation.js +++ b/client-app/src/component/chart/layer/ChartLayer/_LevelNavigation.js @@ -2,7 +2,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "redmic/modules/chart/layer/ChartLayer/_PutButtonInHole" + , "src/component/chart/layer/ChartLayer/_PutButtonInHole" ], function( declare , lang diff --git a/public/javascript/redmic/modules/chart/layer/ChartLayer/_MultipleWindRose.js b/client-app/src/component/chart/layer/ChartLayer/_MultipleWindRose.js similarity index 99% rename from public/javascript/redmic/modules/chart/layer/ChartLayer/_MultipleWindRose.js rename to client-app/src/component/chart/layer/ChartLayer/_MultipleWindRose.js index 039f1b691c4f7e76b254fc64b99fb43a5e440aa4..6d2faa5fc41b56b07454c849cee5d94a615db5fe 100644 --- a/public/javascript/redmic/modules/chart/layer/ChartLayer/_MultipleWindRose.js +++ b/client-app/src/component/chart/layer/ChartLayer/_MultipleWindRose.js @@ -1,5 +1,5 @@ define([ - 'd3/d3.min' + 'd3' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" diff --git a/public/javascript/redmic/modules/chart/layer/ChartLayer/_ObtainableValue.js b/client-app/src/component/chart/layer/ChartLayer/_ObtainableValue.js similarity index 100% rename from public/javascript/redmic/modules/chart/layer/ChartLayer/_ObtainableValue.js rename to client-app/src/component/chart/layer/ChartLayer/_ObtainableValue.js diff --git a/public/javascript/redmic/modules/chart/layer/ChartLayer/_ObtainableValueItfc.js b/client-app/src/component/chart/layer/ChartLayer/_ObtainableValueItfc.js similarity index 92% rename from public/javascript/redmic/modules/chart/layer/ChartLayer/_ObtainableValueItfc.js rename to client-app/src/component/chart/layer/ChartLayer/_ObtainableValueItfc.js index bdfc3eca4e53d75b66cca04e8c50495ca6c8fff2..7c5bc73b5bfe38216b8277d8399a0e718c90eb01 100644 --- a/public/javascript/redmic/modules/chart/layer/ChartLayer/_ObtainableValueItfc.js +++ b/client-app/src/component/chart/layer/ChartLayer/_ObtainableValueItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/public/javascript/redmic/modules/chart/layer/ChartLayer/_PieCommons.js b/client-app/src/component/chart/layer/ChartLayer/_PieCommons.js similarity index 98% rename from public/javascript/redmic/modules/chart/layer/ChartLayer/_PieCommons.js rename to client-app/src/component/chart/layer/ChartLayer/_PieCommons.js index bd4f29b8c60984a4806fd079cc6cf8082dce9382..c9711430102eff4a5d54bee5afa8229f64da5331 100644 --- a/public/javascript/redmic/modules/chart/layer/ChartLayer/_PieCommons.js +++ b/client-app/src/component/chart/layer/ChartLayer/_PieCommons.js @@ -1,5 +1,5 @@ define([ - 'd3/d3.min' + 'd3' , "dojo/_base/declare" , "dojo/_base/lang" , "./_CategoryLayerCommons" diff --git a/public/javascript/redmic/modules/chart/layer/ChartLayer/_PutButtonInHole.js b/client-app/src/component/chart/layer/ChartLayer/_PutButtonInHole.js similarity index 98% rename from public/javascript/redmic/modules/chart/layer/ChartLayer/_PutButtonInHole.js rename to client-app/src/component/chart/layer/ChartLayer/_PutButtonInHole.js index 195d84ea95e5e8a9fd1cfdcf76c2940ef3d1936d..372405f7eb161eb679e7020f9fcf9d523c02150c 100644 --- a/public/javascript/redmic/modules/chart/layer/ChartLayer/_PutButtonInHole.js +++ b/client-app/src/component/chart/layer/ChartLayer/_PutButtonInHole.js @@ -2,7 +2,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "redmic/modules/chart/layer/ChartLayer/_ChartHoleManagement" + , "src/component/chart/layer/ChartLayer/_ChartHoleManagement" , "./_PutButtonInHoleItfc" ], function( declare diff --git a/public/javascript/redmic/modules/chart/layer/ChartLayer/_PutButtonInHoleItfc.js b/client-app/src/component/chart/layer/ChartLayer/_PutButtonInHoleItfc.js similarity index 92% rename from public/javascript/redmic/modules/chart/layer/ChartLayer/_PutButtonInHoleItfc.js rename to client-app/src/component/chart/layer/ChartLayer/_PutButtonInHoleItfc.js index 67351a9861262443f433a7470ea4e5fb6bc0d4f4..5e30dd916a474f754571501c5e1292b66f3a0b66 100644 --- a/public/javascript/redmic/modules/chart/layer/ChartLayer/_PutButtonInHoleItfc.js +++ b/client-app/src/component/chart/layer/ChartLayer/_PutButtonInHoleItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/public/javascript/redmic/modules/chart/layer/ChartLayer/_QueryableValue.js b/client-app/src/component/chart/layer/ChartLayer/_QueryableValue.js similarity index 99% rename from public/javascript/redmic/modules/chart/layer/ChartLayer/_QueryableValue.js rename to client-app/src/component/chart/layer/ChartLayer/_QueryableValue.js index 8580e2fa47e21cd59c668bec86c0e3f87d7b12ca..bfba98bd300a05d7fc7def44f766f49494ea16f4 100644 --- a/public/javascript/redmic/modules/chart/layer/ChartLayer/_QueryableValue.js +++ b/client-app/src/component/chart/layer/ChartLayer/_QueryableValue.js @@ -1,5 +1,5 @@ define([ - 'd3/d3.min' + 'd3' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" diff --git a/public/javascript/redmic/modules/chart/layer/ChartLayer/_ShowInfoInHole.js b/client-app/src/component/chart/layer/ChartLayer/_ShowInfoInHole.js similarity index 97% rename from public/javascript/redmic/modules/chart/layer/ChartLayer/_ShowInfoInHole.js rename to client-app/src/component/chart/layer/ChartLayer/_ShowInfoInHole.js index b37d4b6c1683118a8ebf1f6c9b37baa9c0d06691..c97c93e1dea0df2f829cb5446677dd9497cd3b05 100644 --- a/public/javascript/redmic/modules/chart/layer/ChartLayer/_ShowInfoInHole.js +++ b/client-app/src/component/chart/layer/ChartLayer/_ShowInfoInHole.js @@ -2,8 +2,8 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "redmic/modules/chart/layer/ChartLayer/_ChartHoleManagement" - , "redmic/modules/chart/layer/ChartLayer/_ObtainableValue" + , "src/component/chart/layer/ChartLayer/_ChartHoleManagement" + , "src/component/chart/layer/ChartLayer/_ObtainableValue" ], function( declare , lang diff --git a/public/javascript/redmic/modules/chart/layer/ChartLayer/_SimplePieCommons.js b/client-app/src/component/chart/layer/ChartLayer/_SimplePieCommons.js similarity index 100% rename from public/javascript/redmic/modules/chart/layer/ChartLayer/_SimplePieCommons.js rename to client-app/src/component/chart/layer/ChartLayer/_SimplePieCommons.js diff --git a/public/javascript/redmic/modules/chart/layer/ChartLayer/_SimpleWindRose.js b/client-app/src/component/chart/layer/ChartLayer/_SimpleWindRose.js similarity index 98% rename from public/javascript/redmic/modules/chart/layer/ChartLayer/_SimpleWindRose.js rename to client-app/src/component/chart/layer/ChartLayer/_SimpleWindRose.js index 26f10558da73c12d90417139ad92fd8ec99caae5..df953263f6fb4e1d67e577ec50e68b20bf243c29 100644 --- a/public/javascript/redmic/modules/chart/layer/ChartLayer/_SimpleWindRose.js +++ b/client-app/src/component/chart/layer/ChartLayer/_SimpleWindRose.js @@ -1,5 +1,5 @@ define([ - 'd3/d3.min' + 'd3' , "dojo/_base/declare" , "dojo/_base/lang" ], function( diff --git a/public/javascript/redmic/modules/chart/layer/ChartLayer/_VariableRadiusByDepth.js b/client-app/src/component/chart/layer/ChartLayer/_VariableRadiusByDepth.js similarity index 100% rename from public/javascript/redmic/modules/chart/layer/ChartLayer/_VariableRadiusByDepth.js rename to client-app/src/component/chart/layer/ChartLayer/_VariableRadiusByDepth.js diff --git a/public/javascript/redmic/modules/chart/layer/_LayerCommons.js b/client-app/src/component/chart/layer/_LayerCommons.js similarity index 100% rename from public/javascript/redmic/modules/chart/layer/_LayerCommons.js rename to client-app/src/component/chart/layer/_LayerCommons.js diff --git a/public/javascript/redmic/modules/chart/layer/_LayerCommonsItfc.js b/client-app/src/component/chart/layer/_LayerCommonsItfc.js similarity index 94% rename from public/javascript/redmic/modules/chart/layer/_LayerCommonsItfc.js rename to client-app/src/component/chart/layer/_LayerCommonsItfc.js index a4fafdb728aab7a02e17dd0c997ee7ab7d6066ef..127df271f55262f7560aba45bcad9f3f174c6f86 100644 --- a/public/javascript/redmic/modules/chart/layer/_LayerCommonsItfc.js +++ b/client-app/src/component/chart/layer/_LayerCommonsItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/public/javascript/redmic/modules/chart/layer/_PolarLayerCommons.js b/client-app/src/component/chart/layer/_PolarLayerCommons.js similarity index 100% rename from public/javascript/redmic/modules/chart/layer/_PolarLayerCommons.js rename to client-app/src/component/chart/layer/_PolarLayerCommons.js diff --git a/public/javascript/redmic/modules/chart/layer/_PolarLayerCommonsItfc.js b/client-app/src/component/chart/layer/_PolarLayerCommonsItfc.js similarity index 92% rename from public/javascript/redmic/modules/chart/layer/_PolarLayerCommonsItfc.js rename to client-app/src/component/chart/layer/_PolarLayerCommonsItfc.js index c4580e9bd370420a1805dd394c78209d0984234d..e9617c03e5be0403399ae54f7bce067a1e8cb7c8 100644 --- a/public/javascript/redmic/modules/chart/layer/_PolarLayerCommonsItfc.js +++ b/client-app/src/component/chart/layer/_PolarLayerCommonsItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/public/javascript/redmic/modules/components/Keypad/IconKeypadImpl.js b/client-app/src/component/components/Keypad/IconKeypadImpl.js similarity index 98% rename from public/javascript/redmic/modules/components/Keypad/IconKeypadImpl.js rename to client-app/src/component/components/Keypad/IconKeypadImpl.js index e44b5603d880871ba4ab24517ce9c5fdbc17e7b8..e490e4c1047c6c97a4b606ce678d335900f46397 100644 --- a/public/javascript/redmic/modules/components/Keypad/IconKeypadImpl.js +++ b/client-app/src/component/components/Keypad/IconKeypadImpl.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "put-selector/put" + , 'put-selector' , "./Keypad" ], function( declare @@ -140,7 +140,7 @@ define([ this._itemNodes[itemKey].onclick = function() {}; }, - _getNodeToShow: function() { + getNodeToShow: function() { return this.keypadContainer; }, diff --git a/public/javascript/redmic/modules/components/Keypad/Keypad.js b/client-app/src/component/components/Keypad/Keypad.js similarity index 97% rename from public/javascript/redmic/modules/components/Keypad/Keypad.js rename to client-app/src/component/components/Keypad/Keypad.js index 3d97fc8d4b1546b3e54fee8ac091027ff1177008..179a597184c44b77f240ef9c086a1a8d58178d1f 100644 --- a/public/javascript/redmic/modules/components/Keypad/Keypad.js +++ b/client-app/src/component/components/Keypad/Keypad.js @@ -1,8 +1,8 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Module" - , "redmic/modules/base/_Show" + , "src/component/base/_Module" + , "src/component/base/_Show" , "./_KeypadItfc" ], function( declare diff --git a/public/javascript/redmic/modules/components/Keypad/TrizoneKeypadImpl.js b/client-app/src/component/components/Keypad/TrizoneKeypadImpl.js similarity index 97% rename from public/javascript/redmic/modules/components/Keypad/TrizoneKeypadImpl.js rename to client-app/src/component/components/Keypad/TrizoneKeypadImpl.js index d7890fcf239cd2f8f94b730fedbb186cc05129ed..21601111fafe3e44c0a937367d1c9fe6e835188e 100644 --- a/public/javascript/redmic/modules/components/Keypad/TrizoneKeypadImpl.js +++ b/client-app/src/component/components/Keypad/TrizoneKeypadImpl.js @@ -2,7 +2,7 @@ define([ "dijit/form/Button" , "dojo/_base/declare" , "dojo/_base/lang" - , "put-selector/put" + , 'put-selector' , "./Keypad" ], function( DefaultButton @@ -78,7 +78,7 @@ define([ itemInstance.placeAt(itemZone); }, - _getNodeToShow: function() { + getNodeToShow: function() { return this.keypadContainer; }, diff --git a/public/javascript/redmic/modules/components/Keypad/_KeypadItfc.js b/client-app/src/component/components/Keypad/_KeypadItfc.js similarity index 94% rename from public/javascript/redmic/modules/components/Keypad/_KeypadItfc.js rename to client-app/src/component/components/Keypad/_KeypadItfc.js index 2b7a722462eb23b3207d6622e94f0668bf1e97e9..a339036903d51c7f4e38704a2052caa8082b996d 100644 --- a/public/javascript/redmic/modules/components/Keypad/_KeypadItfc.js +++ b/client-app/src/component/components/Keypad/_KeypadItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/public/javascript/redmic/modules/components/PDFViewer/PDFViewer.js b/client-app/src/component/components/PDFViewer/PDFViewer.js similarity index 89% rename from public/javascript/redmic/modules/components/PDFViewer/PDFViewer.js rename to client-app/src/component/components/PDFViewer/PDFViewer.js index 71e011006be589170a72f8da45a1f2d81b2be146..e9c019558c2c2db374948d8f844f09cc46fd0127 100644 --- a/public/javascript/redmic/modules/components/PDFViewer/PDFViewer.js +++ b/client-app/src/component/components/PDFViewer/PDFViewer.js @@ -1,11 +1,12 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/base/Credentials" - , "redmic/modules/base/_Module" - , "redmic/modules/base/_Show" - , "redmic/modules/layout/templateDisplayer/TemplateDisplayer" - , "put-selector/put" + , "src/util/Credentials" + , "src/component/base/_Module" + , "src/component/base/_Show" + , "src/component/layout/templateDisplayer/TemplateDisplayer" + , 'put-selector' + , 'src/redmicConfig' , "templates/DocumentAuthFailed" , "templates/DocumentNotAvailable" ], function( @@ -16,6 +17,7 @@ define([ , _Show , TemplateDisplayer , put + , redmicConfig , TemplateAuthFailed , TemplateNoAvailable ) { @@ -98,7 +100,8 @@ define([ this.lastPDF = url; - var path = '/javascript/pdfjs/web/viewer.html?file=' + url; + var useBuilt = (/true/i).test(redmicConfig.getEnvVariableValue('envUseBuilt')), + path = '/' + (useBuilt ? 'dist/js' : 'dep') + '/pdfjs/web/viewer.html?file=' + url; if (!this.roleGuestActive) { path += '?access_token%3D' + Credentials.get("accessToken"); @@ -111,7 +114,9 @@ define([ this.dialog.set("title", namePDF[namePDF.length - 1]); } - this.objectNode.addEventListener("load", lang.hitch(this, this._observerError)); + this.objectNode.addEventListener("load", lang.hitch(this, this._observerError), { + passive: true + }); } else { this._showTemplateDisplayerPdfError(); } @@ -119,7 +124,7 @@ define([ _authChecker: function() { - if (!this.roleGuestActive && Credentials.get("userRole") === "ROLE_GUEST") { + if (!this.roleGuestActive && Credentials.userIsGuest()) { if (this.templateDisplayerPdfError) { this._publish(this.templateDisplayerPdfError.getChannel("CHANGE_TEMPLATE"), { template: TemplateAuthFailed @@ -202,7 +207,7 @@ define([ this._showTemplateDisplayerPdfError(); }, - _getNodeToShow: function() { + getNodeToShow: function() { return this.domNode; } diff --git a/public/javascript/redmic/modules/components/ProgressSlider/ProgressSlider.js b/client-app/src/component/components/ProgressSlider/ProgressSlider.js similarity index 96% rename from public/javascript/redmic/modules/components/ProgressSlider/ProgressSlider.js rename to client-app/src/component/components/ProgressSlider/ProgressSlider.js index 8798b41bbef7fcdcb9283b6647af7eaa3b828542..bf238211f92a03361be6f2e278fc590f6be2fb0c 100644 --- a/public/javascript/redmic/modules/components/ProgressSlider/ProgressSlider.js +++ b/client-app/src/component/components/ProgressSlider/ProgressSlider.js @@ -1,8 +1,8 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Module" - , "redmic/modules/base/_Show" + , "src/component/base/_Module" + , "src/component/base/_Show" , "RWidgets/ProgressSlider" , "RWidgets/extensions/_ShowValue" ], function( @@ -146,9 +146,9 @@ define([ this.progressSlider.emit(this.events.SET_DELTA, req.value); }, - _getNodeToShow: function() { + getNodeToShow: function() { return this.progressSlider.domNode; } }); -}); \ No newline at end of file +}); diff --git a/public/javascript/redmic/modules/components/ProgressSlider/StepAndRateEditor.js b/client-app/src/component/components/ProgressSlider/StepAndRateEditor.js similarity index 96% rename from public/javascript/redmic/modules/components/ProgressSlider/StepAndRateEditor.js rename to client-app/src/component/components/ProgressSlider/StepAndRateEditor.js index c4eb8d2d379078ae467f6fa52f91272e248341e8..9c99af0fe061130f84a7b3b0d2ca75c08c1f29d6 100644 --- a/public/javascript/redmic/modules/components/ProgressSlider/StepAndRateEditor.js +++ b/client-app/src/component/components/ProgressSlider/StepAndRateEditor.js @@ -2,10 +2,10 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "dijit/form/NumberSpinner" - , "redmic/modules/base/_Module" - , "redmic/modules/base/_Show" + , "src/component/base/_Module" + , "src/component/base/_Show" , "RWidgets/ValueAndUnitSelector" - , "put-selector/put" + , 'put-selector' ], function( declare , lang @@ -103,7 +103,7 @@ define([ }); }, - _getNodeToShow: function() { + getNodeToShow: function() { return this.domNode; }, @@ -148,4 +148,4 @@ define([ this.valueAndUnitSelector.emit(this.valueAndUnitSelector.events.GET_VALUE); } }); -}); \ No newline at end of file +}); diff --git a/public/javascript/redmic/modules/filter/Filter.js b/client-app/src/component/filter/Filter.js similarity index 98% rename from public/javascript/redmic/modules/filter/Filter.js rename to client-app/src/component/filter/Filter.js index 98bb4cd6b0f0f3a5201bcaa07888a2e39581c90d..0633fb6dfd11bc24d58e1c847b550ffe2cdcce21 100644 --- a/public/javascript/redmic/modules/filter/Filter.js +++ b/client-app/src/component/filter/Filter.js @@ -1,9 +1,9 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Module" - , "redmic/modules/model/ModelImpl" - , "redmic/modules/base/_Store" + , "src/component/base/_Module" + , "src/component/model/ModelImpl" + , "src/component/base/_Store" ], function( declare , lang diff --git a/public/javascript/redmic/modules/form/Form.js b/client-app/src/component/form/Form.js similarity index 98% rename from public/javascript/redmic/modules/form/Form.js rename to client-app/src/component/form/Form.js index 685bd74d7463cb08fec00a0ff35ee27b099a7a2d..93a4be91609f6483b3aab21ca263191b90c22415 100644 --- a/public/javascript/redmic/modules/form/Form.js +++ b/client-app/src/component/form/Form.js @@ -1,9 +1,9 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Module" - , "redmic/modules/base/_Show" - , "redmic/modules/model/ModelImpl" + , "src/component/base/_Module" + , "src/component/base/_Show" + , "src/component/model/ModelImpl" , "./_FormItfc" ], function( declare diff --git a/public/javascript/redmic/modules/form/FormContainerImpl.js b/client-app/src/component/form/FormContainerImpl.js similarity index 98% rename from public/javascript/redmic/modules/form/FormContainerImpl.js rename to client-app/src/component/form/FormContainerImpl.js index f9c6b22be5cfb11cc02077328f8bdb468d1ea96a..3336abc5f8259482e38c504f383c62b296428ad6 100644 --- a/public/javascript/redmic/modules/form/FormContainerImpl.js +++ b/client-app/src/component/form/FormContainerImpl.js @@ -4,7 +4,7 @@ define([ , "dojo/aspect" , "dojo/Deferred" , "dojo/promise/all" - , "redmic/form/FormContainer" + , "src/component/form/form/FormContainer" , "./Form" ], function( declare @@ -63,7 +63,7 @@ define([ if (!this.form) { this.form = new FormContainer(this.formContainerConfig); - this.form.placeAt(this._getNodeToShow()); + this.form.placeAt(this.getNodeToShow()); this.form.startup(); @@ -249,7 +249,7 @@ define([ this.status = isValid; }, - _getNodeToShow: function() { + getNodeToShow: function() { return this.domNode; }, diff --git a/public/javascript/redmic/modules/form/_BaseCreateKeypad.js b/client-app/src/component/form/_BaseCreateKeypad.js similarity index 100% rename from public/javascript/redmic/modules/form/_BaseCreateKeypad.js rename to client-app/src/component/form/_BaseCreateKeypad.js diff --git a/public/javascript/redmic/modules/form/_CreateInternalKeypad.js b/client-app/src/component/form/_CreateInternalKeypad.js similarity index 93% rename from public/javascript/redmic/modules/form/_CreateInternalKeypad.js rename to client-app/src/component/form/_CreateInternalKeypad.js index 97f934817eda7af4c55efe98597180af87f55df0..3063870cc8d9b7957ff0cce88a4ab0d171408a09 100644 --- a/public/javascript/redmic/modules/form/_CreateInternalKeypad.js +++ b/client-app/src/component/form/_CreateInternalKeypad.js @@ -2,8 +2,8 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "put-selector/put" - , "redmic/modules/form/_CreateKeypad" + , 'put-selector' + , "src/component/form/_CreateKeypad" ], function( declare , lang diff --git a/public/javascript/redmic/modules/form/_CreateKeypad.js b/client-app/src/component/form/_CreateKeypad.js similarity index 94% rename from public/javascript/redmic/modules/form/_CreateKeypad.js rename to client-app/src/component/form/_CreateKeypad.js index 34ab04967104d56fe68b5d087bc663e151c92432..b523ca2b457cef39817ed786db6578fbbcbff558 100644 --- a/public/javascript/redmic/modules/form/_CreateKeypad.js +++ b/client-app/src/component/form/_CreateKeypad.js @@ -2,9 +2,9 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , 'put-selector/put' - , "redmic/modules/components/Keypad/TrizoneKeypadImpl" - , "redmic/modules/form/_BaseCreateKeypad" + , 'put-selector' + , "src/component/components/Keypad/TrizoneKeypadImpl" + , "src/component/form/_BaseCreateKeypad" ], function( declare , lang @@ -68,7 +68,7 @@ define([ aspect.after(this, "_defineSubscriptions", lang.hitch(this, this._defineCreateKeypadSubscriptions)); aspect.after(this, "_definePublications", lang.hitch(this, this._defineCreateKeypadPublications)); aspect.after(this, "postCreate", lang.hitch(this, this._postCreateCreateKeypad)); - aspect.after(this, "_getNodeToShow", lang.hitch(this, this._getNodeToShowCreateKeypadAfter)); + aspect.after(this, "getNodeToShow", lang.hitch(this, this._getNodeToShowCreateKeypadAfter)); lang.mixin(this, this.config, args); }, diff --git a/public/javascript/redmic/modules/form/_FormItfc.js b/client-app/src/component/form/_FormItfc.js similarity index 95% rename from public/javascript/redmic/modules/form/_FormItfc.js rename to client-app/src/component/form/_FormItfc.js index 634b2abecd1762ea3e0977a805c59b6351975e93..e580ef92b583ba5253f0b8c60f41d9858fcba4cc 100644 --- a/public/javascript/redmic/modules/form/_FormItfc.js +++ b/client-app/src/component/form/_FormItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/public/javascript/redmic/modules/form/_ListenModelHasChanged.js b/client-app/src/component/form/_ListenModelHasChanged.js similarity index 100% rename from public/javascript/redmic/modules/form/_ListenModelHasChanged.js rename to client-app/src/component/form/_ListenModelHasChanged.js diff --git a/public/javascript/redmic/modules/form/_PublicateChanges.js b/client-app/src/component/form/_PublicateChanges.js similarity index 100% rename from public/javascript/redmic/modules/form/_PublicateChanges.js rename to client-app/src/component/form/_PublicateChanges.js diff --git a/public/javascript/redmic/modules/form/_ShowInTableList.js b/client-app/src/component/form/_ShowInTableList.js similarity index 97% rename from public/javascript/redmic/modules/form/_ShowInTableList.js rename to client-app/src/component/form/_ShowInTableList.js index 7ec46347c85292f5f0dba58bdeb2d27f592df8ef..0fd6b95542a0b122b90791d43ba07c60000de7ec 100644 --- a/public/javascript/redmic/modules/form/_ShowInTableList.js +++ b/client-app/src/component/form/_ShowInTableList.js @@ -4,8 +4,8 @@ define([ , "dojo/aspect" , "dojo/dom-class" , "dojo/query" - , "redmic/modules/form/_BaseCreateKeypad" - , "put-selector/put" + , "src/component/form/_BaseCreateKeypad" + , 'put-selector' ], function( lang , declare diff --git a/public/javascript/redmic/form/FormContainer.js b/client-app/src/component/form/form/FormContainer.js similarity index 87% rename from public/javascript/redmic/form/FormContainer.js rename to client-app/src/component/form/form/FormContainer.js index ff45c4520cf5aebf80bce8dee0ad0f3dedf9716b..10659d9d0ac81daf9cf479b2e76ce7b4f08f51c2 100644 --- a/public/javascript/redmic/form/FormContainer.js +++ b/client-app/src/component/form/form/FormContainer.js @@ -1,5 +1,5 @@ define([ - 'app/redmicConfig' + 'src/redmicConfig' , 'dijit/_TemplatedMixin' , 'dijit/_WidgetBase' , 'dojo/_base/declare' @@ -10,44 +10,44 @@ define([ , 'dojo/dom-class' , 'dojo/Evented' , 'dojo/query' - , 'put-selector/put' - , 'redmic/modules/form/input/_IgnoreNonexistentProperty' - , 'redmic/modules/form/input/_Dependence' - , 'redmic/modules/form/input/_DeleteOnClear' - , 'redmic/modules/form/input/_DisableInput' - - , 'redmic/modules/form/input/DateRangeTextBoxImpl' - , 'redmic/modules/form/input/MultiSelectImpl' - , 'redmic/modules/form/input/RangeImpl' - , 'redmic/modules/form/input/RadioButtonGroupImpl' - , 'redmic/modules/form/input/ValueAndUnitSelectorImpl' - , 'redmic/modules/form/input/CheckBoxImpl' - , 'redmic/modules/form/input/CheckBoxGroupImpl' - , 'redmic/modules/form/input/RadioButtonImpl' - , 'redmic/modules/form/input/TextBoxImpl' - , 'redmic/modules/form/input/NumberSpinnerImpl' - , 'redmic/modules/form/input/NumberTextBoxImpl' - , 'redmic/modules/form/input/SelectImpl' - , 'redmic/modules/form/input/RangeSliderImpl' - , 'redmic/modules/form/input/SliderImpl' - , 'redmic/modules/form/input/KeywordsImpl' - , 'redmic/modules/form/input/ColorPickerImpl' - , 'redmic/modules/form/input/ColorPickerTextBoxImpl' - , 'redmic/modules/form/input/FilteringSelectImpl' - , 'redmic/modules/form/input/DateTextBoxImpl' - , 'redmic/modules/form/input/DateTimeImpl' - , 'redmic/modules/form/input/DateTimeTextBoxImpl' - , 'redmic/modules/form/input/DateRangeImpl' - , 'redmic/modules/form/input/AnnotationImpl' - , 'redmic/modules/form/input/ColorsRampImpl' - , 'redmic/modules/form/input/ColorImpl' - , 'redmic/modules/form/input/SelectOnListPopupImpl' - , 'redmic/modules/form/input/ButtonImpl' - , 'redmic/modules/form/input/PointImpl' - , 'redmic/modules/form/input/UploadFileImpl' - , 'redmic/modules/form/input/TextAreaImpl' - , 'redmic/modules/form/input/GeometryImpl' - , 'redmic/modules/form/input/MapSearchImpl' + , 'put-selector' + , 'src/component/form/input/_IgnoreNonexistentProperty' + , 'src/component/form/input/_Dependence' + , 'src/component/form/input/_DeleteOnClear' + , 'src/component/form/input/_DisableInput' + + , 'src/component/form/input/DateRangeTextBoxImpl' + , 'src/component/form/input/MultiSelectImpl' + , 'src/component/form/input/RangeImpl' + , 'src/component/form/input/RadioButtonGroupImpl' + , 'src/component/form/input/ValueAndUnitSelectorImpl' + , 'src/component/form/input/CheckBoxImpl' + , 'src/component/form/input/CheckBoxGroupImpl' + , 'src/component/form/input/RadioButtonImpl' + , 'src/component/form/input/TextBoxImpl' + , 'src/component/form/input/NumberSpinnerImpl' + , 'src/component/form/input/NumberTextBoxImpl' + , 'src/component/form/input/SelectImpl' + , 'src/component/form/input/RangeSliderImpl' + , 'src/component/form/input/SliderImpl' + , 'src/component/form/input/KeywordsImpl' + , 'src/component/form/input/ColorPickerImpl' + , 'src/component/form/input/ColorPickerTextBoxImpl' + , 'src/component/form/input/FilteringSelectImpl' + , 'src/component/form/input/DateTextBoxImpl' + , 'src/component/form/input/DateTimeImpl' + , 'src/component/form/input/DateTimeTextBoxImpl' + , 'src/component/form/input/DateRangeImpl' + , 'src/component/form/input/AnnotationImpl' + , 'src/component/form/input/ColorsRampImpl' + , 'src/component/form/input/ColorImpl' + , 'src/component/form/input/SelectOnListPopupImpl' + , 'src/component/form/input/ButtonImpl' + , 'src/component/form/input/PointImpl' + , 'src/component/form/input/UploadFileImpl' + , 'src/component/form/input/TextAreaImpl' + , 'src/component/form/input/GeometryImpl' + , 'src/component/form/input/MapSearchImpl' , 'templates/SpeciesFilter' , 'templates/ProjectFilter' @@ -177,7 +177,15 @@ define([ if (this.dataTemplate) { this.templateString = this._getTemplate(); } else { - this.templatePath = require.toUrl('app/' + this.template + 'Form.html'); + var templatePathPrefix = '', + templatePathSuffix = 'Form.html'; + + // TODO parche para compatibilidad con antiguas rutas parciales, las nuevas ya han de empezar con 'src/' + if (this.template.indexOf('src/') !== 0) { + templatePathPrefix = 'app/'; + } + + this.templatePath = require.toUrl(templatePathPrefix + this.template + templatePathSuffix); } }, diff --git a/public/javascript/redmic/form/Select.js b/client-app/src/component/form/form/Select.js similarity index 98% rename from public/javascript/redmic/form/Select.js rename to client-app/src/component/form/form/Select.js index 1122d25b32a339dd15f453634c7ccc4a9a67c1b3..519bd7be90bd0b63fb9b18d62fdb9fb948b05770 100644 --- a/public/javascript/redmic/form/Select.js +++ b/client-app/src/component/form/form/Select.js @@ -14,11 +14,11 @@ define([ // Widget para sobreescribir dijit/form/Select. // description: // Cambiamos la plantilla para dejar de usar tablas y demás morralla. - // + // // Author: Pedro E. Trujillo Brito //
// Last update: 26/11/2014 - Pedro - // + // // config: Object // Opciones y asignaciones por defecto. diff --git a/public/javascript/redmic/form/UploadInput.js b/client-app/src/component/form/form/UploadInput.js similarity index 98% rename from public/javascript/redmic/form/UploadInput.js rename to client-app/src/component/form/form/UploadInput.js index 94d2224c41433bc2a68de90800a1a1ed34a00cb3..14f169716938030bc2cb207be337b07676ffd0e0 100644 --- a/public/javascript/redmic/form/UploadInput.js +++ b/client-app/src/component/form/form/UploadInput.js @@ -1,6 +1,6 @@ define([ - 'alertify/alertify.min' - , 'app/redmicConfig' + 'alertify' + , 'src/redmicConfig' , 'dijit/_TemplatedMixin' , 'dijit/_WidgetBase' , 'dojo/_base/declare' @@ -9,10 +9,10 @@ define([ , 'dojo/Evented' , 'dojo/i18n!./nls/UploadInput' , 'dojo/text!./templates/UploadInput.html' - , 'put-selector/put' - , 'redmic/base/Credentials' + , 'put-selector' + , 'src/util/Credentials' - , 'dropzone/dropzone-amd-module.min' + , 'dropzone' ], function( alertify , redmicConfig diff --git a/public/javascript/redmic/form/nls/UploadInput.js b/client-app/src/component/form/form/nls/UploadInput.js similarity index 100% rename from public/javascript/redmic/form/nls/UploadInput.js rename to client-app/src/component/form/form/nls/UploadInput.js diff --git a/public/javascript/redmic/form/nls/es/UploadInput.js b/client-app/src/component/form/form/nls/es/UploadInput.js similarity index 100% rename from public/javascript/redmic/form/nls/es/UploadInput.js rename to client-app/src/component/form/form/nls/es/UploadInput.js diff --git a/public/javascript/redmic/form/templates/Select.html b/client-app/src/component/form/form/templates/Select.html similarity index 100% rename from public/javascript/redmic/form/templates/Select.html rename to client-app/src/component/form/form/templates/Select.html diff --git a/public/javascript/redmic/form/templates/UploadInput.html b/client-app/src/component/form/form/templates/UploadInput.html similarity index 100% rename from public/javascript/redmic/form/templates/UploadInput.html rename to client-app/src/component/form/form/templates/UploadInput.html diff --git a/public/javascript/redmic/modules/form/input/AnnotationImpl.js b/client-app/src/component/form/input/AnnotationImpl.js similarity index 91% rename from public/javascript/redmic/modules/form/input/AnnotationImpl.js rename to client-app/src/component/form/input/AnnotationImpl.js index 1f81b46a88088ab172c5b4c1842c8666e85b4611..3809b24724a912f2ee7577a81e0d716f189d04fe 100644 --- a/public/javascript/redmic/modules/form/input/AnnotationImpl.js +++ b/client-app/src/component/form/input/AnnotationImpl.js @@ -1,8 +1,8 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "put-selector/put" - , "redmic/modules/form/input/Input" + , 'put-selector' + , "src/component/form/input/Input" ], function( declare , lang @@ -47,4 +47,4 @@ define([ } }); -}); \ No newline at end of file +}); diff --git a/public/javascript/redmic/modules/form/input/ButtonImpl.js b/client-app/src/component/form/input/ButtonImpl.js similarity index 91% rename from public/javascript/redmic/modules/form/input/ButtonImpl.js rename to client-app/src/component/form/input/ButtonImpl.js index a1bb4899b251b7f9d61827b34d1ddfb4c2adaa50..8c22849272ccb53ac503df53e736895605fc247e 100644 --- a/public/javascript/redmic/modules/form/input/ButtonImpl.js +++ b/client-app/src/component/form/input/ButtonImpl.js @@ -2,7 +2,7 @@ define([ "dijit/form/Button" , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/form/input/Input" + , "src/component/form/input/Input" ], function( Button , declare @@ -27,4 +27,4 @@ define([ return new Button(this._inputProps).placeAt(this.containerInput); } }); -}); \ No newline at end of file +}); diff --git a/public/javascript/redmic/modules/form/input/CheckBoxGroupImpl.js b/client-app/src/component/form/input/CheckBoxGroupImpl.js similarity index 98% rename from public/javascript/redmic/modules/form/input/CheckBoxGroupImpl.js rename to client-app/src/component/form/input/CheckBoxGroupImpl.js index c6cb718f9b35e42de089c63fa42a7e42c6375aad..aa5c39c544e02f452ab019ab18a99266ba0f7e2e 100644 --- a/public/javascript/redmic/modules/form/input/CheckBoxGroupImpl.js +++ b/client-app/src/component/form/input/CheckBoxGroupImpl.js @@ -2,8 +2,8 @@ define([ "dijit/form/CheckBox" , "dojo/_base/declare" , "dojo/_base/lang" - , "put-selector/put" - , "redmic/modules/form/input/Input" + , 'put-selector' + , "src/component/form/input/Input" , "RWidgets/Utilities" ], function( CheckBox @@ -211,4 +211,4 @@ define([ } } }); -}); \ No newline at end of file +}); diff --git a/public/javascript/redmic/modules/form/input/CheckBoxImpl.js b/client-app/src/component/form/input/CheckBoxImpl.js similarity index 95% rename from public/javascript/redmic/modules/form/input/CheckBoxImpl.js rename to client-app/src/component/form/input/CheckBoxImpl.js index 773bfbb37ed0cd6f3c11d9ec83bd78a8ee38519b..0757841ea1004777d2dd035563460d08345d3ba2 100644 --- a/public/javascript/redmic/modules/form/input/CheckBoxImpl.js +++ b/client-app/src/component/form/input/CheckBoxImpl.js @@ -2,8 +2,8 @@ define([ "dijit/form/CheckBox" , "dojo/_base/declare" , "dojo/_base/lang" - , "put-selector/put" - , "redmic/modules/form/input/Input" + , 'put-selector' + , "src/component/form/input/Input" ], function( CheckBox , declare diff --git a/public/javascript/redmic/modules/form/input/ColorImpl.js b/client-app/src/component/form/input/ColorImpl.js similarity index 88% rename from public/javascript/redmic/modules/form/input/ColorImpl.js rename to client-app/src/component/form/input/ColorImpl.js index 445a5b8824cd587a6fd7f04a46c4d4753f3a01d0..ef909ad41294bc9857d05c66041f7b4531243a02 100644 --- a/public/javascript/redmic/modules/form/input/ColorImpl.js +++ b/client-app/src/component/form/input/ColorImpl.js @@ -1,9 +1,9 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "put-selector/put" - , "redmic/modules/form/input/ColorPickerImpl" - , "redmic/modules/form/input/_BaseTextBoxWidthExpandTooltipImpl" + , 'put-selector' + , "src/component/form/input/ColorPickerImpl" + , "src/component/form/input/_BaseTextBoxWidthExpandTooltipImpl" ], function( declare , lang diff --git a/public/javascript/redmic/modules/form/input/ColorPickerImpl.js b/client-app/src/component/form/input/ColorPickerImpl.js similarity index 95% rename from public/javascript/redmic/modules/form/input/ColorPickerImpl.js rename to client-app/src/component/form/input/ColorPickerImpl.js index ab1d475b04677402a12d0b5e9c5451af394d0c2e..92c37298d99ca2b02a589bda0eb8a65fdee4ff31 100644 --- a/public/javascript/redmic/modules/form/input/ColorPickerImpl.js +++ b/client-app/src/component/form/input/ColorPickerImpl.js @@ -3,7 +3,7 @@ define([ , "dojo/_base/lang" , "dojo/aspect" , "dojox/widget/ColorPicker" - , "redmic/modules/form/input/Input" + , "src/component/form/input/Input" ], function( declare , lang @@ -45,4 +45,4 @@ define([ this._inputInstance.setColor(obj[this.propertyName]); } }); -}); \ No newline at end of file +}); diff --git a/public/javascript/redmic/modules/form/input/ColorPickerTextBoxImpl.js b/client-app/src/component/form/input/ColorPickerTextBoxImpl.js similarity index 89% rename from public/javascript/redmic/modules/form/input/ColorPickerTextBoxImpl.js rename to client-app/src/component/form/input/ColorPickerTextBoxImpl.js index 2a656d7554fbe865697fec7ab95dd4552f0adba7..42f718567ecccac2631496a4506ddf68af699786 100644 --- a/public/javascript/redmic/modules/form/input/ColorPickerTextBoxImpl.js +++ b/client-app/src/component/form/input/ColorPickerTextBoxImpl.js @@ -1,9 +1,9 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "put-selector/put" - , "redmic/modules/form/input/ColorPickerImpl" - , "redmic/modules/form/input/_BaseTextBoxWidthExpandTooltipImpl" + , 'put-selector' + , "src/component/form/input/ColorPickerImpl" + , "src/component/form/input/_BaseTextBoxWidthExpandTooltipImpl" ], function( declare , lang diff --git a/public/javascript/redmic/modules/form/input/ColorsRampImpl.js b/client-app/src/component/form/input/ColorsRampImpl.js similarity index 97% rename from public/javascript/redmic/modules/form/input/ColorsRampImpl.js rename to client-app/src/component/form/input/ColorsRampImpl.js index fd0c14186680ad0ba83615f7e05b880b1ab2d37d..705252f6112fa7d0c4636a234be4aad3918bfe3e 100644 --- a/public/javascript/redmic/modules/form/input/ColorsRampImpl.js +++ b/client-app/src/component/form/input/ColorsRampImpl.js @@ -2,10 +2,11 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "put-selector/put" - , "redmic/modules/form/input/_BaseMultiSelectImpl" + , 'put-selector' + , "src/component/form/input/_BaseMultiSelectImpl" , "templates/FilterColorRamp" - , 'colorjs/color' + + , 'colorjs' ], function( declare , lang @@ -188,4 +189,4 @@ define([ this._setValue(value); } }); -}); \ No newline at end of file +}); diff --git a/public/javascript/redmic/modules/form/input/DateRangeComplexImpl.js b/client-app/src/component/form/input/DateRangeComplexImpl.js similarity index 98% rename from public/javascript/redmic/modules/form/input/DateRangeComplexImpl.js rename to client-app/src/component/form/input/DateRangeComplexImpl.js index 7cf5f7319ce0ea9c819bc491a98dce89cabd89c3..88b97209059e34378691228d95e4933268a4ce17 100644 --- a/public/javascript/redmic/modules/form/input/DateRangeComplexImpl.js +++ b/client-app/src/component/form/input/DateRangeComplexImpl.js @@ -2,13 +2,13 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , 'moment/moment.min' - , "put-selector/put" - , "redmic/modules/components/Keypad/TrizoneKeypadImpl" - , "redmic/modules/form/input/_Dependence" - , "redmic/modules/form/input/DateTimeImpl" - , "redmic/modules/form/input/Input" - , "redmic/modules/form/input/TextBoxImpl" + , 'moment' + , 'put-selector' + , "src/component/components/Keypad/TrizoneKeypadImpl" + , "src/component/form/input/_Dependence" + , "src/component/form/input/DateTimeImpl" + , "src/component/form/input/Input" + , "src/component/form/input/TextBoxImpl" ], function( declare , lang diff --git a/public/javascript/redmic/modules/form/input/DateRangeImpl.js b/client-app/src/component/form/input/DateRangeImpl.js similarity index 93% rename from public/javascript/redmic/modules/form/input/DateRangeImpl.js rename to client-app/src/component/form/input/DateRangeImpl.js index d0b1ca697342c5dd8c26bf0d0b35e46d3938b26b..88c5f246f922284a4a0ec6df4f846f7fd5c06843 100644 --- a/public/javascript/redmic/modules/form/input/DateRangeImpl.js +++ b/client-app/src/component/form/input/DateRangeImpl.js @@ -1,8 +1,8 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/form/input/DateTimeTextBoxImpl" - , "redmic/modules/form/input/_BaseRange" + , "src/component/form/input/DateTimeTextBoxImpl" + , "src/component/form/input/_BaseRange" ], function( declare , lang diff --git a/public/javascript/redmic/modules/form/input/DateRangeTextBoxImpl.js b/client-app/src/component/form/input/DateRangeTextBoxImpl.js similarity index 93% rename from public/javascript/redmic/modules/form/input/DateRangeTextBoxImpl.js rename to client-app/src/component/form/input/DateRangeTextBoxImpl.js index edbf45873d0005cc24652011611f381beae24fd2..35b4ee3b24cb1f47e1a99c92681c5fed9daf9a9b 100644 --- a/public/javascript/redmic/modules/form/input/DateRangeTextBoxImpl.js +++ b/client-app/src/component/form/input/DateRangeTextBoxImpl.js @@ -1,9 +1,9 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , 'moment/moment.min' - , "redmic/modules/form/input/DateRangeComplexImpl" - , "redmic/modules/form/input/_BaseTextBoxWidthExpandTooltipImpl" + , 'moment' + , "src/component/form/input/DateRangeComplexImpl" + , "src/component/form/input/_BaseTextBoxWidthExpandTooltipImpl" , "RWidgets/Utilities" ], function( declare diff --git a/public/javascript/redmic/modules/form/input/DateTextBoxImpl.js b/client-app/src/component/form/input/DateTextBoxImpl.js similarity index 93% rename from public/javascript/redmic/modules/form/input/DateTextBoxImpl.js rename to client-app/src/component/form/input/DateTextBoxImpl.js index e29c3c2d4890c10075c45bd30a50550713d98635..2a4e6bfc94f6546ee3da0f9b7ef73d0dc0faa551 100644 --- a/public/javascript/redmic/modules/form/input/DateTextBoxImpl.js +++ b/client-app/src/component/form/input/DateTextBoxImpl.js @@ -2,7 +2,7 @@ define([ "dijit/form/DateTextBox" , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/form/input/Input" + , "src/component/form/input/Input" ], function( DateTextBox , declare @@ -31,4 +31,4 @@ define([ return new DateTextBox(this._inputProps).placeAt(this.containerInput); } }); -}); \ No newline at end of file +}); diff --git a/public/javascript/redmic/modules/form/input/DateTimeImpl.js b/client-app/src/component/form/input/DateTimeImpl.js similarity index 95% rename from public/javascript/redmic/modules/form/input/DateTimeImpl.js rename to client-app/src/component/form/input/DateTimeImpl.js index bef94f739b1691e421b70f7f72aeb2e9302220e1..8daccc437bf4b99398973f593e7e34a20f0cc3d1 100644 --- a/public/javascript/redmic/modules/form/input/DateTimeImpl.js +++ b/client-app/src/component/form/input/DateTimeImpl.js @@ -3,10 +3,10 @@ define([ , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , 'moment/moment.min' - , "put-selector/put" - , "redmic/modules/form/input/_BaseDateTime" - , "redmic/modules/form/input/Input" + , 'moment' + , 'put-selector' + , "src/component/form/input/_BaseDateTime" + , "src/component/form/input/Input" , "RWidgets/TimeSelect" ], function( Calendar diff --git a/public/javascript/redmic/modules/form/input/DateTimeTextBoxImpl.js b/client-app/src/component/form/input/DateTimeTextBoxImpl.js similarity index 96% rename from public/javascript/redmic/modules/form/input/DateTimeTextBoxImpl.js rename to client-app/src/component/form/input/DateTimeTextBoxImpl.js index b20fe614104301bc18206d47ac5bb4104371cbce..42194216280e8db1401fe9c344530737f7fe1b15 100644 --- a/public/javascript/redmic/modules/form/input/DateTimeTextBoxImpl.js +++ b/client-app/src/component/form/input/DateTimeTextBoxImpl.js @@ -2,10 +2,10 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , 'moment/moment.min' - , "redmic/modules/form/input/DateTimeImpl" - , "redmic/modules/form/input/_BaseDateTime" - , "redmic/modules/form/input/_BaseTextBoxWidthExpandTooltipImpl" + , 'moment' + , "src/component/form/input/DateTimeImpl" + , "src/component/form/input/_BaseDateTime" + , "src/component/form/input/_BaseTextBoxWidthExpandTooltipImpl" ], function( declare , lang diff --git a/public/javascript/redmic/modules/form/input/FilteringSelectImpl.js b/client-app/src/component/form/input/FilteringSelectImpl.js similarity index 99% rename from public/javascript/redmic/modules/form/input/FilteringSelectImpl.js rename to client-app/src/component/form/input/FilteringSelectImpl.js index 7ba4897a5b9cb4a3ad9dc4bee78d875057621dda..84a6354f1a0a467df3613879ec4b01ae86f84607 100644 --- a/public/javascript/redmic/modules/form/input/FilteringSelectImpl.js +++ b/client-app/src/component/form/input/FilteringSelectImpl.js @@ -1,8 +1,8 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Store" - , "redmic/modules/form/input/Input" + , "src/component/base/_Store" + , "src/component/form/input/Input" , "RWidgets/FilteringSelect" ], function( declare diff --git a/public/javascript/redmic/modules/form/input/GeographicCoordinatesComponentImpl.js b/client-app/src/component/form/input/GeographicCoordinatesComponentImpl.js similarity index 99% rename from public/javascript/redmic/modules/form/input/GeographicCoordinatesComponentImpl.js rename to client-app/src/component/form/input/GeographicCoordinatesComponentImpl.js index 969fef1a1e6065f9406036ae763dd9df2a741d9b..30acebec35d0cd15e64a63d15e377781d77292b1 100644 --- a/public/javascript/redmic/modules/form/input/GeographicCoordinatesComponentImpl.js +++ b/client-app/src/component/form/input/GeographicCoordinatesComponentImpl.js @@ -3,7 +3,7 @@ define([ , "dojo/_base/declare" , "dojo/_base/lang" , "RWidgets/Utilities" - , "redmic/modules/form/input/Input" + , "src/component/form/input/Input" , "RWidgets/Converter" ], function( NumberTextBox diff --git a/public/javascript/redmic/modules/form/input/GeometryImpl.js b/client-app/src/component/form/input/GeometryImpl.js similarity index 96% rename from public/javascript/redmic/modules/form/input/GeometryImpl.js rename to client-app/src/component/form/input/GeometryImpl.js index e5890eb21add7c70950fdc92f7c0ac4f126012c0..c5cb195198b6f693fffbf942ecf62e784f528c74 100644 --- a/public/javascript/redmic/modules/form/input/GeometryImpl.js +++ b/client-app/src/component/form/input/GeometryImpl.js @@ -1,11 +1,11 @@ define([ - 'app/redmicConfig' + 'src/redmicConfig' , 'dijit/form/Textarea' , 'dojo/_base/declare' , 'dojo/_base/lang' - , 'put-selector/put' - , 'redmic/form/UploadInput' - , 'redmic/modules/form/input/Input' + , 'put-selector' + , 'src/component/form/form/UploadInput' + , 'src/component/form/input/Input' ], function( redmicConfig , Textarea diff --git a/public/javascript/redmic/modules/form/input/Input.js b/client-app/src/component/form/input/Input.js similarity index 99% rename from public/javascript/redmic/modules/form/input/Input.js rename to client-app/src/component/form/input/Input.js index 1609514dc66e9f92a83e9b3bec1412f4fb08b38a..064b0e92890c1435367f62625eb501ff1db4b12d 100644 --- a/public/javascript/redmic/modules/form/input/Input.js +++ b/client-app/src/component/form/input/Input.js @@ -1,11 +1,11 @@ define([ - 'app/redmicConfig' + 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" , "dojo/Deferred" - , "redmic/modules/base/_Module" - , "redmic/modules/base/_Show" + , "src/component/base/_Module" + , "src/component/base/_Show" , "./_NodesCreation" , "./_InputItfc" ], function( @@ -567,7 +567,7 @@ define([ this._emitEvt('SUBMITTED', obj); }, - _getNodeToShow: function() { + getNodeToShow: function() { return this.domNode; } diff --git a/public/javascript/redmic/modules/form/input/KeywordsImpl.js b/client-app/src/component/form/input/KeywordsImpl.js similarity index 95% rename from public/javascript/redmic/modules/form/input/KeywordsImpl.js rename to client-app/src/component/form/input/KeywordsImpl.js index 0d9b26ab6c691f55b58df8be3b478b84774c2db3..eb925dcee40573a736597fb7e7a341e4ddea1dda 100644 --- a/public/javascript/redmic/modules/form/input/KeywordsImpl.js +++ b/client-app/src/component/form/input/KeywordsImpl.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/form/input/Input" + , "src/component/form/input/Input" , "RWidgets/KeywordsInput" ], function( declare @@ -48,4 +48,4 @@ define([ this._enable(); } }); -}); \ No newline at end of file +}); diff --git a/public/javascript/redmic/modules/form/input/MapSearchImpl.js b/client-app/src/component/form/input/MapSearchImpl.js similarity index 93% rename from public/javascript/redmic/modules/form/input/MapSearchImpl.js rename to client-app/src/component/form/input/MapSearchImpl.js index fb6fdb0d945e1ca0d1dc4c79a7928a1f55d61f64..a8b1dacab74507f930d6e2949dd331fca943860a 100644 --- a/public/javascript/redmic/modules/form/input/MapSearchImpl.js +++ b/client-app/src/component/form/input/MapSearchImpl.js @@ -1,8 +1,8 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/form/input/Input" - , "redmic/modules/search/GeographicImpl" + , "src/component/form/input/Input" + , "src/component/search/GeographicImpl" ], function( declare , lang diff --git a/public/javascript/redmic/modules/form/input/MultiSelectImpl.js b/client-app/src/component/form/input/MultiSelectImpl.js similarity index 96% rename from public/javascript/redmic/modules/form/input/MultiSelectImpl.js rename to client-app/src/component/form/input/MultiSelectImpl.js index ba488961c82d6eaf3775edbaabad118208fde6db..5d8912102735782ada0d26d58072383cee6c9449 100644 --- a/public/javascript/redmic/modules/form/input/MultiSelectImpl.js +++ b/client-app/src/component/form/input/MultiSelectImpl.js @@ -2,7 +2,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "RWidgets/Utilities" - , "redmic/modules/form/input/_BaseMultiSelectImpl" + , "src/component/form/input/_BaseMultiSelectImpl" ], function( declare , lang @@ -78,4 +78,4 @@ define([ this._status(obj); } }); -}); \ No newline at end of file +}); diff --git a/public/javascript/redmic/modules/form/input/NumberSpinnerImpl.js b/client-app/src/component/form/input/NumberSpinnerImpl.js similarity index 95% rename from public/javascript/redmic/modules/form/input/NumberSpinnerImpl.js rename to client-app/src/component/form/input/NumberSpinnerImpl.js index be704bbac850c2382bd4897493c87e1b1a35fff3..31b89af8a96bf3c10c0f96820c3876bb5c7dfeda 100644 --- a/public/javascript/redmic/modules/form/input/NumberSpinnerImpl.js +++ b/client-app/src/component/form/input/NumberSpinnerImpl.js @@ -2,7 +2,7 @@ define([ "dijit/form/NumberSpinner" , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/form/input/Input" + , "src/component/form/input/Input" ], function( NumberSpinner , declare diff --git a/public/javascript/redmic/modules/form/input/NumberTextBoxImpl.js b/client-app/src/component/form/input/NumberTextBoxImpl.js similarity index 96% rename from public/javascript/redmic/modules/form/input/NumberTextBoxImpl.js rename to client-app/src/component/form/input/NumberTextBoxImpl.js index 463d6f7e1e5db74ba0efcf73939f846a07a7d646..8b4c574f6ffabaa8a968d1d0ce63ff07880fb6cd 100644 --- a/public/javascript/redmic/modules/form/input/NumberTextBoxImpl.js +++ b/client-app/src/component/form/input/NumberTextBoxImpl.js @@ -2,7 +2,7 @@ define([ "dijit/form/NumberTextBox" , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/form/input/Input" + , "src/component/form/input/Input" ], function( NumberTextBox , declare diff --git a/public/javascript/redmic/modules/form/input/PointImpl.js b/client-app/src/component/form/input/PointImpl.js similarity index 98% rename from public/javascript/redmic/modules/form/input/PointImpl.js rename to client-app/src/component/form/input/PointImpl.js index 44851255b3d16ac2b911aeb20ca85e36bbcdaa06..a3040441d25cf434a4d7fe66b798206ac67be8eb 100644 --- a/public/javascript/redmic/modules/form/input/PointImpl.js +++ b/client-app/src/component/form/input/PointImpl.js @@ -5,12 +5,12 @@ define([ , "dojo/_base/lang" , "dojo/number" , "dojo/store/Memory" - , "put-selector/put" + , 'put-selector' , "RWidgets/Utilities" - , "redmic/modules/form/input/GeographicCoordinatesComponentImpl" - , "redmic/modules/form/input/Input" - , "redmic/modules/form/input/NumberSpinnerImpl" - , "redmic/modules/model/ModelImpl" + , "src/component/form/input/GeographicCoordinatesComponentImpl" + , "src/component/form/input/Input" + , "src/component/form/input/NumberSpinnerImpl" + , "src/component/model/ModelImpl" , "RWidgets/Converter" ], function( Button diff --git a/public/javascript/redmic/modules/form/input/RadioButtonGroupImpl.js b/client-app/src/component/form/input/RadioButtonGroupImpl.js similarity index 98% rename from public/javascript/redmic/modules/form/input/RadioButtonGroupImpl.js rename to client-app/src/component/form/input/RadioButtonGroupImpl.js index c010aa2909264920c62388f41b372a1991218185..d895f032a06664cf704b007581db4133ce04eff2 100644 --- a/public/javascript/redmic/modules/form/input/RadioButtonGroupImpl.js +++ b/client-app/src/component/form/input/RadioButtonGroupImpl.js @@ -2,8 +2,8 @@ define([ "dijit/form/RadioButton" , "dojo/_base/declare" , "dojo/_base/lang" - , "put-selector/put" - , "redmic/modules/form/input/Input" + , 'put-selector' + , "src/component/form/input/Input" ], function( RadioButton , declare @@ -165,4 +165,4 @@ define([ } } }); -}); \ No newline at end of file +}); diff --git a/public/javascript/redmic/modules/form/input/RadioButtonImpl.js b/client-app/src/component/form/input/RadioButtonImpl.js similarity index 92% rename from public/javascript/redmic/modules/form/input/RadioButtonImpl.js rename to client-app/src/component/form/input/RadioButtonImpl.js index 9a8818f7a92dee73893dbd40c4cca683cf1654e3..6b38dc5dc7f0550336ed240889c34287006ecace 100644 --- a/public/javascript/redmic/modules/form/input/RadioButtonImpl.js +++ b/client-app/src/component/form/input/RadioButtonImpl.js @@ -2,8 +2,8 @@ define([ "dijit/form/RadioButton" , "dojo/_base/declare" , "dojo/_base/lang" - , "put-selector/put" - , "redmic/modules/form/input/Input" + , 'put-selector' + , "src/component/form/input/Input" ], function( RadioButton , declare @@ -40,4 +40,4 @@ define([ return widget; } }); -}); \ No newline at end of file +}); diff --git a/public/javascript/redmic/modules/form/input/RangeImpl.js b/client-app/src/component/form/input/RangeImpl.js similarity index 88% rename from public/javascript/redmic/modules/form/input/RangeImpl.js rename to client-app/src/component/form/input/RangeImpl.js index 5db5ea9b3b474a5e726460b30ba902fb2dc365b6..8af0a88adbc291513a49107e3995e9838ff6cc12 100644 --- a/public/javascript/redmic/modules/form/input/RangeImpl.js +++ b/client-app/src/component/form/input/RangeImpl.js @@ -1,9 +1,9 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/form/input/NumberSpinnerImpl" - , "redmic/modules/form/input/NumberTextBoxImpl" - , "redmic/modules/form/input/_BaseRange" + , "src/component/form/input/NumberSpinnerImpl" + , "src/component/form/input/NumberTextBoxImpl" + , "src/component/form/input/_BaseRange" ], function( declare , lang diff --git a/public/javascript/redmic/modules/form/input/RangeSliderImpl.js b/client-app/src/component/form/input/RangeSliderImpl.js similarity index 96% rename from public/javascript/redmic/modules/form/input/RangeSliderImpl.js rename to client-app/src/component/form/input/RangeSliderImpl.js index 9cab500f032294cd6c3783cfe24e8295d1cc02a7..e2afb5962129aa8744171cf2989443a43ed8f0c9 100644 --- a/public/javascript/redmic/modules/form/input/RangeSliderImpl.js +++ b/client-app/src/component/form/input/RangeSliderImpl.js @@ -2,7 +2,7 @@ define([ "RWidgets/RangeSlider" , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/form/input/Input" + , "src/component/form/input/Input" ], function( RangeSlider , declare @@ -56,4 +56,4 @@ define([ this._emitChanged(value); } }); -}); \ No newline at end of file +}); diff --git a/public/javascript/redmic/modules/form/input/SelectImpl.js b/client-app/src/component/form/input/SelectImpl.js similarity index 97% rename from public/javascript/redmic/modules/form/input/SelectImpl.js rename to client-app/src/component/form/input/SelectImpl.js index ec378c27a875542a87b8bd94c59dfb4088ae7356..dde706e13700a3d86d47108cdf7ad730d1e89592 100644 --- a/public/javascript/redmic/modules/form/input/SelectImpl.js +++ b/client-app/src/component/form/input/SelectImpl.js @@ -1,12 +1,12 @@ define([ - "app/redmicConfig" + 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" , "RWidgets/Utilities" - , "redmic/form/Select" - , "redmic/modules/base/_Store" - , "redmic/modules/form/input/Input" + , "src/component/form/form/Select" + , "src/component/base/_Store" + , "src/component/form/input/Input" ], function( redmicConfig , declare @@ -38,6 +38,7 @@ define([ labelKeyPropertyName: "labelKey", propertyName: "name", includeEmptyValue: true, + emptyValueLabel: ' ', resetValue: false, pathSeparator: '.', _items: {} @@ -195,7 +196,7 @@ define([ if (this.includeEmptyValue) { options.push({ value: null, - label: ' ', + label: this.emptyValueLabel, selected: true }); } diff --git a/public/javascript/redmic/modules/form/input/SelectOnListPopupImpl.js b/client-app/src/component/form/input/SelectOnListPopupImpl.js similarity index 94% rename from public/javascript/redmic/modules/form/input/SelectOnListPopupImpl.js rename to client-app/src/component/form/input/SelectOnListPopupImpl.js index 7c4c43f6d33095b5e8a776ea7858e7b00910a790..223f4f649029ad503136304c0f3aeb6947ba228e 100644 --- a/public/javascript/redmic/modules/form/input/SelectOnListPopupImpl.js +++ b/client-app/src/component/form/input/SelectOnListPopupImpl.js @@ -4,11 +4,11 @@ define([ , "app/designs/textSearchList/layout/BasicTopZone" , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_ShowInPopup" - , "redmic/modules/form/input/_SelectOnPopupImpl" - , "redmic/modules/browser/_ButtonsInRow" - , "redmic/modules/browser/_HierarchicalSelect" - , "redmic/modules/browser/HierarchicalImpl" + , "src/component/base/_ShowInPopup" + , "src/component/form/input/_SelectOnPopupImpl" + , "src/component/browser/_ButtonsInRow" + , "src/component/browser/_HierarchicalSelect" + , "src/component/browser/HierarchicalImpl" ], function( _LocalSelectionView , Controller diff --git a/public/javascript/redmic/modules/form/input/SliderImpl.js b/client-app/src/component/form/input/SliderImpl.js similarity index 95% rename from public/javascript/redmic/modules/form/input/SliderImpl.js rename to client-app/src/component/form/input/SliderImpl.js index 05d23aa5974ac0ef1c230fde7f27ebe73e95705d..21e5f3ebb684b69827bd4e43eac62f9c262c0c73 100644 --- a/public/javascript/redmic/modules/form/input/SliderImpl.js +++ b/client-app/src/component/form/input/SliderImpl.js @@ -2,7 +2,7 @@ define([ "RWidgets/Slider" , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/form/input/Input" + , "src/component/form/input/Input" ], function( Slider , declare @@ -45,4 +45,4 @@ define([ this._emitChanged(value); } }); -}); \ No newline at end of file +}); diff --git a/public/javascript/redmic/modules/form/input/TextAreaImpl.js b/client-app/src/component/form/input/TextAreaImpl.js similarity index 92% rename from public/javascript/redmic/modules/form/input/TextAreaImpl.js rename to client-app/src/component/form/input/TextAreaImpl.js index c34a063ec283c6411e3934007cd72ade281205cf..8f003d65101ea6dddb749b985954509357d12950 100644 --- a/public/javascript/redmic/modules/form/input/TextAreaImpl.js +++ b/client-app/src/component/form/input/TextAreaImpl.js @@ -2,7 +2,7 @@ define([ "dijit/form/Textarea" , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/form/input/Input" + , "src/component/form/input/Input" ], function( Textarea , declare @@ -28,4 +28,4 @@ define([ return new Textarea(this._inputProps).placeAt(this.containerInput); } }); -}); \ No newline at end of file +}); diff --git a/public/javascript/redmic/modules/form/input/TextBoxImpl.js b/client-app/src/component/form/input/TextBoxImpl.js similarity index 92% rename from public/javascript/redmic/modules/form/input/TextBoxImpl.js rename to client-app/src/component/form/input/TextBoxImpl.js index 42ace79182ff604a6622aad98eff4b6d2ad5d90f..f9b5f9fd78c333f3d6ae6133daa60ab93d816284 100644 --- a/public/javascript/redmic/modules/form/input/TextBoxImpl.js +++ b/client-app/src/component/form/input/TextBoxImpl.js @@ -2,7 +2,7 @@ define([ "dijit/form/ValidationTextBox" , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/form/input/Input" + , "src/component/form/input/Input" ], function( ValidationTextBox , declare @@ -28,4 +28,4 @@ define([ return new ValidationTextBox(this._inputProps).placeAt(this.containerInput); } }); -}); \ No newline at end of file +}); diff --git a/public/javascript/redmic/modules/form/input/UploadFileImpl.js b/client-app/src/component/form/input/UploadFileImpl.js similarity index 96% rename from public/javascript/redmic/modules/form/input/UploadFileImpl.js rename to client-app/src/component/form/input/UploadFileImpl.js index cb6cbe733aa1ef692c9f0662ec3394de2019b0f9..9c5c3744e7c05ae2e6732e3e54ae6c314521e6dd 100644 --- a/public/javascript/redmic/modules/form/input/UploadFileImpl.js +++ b/client-app/src/component/form/input/UploadFileImpl.js @@ -3,10 +3,10 @@ define([ , 'dojo/_base/lang' , 'dojo/Deferred' , 'dojo/on' - , 'redmic/base/Credentials' - , 'redmic/form/UploadInput' - , 'redmic/modules/form/input/Input' - , 'redmic/validation/stringFormats' + , 'src/util/Credentials' + , 'src/component/form/form/UploadInput' + , 'src/component/form/input/Input' + , 'src/util/stringFormats' , 'RWidgets/Utilities' ], function( declare @@ -219,4 +219,4 @@ define([ this._enable(); } }); -}); \ No newline at end of file +}); diff --git a/public/javascript/redmic/modules/form/input/ValueAndUnitSelectorImpl.js b/client-app/src/component/form/input/ValueAndUnitSelectorImpl.js similarity index 96% rename from public/javascript/redmic/modules/form/input/ValueAndUnitSelectorImpl.js rename to client-app/src/component/form/input/ValueAndUnitSelectorImpl.js index eeccd6b0666e5672816320be03208bb7f6576ad7..7ea5442993a95fc13a9ecc4566a982f2c32c7035 100644 --- a/public/javascript/redmic/modules/form/input/ValueAndUnitSelectorImpl.js +++ b/client-app/src/component/form/input/ValueAndUnitSelectorImpl.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/form/input/Input" + , "src/component/form/input/Input" , "RWidgets/ValueAndUnitSelector" ], function( declare @@ -60,4 +60,4 @@ define([ this._enable(); } }); -}); \ No newline at end of file +}); diff --git a/public/javascript/redmic/modules/form/input/_BaseDateTime.js b/client-app/src/component/form/input/_BaseDateTime.js similarity index 98% rename from public/javascript/redmic/modules/form/input/_BaseDateTime.js rename to client-app/src/component/form/input/_BaseDateTime.js index 9806893c73d40446422f10925c4993c44e89c3b1..e9e93dbd8b03ab41882d0fb1ac1bb66265c2148f 100644 --- a/public/javascript/redmic/modules/form/input/_BaseDateTime.js +++ b/client-app/src/component/form/input/_BaseDateTime.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , 'moment/moment.min' + , 'moment' ], function( declare , lang diff --git a/public/javascript/redmic/modules/form/input/_BaseMultiSelectImpl.js b/client-app/src/component/form/input/_BaseMultiSelectImpl.js similarity index 96% rename from public/javascript/redmic/modules/form/input/_BaseMultiSelectImpl.js rename to client-app/src/component/form/input/_BaseMultiSelectImpl.js index c401c159c9e836ff3cd86b0e3fb94557cbc4fc27..ccadab224e3ded543abce07c93662a1081bf94c6 100644 --- a/public/javascript/redmic/modules/form/input/_BaseMultiSelectImpl.js +++ b/client-app/src/component/form/input/_BaseMultiSelectImpl.js @@ -1,14 +1,14 @@ define([ - "app/redmicConfig" + 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "put-selector/put" - , "redmic/modules/base/_Store" - , "redmic/modules/base/_ShowInTooltip" - , "redmic/modules/base/_ShowOnEvt" - , "redmic/modules/form/input/Input" - , "redmic/modules/layout/listMenu/ListMenu" + , 'put-selector' + , "src/component/base/_Store" + , "src/component/base/_ShowInTooltip" + , "src/component/base/_ShowOnEvt" + , "src/component/form/input/Input" + , "src/component/layout/listMenu/ListMenu" ], function( redmicConfig , declare diff --git a/public/javascript/redmic/modules/form/input/_BaseRange.js b/client-app/src/component/form/input/_BaseRange.js similarity index 97% rename from public/javascript/redmic/modules/form/input/_BaseRange.js rename to client-app/src/component/form/input/_BaseRange.js index f6f48241169756a3d396752f09d37019e3305b1d..4b67866f9fddd930996d34ab1c5f40ad93c41c53 100644 --- a/public/javascript/redmic/modules/form/input/_BaseRange.js +++ b/client-app/src/component/form/input/_BaseRange.js @@ -1,9 +1,9 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/form/input/Input" - , "redmic/modules/form/input/_Dependence" - , "redmic/modules/form/input/_DisableInput" + , "src/component/form/input/Input" + , "src/component/form/input/_Dependence" + , "src/component/form/input/_DisableInput" ], function( declare , lang diff --git a/public/javascript/redmic/modules/form/input/_BaseTextBoxWidthExpandTooltipImpl.js b/client-app/src/component/form/input/_BaseTextBoxWidthExpandTooltipImpl.js similarity index 89% rename from public/javascript/redmic/modules/form/input/_BaseTextBoxWidthExpandTooltipImpl.js rename to client-app/src/component/form/input/_BaseTextBoxWidthExpandTooltipImpl.js index 3a2955f4bdba4424a39bf2cc60cc996a52de87c5..0a38528cd57c4a4c67f8fa969d3c3c4963a45f9e 100644 --- a/public/javascript/redmic/modules/form/input/_BaseTextBoxWidthExpandTooltipImpl.js +++ b/client-app/src/component/form/input/_BaseTextBoxWidthExpandTooltipImpl.js @@ -2,7 +2,7 @@ define([ "dijit/form/ValidationTextBox" , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/form/input/_BaseWidthExpandTooltipImpl" + , "src/component/form/input/_BaseWidthExpandTooltipImpl" ], function( ValidationTextBox , declare @@ -27,4 +27,4 @@ define([ return new ValidationTextBox(this._inputProps).placeAt(this.containerInput); } }); -}); \ No newline at end of file +}); diff --git a/public/javascript/redmic/modules/form/input/_BaseWidthExpandTooltipImpl.js b/client-app/src/component/form/input/_BaseWidthExpandTooltipImpl.js similarity index 97% rename from public/javascript/redmic/modules/form/input/_BaseWidthExpandTooltipImpl.js rename to client-app/src/component/form/input/_BaseWidthExpandTooltipImpl.js index de3052261fedcc70f7a25c0429dfe55208660a0f..b81728403a7c1d40d70f75c15d6389d1f880eeb7 100644 --- a/public/javascript/redmic/modules/form/input/_BaseWidthExpandTooltipImpl.js +++ b/client-app/src/component/form/input/_BaseWidthExpandTooltipImpl.js @@ -2,9 +2,9 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "put-selector/put" - , "redmic/modules/base/_ShowInTooltip" - , "redmic/modules/form/input/Input" + , 'put-selector' + , "src/component/base/_ShowInTooltip" + , "src/component/form/input/Input" ], function( declare , lang diff --git a/public/javascript/redmic/modules/form/input/_DeleteOnClear.js b/client-app/src/component/form/input/_DeleteOnClear.js similarity index 100% rename from public/javascript/redmic/modules/form/input/_DeleteOnClear.js rename to client-app/src/component/form/input/_DeleteOnClear.js diff --git a/public/javascript/redmic/modules/form/input/_Dependence.js b/client-app/src/component/form/input/_Dependence.js similarity index 99% rename from public/javascript/redmic/modules/form/input/_Dependence.js rename to client-app/src/component/form/input/_Dependence.js index 3ef57ebb00f28293879dacea703355e0ca17b4a9..6d087a9c38a27a88cb29fdbb85acda58bcba102c 100644 --- a/public/javascript/redmic/modules/form/input/_Dependence.js +++ b/client-app/src/component/form/input/_Dependence.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , 'moment/moment.min' + , 'moment' ], function( declare , lang diff --git a/public/javascript/redmic/modules/form/input/_DisableInput.js b/client-app/src/component/form/input/_DisableInput.js similarity index 99% rename from public/javascript/redmic/modules/form/input/_DisableInput.js rename to client-app/src/component/form/input/_DisableInput.js index 2160ae392b464f3870191d7a5b1494223f8d5746..d425641df26c0fa8573eb67d385dd42642e5b402 100644 --- a/public/javascript/redmic/modules/form/input/_DisableInput.js +++ b/client-app/src/component/form/input/_DisableInput.js @@ -2,7 +2,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "put-selector/put" + , 'put-selector' ], function( declare , lang diff --git a/public/javascript/redmic/modules/form/input/_IgnoreNonexistentProperty.js b/client-app/src/component/form/input/_IgnoreNonexistentProperty.js similarity index 100% rename from public/javascript/redmic/modules/form/input/_IgnoreNonexistentProperty.js rename to client-app/src/component/form/input/_IgnoreNonexistentProperty.js diff --git a/public/javascript/redmic/modules/form/input/_InputItfc.js b/client-app/src/component/form/input/_InputItfc.js similarity index 95% rename from public/javascript/redmic/modules/form/input/_InputItfc.js rename to client-app/src/component/form/input/_InputItfc.js index 562ff3a75cce75c68d6b2b305e78b8cdd15d574a..231c930a8294e4fa4ce656c48f8ecd9dbda9ac81 100644 --- a/public/javascript/redmic/modules/form/input/_InputItfc.js +++ b/client-app/src/component/form/input/_InputItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/public/javascript/redmic/modules/form/input/_NodesCreation.js b/client-app/src/component/form/input/_NodesCreation.js similarity index 93% rename from public/javascript/redmic/modules/form/input/_NodesCreation.js rename to client-app/src/component/form/input/_NodesCreation.js index d49742dd982f80ee912edb9cc7b44ee2fb127afb..cdfb9730f881e9d50500c0b21d15cf112551c567 100644 --- a/public/javascript/redmic/modules/form/input/_NodesCreation.js +++ b/client-app/src/component/form/input/_NodesCreation.js @@ -3,10 +3,10 @@ define([ , 'dojo/_base/lang' , 'dojo/aspect' , 'dojo/dom-class' - , 'redmic/modules/base/_ShowInTooltip' - , 'redmic/modules/base/_ShowOnEvt' - , 'redmic/modules/layout/dataDisplayer/DataDisplayer' - , 'put-selector/put' + , 'src/component/base/_ShowInTooltip' + , 'src/component/base/_ShowOnEvt' + , 'src/component/layout/dataDisplayer/DataDisplayer' + , 'put-selector' ], function( declare , lang @@ -36,7 +36,7 @@ define([ _afterShowNodesCreation: function() { - put(this._moduleOwnNode, '[required=' + this._inputProps.required + ']'); + this._moduleOwnNode && put(this._moduleOwnNode, '[required=' + this._inputProps.required + ']'); }, _createInputNodes: function() { diff --git a/public/javascript/redmic/modules/form/input/_SelectOnPopupImpl.js b/client-app/src/component/form/input/_SelectOnPopupImpl.js similarity index 97% rename from public/javascript/redmic/modules/form/input/_SelectOnPopupImpl.js rename to client-app/src/component/form/input/_SelectOnPopupImpl.js index f270ad1eb3a7efd9fed0fdfb27f0eef6e16358ce..84c5272fb71fb995f0f4fb05717b1d871389b98a 100644 --- a/public/javascript/redmic/modules/form/input/_SelectOnPopupImpl.js +++ b/client-app/src/component/form/input/_SelectOnPopupImpl.js @@ -1,10 +1,10 @@ define([ - "app/redmicConfig" + 'src/redmicConfig' , "dijit/form/ValidationTextBox" , "dojo/_base/declare" , "dojo/_base/lang" - , "put-selector/put" - , "redmic/modules/form/input/Input" + , 'put-selector' + , "src/component/form/input/Input" ], function( redmicConfig , ValidationTextBox diff --git a/public/javascript/redmic/modules/gateway/AddItemGatewayImpl.js b/client-app/src/component/gateway/AddItemGatewayImpl.js similarity index 96% rename from public/javascript/redmic/modules/gateway/AddItemGatewayImpl.js rename to client-app/src/component/gateway/AddItemGatewayImpl.js index ca8c54f6c13852a972eddc453360ed5efdba9fa6..87e67eaccde1948151be6b2b3eb3bc243ff380cb 100644 --- a/public/javascript/redmic/modules/gateway/AddItemGatewayImpl.js +++ b/client-app/src/component/gateway/AddItemGatewayImpl.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Store" + , "src/component/base/_Store" , "./Gateway" ], function( declare diff --git a/public/javascript/redmic/modules/gateway/Gateway.js b/client-app/src/component/gateway/Gateway.js similarity index 99% rename from public/javascript/redmic/modules/gateway/Gateway.js rename to client-app/src/component/gateway/Gateway.js index 2d23393257e10dbd8b4bb322d847bb4f8604c26e..5c5ce3148f68922c50b69aea220865535b37ae4e 100644 --- a/public/javascript/redmic/modules/gateway/Gateway.js +++ b/client-app/src/component/gateway/Gateway.js @@ -2,7 +2,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "RWidgets/Utilities" - , "redmic/modules/base/_Module" + , "src/component/base/_Module" , "./_GatewayItfc" ], function( declare diff --git a/public/javascript/redmic/modules/gateway/LocalSelectorGatewayImpl.js b/client-app/src/component/gateway/LocalSelectorGatewayImpl.js similarity index 97% rename from public/javascript/redmic/modules/gateway/LocalSelectorGatewayImpl.js rename to client-app/src/component/gateway/LocalSelectorGatewayImpl.js index 1f3a350baf51c69ce8c1f56e3d8e3e30fd4cc8c1..44aca435acd1ae2ebebfa472364afc3eb8adf83d 100644 --- a/public/javascript/redmic/modules/gateway/LocalSelectorGatewayImpl.js +++ b/client-app/src/component/gateway/LocalSelectorGatewayImpl.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Store" + , "src/component/base/_Store" , "./Gateway" ], function( declare diff --git a/public/javascript/redmic/modules/gateway/MapCenteringGatewayImpl.js b/client-app/src/component/gateway/MapCenteringGatewayImpl.js similarity index 100% rename from public/javascript/redmic/modules/gateway/MapCenteringGatewayImpl.js rename to client-app/src/component/gateway/MapCenteringGatewayImpl.js diff --git a/public/javascript/redmic/modules/gateway/_GatewayItfc.js b/client-app/src/component/gateway/_GatewayItfc.js similarity index 91% rename from public/javascript/redmic/modules/gateway/_GatewayItfc.js rename to client-app/src/component/gateway/_GatewayItfc.js index d8aae830012e454c30217e47fc0e4b4bfc0d3d4f..db729374c4d3180a753faa23eb399eac2d0cb711 100644 --- a/public/javascript/redmic/modules/gateway/_GatewayItfc.js +++ b/client-app/src/component/gateway/_GatewayItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/public/javascript/redmic/modules/layout/TabsDisplayer.js b/client-app/src/component/layout/TabsDisplayer.js similarity index 97% rename from public/javascript/redmic/modules/layout/TabsDisplayer.js rename to client-app/src/component/layout/TabsDisplayer.js index e700ffd3b0caeaf3d882d43e05cce1b514a86524..83c2b33b2164128669fa94270753b0b8fc96e7c5 100644 --- a/public/javascript/redmic/modules/layout/TabsDisplayer.js +++ b/client-app/src/component/layout/TabsDisplayer.js @@ -4,8 +4,8 @@ define([ , 'dojo/_base/declare' , 'dojo/_base/lang' , 'dojo/query' - , 'redmic/modules/base/_Module' - , 'redmic/modules/base/_Show' + , 'src/component/base/_Module' + , 'src/component/base/_Show' ], function( ContentPane , TabContainer @@ -177,7 +177,7 @@ define([ this._container.resize(); }, - _getNodeToShow: function() { + getNodeToShow: function() { return this._container.domNode; } diff --git a/client-app/src/component/layout/TagList.js b/client-app/src/component/layout/TagList.js new file mode 100644 index 0000000000000000000000000000000000000000..000e1953c5e33f8a4df47b84d23548574df1c077 --- /dev/null +++ b/client-app/src/component/layout/TagList.js @@ -0,0 +1,152 @@ +define([ + 'dojo/_base/declare' + , 'dojo/_base/lang' + , 'dojo/dom-class' + , 'put-selector' + , 'src/component/base/_Module' + , 'src/component/base/_Show' +], function( + declare + , lang + , domClass + , put + , _Module + , _Show +) { + + return declare([_Module, _Show], { + // summary: + // Visualizador de listado de etiquetas, con eventos de interacción sobre las mismas. + + constructor: function(args) { + + this.config = { + ownChannel: 'tagList', + events: { + TAG_CLICKED: 'tagClicked' + }, + actions: { + TAG_CLICKED: 'tagClicked' + }, + + tagsString: '', + tagsDelimiter: ',', + simpleSelection: false, + + _tagsContainerClass: 'tagListContainer', + _tagsClass: 'tagListItem', + _tagSelectedClass: 'selected', + + _tagPropsByValue: {} + }; + + lang.mixin(this, this.config, args); + }, + + _definePublications: function() { + + this.publicationsConfig.push({ + event: 'TAG_CLICKED', + channel : this.getChannel('TAG_CLICKED') + }); + }, + + _initialize: function() { + + put(this.domNode, '.' + this._tagsContainerClass); + + if (!this.tagsString || !this.tagsString.length) { + console.error('No tags available to show at "%s"', this.getChannel()); + return; + } + + this.tagsString.split(this.tagsDelimiter).forEach(lang.hitch(this, this._addTag)); + }, + + _addTag: function(tagValue, tagIndex) { + + var tagNodeDefinition = 'span.' + this._tagsClass + '[title=' + this.i18n.select + ']', + tagNodeContent = this.getTagLabel ? this.getTagLabel(tagValue, tagIndex) : tagValue, + tagNode = put(this.domNode, tagNodeDefinition, tagNodeContent); + + this._tagPropsByValue[tagValue] = { + label: tagNodeContent, + index: tagIndex, + node: tagNode + }; + + tagNode.onclick = lang.hitch(this, this._onTagClick, tagValue); + + this._manageSelectionOnTagAdd(tagValue, tagIndex); + }, + + _onTagClick: function(tagValue) { + + var tagProps = this._tagPropsByValue[tagValue]; + + this._emitEvt('TAG_CLICKED', { + value: tagValue, + label: tagProps.label, + index: tagProps.index + }); + + this._manageSelectionOnTagClick(tagValue); + }, + + _manageSelectionOnTagAdd: function(tagValue, tagIndex) { + + var tagProps = this._tagPropsByValue[tagValue], + isTagSelected = this.getSelectedTags ? this.getSelectedTags(tagValue, tagIndex) : false, + tagNode = tagProps.node; + + if (!isTagSelected) { + return; + } + + if (this.simpleSelection) { + if (this._firstTagSelected) { + return; + } + this._firstTagSelected = true; + } + + this._selectTagNode(tagNode); + }, + + _manageSelectionOnTagClick: function(tagValue) { + + var tagProps = this._tagPropsByValue[tagValue], + tagNode = tagProps.node; + + if (this.simpleSelection) { + this._clearSelectTagNode(); + this._selectTagNode(tagNode); + } else { + this._toggleSelectTagNode(tagNode); + } + }, + + _selectTagNode: function(tagNode) { + + domClass.add(tagNode, this._tagSelectedClass); + }, + + _deselectTagNode: function(tagNode) { + + domClass.remove(tagNode, this._tagSelectedClass); + }, + + _toggleSelectTagNode: function(tagNode) { + + domClass.toggle(tagNode, this._tagSelectedClass); + }, + + _clearSelectTagNode: function() { + + Object.values(this._tagPropsByValue).forEach(lang.hitch(this, function(item) { + + this._deselectTagNode(item.node); + })); + } + }); +}); diff --git a/public/javascript/redmic/modules/layout/dataDisplayer/DataDisplayer.js b/client-app/src/component/layout/dataDisplayer/DataDisplayer.js similarity index 90% rename from public/javascript/redmic/modules/layout/dataDisplayer/DataDisplayer.js rename to client-app/src/component/layout/dataDisplayer/DataDisplayer.js index f92598f6c8f70327a1579fad8d7e46b41faae82c..51537d500f5ab5e6f5ffd164ffaeba1b61f503d7 100644 --- a/public/javascript/redmic/modules/layout/dataDisplayer/DataDisplayer.js +++ b/client-app/src/component/layout/dataDisplayer/DataDisplayer.js @@ -1,9 +1,9 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' - , 'put-selector/put' - , 'redmic/modules/base/_Module' - , 'redmic/modules/base/_Show' + , 'put-selector' + , 'src/component/base/_Module' + , 'src/component/base/_Show' ], function( declare , lang @@ -46,7 +46,7 @@ define([ this._setDataToDisplay(data); }, - _getNodeToShow: function() { + getNodeToShow: function() { return this.domNode; }, diff --git a/public/javascript/redmic/modules/layout/genericDisplayer/GenericDisplayer.js b/client-app/src/component/layout/genericDisplayer/GenericDisplayer.js similarity index 94% rename from public/javascript/redmic/modules/layout/genericDisplayer/GenericDisplayer.js rename to client-app/src/component/layout/genericDisplayer/GenericDisplayer.js index 954fa170f1cc7adf532284f4503308153a9dd22d..7c03193439c437e5ce7854456965d211e8f2be5b 100644 --- a/public/javascript/redmic/modules/layout/genericDisplayer/GenericDisplayer.js +++ b/client-app/src/component/layout/genericDisplayer/GenericDisplayer.js @@ -1,9 +1,9 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' - , 'put-selector/put' - , 'redmic/modules/base/_Module' - , 'redmic/modules/base/_Show' + , 'put-selector' + , 'src/component/base/_Module' + , 'src/component/base/_Show' ], function ( declare , lang @@ -48,7 +48,7 @@ define([ postCreate: function() { - var ownNode = this._getNodeToShow(), + var ownNode = this.getNodeToShow(), layoutClasses = this.layoutClass, contentClasses = this.contentClass; @@ -69,7 +69,7 @@ define([ } }, - _getNodeToShow: function() { + getNodeToShow: function() { return this.domNode; }, diff --git a/public/javascript/redmic/modules/layout/genericDisplayer/GenericWithTopbarDisplayerImpl.js b/client-app/src/component/layout/genericDisplayer/GenericWithTopbarDisplayerImpl.js similarity index 97% rename from public/javascript/redmic/modules/layout/genericDisplayer/GenericWithTopbarDisplayerImpl.js rename to client-app/src/component/layout/genericDisplayer/GenericWithTopbarDisplayerImpl.js index ae336f676af94b9e20d1ec66e0122d94902e4ef7..1f672744f30ab82bb546a0318a1139dcffd5c196 100644 --- a/public/javascript/redmic/modules/layout/genericDisplayer/GenericWithTopbarDisplayerImpl.js +++ b/client-app/src/component/layout/genericDisplayer/GenericWithTopbarDisplayerImpl.js @@ -1,7 +1,7 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' - , 'put-selector/put' + , 'put-selector' , './GenericDisplayer' ], function ( declare @@ -46,7 +46,7 @@ define([ postCreate: function() { - this._topbarNode = put(this._getNodeToShow(), 'div.' + this.topbarClass); + this._topbarNode = put(this.getNodeToShow(), 'div.' + this.topbarClass); this._titleNode = put(this._topbarNode, 'div.' + this.titleClass); this._addTitle(this.title); diff --git a/public/javascript/redmic/modules/layout/listMenu/ListMenu.js b/client-app/src/component/layout/listMenu/ListMenu.js similarity index 99% rename from public/javascript/redmic/modules/layout/listMenu/ListMenu.js rename to client-app/src/component/layout/listMenu/ListMenu.js index 9675bbbb77cd68cfdc3fde14420f8d1303bcacd6..71527bf14f3d99275de30dae3cc380c17ac66dbd 100644 --- a/public/javascript/redmic/modules/layout/listMenu/ListMenu.js +++ b/client-app/src/component/layout/listMenu/ListMenu.js @@ -2,10 +2,10 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "dojo/dom-class" - , "put-selector/put" + , 'put-selector' , "RWidgets/Utilities" - , "redmic/modules/base/_Module" - , "redmic/modules/base/_Show" + , "src/component/base/_Module" + , "src/component/base/_Show" ], function( declare , lang @@ -610,7 +610,7 @@ define([ } }, - _getNodeToShow: function() { + getNodeToShow: function() { return this.domNode; }, diff --git a/public/javascript/redmic/modules/layout/nestedContent/NestedBrowsersImpl.js b/client-app/src/component/layout/nestedContent/NestedBrowsersImpl.js similarity index 96% rename from public/javascript/redmic/modules/layout/nestedContent/NestedBrowsersImpl.js rename to client-app/src/component/layout/nestedContent/NestedBrowsersImpl.js index a0acfee410143d1af64032dcb94f81f535e54972..95aa734226e107d8d7062148005ce85ae1e62f77 100644 --- a/public/javascript/redmic/modules/layout/nestedContent/NestedBrowsersImpl.js +++ b/client-app/src/component/layout/nestedContent/NestedBrowsersImpl.js @@ -1,11 +1,11 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' - , 'redmic/modules/browser/bars/Total' - , 'redmic/modules/browser/_ButtonsInRow' - , 'redmic/modules/browser/_Framework' - , 'redmic/modules/browser/_MultiTemplate' - , 'redmic/modules/browser/ListImpl' + , 'src/component/browser/bars/Total' + , 'src/component/browser/_ButtonsInRow' + , 'src/component/browser/_Framework' + , 'src/component/browser/_MultiTemplate' + , 'src/component/browser/ListImpl' , 'templates/DefaultList' , 'RWidgets/Utilities' , './NestedContent' diff --git a/public/javascript/redmic/modules/layout/nestedContent/NestedContent.js b/client-app/src/component/layout/nestedContent/NestedContent.js similarity index 94% rename from public/javascript/redmic/modules/layout/nestedContent/NestedContent.js rename to client-app/src/component/layout/nestedContent/NestedContent.js index 0800a0fdcfd0aa082a29b7d78c77d2d653032a79..31eefc426b7e8e7dec12b6fe73d06c9fd80bf913 100644 --- a/public/javascript/redmic/modules/layout/nestedContent/NestedContent.js +++ b/client-app/src/component/layout/nestedContent/NestedContent.js @@ -1,10 +1,10 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' - , 'redmic/modules/base/_Module' - , 'redmic/modules/base/_Show' - , 'redmic/modules/base/_Store' - , 'redmic/modules/layout/genericDisplayer/GenericWithTopbarDisplayerImpl' + , 'src/component/base/_Module' + , 'src/component/base/_Show' + , 'src/component/base/_Store' + , 'src/component/layout/genericDisplayer/GenericWithTopbarDisplayerImpl' , 'RWidgets/Button' ], function ( declare diff --git a/public/javascript/redmic/modules/layout/templateDisplayer/TemplateDisplayer.js b/client-app/src/component/layout/templateDisplayer/TemplateDisplayer.js similarity index 93% rename from public/javascript/redmic/modules/layout/templateDisplayer/TemplateDisplayer.js rename to client-app/src/component/layout/templateDisplayer/TemplateDisplayer.js index 4f11533e537e613452ace6bbaa773d6452151bbf..0de5ab91645baf61c59cddd1fe016076091600e2 100644 --- a/public/javascript/redmic/modules/layout/templateDisplayer/TemplateDisplayer.js +++ b/client-app/src/component/layout/templateDisplayer/TemplateDisplayer.js @@ -1,10 +1,10 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' - , 'put-selector/put' - , 'redmic/modules/base/_Module' - , 'redmic/modules/base/_Show' - , 'redmic/modules/base/_Store' + , 'put-selector' + , 'src/component/base/_Module' + , 'src/component/base/_Show' + , 'src/component/base/_Store' , 'templates/LoadingEmpty' ], function( declare @@ -78,7 +78,7 @@ define([ _prepareNodes: function() { - var node = this._getNodeToShow(), + var node = this.getNodeToShow(), customClass = this['class']; put(node, '.' + this.containerClass); @@ -133,7 +133,7 @@ define([ _setContent: function(content) { - var node = this._getNodeToShow(); + var node = this.getNodeToShow(); node.innerHTML = content; @@ -161,7 +161,7 @@ define([ this._setContent(this._loadedTemplate); }, - _getNodeToShow: function() { + getNodeToShow: function() { return this.domNode; } diff --git a/public/javascript/redmic/modules/layout/wizard/Wizard.js b/client-app/src/component/layout/wizard/Wizard.js similarity index 99% rename from public/javascript/redmic/modules/layout/wizard/Wizard.js rename to client-app/src/component/layout/wizard/Wizard.js index 909e91baf5001ac738b2dabfa2b9a0382a5426cb..bc6571458ba941e171cee5fffc84f0685d92f2d3 100644 --- a/public/javascript/redmic/modules/layout/wizard/Wizard.js +++ b/client-app/src/component/layout/wizard/Wizard.js @@ -4,10 +4,10 @@ define([ , "dojo/_base/lang" , "dojo/keys" , "dojo/Deferred" - , "put-selector/put" - , "redmic/modules/base/_Module" - , "redmic/modules/base/_Show" - , "redmic/modules/model/ModelImpl" + , 'put-selector' + , "src/component/base/_Module" + , "src/component/base/_Show" + , "src/component/model/ModelImpl" , "./_WizardStep" ], function( BorderContainer @@ -372,7 +372,7 @@ define([ } }, - _getNodeToShow: function() { + getNodeToShow: function() { return this.container; }, diff --git a/public/javascript/redmic/modules/layout/wizard/_CompleteBySelection.js b/client-app/src/component/layout/wizard/_CompleteBySelection.js similarity index 98% rename from public/javascript/redmic/modules/layout/wizard/_CompleteBySelection.js rename to client-app/src/component/layout/wizard/_CompleteBySelection.js index 496684950a41fbfed9f36235afddc796b7b5080d..7089031bdd828fcd83c8a91150eb99c8cdb90a87 100644 --- a/public/javascript/redmic/modules/layout/wizard/_CompleteBySelection.js +++ b/client-app/src/component/layout/wizard/_CompleteBySelection.js @@ -3,7 +3,7 @@ define([ , 'dojo/_base/declare' , 'dojo/_base/lang' , 'dojo/aspect' - , 'redmic/modules/browser/_Select' + , 'src/component/browser/_Select' ], function ( _LocalSelectionView , declare diff --git a/public/javascript/redmic/modules/layout/wizard/_StepBreadcrumbs.js b/client-app/src/component/layout/wizard/_StepBreadcrumbs.js similarity index 99% rename from public/javascript/redmic/modules/layout/wizard/_StepBreadcrumbs.js rename to client-app/src/component/layout/wizard/_StepBreadcrumbs.js index 99ac62403b1cb0c02ab1a3178d47404f01f3b791..49af129509b1b89efe2ea8f51b524687b172b541 100644 --- a/public/javascript/redmic/modules/layout/wizard/_StepBreadcrumbs.js +++ b/client-app/src/component/layout/wizard/_StepBreadcrumbs.js @@ -2,7 +2,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "put-selector/put" + , 'put-selector' ], function( declare , lang diff --git a/public/javascript/redmic/modules/layout/wizard/_StepNavigation.js b/client-app/src/component/layout/wizard/_StepNavigation.js similarity index 98% rename from public/javascript/redmic/modules/layout/wizard/_StepNavigation.js rename to client-app/src/component/layout/wizard/_StepNavigation.js index aef6ac24a01fd63b0593085e827f95a87808962f..d2e5c7d2db691cbf0c39fb57ce9cd2a1d03ecbca 100644 --- a/public/javascript/redmic/modules/layout/wizard/_StepNavigation.js +++ b/client-app/src/component/layout/wizard/_StepNavigation.js @@ -1,8 +1,8 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "put-selector/put" - , "redmic/modules/components/Keypad/TrizoneKeypadImpl" + , 'put-selector' + , "src/component/components/Keypad/TrizoneKeypadImpl" ], function( declare , lang diff --git a/public/javascript/redmic/modules/layout/wizard/_WizardStep.js b/client-app/src/component/layout/wizard/_WizardStep.js similarity index 99% rename from public/javascript/redmic/modules/layout/wizard/_WizardStep.js rename to client-app/src/component/layout/wizard/_WizardStep.js index 4720149606d19d65ba6895d2d4e65bd1d4a5150c..533659247b3a16b0e5ab373aac84adb417e82986 100644 --- a/public/javascript/redmic/modules/layout/wizard/_WizardStep.js +++ b/client-app/src/component/layout/wizard/_WizardStep.js @@ -1,10 +1,10 @@ define([ - "app/redmicConfig" + 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" , "dojo/Deferred" - , "redmic/modules/model/ModelImpl" + , "src/component/model/ModelImpl" , "./_WizardStepItfc" ], function( redmicConfig @@ -452,7 +452,7 @@ define([ this._isValidProperty = !propErrors; - if (redmicConfig.getEnvVariableValue('envDebug') === 'true') { + if ((/true/i).test(redmicConfig.getEnvVariableValue('envDebug'))) { console.warn('Wizard step validation', { property: this.propertyName, isValid: this._isValidProperty, diff --git a/public/javascript/redmic/modules/layout/wizard/_WizardStepItfc.js b/client-app/src/component/layout/wizard/_WizardStepItfc.js similarity index 96% rename from public/javascript/redmic/modules/layout/wizard/_WizardStepItfc.js rename to client-app/src/component/layout/wizard/_WizardStepItfc.js index 80560d1f47f0936feecfa6f41ed1464a899ec4bd..d31f9e551c431c96790d64356929ffc6cb72cfec 100644 --- a/public/javascript/redmic/modules/layout/wizard/_WizardStepItfc.js +++ b/client-app/src/component/layout/wizard/_WizardStepItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/public/javascript/redmic/modules/map/LeafletImpl.js b/client-app/src/component/map/LeafletImpl.js similarity index 92% rename from public/javascript/redmic/modules/map/LeafletImpl.js rename to client-app/src/component/map/LeafletImpl.js index 546a0cb95f6afb89294008155547efde27514df4..c488cf60f1deec2589d3bacaaa35bac1a007d0db 100644 --- a/public/javascript/redmic/modules/map/LeafletImpl.js +++ b/client-app/src/component/map/LeafletImpl.js @@ -4,8 +4,9 @@ define([ , "dojo/Deferred" , "dojo/dom-class" , "dojo/query" - , 'leaflet/leaflet' - , "put-selector/put" + , 'leaflet' + , 'put-selector' + , 'src/redmicConfig' , "./_LeafletImplItfc" , './_LeafletWidgetsManagement' , "./_ListenContainers" @@ -19,6 +20,7 @@ define([ , query , L , put + , redmicConfig , _LeafletImplItfc , _LeafletWidgetsManagement , _ListenContainers @@ -48,14 +50,16 @@ define([ _initialize: function() { - L.Icon.Default.imagePath = "/javascript/leaflet/dist/images/"; + var useBuilt = (/true/i).test(redmicConfig.getEnvVariableValue('envUseBuilt')); + L.Icon.Default.imagePath = '/' + (useBuilt ? 'dist/js' : 'dep') + '/leaflet/dist/images/'; this.mapParentNode = put("div.map"); this.mapNode = put(this.mapParentNode, "div.map"); this.map = L.map(this.mapNode, { - crs: L.CRS.EPSG4326, + //crs: L.CRS.EPSG4326, doubleClickZoom: false, + zoomControl: false, minZoom: this.minZoom, maxZoom: this.maxZoom, attributionControl: true, @@ -72,7 +76,7 @@ define([ this.map.on("layeradd", lang.hitch(this, this._onLayerAdd)); this.map.on("layerremove", lang.hitch(this, this._onLayerRemove)); - this.map.on("baselayerchange", lang.hitch(this, this._onBaseLayerChangedFromControl)); + this.map.on("baselayerchange", lang.hitch(this, this._onBaseLayerChange)); this.map.on("zoomend", lang.hitch(this, this._groupEventArgs, 'ZOOM_END')); this.map.on("moveend", lang.hitch(this, this._groupEventArgs, 'PAN')); this.map.on("click", lang.hitch(this, this._onMapClick)); @@ -93,7 +97,7 @@ define([ }; if (this._infoForAddedLayers[layerId]) { - layerAddReq.extraInfo = this._infoForAddedLayers[layerId]; + layerAddReq.atlasItem = this._infoForAddedLayers[layerId]; delete this._infoForAddedLayers[layerId]; } @@ -118,14 +122,21 @@ define([ _onMapClick: function(evt) { - !this._clickDisabled && this._emitEvt('CLICK', { + this._emitEvt('CLICK', this._getMapClickEventValue(evt)); + }, + + _getMapClickEventValue: function(evt) { + + var inheritedValue = this.inherited(arguments) || {}; + + return this._merge([inheritedValue, { latLng: evt.latlng, zoom: this.getZoom(), bbox: this.getBounds(), size: this.map.getSize(), containerPoint: evt.containerPoint, layerPoint: evt.layerPoint - }); + }]); }, _setOwnCallbacksForEvents: function() { @@ -154,7 +165,7 @@ define([ this._onEvt('LAYER_REMOVED_FROM_PANE', lang.hitch(this, this._onLayerRemovedFromPane)); }, - _getNodeToShow: function() { + getNodeToShow: function() { return this.mapParentNode; }, @@ -230,10 +241,6 @@ define([ } this.map.invalidateSize(); - - if (this.miniMap && this.miniMapInstance) { - this.miniMapInstance.addTo(this.map); - } }, hasLayer: function(layer) { diff --git a/public/javascript/redmic/modules/map/Map.js b/client-app/src/component/map/Map.js similarity index 97% rename from public/javascript/redmic/modules/map/Map.js rename to client-app/src/component/map/Map.js index c503e68183c343da46c9ca8cbf47256738d5c2fb..7555931cee20b2a6b6961a19031cfd2b1a2c4296 100644 --- a/public/javascript/redmic/modules/map/Map.js +++ b/client-app/src/component/map/Map.js @@ -1,9 +1,9 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , 'uuid/uuidv4.min' - , "redmic/modules/base/_Module" - , "redmic/modules/base/_Show" + , 'uuid' + , "src/component/base/_Module" + , "src/component/base/_Show" , './_StaticLayersManagement' , "./_MapItfc" ], function( @@ -367,6 +367,9 @@ define([ optional: !!optional }; } else { + if (overlayLayerObj.instance !== layer) { + overlayLayerObj.instance = layer; + } this._setLayerZIndex(layer, overlayLayerObj.order); } @@ -387,7 +390,8 @@ define([ } if (layerObj.layer) { - return this._getLayerId(layerObj.layer) || layerObj.id; + return this._getLayerId(layerObj.layer) || + (layerObj instanceof _Module ? layerObj.getOwnChannel() : layerObj.id); } return layerObj._leaflet_id || (layerObj.options && layerObj.options.id); @@ -418,13 +422,14 @@ define([ layerId = layer; } - if (layerId === undefined) { + if (layerId === undefined || typeof layerId === 'number') { this.removeLayer(layer); } else if (this._overlayLayers[layerId]) { this._removeMapLayer(layerId, keepInstance); } else if (this._baseLayerInstances[layerId]) { this._removeMapBaseLayer(layerId, keepInstance); } else { + console.error('Failed to remove layer:', layer); this._emitEvt('LAYER_REMOVE_FAIL', layer); } }, diff --git a/public/javascript/redmic/modules/map/MapButton.js b/client-app/src/component/map/MapButton.js similarity index 98% rename from public/javascript/redmic/modules/map/MapButton.js rename to client-app/src/component/map/MapButton.js index ebb1016297310de47f5ee27682915179794c944b..13eac7cee687b229f55e167997d2169c2986d505 100644 --- a/public/javascript/redmic/modules/map/MapButton.js +++ b/client-app/src/component/map/MapButton.js @@ -4,8 +4,8 @@ define([ , "dojo/_base/lang" , "dojo/dom-class" , "dojo/Stateful" - , "put-selector/put" - , "redmic/base/Mediator" + , 'put-selector' + , "src/util/Mediator" ], function( _WidgetBase , declare diff --git a/client-app/src/component/map/StaticLayersDefinition.js b/client-app/src/component/map/StaticLayersDefinition.js new file mode 100644 index 0000000000000000000000000000000000000000..b4b64d82f5fea668003c68c81e99565572f5707c --- /dev/null +++ b/client-app/src/component/map/StaticLayersDefinition.js @@ -0,0 +1,135 @@ +define([ + 'leaflet' +], function( + L +) { + + return { + // summary: + // Definiciones estáticas de capas para el módulo Map. + // description: + // Contiene la definición de las diferentes capas base y superpuestas, en formato compatible con Leaflet. + // Para declarar una capa como base, se debe indicar con la propiedad 'basemap: true'. Soporta ordenación + // mediante la propiedad 'order' (valores enteros >= 1). + // Para declarar una capa como opcional (superpuesta pero cargada automáticamente, permitiendo su + // desactivación), se debe indicar con la propiedad 'optional: true'. + + 'topografico': { + basemap: true, + protocol: 'WMS-C', + url: 'https://{s}.grafcan.es/ServicioWMS/MTI', + props: { + layers: 'WMS_MTI', + format: 'image/png', + subdomains: ['idecan2', 'idecan3'], + uppercase: true, + attribution: 'GRAFCAN', + minZoom: 5, + maxZoom: 21 + } + }, + + 'ortofoto': { + basemap: true, + protocol: 'WMS-C', + url: 'https://{s}.grafcan.es/ServicioWMS/OrtoExpress_bat', + props: { + layers: 'WMS_OrtoExpress', + crs: L.CRS.EPSG4326, // TODO por ahora, sólo está soportado este sistema de referencia + format: 'image/jpeg', + uppercase: true, + subdomains: ['idecan1', 'idecan3'], + attribution: 'GRAFCAN', + minZoom: 5, + maxZoom: 21 + } + }, + + 'eoc-map': { + basemap: true, + order: 1, + protocol: 'TMS', + url: 'https://tiles.geoservice.dlr.de/service/tms/1.0.0/{layers}@{crs}@{format}/{z}/{x}/{y}.{format}', + props: { + layers: 'eoc:basemap', + tms: true, + crs: 'EPSG:3857', + format: 'png', + attribution: 'EOC Geoservice', + minZoom: 1, + maxZoom: 15 + } + }, + + 'eoc-overlay': { + optional: true, + protocol: 'TMS', + url: 'https://tiles.geoservice.dlr.de/service/tms/1.0.0/{layers}@{crs}@{format}/{z}/{x}/{y}.{format}', + props: { + layers: 'eoc:baseoverlay', + tms: true, + crs: 'EPSG:3857', + format: 'png', + attribution: 'EOC Geoservice', + minZoom: 1, + maxZoom: 15 + } + }, + + 'grid5000m': { + protocol: 'WMS-C', + url: 'https://atlas.redmic.es/geoserver/gg/wms', + props: { + layers: 'grid5000m', + format: 'image/png', + transparent: true, + tiled: true, + attribution: 'REDMIC', + minZoom: 7, + maxZoom: 12 + } + }, + + 'grid1000m': { + protocol: 'WMS-C', + url: 'https://atlas.redmic.es/geoserver/gg/wms', + props: { + layers: 'grid1000m', + format: 'image/png', + transparent: true, + tiled: true, + attribution: 'REDMIC', + minZoom: 10, + maxZoom: 15 + } + }, + + 'grid500m': { + protocol: 'WMS-C', + url: 'https://atlas.redmic.es/geoserver/gg/wms', + props: { + layers: 'grid500m', + format: 'image/png', + transparent: true, + tiled: true, + attribution: 'REDMIC', + minZoom: 11, + maxZoom: 16 + } + }, + + 'grid100m': { + protocol: 'WMS-C', + url: 'https://atlas.redmic.es/geoserver/gg/wms', + props: { + layers: 'grid100m', + format: 'image/png', + transparent: true, + tiled: true, + attribution: 'REDMIC', + minZoom: 14, + maxZoom: 19 + } + } + }; +}); diff --git a/public/javascript/redmic/modules/map/_ImportWkt.js b/client-app/src/component/map/_ImportWkt.js similarity index 97% rename from public/javascript/redmic/modules/map/_ImportWkt.js rename to client-app/src/component/map/_ImportWkt.js index 677efbc0eeebad70d844c348889a5bcd88045682..10c145c1f521c71e980de001624a0a161e621ad6 100644 --- a/public/javascript/redmic/modules/map/_ImportWkt.js +++ b/client-app/src/component/map/_ImportWkt.js @@ -2,13 +2,13 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' , 'dojo/aspect' - , 'leaflet/leaflet' - , 'wicket/wicket-leaflet.min' + , 'wicket' + + , 'leaflet' ], function( declare , lang , aspect - , L , wicket ) { diff --git a/public/javascript/redmic/modules/map/_LeafletDraw.js b/client-app/src/component/map/_LeafletDraw.js similarity index 100% rename from public/javascript/redmic/modules/map/_LeafletDraw.js rename to client-app/src/component/map/_LeafletDraw.js diff --git a/public/javascript/redmic/modules/map/_LeafletImplItfc.js b/client-app/src/component/map/_LeafletImplItfc.js similarity index 93% rename from public/javascript/redmic/modules/map/_LeafletImplItfc.js rename to client-app/src/component/map/_LeafletImplItfc.js index cd11d716e3fdf458c9999669d977ade583f2a0b4..21fea60b34befcbd277fbf7623de7b94bd6b094d 100644 --- a/public/javascript/redmic/modules/map/_LeafletImplItfc.js +++ b/client-app/src/component/map/_LeafletImplItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/client-app/src/component/map/_LeafletWidgetsManagement.js b/client-app/src/component/map/_LeafletWidgetsManagement.js new file mode 100644 index 0000000000000000000000000000000000000000..532a64e80c520d2fd4db1e332c8b5b533db02652 --- /dev/null +++ b/client-app/src/component/map/_LeafletWidgetsManagement.js @@ -0,0 +1,110 @@ +define([ + 'dojo/_base/declare' + , 'dojo/_base/lang' + , 'leaflet' + , 'src/component/map/widget/_LeafletLayersSelector' + , 'src/component/map/widget/_LeafletMeasureTools' + , 'src/component/map/widget/_LeafletMiniMap' + , 'src/component/map/widget/_LeafletTimeDimension' + + , 'awesome-markers' + , 'L-coordinates' + , 'L-navBar' +], function( + declare + , lang + , L + , _LeafletLayersSelector + , _LeafletMeasureTools + , _LeafletMiniMap + , _LeafletTimeDimension +) { + + return declare([_LeafletLayersSelector, _LeafletMeasureTools, _LeafletMiniMap, _LeafletTimeDimension], { + // summary: + // Incluye y configura widgets para Leaflet. + // description: + // Complementa a la implementación de mapa Leaflet con widgets que amplían su funcionalidad. + + constructor: function(args) { + + this.config = { + zoomControl: true, + coordinatesViewer: true, + navBar: true, + scaleBar: true + }; + + lang.mixin(this, this.config, args); + }, + + _addMapWidgets: function() { + + this._addZoomControl(); + this._addCoordinatesViewer(); + this._addNavBar(); + this._addScaleBar(); + }, + + _addZoomControl: function() { + + if (!this.zoomControl) { + return; + } + + L.control.zoom({ + zoomInTitle: this.i18n.leafletZoomInButton, + zoomOutTitle: this.i18n.leafletZoomOutButton + }).addTo(this.map); + }, + + _addCoordinatesViewer: function() { + + if (!this.coordinatesViewer) { + return; + } + + var awesomeIcon = L.AwesomeMarkers.icon({ + icon: 'bullseye', + markerColor: 'darkgreen', + prefix: 'fa' + }); + + L.control.coordinates({ + position: 'bottomleft', + enableUserInput: true, + decimals: 5, + decimalSeperator: ',', + useDMS: true, + markerProps: { + icon: awesomeIcon + } + }).addTo(this.map); + }, + + _addNavBar: function() { + + if (!this.navBar) { + return; + } + + L.control.navbar({ + homeTitle: this.i18n.leafletHomeButton, + forwardTitle: this.i18n.leafletForwardButton, + backTitle: this.i18n.leafletBackButton + }).addTo(this.map); + }, + + _addScaleBar: function() { + + if (!this.scaleBar) { + return; + } + + L.control.scale({ + position: 'bottomright', + imperial: false + }).addTo(this.map); + } + }); +}); diff --git a/public/javascript/redmic/modules/map/_ListenContainers.js b/client-app/src/component/map/_ListenContainers.js similarity index 100% rename from public/javascript/redmic/modules/map/_ListenContainers.js rename to client-app/src/component/map/_ListenContainers.js diff --git a/public/javascript/redmic/modules/map/_MapItfc.js b/client-app/src/component/map/_MapItfc.js similarity index 96% rename from public/javascript/redmic/modules/map/_MapItfc.js rename to client-app/src/component/map/_MapItfc.js index b625ff06c9b201b840a1a3b723576057866f72d5..fb8517c33e0339644a7115d4cc11ca4d83a9754b 100644 --- a/public/javascript/redmic/modules/map/_MapItfc.js +++ b/client-app/src/component/map/_MapItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/public/javascript/redmic/modules/map/_OverlayLayersManagement.js b/client-app/src/component/map/_OverlayLayersManagement.js similarity index 98% rename from public/javascript/redmic/modules/map/_OverlayLayersManagement.js rename to client-app/src/component/map/_OverlayLayersManagement.js index 63e7b21958e5ce80617f27eed11df851b6a05712..abd491ef390aea0595496d7da0cce1c8e533b60c 100644 --- a/public/javascript/redmic/modules/map/_OverlayLayersManagement.js +++ b/client-app/src/component/map/_OverlayLayersManagement.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "put-selector/put" + , 'put-selector' ], function( declare , lang diff --git a/public/javascript/redmic/modules/map/_PlaceNamesButton.js b/client-app/src/component/map/_PlaceNamesButton.js similarity index 96% rename from public/javascript/redmic/modules/map/_PlaceNamesButton.js rename to client-app/src/component/map/_PlaceNamesButton.js index 8070c2c88fe94172b290e3f8bf71f08785c002b2..944762b56491448af96d8840a3f288b5da9d64d0 100644 --- a/public/javascript/redmic/modules/map/_PlaceNamesButton.js +++ b/client-app/src/component/map/_PlaceNamesButton.js @@ -3,8 +3,8 @@ define([ ,"dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "redmic/modules/map/MapButton" - , "redmic/modules/base/_ShowInPopup" + , "src/component/map/MapButton" + , "src/component/base/_ShowInPopup" ], function( PlaceNames , declare @@ -51,7 +51,7 @@ define([ centerContent: this.placeNamesNode, width: 4, height: "sm", - reposition: "n" + reposition: "e" }, this.placeNamesConfig || {}]); }, diff --git a/public/javascript/redmic/modules/map/_StaticLayersManagement.js b/client-app/src/component/map/_StaticLayersManagement.js similarity index 95% rename from public/javascript/redmic/modules/map/_StaticLayersManagement.js rename to client-app/src/component/map/_StaticLayersManagement.js index 1f69f2d645428bf9c03cefc02886a9af37aa9760..08af2cb8f9b004f067e5a86fcc3a36f121f8f223 100644 --- a/public/javascript/redmic/modules/map/_StaticLayersManagement.js +++ b/client-app/src/component/map/_StaticLayersManagement.js @@ -1,8 +1,8 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' - , 'put-selector/put' - , 'redmic/modules/map/layer/_LayerProtocols' + , 'put-selector' + , 'src/component/map/layer/_LayerProtocols' , './StaticLayersDefinition' ], function( declare @@ -54,7 +54,7 @@ define([ // Código HTML de la etiqueta de la capa. var title = this.i18n[layerId] || layerId, - thumbPath = '/resources/images/map/layer-' + layerId + '.png', + thumbPath = '/res/images/map/layer-' + layerId + '.png', thumbAttr = 'style=background-image:url(' + thumbPath + ')', outerContainer = put('div.sharpContainer.layerThumbnailContainer.relativeContainer[' + thumbAttr + ']'), innerContainerClass = '.wrapContainer.hardTranslucentContainer.absoluteContainer.thumbCaption'; diff --git a/public/javascript/redmic/modules/map/layer/DrawingLayerImpl.js b/client-app/src/component/map/layer/DrawingLayerImpl.js similarity index 99% rename from public/javascript/redmic/modules/map/layer/DrawingLayerImpl.js rename to client-app/src/component/map/layer/DrawingLayerImpl.js index 71da65862699e89252c358d834783e5841f99206..08114edb47e042f3648287672d2346654ff8f1c5 100644 --- a/public/javascript/redmic/modules/map/layer/DrawingLayerImpl.js +++ b/client-app/src/component/map/layer/DrawingLayerImpl.js @@ -2,10 +2,10 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , 'leaflet/leaflet' + , 'leaflet' , "./MapLayer" - , 'L-draw/leaflet.draw' + , 'L-draw' ], function( declare , lang diff --git a/public/javascript/redmic/modules/map/layer/GeoJsonLayerImpl.js b/client-app/src/component/map/layer/GeoJsonLayerImpl.js similarity index 99% rename from public/javascript/redmic/modules/map/layer/GeoJsonLayerImpl.js rename to client-app/src/component/map/layer/GeoJsonLayerImpl.js index 0d333406ffb352f6cb1c6d8e31239210de21563c..8730582a31d6ecb3754f0b7daf550585ebe499a0 100644 --- a/public/javascript/redmic/modules/map/layer/GeoJsonLayerImpl.js +++ b/client-app/src/component/map/layer/GeoJsonLayerImpl.js @@ -1,12 +1,12 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , 'leaflet/leaflet' + , 'leaflet' , "./_AnimateMarker" , "./_GeoJsonLayerItfc" , "./MapLayer" - , 'awesome-markers/leaflet.awesome-markers.min' + , 'awesome-markers' ], function( declare , lang diff --git a/public/javascript/redmic/modules/map/layer/GridLayerImpl.js b/client-app/src/component/map/layer/GridLayerImpl.js similarity index 98% rename from public/javascript/redmic/modules/map/layer/GridLayerImpl.js rename to client-app/src/component/map/layer/GridLayerImpl.js index 7a7e14711bf63ce67f69875055aa42e5c2e68e7a..356bf07fba5c3275b14ba32d95dd62f0b1fa37fc 100644 --- a/public/javascript/redmic/modules/map/layer/GridLayerImpl.js +++ b/client-app/src/component/map/layer/GridLayerImpl.js @@ -1,11 +1,11 @@ define([ - 'd3/d3.min' + 'd3' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , 'leaflet/leaflet' - , "redmic/base/Credentials" - , "redmic/modules/filter/Filter" + , 'leaflet' + , "src/util/Credentials" + , "src/component/filter/Filter" , "./MapLayer" ], function( d3 diff --git a/public/javascript/redmic/modules/map/layer/MapLayer.js b/client-app/src/component/map/layer/MapLayer.js similarity index 98% rename from public/javascript/redmic/modules/map/layer/MapLayer.js rename to client-app/src/component/map/layer/MapLayer.js index 004c61ca1c89b76c7cfc819117421e93145c78ab..438a073231352847c9ce4b8a5e53863bac139d47 100644 --- a/public/javascript/redmic/modules/map/layer/MapLayer.js +++ b/client-app/src/component/map/layer/MapLayer.js @@ -1,8 +1,8 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Module" - , "redmic/modules/base/_Store" + , "src/component/base/_Module" + , "src/component/base/_Store" , "./_MapLayerItfc" ], function( declare @@ -190,7 +190,7 @@ define([ _subLayerAdded: function(response) { // TODO quizá sea mejor retrasar la carga de la leyenda, bajo petición - this._getLayerLegend(response.extraInfo); + this._getLayerLegend(response.atlasItem); this._mapInstance = response.mapInstance; this._publish(this.getChannel('CONNECT'), { diff --git a/public/javascript/redmic/modules/map/layer/PruneClusterLayerImpl.js b/client-app/src/component/map/layer/PruneClusterLayerImpl.js similarity index 98% rename from public/javascript/redmic/modules/map/layer/PruneClusterLayerImpl.js rename to client-app/src/component/map/layer/PruneClusterLayerImpl.js index 5f1db0811684e159bef7555bb62e79af3f9be54b..d20893091b4823f9787904593c6ba3239455d3f9 100644 --- a/public/javascript/redmic/modules/map/layer/PruneClusterLayerImpl.js +++ b/client-app/src/component/map/layer/PruneClusterLayerImpl.js @@ -2,14 +2,14 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , 'leaflet/leaflet' - , 'pruneCluster/PruneCluster.amd.min' + , 'leaflet' + , 'pruneCluster' , "templates/LoadingArrows" , "./_AnimateMarker" , "./_PruneClusterLayerItfc" , "./MapLayer" - , 'awesome-markers/leaflet.awesome-markers.min' + , 'awesome-markers' ], function( declare , lang @@ -162,7 +162,7 @@ define([ createIcon: function () { - var e = document.createElement('canvas'); + var e = globalThis.document.createElement('canvas'); this._setIconStyles(e, 'icon'); var s = this.options.iconSize; e.width = s.x; diff --git a/public/javascript/redmic/modules/map/layer/TrackingLayerImpl.js b/client-app/src/component/map/layer/TrackingLayerImpl.js similarity index 99% rename from public/javascript/redmic/modules/map/layer/TrackingLayerImpl.js rename to client-app/src/component/map/layer/TrackingLayerImpl.js index c572b1509457558e601e391cc36f1d5107727cb9..a8c1fede20b8b9238c24616948fd6ba96242ba93 100644 --- a/public/javascript/redmic/modules/map/layer/TrackingLayerImpl.js +++ b/client-app/src/component/map/layer/TrackingLayerImpl.js @@ -1,5 +1,5 @@ define([ - 'd3/d3.min' + 'd3' , 'dojo/_base/declare' , 'dojo/_base/lang' , 'dojo/aspect' @@ -8,7 +8,7 @@ define([ , 'dojo/mouse' , 'dojo/on' , 'dojo/promise/all' - , 'redmic/modules/map/layer/TrackingLine' + , 'src/component/map/layer/TrackingLine' , 'RWidgets/Utilities' , './_D3Expansion' , './MapLayer' diff --git a/public/javascript/redmic/modules/map/layer/TrackingLine.js b/client-app/src/component/map/layer/TrackingLine.js similarity index 99% rename from public/javascript/redmic/modules/map/layer/TrackingLine.js rename to client-app/src/component/map/layer/TrackingLine.js index d3e683e00246563c2c3b3ef601d33d2ff9c92dd1..5ca1726c213e02172ea19dcd2ef08f3c8d7dfd17 100644 --- a/public/javascript/redmic/modules/map/layer/TrackingLine.js +++ b/client-app/src/component/map/layer/TrackingLine.js @@ -1,12 +1,12 @@ define([ - 'd3/d3.min' + 'd3' , 'dojo/_base/declare' , 'dojo/_base/lang' , 'dojo/Deferred' , 'dojo/mouse' , 'dojo/on' - , 'leaflet/leaflet' - , 'redmic/modules/base/_Module' + , 'leaflet' + , 'src/component/base/_Module' , 'RWidgets/Utilities' , './_TrackingDataManagement' , './_TrackingMarkersManagement' diff --git a/client-app/src/component/map/layer/WmsLayerImpl.js b/client-app/src/component/map/layer/WmsLayerImpl.js new file mode 100644 index 0000000000000000000000000000000000000000..e63b52079732a8ad78198c8e61b9cebed2d73a04 --- /dev/null +++ b/client-app/src/component/map/layer/WmsLayerImpl.js @@ -0,0 +1,123 @@ +define([ + 'dojo/_base/declare' + , 'dojo/_base/lang' + , 'src/component/map/layer/_LayerDimensions' + , 'src/component/map/layer/_LayerFeatureInfo' + , 'src/component/map/layer/_LayerProtocols' + , 'src/component/map/layer/MapLayer' + , 'src/component/map/StaticLayersDefinition' + , 'templates/ServiceOGCImage' +], function( + declare + , lang + , _LayerDimensions + , _LayerFeatureInfo + , _LayerProtocols + , MapLayer + , StaticLayersDefinition + , ServiceOGCImage +) { + + return declare([MapLayer, _LayerProtocols, _LayerFeatureInfo, _LayerDimensions], { + // summary: + // Implementación de capa provista por servicio externo. + // description: + // Proporciona la fachada para trabajar con capas servidas mediante protocolos WMS, WMS-C, WMTS y TMS. + + constructor: function(args) { + + this.config = { + ownChannel: 'wmsLayer', + innerLayerDefinition: null, + refresh: 0 + }; + + lang.mixin(this, this.config, args); + }, + + _initialize: function() { + + if (!this.innerLayerDefinition) { + return; + } + + if (typeof this.innerLayerDefinition === 'string') { + this.innerLayerDefinition = StaticLayersDefinition[this.innerLayerDefinition]; + } + + this.layer = this._getLayerInstance(this.innerLayerDefinition); + }, + + _afterLayerAdded: function(data) { + + this._setRefreshInterval(); + }, + + _afterLayerRemoved: function() { + + this._stopRefreshInterval(); + }, + + _setRefreshInterval: function() { + + if (this._checkRefreshIsValid() && !this._refreshIntervalHandler) { + var cbk = lang.hitch(this, this._redraw), + timeout = this.refresh * 1000; + + this._refreshIntervalHandler = setInterval(cbk, timeout); + } + }, + + _checkRefreshIsValid: function() { + + return this.refresh && Number.isInteger(this.refresh); + }, + + _redraw: function() { + + if (!this.layer) { + return; + } + + this.layer.setParams({ + timestamp: Date.now() + }); + }, + + _stopRefreshInterval: function() { + + if (!this._refreshIntervalHandler) { + return; + } + + clearInterval(this._refreshIntervalHandler); + delete this._refreshIntervalHandler; + }, + + _getLayerLegend: function(atlasItem) { + + var legendElement = ServiceOGCImage({ + data: atlasItem + }); + + this._emitEvt('LAYER_LEGEND', this._getLayerLegendToPublish(legendElement)); + }, + + _chkLayerIsMe: function(response) { + + var layerAddedId = response.layer._leaflet_id; + + return layerAddedId === this.layerId; + }, + + _onMapShown: function(response) { + + this._setRefreshInterval(); + }, + + _onMapHidden: function(response) { + + this._stopRefreshInterval(); + } + }); +}); diff --git a/public/javascript/redmic/modules/map/layer/_AddFilter.js b/client-app/src/component/map/layer/_AddFilter.js similarity index 98% rename from public/javascript/redmic/modules/map/layer/_AddFilter.js rename to client-app/src/component/map/layer/_AddFilter.js index 285d67017ddd2fecc507954f153da0a1c57a3a2d..dae7160aedea49319d9a6e0d7a725df377ed6115 100644 --- a/public/javascript/redmic/modules/map/layer/_AddFilter.js +++ b/client-app/src/component/map/layer/_AddFilter.js @@ -2,7 +2,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "redmic/modules/base/_Filter" + , "src/component/base/_Filter" ], function( declare , lang diff --git a/public/javascript/redmic/modules/map/layer/_AnimateMarker.js b/client-app/src/component/map/layer/_AnimateMarker.js similarity index 93% rename from public/javascript/redmic/modules/map/layer/_AnimateMarker.js rename to client-app/src/component/map/layer/_AnimateMarker.js index e7668add9a036c57d13e067e399bc74ccd3c2eec..8bc5d8f6c67bb2de9354999edccaabf470877faa 100644 --- a/public/javascript/redmic/modules/map/layer/_AnimateMarker.js +++ b/client-app/src/component/map/layer/_AnimateMarker.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , 'put-selector/put' + , 'put-selector' ], function( declare , lang @@ -45,7 +45,7 @@ define([ put(container.parentNode, icon); put('!', container); - }, markerIcon, animatedContainer)); + }, markerIcon, animatedContainer), { passive: true }); } }); }); diff --git a/public/javascript/redmic/modules/map/layer/_D3Expansion.js b/client-app/src/component/map/layer/_D3Expansion.js similarity index 100% rename from public/javascript/redmic/modules/map/layer/_D3Expansion.js rename to client-app/src/component/map/layer/_D3Expansion.js diff --git a/public/javascript/redmic/modules/map/layer/_Editable.js b/client-app/src/component/map/layer/_Editable.js similarity index 99% rename from public/javascript/redmic/modules/map/layer/_Editable.js rename to client-app/src/component/map/layer/_Editable.js index 860414307652d2721d129f7c74ed27569afae0b2..e1ef2968876f7b54b35c269fa6fce8b2c53e3aa5 100644 --- a/public/javascript/redmic/modules/map/layer/_Editable.js +++ b/client-app/src/component/map/layer/_Editable.js @@ -4,7 +4,7 @@ define([ , "dojo/aspect" , "dojo/query" , "RWidgets/Utilities" - , "redmic/modules/map/layer/_RadiusCommons" + , "src/component/map/layer/_RadiusCommons" ], function( declare , lang diff --git a/public/javascript/redmic/modules/map/layer/_GeoJsonLayerItfc.js b/client-app/src/component/map/layer/_GeoJsonLayerItfc.js similarity index 92% rename from public/javascript/redmic/modules/map/layer/_GeoJsonLayerItfc.js rename to client-app/src/component/map/layer/_GeoJsonLayerItfc.js index f6652229ed88ce94d1719a1e3831356bedf2ef77..13995df716dded026ca6bab9e46aa5d1675716c9 100644 --- a/public/javascript/redmic/modules/map/layer/_GeoJsonLayerItfc.js +++ b/client-app/src/component/map/layer/_GeoJsonLayerItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/public/javascript/redmic/modules/map/layer/_Highlightable.js b/client-app/src/component/map/layer/_Highlightable.js similarity index 100% rename from public/javascript/redmic/modules/map/layer/_Highlightable.js rename to client-app/src/component/map/layer/_Highlightable.js diff --git a/client-app/src/component/map/layer/_LayerDimensions.js b/client-app/src/component/map/layer/_LayerDimensions.js new file mode 100644 index 0000000000000000000000000000000000000000..12e77a10c8dfe8739003b8562c4d044e4959a756 --- /dev/null +++ b/client-app/src/component/map/layer/_LayerDimensions.js @@ -0,0 +1,119 @@ +define([ + 'dojo/_base/declare' + , 'dojo/_base/lang' + , 'dojo/aspect' + , 'moment' +], function( + declare + , lang + , aspect + , moment +) { + + return declare(null, { + // summary: + // Extensión de MapLayer para asignar valores a diferentes dimensiones de la capa, como la temporal o la de + // elevación. + + constructor: function(args) { + + this.config = { + layerDimensionsActions: { + SET_LAYER_DIMENSION: 'SET_LAYER_DIMENSION' + }, + + _currentDimensionValues: {} + }; + + lang.mixin(this, this.config, args); + + aspect.after(this, '_mixEventsAndActions', lang.hitch(this, this._mixLayerDimensionsEventsAndActions)); + aspect.after(this, '_defineSubscriptions', lang.hitch(this, this._defineLayerDimensionsSubscriptions)); + aspect.after(this, '_afterLayerAdded', lang.hitch(this, this._afterLayerAddedLayerDimensions)); + }, + + _mixLayerDimensionsEventsAndActions: function() { + + lang.mixin(this.actions, this.layerDimensionsActions); + delete this.layerDimensionsActions; + }, + + _defineLayerDimensionsSubscriptions: function() { + + this.subscriptionsConfig.push({ + channel: this.getChannel('SET_LAYER_DIMENSION'), + callback: '_subSetLayerDimension' + }); + + this._deleteDuplicatedChannels(this.subscriptionsConfig); + }, + + _afterLayerAddedLayerDimensions: function() { + + var elevationDimension = this.dimensions && this.dimensions.elevation; + + if (elevationDimension) { + this._setElevationDimension({ + value: elevationDimension.defaultValue + }); + } + }, + + _obtainDimensionParams: function(data) { + + var dimensionParams = {}; + + this._obtainTimeDimensionParams(dimensionParams, data); + this._obtainElevationDimensionParams(dimensionParams); + + return dimensionParams; + }, + + _obtainTimeDimensionParams: function(dimensionParams, data) { + + if (dimensionParams && data && data.time) { + dimensionParams.time = moment(data.time).toISOString(); + this._currentDimensionValues.time = dimensionParams.time; + } + + return dimensionParams; + }, + + _obtainElevationDimensionParams: function(dimensionParams) { + + if (dimensionParams && this._currentDimensionValues.elevation) { + dimensionParams.elevation = this._currentDimensionValues.elevation; + } + + return dimensionParams; + }, + + _subSetLayerDimension: function(req) { + + if (!req || !req.elevation) { + return; + } + + this._setElevationDimension(req.elevation); + }, + + _setElevationDimension: function(elevation) { + + var newElevation = elevation.value; + this._currentDimensionValues.elevation = newElevation; + + this._applyElevationDimension(); + }, + + _applyElevationDimension: function() { + + if (!this.layer) { + return; + } + + this.layer.setParams({ + elevation: this._currentDimensionValues.elevation + }); + } + }); +}); diff --git a/public/javascript/redmic/modules/map/layer/WmsLayerImpl.js b/client-app/src/component/map/layer/_LayerFeatureInfo.js similarity index 63% rename from public/javascript/redmic/modules/map/layer/WmsLayerImpl.js rename to client-app/src/component/map/layer/_LayerFeatureInfo.js index 482bc0b8cffd97f0ed4c113b05c57526065108e6..0017010f11e99fa26bd7faf83ac22e0ba0bac135 100644 --- a/public/javascript/redmic/modules/map/layer/WmsLayerImpl.js +++ b/client-app/src/component/map/layer/_LayerFeatureInfo.js @@ -1,33 +1,20 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' - , 'leaflet/leaflet' - , 'redmic/modules/map/StaticLayersDefinition' - , 'templates/ServiceOGCImage' - , './_LayerProtocols' - , './MapLayer' + , 'leaflet' ], function( declare , lang , L - , StaticLayersDefinition - , ServiceOGCImage - , _LayerProtocols - , MapLayer ) { - return declare([MapLayer, _LayerProtocols], { + return declare(null, { // summary: - // Implementación de capa provista por servicio externo. - // description: - // Proporciona la fachada para trabajar con capas servidas mediante protocolos WMS, WMS-C, WMTS y TMS. + // Extensión de WmsLayerImpl para gestionar las peticiones de información mediante getFeatureInfo. constructor: function(args) { this.config = { - ownChannel: 'wmsLayer', - layerDefinition: null, - refresh: 0, getFeatureInfoService: 'WMS', getFeatureInfoVersion: '1.1.1', getFeatureInfoRequest: 'GetFeatureInfo', @@ -40,72 +27,38 @@ define([ lang.mixin(this, this.config, args); }, - _initialize: function() { - - if (!this.layerDefinition) { - return; - } - - if (typeof this.layerDefinition === 'string') { - this.layerDefinition = StaticLayersDefinition[this.layerDefinition]; - } - - this.layer = this._getLayerInstance(this.layerDefinition); - }, - - _afterLayerAdded: function(data) { - - this._setRefreshInterval(); - }, - - _afterLayerRemoved: function() { - - this._stopRefreshInterval(); - }, - - _setRefreshInterval: function() { - - if (this._checkRefreshIsValid() && !this._refreshIntervalHandler) { - var cbk = lang.hitch(this, this._redraw), - timeout = this.refresh * 1000; - - this._refreshIntervalHandler = setInterval(cbk, timeout); - } - }, + _requestLayerInfo: function(obj) { - _checkRefreshIsValid: function() { + this.infoTarget = this._obtainLayerInfoTarget(obj); - return this.refresh && Number.isInteger(this.refresh); + this._emitEvt('GET', { + target: this.infoTarget, + requesterId: this.getOwnChannel(), + headers: { + 'X-Requested-With': '' + } + }); }, - _redraw: function() { - - if (!this.layer) { - return; - } + _processLayerInfo: function(data) { - this.layer.setParams({ - timestamp: Date.now() + this._emitEvt('LAYER_INFO', { + layerId: this.layerId, + layerLabel: this.layerLabel, + info: data }); }, - _stopRefreshInterval: function() { - - if (!this._refreshIntervalHandler) { - return; - } - - clearInterval(this._refreshIntervalHandler); - delete this._refreshIntervalHandler; - }, + _obtainLayerInfoTarget: function(data) { - _getLayerLegend: function(extraInfo) { + var protocol = this.innerLayerDefinition.protocol, + mustUseAlternativeDefinition = protocol === 'WMTS' || protocol === 'TMS' || protocol === 'WMS-C'; - var legendElement = ServiceOGCImage({ - data: extraInfo - }); + if (mustUseAlternativeDefinition) { + return this._obtainLayerAlternativeDefinitionTarget(data); + } - this._emitEvt('LAYER_LEGEND', this._getLayerLegendToPublish(legendElement)); + return this._obtainLayerMainDefinitionTarget(data); }, _chkUrlAndAddParams: function(url, paramsStr) { @@ -126,31 +79,6 @@ define([ return url + params; }, - _requestLayerInfo: function(obj) { - - this.infoTarget = this._obtainLayerInfoTarget(obj); - - this._emitEvt('GET', { - target: this.infoTarget, - requesterId: this.getOwnChannel(), - headers: { - 'X-Requested-With': '' - } - }); - }, - - _obtainLayerInfoTarget: function(data) { - - var protocol = this.layerDefinition.protocol, - mustUseAlternativeDefinition = protocol === 'WMTS' || protocol === 'TMS' || protocol === 'WMS-C'; - - if (mustUseAlternativeDefinition) { - return this._obtainLayerAlternativeDefinitionTarget(data); - } - - return this._obtainLayerMainDefinitionTarget(data); - }, - _obtainLayerMainDefinitionTarget: function(data) { return this._chkUrlAndAddParams(this._obtainMainGetUrl(), this._obtainMainGetParams(data)); @@ -158,7 +86,7 @@ define([ _obtainLayerAlternativeDefinitionTarget: function(data) { - var alternativeDefinitions = this.layerDefinition.alternativeDefinitions, + var alternativeDefinitions = this.innerLayerDefinition.alternativeDefinitions, alternativeDefinition; for (var i = 0; i < alternativeDefinitions.length; i++) { @@ -170,7 +98,7 @@ define([ } if (!alternativeDefinition) { - console.error('Alternative protocol not found for GetFeatureInfo at layer:', this.layerDefinition); + console.error('Alternative protocol not found for GetFeatureInfo at layer:', this.innerLayerDefinition); return; } @@ -217,50 +145,53 @@ define([ _obtainAltGetParams: function(altDef, data) { - var getParams = this._obtainCommonGetParams(), - posParams = this._obtainPositionGetParams(data.containerPoint, getParams.version), + var commonGetParams = this._obtainCommonGetParams(), + dimensionParams = this._obtainDimensionParams(data), + positionParams = this._obtainPositionGetParams(data.containerPoint, commonGetParams.version), + sizeParams = { + width: data.size.x, + height: data.size.y, + bbox: data.bbox.toBBoxString() + }, layerProps = altDef.props, layerName = layerProps.layers, layerStyles = layerProps.styles || ''; - lang.mixin(getParams, posParams, { + var getParams = this._merge([commonGetParams, dimensionParams, positionParams, sizeParams, { layers: layerName, query_layers: layerName, - styles: layerStyles, - width: data.size.x, - height: data.size.y, - bbox: data.bbox.toBBoxString() - }); + styles: layerStyles + }]); return L.Util.getParamString(getParams); }, _obtainMainGetUrl: function() { - return this.layer._wmsUrl + '?'; + var innerLayer = this._getInnerLayerInstance(); + + return innerLayer._wmsUrl + '?'; }, _obtainMainGetParams: function(data) { - var getParams = this._obtainCommonGetParams(), - serviceVersion = getParams.version, - layerName = this.layer.wmsParams.layers; - - lang.mixin(getParams, { - layers: layerName, - query_layers: layerName, - styles: this.layer.wmsParams.styles - }); + var commonGetParams = this._obtainCommonGetParams(), + dimensionParams = this._obtainDimensionParams(data), + serviceVersion = commonGetParams.version, + layerName = this._getLayerWmsParams().layers, + positionParams, sizeParams; - var isTiled = this.layerDefinition.protocol === 'WMS-C'; + var isTiled = this.innerLayerDefinition.protocol === 'WMS-C'; if (!isTiled) { var containerPosParams = this._obtainPositionGetParams(data.containerPoint, serviceVersion); - lang.mixin(getParams, containerPosParams, { + positionParams = containerPosParams; + + sizeParams = { width: data.size.x, height: data.size.y, bbox: data.bbox.toBBoxString() - }); + }; } else { var tile = this._getClickedTile(data.latLng, data.zoom), tileSize = this.layer.getTileSize(), @@ -268,16 +199,42 @@ define([ tilePosParams = this._obtainPositionGetParams(tilePoint, serviceVersion); // TODO falla el punto - lang.mixin(getParams, tilePosParams, { + positionParams = tilePosParams; + + sizeParams = { width: tileSize.x, height: tileSize.y, bbox: this._getTileBbox(tile) - }); + }; } + var getParams = this._merge([commonGetParams, dimensionParams, positionParams, sizeParams, { + layers: layerName, + query_layers: layerName, + styles: this._getLayerWmsParams().styles + }]); + return L.Util.getParamString(getParams); }, + _getInnerLayerInstance: function() { + + var innerLayer; + if (this.layer.getBaseLayer) { + innerLayer = this.layer.getBaseLayer(); + } else { + innerLayer = this.layer; + } + return innerLayer; + }, + + _getLayerWmsParams: function() { + + var innerLayer = this._getInnerLayerInstance(); + + return innerLayer.wmsParams || {}; + }, + _getClickedTile: function(clickLatLng, currZoom) { var clickedTileKey = this._getTileKey(clickLatLng, currZoom); @@ -311,32 +268,6 @@ define([ exprMatches = new RegExp(bboxExpr).exec(tileSrc); return exprMatches[1]; - }, - - _chkLayerIsMe: function(response) { - - var layerAddedId = response.layer._leaflet_id; - - return layerAddedId === this.layerId; - }, - - _processLayerInfo: function(data) { - - this._emitEvt('LAYER_INFO', { - layerId: this.layerId, - layerLabel: this.layerLabel, - info: data - }); - }, - - _onMapShown: function(response) { - - this._setRefreshInterval(); - }, - - _onMapHidden: function(response) { - - this._stopRefreshInterval(); } }); }); diff --git a/public/javascript/redmic/modules/map/layer/_LayerProtocols.js b/client-app/src/component/map/layer/_LayerProtocols.js similarity index 95% rename from public/javascript/redmic/modules/map/layer/_LayerProtocols.js rename to client-app/src/component/map/layer/_LayerProtocols.js index 5c32033bc72e7f8666d4d9bbc323785e0012af90..c7eadca7810d60b7cdd071bf2facef5a25274b52 100644 --- a/public/javascript/redmic/modules/map/layer/_LayerProtocols.js +++ b/client-app/src/component/map/layer/_LayerProtocols.js @@ -1,9 +1,9 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' - , 'leaflet/leaflet' + , 'leaflet' - , 'leaflet-nontiledlayer/NonTiledLayer' + , 'leaflet-nontiledlayer' ], function( declare , lang @@ -56,6 +56,7 @@ define([ if (layerProtocol === 'WMS') { layerProps.pane = 'tilePane'; + layerProps.version = '1.3.0'; } return new LayerImplementation(layerUrl, layerProps); // return Object diff --git a/public/javascript/redmic/modules/map/layer/_ListenBounds.js b/client-app/src/component/map/layer/_ListenBounds.js similarity index 100% rename from public/javascript/redmic/modules/map/layer/_ListenBounds.js rename to client-app/src/component/map/layer/_ListenBounds.js diff --git a/public/javascript/redmic/modules/map/layer/_ListenZoom.js b/client-app/src/component/map/layer/_ListenZoom.js similarity index 100% rename from public/javascript/redmic/modules/map/layer/_ListenZoom.js rename to client-app/src/component/map/layer/_ListenZoom.js diff --git a/public/javascript/redmic/modules/map/layer/_MapLayerItfc.js b/client-app/src/component/map/layer/_MapLayerItfc.js similarity index 95% rename from public/javascript/redmic/modules/map/layer/_MapLayerItfc.js rename to client-app/src/component/map/layer/_MapLayerItfc.js index 298507f65368f4af7b6991dc2b1f9f5700c6f2be..11e00f53f03de242b703f604eb3245ec9f05ffe6 100644 --- a/public/javascript/redmic/modules/map/layer/_MapLayerItfc.js +++ b/client-app/src/component/map/layer/_MapLayerItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/public/javascript/redmic/modules/map/layer/_PruneClusterLayerItfc.js b/client-app/src/component/map/layer/_PruneClusterLayerItfc.js similarity index 93% rename from public/javascript/redmic/modules/map/layer/_PruneClusterLayerItfc.js rename to client-app/src/component/map/layer/_PruneClusterLayerItfc.js index 9d48c41be6ac5ed85d83539fd47a80d03fa45524..b99df1bc3b1d73fab9ac61e608134657e1a5c31f 100644 --- a/public/javascript/redmic/modules/map/layer/_PruneClusterLayerItfc.js +++ b/client-app/src/component/map/layer/_PruneClusterLayerItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/public/javascript/redmic/modules/map/layer/_PublishInfo.js b/client-app/src/component/map/layer/_PublishInfo.js similarity index 95% rename from public/javascript/redmic/modules/map/layer/_PublishInfo.js rename to client-app/src/component/map/layer/_PublishInfo.js index bcf1f7ee1804c96525dbc9f4b92389efda7a90c8..e4ed8ea84fcf532e53f9ec94e319dfac6ba87fab 100644 --- a/public/javascript/redmic/modules/map/layer/_PublishInfo.js +++ b/client-app/src/component/map/layer/_PublishInfo.js @@ -34,8 +34,8 @@ define([ constructor: function(args) { aspect.after(this, "_mixEventsAndActions", lang.hitch(this, this._mixPublishInfoEventsAndActions)); - aspect.after(this, "_defineSubscriptions", lang.hitch(this, this._defineSelectionSubscriptions)); - aspect.after(this, "_definePublications", lang.hitch(this, this._defineSelectionPublications)); + aspect.after(this, "_defineSubscriptions", lang.hitch(this, this._definePublishInfoSubscriptions)); + aspect.after(this, "_definePublications", lang.hitch(this, this._definePublishInfoPublications)); }, _mixPublishInfoEventsAndActions: function () { @@ -46,7 +46,7 @@ define([ delete this.publishInfoActions; }, - _defineSelectionSubscriptions: function () { + _definePublishInfoSubscriptions: function () { this.subscriptionsConfig.push({ channel: this._buildChannel(this.mapChannel, this.actions.MAP_CLICKED), @@ -71,7 +71,7 @@ define([ this._deleteDuplicatedChannels(this.subscriptionsConfig); }, - _defineSelectionPublications: function () { + _definePublishInfoPublications: function () { this.publicationsConfig.push({ event: 'LAYER_INFO', diff --git a/public/javascript/redmic/modules/map/layer/_PublishInfoItfc.js b/client-app/src/component/map/layer/_PublishInfoItfc.js similarity index 93% rename from public/javascript/redmic/modules/map/layer/_PublishInfoItfc.js rename to client-app/src/component/map/layer/_PublishInfoItfc.js index 108ea1bf6d06ba017613cc3678048d5955017bad..c0e73e62b355cc50011b38b5efb351557514c5b0 100644 --- a/public/javascript/redmic/modules/map/layer/_PublishInfoItfc.js +++ b/client-app/src/component/map/layer/_PublishInfoItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/public/javascript/redmic/modules/map/layer/_RadiusCommons.js b/client-app/src/component/map/layer/_RadiusCommons.js similarity index 100% rename from public/javascript/redmic/modules/map/layer/_RadiusCommons.js rename to client-app/src/component/map/layer/_RadiusCommons.js diff --git a/public/javascript/redmic/modules/map/layer/_RadiusOnClick.js b/client-app/src/component/map/layer/_RadiusOnClick.js similarity index 98% rename from public/javascript/redmic/modules/map/layer/_RadiusOnClick.js rename to client-app/src/component/map/layer/_RadiusOnClick.js index 8b5cef28968ee785a7a57c912c912d18f4eb55db..09a8ed1dafa982b1e036af8fb06417ee506309ea 100644 --- a/public/javascript/redmic/modules/map/layer/_RadiusOnClick.js +++ b/client-app/src/component/map/layer/_RadiusOnClick.js @@ -2,7 +2,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "redmic/modules/map/layer/_RadiusCommons" + , "src/component/map/layer/_RadiusCommons" ], function( declare , lang diff --git a/public/javascript/redmic/modules/map/layer/_RadiusOnSelect.js b/client-app/src/component/map/layer/_RadiusOnSelect.js similarity index 96% rename from public/javascript/redmic/modules/map/layer/_RadiusOnSelect.js rename to client-app/src/component/map/layer/_RadiusOnSelect.js index 62cf141c2bc661ff03cf94741700c87d1dff4998..cd4c55ef855f73c86034d1e1f8258f593f1a9a35 100644 --- a/public/javascript/redmic/modules/map/layer/_RadiusOnSelect.js +++ b/client-app/src/component/map/layer/_RadiusOnSelect.js @@ -2,7 +2,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "redmic/modules/map/layer/_RadiusCommons" + , "src/component/map/layer/_RadiusCommons" ], function( declare , lang diff --git a/public/javascript/redmic/modules/map/layer/_SelectOnClick.js b/client-app/src/component/map/layer/_SelectOnClick.js similarity index 100% rename from public/javascript/redmic/modules/map/layer/_SelectOnClick.js rename to client-app/src/component/map/layer/_SelectOnClick.js diff --git a/public/javascript/redmic/modules/map/layer/_Selectable.js b/client-app/src/component/map/layer/_Selectable.js similarity index 99% rename from public/javascript/redmic/modules/map/layer/_Selectable.js rename to client-app/src/component/map/layer/_Selectable.js index 5a6ec4caf62123faa4cfd418fcb4b31da6e77d14..74f35b75d7bc738a43c399d4307715ad59d3439c 100644 --- a/public/javascript/redmic/modules/map/layer/_Selectable.js +++ b/client-app/src/component/map/layer/_Selectable.js @@ -2,7 +2,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "redmic/modules/base/_Selection" + , "src/component/base/_Selection" , "./_SelectableItfc" ], function( declare diff --git a/public/javascript/redmic/modules/map/layer/_SelectableItfc.js b/client-app/src/component/map/layer/_SelectableItfc.js similarity index 93% rename from public/javascript/redmic/modules/map/layer/_SelectableItfc.js rename to client-app/src/component/map/layer/_SelectableItfc.js index 34da5c4f57be9688d7d32cfdca5f1dd92d301292..a868007bb1836797437f979fd029e4f23bd63ed4 100644 --- a/public/javascript/redmic/modules/map/layer/_SelectableItfc.js +++ b/client-app/src/component/map/layer/_SelectableItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/public/javascript/redmic/modules/map/layer/_TrackingDataManagement.js b/client-app/src/component/map/layer/_TrackingDataManagement.js similarity index 99% rename from public/javascript/redmic/modules/map/layer/_TrackingDataManagement.js rename to client-app/src/component/map/layer/_TrackingDataManagement.js index 9ea0385ca9e9196ac48c6b4639c6f38e8b35f9d3..9b83abc6bf4ac0452716ea0eae0a10aeed9fd49e 100644 --- a/public/javascript/redmic/modules/map/layer/_TrackingDataManagement.js +++ b/client-app/src/component/map/layer/_TrackingDataManagement.js @@ -2,7 +2,7 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' , 'dojo/aspect' - , 'moment/moment.min' + , 'moment' , 'RWidgets/Utilities' ], function( declare diff --git a/public/javascript/redmic/modules/map/layer/_TrackingMarkersManagement.js b/client-app/src/component/map/layer/_TrackingMarkersManagement.js similarity index 99% rename from public/javascript/redmic/modules/map/layer/_TrackingMarkersManagement.js rename to client-app/src/component/map/layer/_TrackingMarkersManagement.js index d44a78d716f3df8fcc5e5b262aa13178bc114ba7..66eb7e1e6a38867ae019af53fab4a41f1f1b5981 100644 --- a/public/javascript/redmic/modules/map/layer/_TrackingMarkersManagement.js +++ b/client-app/src/component/map/layer/_TrackingMarkersManagement.js @@ -1,5 +1,5 @@ define([ - 'd3/d3.min' + 'd3' , 'dojo/_base/declare' , 'dojo/_base/lang' , 'dojo/aspect' diff --git a/client-app/src/component/map/widget/_LeafletLayersSelector.js b/client-app/src/component/map/widget/_LeafletLayersSelector.js new file mode 100644 index 0000000000000000000000000000000000000000..b9b8f3d44cee00602839d9dde17540b6de9c425b --- /dev/null +++ b/client-app/src/component/map/widget/_LeafletLayersSelector.js @@ -0,0 +1,88 @@ +define([ + 'dojo/_base/declare' + , 'dojo/_base/lang' + , 'dojo/dom-class' + , 'dojo/aspect' + , 'leaflet' +], function( + declare + , lang + , domClass + , aspect + , L +) { + + return declare(null, { + // summary: + // Incluye y configura widget selector de capas para Leaflet y prepara callbacks relacionados con la + // gestión de capas. + + constructor: function(args) { + + this.config = { + layersSelector: true + }; + + lang.mixin(this, this.config, args); + + if (this.layersSelector) { + this._layersSelectorInstance = L.control.layers(); + } + + aspect.before(this, '_addMapWidgets', lang.hitch(this, this._addLayersSelectorMapWidgets)); + }, + + _addLayersSelectorMapWidgets: function() { + + if (!this.layersSelector || !this._layersSelectorInstance) { + return; + } + + this._addLayersSelector(); + }, + + _addLayersSelector: function() { + + this._layersSelectorInstance.addTo(this.map); + domClass.add(this._layersSelectorInstance._container.firstChild, 'fa-globe'); + }, + + _addLayerToSelector: function(layer, label, optional) { + + if (!this._layersSelectorInstance) { + return; + } + + var addMethod = !optional ? 'addBaseLayer' : 'addOverlay', + layerLabel = this.i18n[label] || label; + + this._layersSelectorInstance[addMethod](layer, layerLabel); + }, + + _removeLayerFromSelector: function(layer) { + + if (!this._layersSelectorInstance) { + return; + } + + this._layersSelectorInstance.removeLayer(layer); + }, + + _onBaseLayerChange: function(evt) { + + var layerInstance = evt.layer, + layerId = layerInstance._leaflet_id; + + this._setLayerZIndex(layerInstance, 0); + + this._emitEvt('TRACK', { + type: TRACK.type.event, + info: { + category: TRACK.category.layer, + action: TRACK.action.click, + label: 'Basemap changed: ' + layerId + } + }); + } + }); +}); diff --git a/client-app/src/component/map/widget/_LeafletMeasureTools.js b/client-app/src/component/map/widget/_LeafletMeasureTools.js new file mode 100644 index 0000000000000000000000000000000000000000..3fa7e9c54cda2bedc763871c4e8792ec340950e9 --- /dev/null +++ b/client-app/src/component/map/widget/_LeafletMeasureTools.js @@ -0,0 +1,107 @@ +define([ + 'dojo/_base/declare' + , 'dojo/_base/kernel' + , 'dojo/_base/lang' + , 'dojo/aspect' + , 'leaflet' + , 'put-selector' +], function( + declare + , kernel + , lang + , aspect + , L + , put +) { + + return declare(null, { + // summary: + // Incluye y configura widget leaflet-measure para Leaflet. + + constructor: function(args) { + + this.config = { + measureTools: true + }; + + lang.mixin(this, this.config, args); + + aspect.before(this, '_addMapWidgets', lang.hitch(this, this._addMeasureToolsMapWidgets)); + }, + + _addMeasureToolsMapWidgets: function() { + + if (!this.measureTools) { + return; + } + + this._addMeasureTools(); + }, + + _addMeasureTools: function() { + + var measureToolsPath = 'leaflet-measure/leaflet-measure.' + kernel.locale; + + require([measureToolsPath], lang.hitch(this, this._onMeasureToolsLoaded)); + + this.map.on('measurestart', lang.hitch(this, this._onLeafletMeasureStart)); + this.map.on('measurefinish', lang.hitch(this, this._onLeafletMeasureFinish)); + }, + + _onMeasureToolsLoaded: function() { + + this._applyAutoJumpIssuePatch(); + + var measureTools = new L.Control.Measure({ + position: 'topright', + primaryLengthUnit: 'meters', + secondaryLengthUnit: 'kilometers', + primaryAreaUnit: 'sqmeters', + secondaryAreaUnit: 'hectares' + }).addTo(this.map); + + this._reorderMeasureToolsMapButton(measureTools._container); + }, + + _applyAutoJumpIssuePatch: function() { + + // TODO workaround >= v1.8 https://github.com/ljagis/leaflet-measure/issues/171#issuecomment-1137483548 + L.Control.Measure.include({ + // set icon on the capture marker + _setCaptureMarkerIcon: function () { + // disable autopan + this._captureMarker.options.autoPanOnFocus = false; + + // default function + this._captureMarker.setIcon( + L.divIcon({ + iconSize: this._map.getSize().multiplyBy(2) + }) + ); + }, + }); + }, + + _reorderMeasureToolsMapButton: function(buttonContainerNode) { + + var controlsNode = buttonContainerNode.parentNode, + childControlNodes = Array.from(controlsNode.children), + desiredPreviousControlNode = childControlNodes.find(function(childNode) { + + return childNode.firstChild.title === 'Layers'; + }) || controlsNode.children[0]; + + if (desiredPreviousControlNode) { + put(desiredPreviousControlNode, '+', buttonContainerNode); + } + }, + + _onLeafletMeasureStart: function(evt) { + + }, + + _onLeafletMeasureFinish: function(evt) { + + } + }); +}); diff --git a/client-app/src/component/map/widget/_LeafletMiniMap.js b/client-app/src/component/map/widget/_LeafletMiniMap.js new file mode 100644 index 0000000000000000000000000000000000000000..10184e4753f22dcc4d70565854ced9fcfe59283c --- /dev/null +++ b/client-app/src/component/map/widget/_LeafletMiniMap.js @@ -0,0 +1,67 @@ +define([ + 'dojo/_base/declare' + , 'dojo/_base/lang' + , 'dojo/aspect' + , 'L-miniMap' +], function( + declare + , lang + , aspect + , MiniMap +) { + + return declare(null, { + // summary: + // Incluye y configura widget Leaflet-MiniMap para Leaflet. + + constructor: function(args) { + + this.config = { + miniMap: true + }; + + lang.mixin(this, this.config, args); + + aspect.after(this, '_addMapWidgets', lang.hitch(this, this._addMiniMapMapWidgets)); + aspect.after(this, 'invalidateSize', lang.hitch(this, this._miniMapInvalidateSize)); + }, + + _addMiniMapMapWidgets: function() { + + if (!this.miniMap) { + return; + } + + this._addMiniMap(); + }, + + _addMiniMap: function() { + + var baseLayer = this._getStaticLayerInstance('eoc-map'); + + var miniMapConfig = { + position: 'topright', + collapsedWidth: 28, + collapsedHeight: 28, + toggleDisplay: true, + minimized: true, + strings: { + showText: this.i18n.miniMapShowText, + hideText: this.i18n.miniMapHideText + } + }; + + this._miniMapInstance = new MiniMap(baseLayer, miniMapConfig); + this._miniMapInstance.addTo(this.map); + }, + + _miniMapInvalidateSize: function() { + + if (!this.miniMap || !this._miniMapInstance) { + return; + } + + this._miniMapInstance.addTo(this.map); + } + }); +}); diff --git a/client-app/src/component/map/widget/_LeafletTimeDimension.js b/client-app/src/component/map/widget/_LeafletTimeDimension.js new file mode 100644 index 0000000000000000000000000000000000000000..5dbb42764c4f2ba23bce6cf0f02c959c45ef778c --- /dev/null +++ b/client-app/src/component/map/widget/_LeafletTimeDimension.js @@ -0,0 +1,278 @@ +define([ + 'dojo/_base/declare' + , 'dojo/_base/lang' + , 'dojo/aspect' + , 'leaflet' + , 'moment' + , 'put-selector' + + , 'leaflet-nontiledlayer' + , 'iso8601-js-period' + , 'L-timeDimension' +], function( + declare + , lang + , aspect + , L + , moment + , put +) { + + return declare(null, { + // summary: + // Incluye y configura widget Leaflet.TimeDimension para Leaflet. + + constructor: function(args) { + + this.config = { + timeDimensionPeriod: 'P1D', + timeDimensionCurrentTime: moment().utc().startOf('day').subtract(1, 'days'), + timeDimensionControlPosition: 'bottomleft', + timeDimensionMinSpeed: 0.1, + timeDimensionMaxSpeed: 1, + timeDimensionSpeedStep: 0.1, + timeDimensionTransitionTime: 2000, + timeDimensionBuffer: 3, + timeDimensionMinBufferReady: 1, + + timeDimensionMinTime: null, + timeDimensionMaxTime: moment().utc().startOf('day'), + + getTimeDimensionExternalContainer: null, + + _layersWithTimeDimension: {} + }; + + lang.mixin(this, this.config, args); + + aspect.before(this, '_addMapLayer', lang.hitch(this, this._addTimeDimensionMapLayer)); + aspect.before(this, '_removeMapLayer', lang.hitch(this, this._removeTimeDimensionMapLayer)); + }, + + _addTimeDimensionMapLayer: function(obj) { + + var atlasItem = obj && obj.atlasItem; + + if (!atlasItem) { + return; + } + + var timeDefinition = atlasItem.timeDefinition; + + if (!timeDefinition) { + return; + } + + var layerId = obj.layerId || (obj.layer && obj.layer.layerId); + + this._layersWithTimeDimension[layerId] = timeDefinition; + + if (!this._timeDimensionInstance) { + this._addTimeDimensionWidget(); + } + + this._updateTimeDimensionWidget(); + }, + + _removeTimeDimensionMapLayer: function(layerId) { + + if (!this._layersWithTimeDimension[layerId]) { + return; + } + + delete this._layersWithTimeDimension[layerId]; + + var layerInstance = this._overlayLayers[layerId].instance; + this._timeDimensionInstance.unregisterSyncedLayer(layerInstance); + + var layersWithTimeDimensionCount = Object.keys(this._layersWithTimeDimension).length; + + if (!layersWithTimeDimensionCount && this._timeDimensionInstance) { + this._removeTimeDimensionWidget(); + return; + } + + this._updateTimeDimensionWidget(); + }, + + _updateTimeDimensionWidget: function() { + + var timeLimitsObj = this._getCurrentLayersTimeLimits(); + + if (this.timeDimensionMinTime) { + timeLimitsObj.startMoment = this.timeDimensionMinTime; + timeLimitsObj.startTime = timeLimitsObj.startMoment.toDate(); + } + + if (this.timeDimensionMaxTime) { + timeLimitsObj.endMoment = this.timeDimensionMaxTime; + timeLimitsObj.endTime = timeLimitsObj.endMoment.toDate(); + } + + var times = L.TimeDimension.Util.explodeTimeRange(timeLimitsObj.startTime, timeLimitsObj.endTime, + this.timeDimensionPeriod); + + this._timeDimensionInstance.setAvailableTimes(times, 'replace'); + + this._setValidTimePosition(timeLimitsObj); + }, + + _getCurrentLayersTimeLimits: function() { + + var layersTimeDefinitions = Object.values(this._layersWithTimeDimension), + startMoment, endMoment; + + layersTimeDefinitions.forEach(function(item) { + + var itemStartMoment = moment(item.startDate).utc(), + itemEndMoment = moment(item.endDate).utc(); + + if (!startMoment || itemStartMoment.isBefore(startMoment)) { + startMoment = itemStartMoment; + } + if (!endMoment || itemEndMoment.isAfter(endMoment)) { + endMoment = itemEndMoment; + } + }); + + return { + startMoment: startMoment, + endMoment: endMoment, + startTime: startMoment.valueOf(), + endTime: endMoment.valueOf() + }; + }, + + _setValidTimePosition: function(timeLimitsObj) { + + var currStartMoment = timeLimitsObj.startMoment, + currEndMoment = timeLimitsObj.endMoment, + currTime = this.timeDimensionCurrentTime || this._getCurrentlySelectedTime(), + validTimePosition = currTime; + + if (currStartMoment.isAfter(currTime)) { + validTimePosition = timeLimitsObj.startTime; + } else if (currEndMoment.isBefore(currTime)) { + validTimePosition = timeLimitsObj.endTime; + } + + this._timeDimensionInstance.setCurrentTime(validTimePosition); + }, + + _getCurrentlySelectedTime: function() { + + return this._timeDimensionInstance && this._timeDimensionInstance.getCurrentTime(); + }, + + _addTimeDimensionWidget: function() { + + this._timeDimensionInstance = new L.TimeDimension({ + period: this.timeDimensionPeriod + }); + + this._timeDimensionControlInstance = new L.Control.TimeDimension({ + timeDimension: this._timeDimensionInstance, + playerOptions: { + transitionTime: this.timeDimensionTransitionTime, + buffer: this.timeDimensionBuffer, + minBufferReady: this.timeDimensionMinBufferReady, + loop: true, + startOver: true + }, + position: this.timeDimensionControlPosition, + limitSliders: true, + autoPlay: false, + minSpeed: this.timeDimensionMinSpeed, + maxSpeed: this.timeDimensionMaxSpeed, + speedStep: this.timeDimensionSpeedStep + }).addTo(this.map); + + if (this.getTimeDimensionExternalContainer) { + this._manageTimeDimensionControlLocation(); + } + }, + + _manageTimeDimensionControlLocation: function() { + + var externalContainer = this.getTimeDimensionExternalContainer(); + + if (!externalContainer) { + return; + } + + if (externalContainer.then) { + externalContainer.then(lang.hitch(this, this._relocateTimeDimensionControl)); + } else { + this._relocateTimeDimensionControl(externalContainer); + } + }, + + _relocateTimeDimensionControl: function(externalContainer) { + + if (!externalContainer) { + return; + } + + put(externalContainer, this._timeDimensionControlInstance._container); + }, + + _removeTimeDimensionWidget: function() { + + this._timeDimensionControlInstance.remove(); + + delete this._timeDimensionControlInstance; + delete this._timeDimensionInstance; + }, + + _getInnerLayer: function(layer, layerId) { + + var originalLayer = this.inherited(arguments); + + if (!originalLayer || !this._layersWithTimeDimension[layerId]) { + return originalLayer; + } + + var timeDimensionLayer = this._getLayerWithTimeDimensionWrapper(layerId, originalLayer); + + // TODO parche para actualizar la instancia de la capa interna en el componente de capa, necesario para + // que responda a la hora de aplicarle cambios de parámetros, como el de la dimensión de elevación + layer.layer = timeDimensionLayer; + + return timeDimensionLayer; + }, + + _getLayerWithTimeDimensionWrapper: function(layerId, originalLayer) { + + var layerWithoutTimeDimension = originalLayer.getBaseLayer ? originalLayer.getBaseLayer() : originalLayer; + + var timeDimensionLayer = L.timeDimension.layer.wms(layerWithoutTimeDimension, { + timeDimension: this._timeDimensionInstance + }); + + this._setLayerAvailableTimes(timeDimensionLayer, this._layersWithTimeDimension[layerId]); + + this._timeDimensionInstance.registerSyncedLayer(timeDimensionLayer); + + return timeDimensionLayer; + }, + + _setLayerAvailableTimes: function(layerInstance, timeDefinition) { + + var layerStartTime = moment(timeDefinition.startDate).utc().toDate(), + layerEndTime = moment(timeDefinition.endDate).utc().toDate(), + layerPeriod = timeDefinition.period || this.timeDimensionPeriod, + timesArray = L.TimeDimension.Util.explodeTimeRange(layerStartTime, layerEndTime, layerPeriod); + + layerInstance.setAvailableTimes(timesArray); + }, + + _getMapClickEventValue: function(evt) { + + var inheritedValue = this.inherited(arguments) || {}; + + return this._merge([inheritedValue, { + time: this._getCurrentlySelectedTime() + }]); + } + }); +}); diff --git a/public/javascript/redmic/modules/mapQuery/QueryOnMap.js b/client-app/src/component/mapQuery/QueryOnMap.js similarity index 99% rename from public/javascript/redmic/modules/mapQuery/QueryOnMap.js rename to client-app/src/component/mapQuery/QueryOnMap.js index 69f1033b789a2647f2628542d69e03173a95f07f..c9745e134ccc428dbad56c81fdf32667e2ccdf31 100644 --- a/public/javascript/redmic/modules/mapQuery/QueryOnMap.js +++ b/client-app/src/component/mapQuery/QueryOnMap.js @@ -1,7 +1,7 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' - , 'redmic/modules/base/_Module' + , 'src/component/base/_Module' , './_ContentManagement' , './_ResultsBrowser' ], function( diff --git a/public/javascript/redmic/modules/mapQuery/_ContentManagement.js b/client-app/src/component/mapQuery/_ContentManagement.js similarity index 100% rename from public/javascript/redmic/modules/mapQuery/_ContentManagement.js rename to client-app/src/component/mapQuery/_ContentManagement.js diff --git a/public/javascript/redmic/modules/mapQuery/_ResultsBrowser.js b/client-app/src/component/mapQuery/_ResultsBrowser.js similarity index 94% rename from public/javascript/redmic/modules/mapQuery/_ResultsBrowser.js rename to client-app/src/component/mapQuery/_ResultsBrowser.js index 90683274854f45671236f5fb151a1037dd02ec19..f97625fb0987cb001d6d1e93b736048f634dd580 100644 --- a/public/javascript/redmic/modules/mapQuery/_ResultsBrowser.js +++ b/client-app/src/component/mapQuery/_ResultsBrowser.js @@ -2,9 +2,9 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' , 'dojo/aspect' - , 'redmic/modules/base/_Show' - , 'redmic/modules/layout/nestedContent/NestedBrowsersImpl' - , 'redmic/modules/layout/dataDisplayer/DataDisplayer' + , 'src/component/base/_Show' + , 'src/component/layout/nestedContent/NestedBrowsersImpl' + , 'src/component/layout/dataDisplayer/DataDisplayer' , 'templates/LoadingCustom' ], function( declare diff --git a/public/javascript/redmic/modules/model/Model.js b/client-app/src/component/model/Model.js similarity index 98% rename from public/javascript/redmic/modules/model/Model.js rename to client-app/src/component/model/Model.js index 0a59a328f2b41ed9acd1320a4d3b8fe8358a9414..f9adb84ddfa189fe8af481b555ed52b497d895e9 100644 --- a/public/javascript/redmic/modules/model/Model.js +++ b/client-app/src/component/model/Model.js @@ -1,10 +1,10 @@ define([ - 'app/redmicConfig' + 'src/redmicConfig' , 'dojo/_base/declare' , 'dojo/_base/lang' - , 'redmic/modules/base/_Module' - , 'redmic/modules/base/_Persistence' - , 'redmic/modules/base/_Store' + , 'src/component/base/_Module' + , 'src/component/base/_Persistence' + , 'src/component/base/_Store' , './_ModelItfc' ], function( redmicConfig diff --git a/public/javascript/redmic/modules/model/ModelImpl.js b/client-app/src/component/model/ModelImpl.js similarity index 98% rename from public/javascript/redmic/modules/model/ModelImpl.js rename to client-app/src/component/model/ModelImpl.js index 0ef31c42f80dfc3d1f4056ae58462f5215aaaab6..f7338d3bda6c2eda5acf5ec178cec820e8779649 100644 --- a/public/javascript/redmic/modules/model/ModelImpl.js +++ b/client-app/src/component/model/ModelImpl.js @@ -1,6 +1,6 @@ define([ - "app/base/models/_Model" - , "app/redmicConfig" + "src/component/model/model/_Model" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/Deferred" @@ -61,7 +61,7 @@ define([ var isValid = this.modelInstance.get('isValid'); - if (redmicConfig.getEnvVariableValue('envDebug') === 'true') { + if ((/true/i).test(redmicConfig.getEnvVariableValue('envDebug'))) { console.warn('Model validation errors', { target: this.target, isValid: isValid, diff --git a/public/javascript/redmic/modules/model/_ModelItfc.js b/client-app/src/component/model/_ModelItfc.js similarity index 96% rename from public/javascript/redmic/modules/model/_ModelItfc.js rename to client-app/src/component/model/_ModelItfc.js index 80f00054cada95e11af2c64aa2936db6571b42a5..1a7e9d3735083eb9a29ae66a72c6a9cee5bbbac0 100644 --- a/public/javascript/redmic/modules/model/_ModelItfc.js +++ b/client-app/src/component/model/_ModelItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/public/javascript/app/base/models/_Model.js b/client-app/src/component/model/model/_Model.js similarity index 99% rename from public/javascript/app/base/models/_Model.js rename to client-app/src/component/model/model/_Model.js index 486313ab89a84738e4768930059384f134d23db1..9ed566b4c5d46aad614e284480ed10acefdcd0f6 100644 --- a/public/javascript/app/base/models/_Model.js +++ b/client-app/src/component/model/model/_Model.js @@ -1,10 +1,10 @@ define([ - "app/base/models/attr/ObjAttr" + "src/component/model/model/attr/ObjAttr" , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/Evented" , "dojo/topic" - , 'uuid/uuidv4.min' + , 'uuid' , "RWidgets/Utilities" ], function ( ObjAttr diff --git a/public/javascript/app/base/models/attr/ArrayAttr.js b/client-app/src/component/model/model/attr/ArrayAttr.js similarity index 98% rename from public/javascript/app/base/models/attr/ArrayAttr.js rename to client-app/src/component/model/model/attr/ArrayAttr.js index 153fa91dcda6e8bb9fb98b0e6b00c2a8ff0e2b75..cb8acd325e48d2e49ff6efc9a9d976729cfc27e7 100644 --- a/public/javascript/app/base/models/attr/ArrayAttr.js +++ b/client-app/src/component/model/model/attr/ArrayAttr.js @@ -3,8 +3,8 @@ define([ , "dojo/_base/lang" , "dojo/Deferred" , "RWidgets/Utilities" - , 'uuid/uuidv4.min' - , "./_ComplexAttr" + , 'uuid' + , "src/component/model/model/attr/_ComplexAttr" ], function ( declare , lang @@ -402,7 +402,7 @@ define([ this._buildItem({ name: "_requiredObjAttr", - path: "app/base/models/attr/ObjAttr" + path: "src/component/model/model/attr/ObjAttr" }, schema, props, dfd); }, @@ -434,7 +434,7 @@ define([ this._buildItem({ name: "_requiredRelationAttr", - path: "app/base/models/attr/RelationAttr" + path: "src/component/model/model/attr/RelationAttr" }, schema, props, dfd); }, @@ -450,7 +450,7 @@ define([ this._buildItem({ name: "_requiredAttr", - path: "app/base/models/attr/Attr" + path: "src/component/model/model/attr/Attr" }, schema, props, dfd); }, diff --git a/public/javascript/app/base/models/attr/Attr.js b/client-app/src/component/model/model/attr/Attr.js similarity index 99% rename from public/javascript/app/base/models/attr/Attr.js rename to client-app/src/component/model/model/attr/Attr.js index 5b7889957918a4cf21a7204763901d7b8c014846..0b02f4b0317254dc10b77ac02f6bef2f2edfb802 100644 --- a/public/javascript/app/base/models/attr/Attr.js +++ b/client-app/src/component/model/model/attr/Attr.js @@ -1,8 +1,8 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , 'moment/moment.min' - , "./_Attr" + , 'moment' + , "src/component/model/model/attr/_Attr" ], function( declare , lang diff --git a/public/javascript/app/base/models/attr/ObjAttr.js b/client-app/src/component/model/model/attr/ObjAttr.js similarity index 98% rename from public/javascript/app/base/models/attr/ObjAttr.js rename to client-app/src/component/model/model/attr/ObjAttr.js index a23ffbfffb27386f153594d6d340f1571245c660..015374c0e092cafc4ac97738a573e8e1649f9fb2 100644 --- a/public/javascript/app/base/models/attr/ObjAttr.js +++ b/client-app/src/component/model/model/attr/ObjAttr.js @@ -1,11 +1,11 @@ define([ - "app/base/models/attr/ArrayAttr" - , "app/base/models/attr/Attr" - , "app/base/models/attr/RelationAttr" + "src/component/model/model/attr/ArrayAttr" + , "src/component/model/model/attr/Attr" + , "src/component/model/model/attr/RelationAttr" , "dojo/_base/declare" , "dojo/_base/lang" , "RWidgets/Utilities" - , "./_ComplexAttr" + , "src/component/model/model/attr/_ComplexAttr" ], function( ArrayAttr , Attr diff --git a/public/javascript/app/base/models/attr/RelationAttr.js b/client-app/src/component/model/model/attr/RelationAttr.js similarity index 99% rename from public/javascript/app/base/models/attr/RelationAttr.js rename to client-app/src/component/model/model/attr/RelationAttr.js index a958eaa4b375ca1c5533a318e0bcb6b1f6bf369d..8e3acea713c0dcca34f9919198a5f210152d4c52 100644 --- a/public/javascript/app/base/models/attr/RelationAttr.js +++ b/client-app/src/component/model/model/attr/RelationAttr.js @@ -1,5 +1,5 @@ define([ - "app/base/models/attr/Attr" + "src/component/model/model/attr/Attr" , "dojo/_base/declare" , "dojo/_base/lang" ], function ( diff --git a/public/javascript/app/base/models/attr/_Attr.js b/client-app/src/component/model/model/attr/_Attr.js similarity index 99% rename from public/javascript/app/base/models/attr/_Attr.js rename to client-app/src/component/model/model/attr/_Attr.js index fc811c0291efb57632fd9a7cc9183be09d3e48dd..148718c8aa82df4f4260376a4bc0d926d1db61d7 100644 --- a/public/javascript/app/base/models/attr/_Attr.js +++ b/client-app/src/component/model/model/attr/_Attr.js @@ -4,8 +4,8 @@ define([ , "dojo/Deferred" , "dojo/Stateful" , "dojo/topic" - , "json-schema-ref-parser/ref-parser.min" - , "redmic/base/tv4" + , "json-schema-ref-parser" + , "src/util/tv4" ], function( declare , lang diff --git a/public/javascript/app/base/models/attr/_ComplexAttr.js b/client-app/src/component/model/model/attr/_ComplexAttr.js similarity index 98% rename from public/javascript/app/base/models/attr/_ComplexAttr.js rename to client-app/src/component/model/model/attr/_ComplexAttr.js index 0304ffb423d82a6579c1e6a3b12dcf3268f7a5f3..2169aae5a3bda379ed567a516aad1df7ecca1ee4 100644 --- a/public/javascript/app/base/models/attr/_ComplexAttr.js +++ b/client-app/src/component/model/model/attr/_ComplexAttr.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "./_Attr" + , "src/component/model/model/attr/_Attr" ], function( declare , lang diff --git a/public/javascript/redmic/modules/notification/Alert.js b/client-app/src/component/notification/Alert.js similarity index 95% rename from public/javascript/redmic/modules/notification/Alert.js rename to client-app/src/component/notification/Alert.js index b25d917185c9765ce99a8c4c8c475d787969a209..38d231177b2b962684922ced44f2c3be0937cc72 100644 --- a/public/javascript/redmic/modules/notification/Alert.js +++ b/client-app/src/component/notification/Alert.js @@ -1,8 +1,8 @@ define([ - 'alertify/alertify.min' + 'alertify' , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Module" + , "src/component/base/_Module" ], function( alertify , declare diff --git a/public/javascript/redmic/modules/notification/CommunicationCenter.js b/client-app/src/component/notification/CommunicationCenter.js similarity index 96% rename from public/javascript/redmic/modules/notification/CommunicationCenter.js rename to client-app/src/component/notification/CommunicationCenter.js index f1aeccbc9f96c4dc1af74eada2e3ae4c25bbd874..713ab4d2f6520122ede1c9195ef5be613132a567 100644 --- a/public/javascript/redmic/modules/notification/CommunicationCenter.js +++ b/client-app/src/component/notification/CommunicationCenter.js @@ -1,8 +1,8 @@ define([ - 'alertify/alertify.min' + 'alertify' , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Module" + , "src/component/base/_Module" ], function( alertify , declare diff --git a/public/javascript/redmic/modules/notification/Notification.js b/client-app/src/component/notification/Notification.js similarity index 95% rename from public/javascript/redmic/modules/notification/Notification.js rename to client-app/src/component/notification/Notification.js index af1a072212722043e067485c874457c798c91297..e6652b90f9bf678aac877b6f46683830bf1213ad 100644 --- a/public/javascript/redmic/modules/notification/Notification.js +++ b/client-app/src/component/notification/Notification.js @@ -1,12 +1,12 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Module" - , "redmic/modules/base/_Show" - , "redmic/modules/base/_Store" - , "redmic/modules/notification/NotificationSidebar" - , "redmic/modules/notification/TaskNotification" - , "put-selector/put" + , "src/component/base/_Module" + , "src/component/base/_Show" + , "src/component/base/_Store" + , "src/component/notification/NotificationSidebar" + , "src/component/notification/TaskNotification" + , 'put-selector' ], function( declare , lang @@ -122,7 +122,9 @@ define([ this.iconNode = put(this.domNode, 'i.' + this.notificationIconClass); this.spanNode = put(this.domNode, "span.hidden", 0); - this.iconNode.addEventListener('animationend', lang.hitch(this, this._removeAnimated)); + this.iconNode.addEventListener('animationend', lang.hitch(this, this._removeAnimated), { + passive: true + }); this.domNode.onclick = lang.hitch(this, this._clickNotification); @@ -170,7 +172,7 @@ define([ }); }, - _getNodeToShow: function() { + getNodeToShow: function() { return this.domNode; }, diff --git a/public/javascript/redmic/modules/notification/NotificationSidebar.js b/client-app/src/component/notification/NotificationSidebar.js similarity index 97% rename from public/javascript/redmic/modules/notification/NotificationSidebar.js rename to client-app/src/component/notification/NotificationSidebar.js index 2a31b3059fbe7afa9ef2472b005bd2d9faae6f38..e3df83c4abc48a180b5228f93e7797201a65e2c2 100644 --- a/public/javascript/redmic/modules/notification/NotificationSidebar.js +++ b/client-app/src/component/notification/NotificationSidebar.js @@ -1,10 +1,10 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Module" - , "redmic/modules/base/_Show" - , "redmic/modules/base/_Store" - , "put-selector/put" + , "src/component/base/_Module" + , "src/component/base/_Show" + , "src/component/base/_Store" + , 'put-selector' ], function( declare , lang @@ -165,7 +165,7 @@ define([ } }, - _getNodeToShow: function() { + getNodeToShow: function() { return this.domNode; }, @@ -228,7 +228,9 @@ define([ this._functionListener = lang.hitch(this, this.inherited, arguments); - this.domNode.addEventListener('animationend', this._functionListener); + this.domNode.addEventListener('animationend', this._functionListener, { + passive: true + }); put(this.domNode, ".retiring"); }, diff --git a/public/javascript/redmic/modules/notification/TaskNotification.js b/client-app/src/component/notification/TaskNotification.js similarity index 92% rename from public/javascript/redmic/modules/notification/TaskNotification.js rename to client-app/src/component/notification/TaskNotification.js index 147a2b47b0aaa92d08384280ac744dc7ddea6a8a..546eb84a6ef0b541ab628dcf83afc81961df74bc 100644 --- a/public/javascript/redmic/modules/notification/TaskNotification.js +++ b/client-app/src/component/notification/TaskNotification.js @@ -1,17 +1,17 @@ define([ - 'alertify/alertify.min' + 'alertify' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/query" - , "redmic/modules/base/_Module" - , "redmic/modules/base/_Show" - , "redmic/modules/base/_Store" - , "redmic/modules/components/Keypad/IconKeypadImpl" - , "redmic/modules/browser/_ButtonsInRow" - , "redmic/modules/browser/_Framework" - , "redmic/modules/browser/ListImpl" - , "redmic/modules/browser/bars/Total" - , "put-selector/put" + , "src/component/base/_Module" + , "src/component/base/_Show" + , "src/component/base/_Store" + , "src/component/components/Keypad/IconKeypadImpl" + , "src/component/browser/_ButtonsInRow" + , "src/component/browser/_Framework" + , "src/component/browser/ListImpl" + , "src/component/browser/bars/Total" + , 'put-selector' , "templates/NotificationList" , "dijit/ProgressBar" ], function( @@ -151,7 +151,7 @@ define([ }); }, - _getNodeToShow: function() { + getNodeToShow: function() { return this.domNode; }, diff --git a/public/javascript/redmic/modules/search/CompositeImpl.js b/client-app/src/component/search/CompositeImpl.js similarity index 99% rename from public/javascript/redmic/modules/search/CompositeImpl.js rename to client-app/src/component/search/CompositeImpl.js index 43978aced030075d89cda66a7fb508418f0ed70f..29a9bdd41bdddd39d8276e624943b973d1a4bb5a 100644 --- a/public/javascript/redmic/modules/search/CompositeImpl.js +++ b/client-app/src/component/search/CompositeImpl.js @@ -259,7 +259,7 @@ define([ } }, - _getNodeToShow: function() { + getNodeToShow: function() { return this.domNode; }, diff --git a/public/javascript/redmic/modules/search/DateRangeImpl.js b/client-app/src/component/search/DateRangeImpl.js similarity index 96% rename from public/javascript/redmic/modules/search/DateRangeImpl.js rename to client-app/src/component/search/DateRangeImpl.js index eb882b03089111332b887d2b9bdaf93accde1a34..dffea4bd3ac37c745b54c987ca71e24344f991d5 100644 --- a/public/javascript/redmic/modules/search/DateRangeImpl.js +++ b/client-app/src/component/search/DateRangeImpl.js @@ -2,7 +2,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "put-selector/put" + , 'put-selector' , "RWidgets/DatePicker" , "./Search" ], function( @@ -52,7 +52,7 @@ define([ this.datePicker.placeAt(this.domNode); }, - _getNodeToShow: function() { + getNodeToShow: function() { return this.domNode; }, diff --git a/public/javascript/redmic/modules/search/FacetsImpl.js b/client-app/src/component/search/FacetsImpl.js similarity index 100% rename from public/javascript/redmic/modules/search/FacetsImpl.js rename to client-app/src/component/search/FacetsImpl.js diff --git a/public/javascript/redmic/modules/search/GeographicImpl.js b/client-app/src/component/search/GeographicImpl.js similarity index 96% rename from public/javascript/redmic/modules/search/GeographicImpl.js rename to client-app/src/component/search/GeographicImpl.js index cf93637aa552b8a37ff23f380170415d498918d7..7c8aef2858a476c82447981d6bf7fd566c1a60dd 100644 --- a/public/javascript/redmic/modules/search/GeographicImpl.js +++ b/client-app/src/component/search/GeographicImpl.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "put-selector/put" + , 'put-selector' , "RWidgets/Map" , "./Search" ], function( @@ -50,7 +50,7 @@ define([ this.mapSearch.resize(); }, - _getNodeToShow: function() { + getNodeToShow: function() { return this.domNode; }, diff --git a/public/javascript/redmic/modules/search/MultiSelectImpl.js b/client-app/src/component/search/MultiSelectImpl.js similarity index 95% rename from public/javascript/redmic/modules/search/MultiSelectImpl.js rename to client-app/src/component/search/MultiSelectImpl.js index 50d2f7d1a7b2193c2248200b020ac846f783df88..9bc0ed617da9e13467a1023bc95f4e30903153d3 100644 --- a/public/javascript/redmic/modules/search/MultiSelectImpl.js +++ b/client-app/src/component/search/MultiSelectImpl.js @@ -2,11 +2,11 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "put-selector/put" - , "redmic/modules/base/_ShowInTooltip" - , "redmic/modules/base/_ShowOnEvt" - , "redmic/modules/base/_Store" - , "redmic/modules/layout/listMenu/ListMenu" + , 'put-selector' + , "src/component/base/_ShowInTooltip" + , "src/component/base/_ShowOnEvt" + , "src/component/base/_Store" + , "src/component/layout/listMenu/ListMenu" , "./Search" ], function( declare @@ -139,7 +139,7 @@ define([ }); }, - _getNodeToShow: function() { + getNodeToShow: function() { return this.domNode; }, diff --git a/public/javascript/redmic/modules/search/RangeImpl.js b/client-app/src/component/search/RangeImpl.js similarity index 94% rename from public/javascript/redmic/modules/search/RangeImpl.js rename to client-app/src/component/search/RangeImpl.js index 59109c7962953a81e1dac975fb87d1c65b83c66f..e92631d5d655aabf86f222e194e437c9e7964c3d 100644 --- a/public/javascript/redmic/modules/search/RangeImpl.js +++ b/client-app/src/component/search/RangeImpl.js @@ -2,8 +2,8 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "put-selector/put" - , "redmic/modules/form/input/NumberTextBoxImpl" + , 'put-selector' + , "src/component/form/input/NumberTextBoxImpl" , "./Search" ], function( declare @@ -76,7 +76,7 @@ define([ }); }, - _getNodeToShow: function() { + getNodeToShow: function() { return this.domNode; }, diff --git a/public/javascript/redmic/modules/search/Search.js b/client-app/src/component/search/Search.js similarity index 97% rename from public/javascript/redmic/modules/search/Search.js rename to client-app/src/component/search/Search.js index dde870be970d538690d8215f272cf281a18eb4f9..ec7df3348d882e50820a9c92bf3c40ca8ac19a8d 100644 --- a/public/javascript/redmic/modules/search/Search.js +++ b/client-app/src/component/search/Search.js @@ -1,8 +1,8 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Module" - , "redmic/modules/base/_Show" + , "src/component/base/_Module" + , "src/component/base/_Show" , "./_SearchItfc" ], function( declare diff --git a/public/javascript/redmic/modules/search/TextImpl.js b/client-app/src/component/search/TextImpl.js similarity index 99% rename from public/javascript/redmic/modules/search/TextImpl.js rename to client-app/src/component/search/TextImpl.js index 5c6f8be85dd448f98240b8d454ca4e37364d3b3a..c280b0d7f3fa497a433b27e7eb4dd450b58acf2d 100644 --- a/public/javascript/redmic/modules/search/TextImpl.js +++ b/client-app/src/component/search/TextImpl.js @@ -3,7 +3,7 @@ define([ , "dojo/_base/lang" , "dojo/aspect" , 'dojo/query' - , "redmic/modules/base/_Store" + , "src/component/base/_Store" , "RWidgets/TextSearch" , "./Search" ], function( @@ -126,7 +126,7 @@ define([ this._globalClicksHandler.pause(); }, - _getNodeToShow: function() { + getNodeToShow: function() { return this.textSearch.domNode; }, diff --git a/public/javascript/redmic/modules/search/_HideFormByAction.js b/client-app/src/component/search/_HideFormByAction.js similarity index 100% rename from public/javascript/redmic/modules/search/_HideFormByAction.js rename to client-app/src/component/search/_HideFormByAction.js diff --git a/public/javascript/redmic/modules/search/_SearchItfc.js b/client-app/src/component/search/_SearchItfc.js similarity index 92% rename from public/javascript/redmic/modules/search/_SearchItfc.js rename to client-app/src/component/search/_SearchItfc.js index 5479fa28960a649838773b3a8e31376c8ce39604..d20d1e72def7705cf4155b7474c5192fb403484d 100644 --- a/public/javascript/redmic/modules/search/_SearchItfc.js +++ b/client-app/src/component/search/_SearchItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/public/javascript/redmic/modules/selection/SelectionBox.js b/client-app/src/component/selection/SelectionBox.js similarity index 92% rename from public/javascript/redmic/modules/selection/SelectionBox.js rename to client-app/src/component/selection/SelectionBox.js index c5d5feac06c8394231ff75069acfb03f8c427884..84fa892532b5e1baae4d6d957bf09cfa333d6627 100644 --- a/public/javascript/redmic/modules/selection/SelectionBox.js +++ b/client-app/src/component/selection/SelectionBox.js @@ -2,16 +2,16 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' , 'dojo/Deferred' - , 'put-selector/put' - , 'redmic/base/Credentials' - , 'redmic/modules/base/_ListenQueryParams' - , 'redmic/modules/base/_Module' - , 'redmic/modules/base/_Show' - , 'redmic/modules/base/_Selection' - , 'redmic/modules/base/_ShowInTooltip' - , 'redmic/modules/base/_ShowOnEvt' - , 'redmic/modules/layout/listMenu/ListMenu' - , 'redmic/modules/selection/SelectionManager' + , 'put-selector' + , 'src/util/Credentials' + , 'src/component/base/_ListenQueryParams' + , 'src/component/base/_Module' + , 'src/component/base/_Show' + , 'src/component/base/_Selection' + , 'src/component/base/_ShowInTooltip' + , 'src/component/base/_ShowOnEvt' + , 'src/component/layout/listMenu/ListMenu' + , 'src/component/selection/SelectionManager' ], function( declare , lang @@ -174,7 +174,7 @@ define([ _isRegisteredUser: function(item) { - return Credentials.get('userRole') !== 'ROLE_GUEST'; + return !Credentials.userIsGuest(); }, _select: function(item, total) { diff --git a/public/javascript/redmic/modules/selection/SelectionManager.js b/client-app/src/component/selection/SelectionManager.js similarity index 96% rename from public/javascript/redmic/modules/selection/SelectionManager.js rename to client-app/src/component/selection/SelectionManager.js index 447a7c7a49a75cd70a5303a54476f214a39e498b..4501d04c9c8503b78cfe868fb4f7c8fb5f4dc30a 100644 --- a/public/javascript/redmic/modules/selection/SelectionManager.js +++ b/client-app/src/component/selection/SelectionManager.js @@ -1,15 +1,15 @@ define([ - 'alertify/alertify.min' + 'alertify' , 'app/designs/textSearchList/main/Selection' , 'dojo/_base/declare' , 'dojo/_base/lang' , 'dojo/Deferred' - , 'put-selector/put' - , 'redmic/base/Credentials' - , 'redmic/modules/base/_Module' - , 'redmic/modules/base/_Selection' - , 'redmic/modules/base/_Show' - , 'redmic/modules/base/_ShowInPopup' + , 'put-selector' + , 'src/util/Credentials' + , 'src/component/base/_Module' + , 'src/component/base/_Selection' + , 'src/component/base/_Show' + , 'src/component/base/_ShowInPopup' ], function( alertify , Selection @@ -229,7 +229,7 @@ define([ return; } - var shareUrl = window.location + '?settings-id=' + res.data[this.idProperty]; + var shareUrl = globalThis.location + '?settings-id=' + res.data[this.idProperty]; alertify.message(' ' + this.i18n.copyToClipboard, 0, lang.hitch(this, function(url) { diff --git a/public/javascript/redmic/modules/selection/Selector.js b/client-app/src/component/selection/Selector.js similarity index 98% rename from public/javascript/redmic/modules/selection/Selector.js rename to client-app/src/component/selection/Selector.js index d4bc964b5a64bf22fb2374cb1d3321ec3dc269f8..6e28737eee0ecc144dc69dbfcb8a67b76f64ac73 100644 --- a/public/javascript/redmic/modules/selection/Selector.js +++ b/client-app/src/component/selection/Selector.js @@ -1,11 +1,11 @@ define([ - 'app/redmicConfig' + 'src/redmicConfig' , 'dojo/_base/declare' , 'dojo/_base/lang' , 'dojo/Deferred' , 'dojo/promise/all' - , 'redmic/modules/base/_Module' - , 'redmic/modules/base/_SelectionBase' + , 'src/component/base/_Module' + , 'src/component/base/_SelectionBase' , 'RWidgets/Utilities' , './_SelectorItfc' , './_SelectorPersistence' diff --git a/public/javascript/redmic/modules/selection/_SelectorItfc.js b/client-app/src/component/selection/_SelectorItfc.js similarity index 93% rename from public/javascript/redmic/modules/selection/_SelectorItfc.js rename to client-app/src/component/selection/_SelectorItfc.js index 45f8c54065e7efe185112472f069b7d3f21b0fa7..fafcb210675c043981680c7fb7c8d957e5a67f43 100644 --- a/public/javascript/redmic/modules/selection/_SelectorItfc.js +++ b/client-app/src/component/selection/_SelectorItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/public/javascript/redmic/modules/selection/_SelectorPersistence.js b/client-app/src/component/selection/_SelectorPersistence.js similarity index 99% rename from public/javascript/redmic/modules/selection/_SelectorPersistence.js rename to client-app/src/component/selection/_SelectorPersistence.js index a052755aac74c158444bf2ec12287e1dfbf4fdc4..610286de987e55601787542cf93e0de05c74f562 100644 --- a/public/javascript/redmic/modules/selection/_SelectorPersistence.js +++ b/client-app/src/component/selection/_SelectorPersistence.js @@ -1,9 +1,9 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' - , 'redmic/modules/base/_Persistence' - , 'redmic/modules/base/_Store' - , 'redmic/base/Credentials' + , 'src/component/base/_Persistence' + , 'src/component/base/_Store' + , 'src/util/Credentials' ], function( declare , lang diff --git a/public/javascript/redmic/modules/socket/Socket.js b/client-app/src/component/socket/Socket.js similarity index 96% rename from public/javascript/redmic/modules/socket/Socket.js rename to client-app/src/component/socket/Socket.js index b29ca8c6c3e18fc72466aa247fef6f4b27bdb933..85dbfb7e1c479cc5c52dd3fa14187c21aba52bcc 100644 --- a/public/javascript/redmic/modules/socket/Socket.js +++ b/client-app/src/component/socket/Socket.js @@ -1,12 +1,12 @@ define([ - 'app/redmicConfig' + 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Module" - , "redmic/base/Credentials" - , 'sockjs/sockjs.min' + , "src/component/base/_Module" + , "src/util/Credentials" + , 'sockjs' - , 'stomp-websocket/stomp.min' + , 'stomp-websocket' ], function( redmicConfig , declare diff --git a/public/javascript/redmic/modules/socket/Task.js b/client-app/src/component/socket/Task.js similarity index 95% rename from public/javascript/redmic/modules/socket/Task.js rename to client-app/src/component/socket/Task.js index dd794236099452dadbd482140f6888107d6e84ea..4d78a2191b4a4a91de1102cda44c81e26f6ce7d2 100644 --- a/public/javascript/redmic/modules/socket/Task.js +++ b/client-app/src/component/socket/Task.js @@ -1,21 +1,25 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_AuthFirewall" - , "redmic/modules/base/_Module" - , "redmic/modules/base/_Store" - , "redmic/modules/base/_Selection" - , "redmic/base/Credentials" + , "src/component/base/_Module" + , "src/component/base/_Store" + , "src/component/base/_Selection" + , 'src/component/socket/_IngestData' + , 'src/component/socket/_Report' + , 'src/component/socket/_Worms' + , "src/util/Credentials" ], function( declare , lang - , _AuthFirewall , _Module , _Store , _Selection + , _IngestData + , _Report + , _Worms , Credentials ){ - return declare([_Module, _AuthFirewall, _Store, _Selection], { + return declare([_Module, _Store, _Selection, _Report, _Worms, _IngestData], { // Summary: // Módulo para gestionar la ejecución de tareas en segundo plano via sockets @@ -53,12 +57,12 @@ define([ }; lang.mixin(this, this.config, args); - - this.baseSubscriptionsTarget = '/user/' + Credentials.get("userId"); }, _setConfigurations: function() { + this.baseSubscriptionsTarget = '/user/' + Credentials.get("userId"); + this.socketChannels = this._merge([{ getTasks: { baseTarget: this.baseSubscriptionsTarget + this.baseTarget + 'status', diff --git a/public/javascript/redmic/modules/socket/_IngestData.js b/client-app/src/component/socket/_IngestData.js similarity index 95% rename from public/javascript/redmic/modules/socket/_IngestData.js rename to client-app/src/component/socket/_IngestData.js index c585f89fadf304709ebe82ee25cf69c27d30a5e8..052d369cf2a8c09ccde90731b09349e0dfc71936 100644 --- a/public/javascript/redmic/modules/socket/_IngestData.js +++ b/client-app/src/component/socket/_IngestData.js @@ -1,14 +1,14 @@ define([ - "app/redmicConfig" - , "dojo/_base/declare" + "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "redmic/base/Credentials" + , 'src/redmicConfig' + , 'src/util/Credentials' ], function( - redmicConfig - , declare + declare , lang , aspect + , redmicConfig , Credentials ){ return declare(null, { @@ -18,6 +18,10 @@ define([ constructor: function(args) { + if (!Credentials.userIsEditor()) { + return; + } + this.config = { // own actions ingestDataActions: { @@ -30,8 +34,6 @@ define([ lang.mixin(this, this.config, args); - this.ingestBaseTarget = this.baseTarget + "ingest/"; - aspect.before(this, "_afterSetConfigurations", lang.hitch(this, this._setIngestDataConfigurations)); aspect.after(this, "_defineSubscriptions", lang.hitch(this, this._defineIngestDataSubscriptions)); aspect.before(this, "_mixEventsAndActions", lang.hitch(this, this._mixIngestDataEventsAndActions)); @@ -39,6 +41,8 @@ define([ _setIngestDataConfigurations: function() { + this.ingestBaseTarget = this.baseTarget + "ingest/"; + this.socketChannels = this._merge([{ ingestStatus: { baseTarget: this.baseSubscriptionsTarget + this.ingestBaseTarget + 'status', @@ -138,7 +142,7 @@ define([ id: parameters.surveyId || parameters.elementUuid }); } else if (obj.taskName === "ingest-data-document") { - url = redmicConfig.viewPaths.documentLoad; + url = redmicConfig.viewPaths.bibliographyLoad; } if (url) { diff --git a/public/javascript/redmic/modules/socket/_Report.js b/client-app/src/component/socket/_Report.js similarity index 98% rename from public/javascript/redmic/modules/socket/_Report.js rename to client-app/src/component/socket/_Report.js index 95036648762c427854587692fb3e2d64691c8d62..9be9a1b5d5fd026f58a8ac7fc745fd5da231ed46 100644 --- a/public/javascript/redmic/modules/socket/_Report.js +++ b/client-app/src/component/socket/_Report.js @@ -1,16 +1,16 @@ define([ - 'alertify/alertify.min' - , "app/redmicConfig" + 'alertify' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "redmic/base/Credentials" + , 'src/redmicConfig' + , "src/util/Credentials" ], function( alertify - , redmicConfig , declare , lang , aspect + , redmicConfig , Credentials ){ return declare(null, { @@ -32,8 +32,6 @@ define([ lang.mixin(this, this.config, args); - this.reportBaseTarget = this.baseTarget + "report/"; - aspect.before(this, "_afterSetConfigurations", lang.hitch(this, this._setReportConfigurations)); aspect.after(this, "_defineSubscriptions", lang.hitch(this, this._defineReportSubscriptions)); aspect.before(this, "_mixEventsAndActions", lang.hitch(this, this._mixReportEventsAndActions)); @@ -41,6 +39,8 @@ define([ _setReportConfigurations: function() { + this.reportBaseTarget = this.baseTarget + "report/"; + this.socketChannels = this._merge([{ reportStatus: { baseTarget: this.baseSubscriptionsTarget + this.reportBaseTarget + 'status', diff --git a/public/javascript/redmic/modules/socket/_Worms.js b/client-app/src/component/socket/_Worms.js similarity index 95% rename from public/javascript/redmic/modules/socket/_Worms.js rename to client-app/src/component/socket/_Worms.js index 33b0c4eb6daca67bf8409718645f39fbfbacbff3..7807067cca707d36d9082c3070166ca7aea35a52 100644 --- a/public/javascript/redmic/modules/socket/_Worms.js +++ b/client-app/src/component/socket/_Worms.js @@ -1,15 +1,11 @@ define([ - "app/redmicConfig" - , "dojo/_base/declare" + "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "redmic/base/Credentials" ], function( - redmicConfig - , declare + declare , lang , aspect - , Credentials ){ return declare(null, { // Summary: @@ -27,8 +23,6 @@ define([ lang.mixin(this, this.config, args); - this.wormsBaseTarget = this.baseTarget + "wormstoredmic/"; - aspect.before(this, "_afterSetConfigurations", lang.hitch(this, this._setWormsConfigurations)); aspect.after(this, "_defineSubscriptions", lang.hitch(this, this._defineWormsSubscriptions)); aspect.before(this, "_mixEventsAndActions", lang.hitch(this, this._mixWormsEventsAndActions)); @@ -36,6 +30,8 @@ define([ _setWormsConfigurations: function() { + this.wormsBaseTarget = this.baseTarget + "wormstoredmic/"; + this.socketChannels = this._merge([{ ingestStatus: { baseTarget: this.baseSubscriptionsTarget + this.wormsBaseTarget + '/status', diff --git a/public/javascript/redmic/modules/store/RequestJoiner/AtlasDataImpl.js b/client-app/src/component/store/RequestJoiner/AtlasDataImpl.js similarity index 99% rename from public/javascript/redmic/modules/store/RequestJoiner/AtlasDataImpl.js rename to client-app/src/component/store/RequestJoiner/AtlasDataImpl.js index e52af90f6b46f01d164303935235fa9cc1ccb67d..e70d9c2535407682b0bf53fc7727ab4e33e2fd51 100644 --- a/public/javascript/redmic/modules/store/RequestJoiner/AtlasDataImpl.js +++ b/client-app/src/component/store/RequestJoiner/AtlasDataImpl.js @@ -1,5 +1,5 @@ define([ - 'app/redmicConfig' + 'src/redmicConfig' , 'dojo/_base/declare' , 'dojo/_base/lang' , 'dojo/Deferred' diff --git a/public/javascript/redmic/modules/store/RequestJoiner/RequestJoiner.js b/client-app/src/component/store/RequestJoiner/RequestJoiner.js similarity index 98% rename from public/javascript/redmic/modules/store/RequestJoiner/RequestJoiner.js rename to client-app/src/component/store/RequestJoiner/RequestJoiner.js index d464dba4e198e2991f8f091351298b5d9a550971..4e2caedc2ff7172bde0e5bd1eaee8e1b50e7abd1 100644 --- a/public/javascript/redmic/modules/store/RequestJoiner/RequestJoiner.js +++ b/client-app/src/component/store/RequestJoiner/RequestJoiner.js @@ -3,8 +3,8 @@ define([ , 'dojo/_base/lang' , 'dojo/Deferred' , 'dojo/promise/all' - , 'redmic/modules/base/_Module' - , 'redmic/modules/base/_Store' + , 'src/component/base/_Module' + , 'src/component/base/_Store' , './_RequestJoinerItfc' ], function( declare diff --git a/public/javascript/redmic/modules/store/RequestJoiner/_RequestJoinerItfc.js b/client-app/src/component/store/RequestJoiner/_RequestJoinerItfc.js similarity index 95% rename from public/javascript/redmic/modules/store/RequestJoiner/_RequestJoinerItfc.js rename to client-app/src/component/store/RequestJoiner/_RequestJoinerItfc.js index 59b83adbd22bf98dfaac1b8df4bb9311accb6df1..1b38028706f51b0d8e141562497215205edc6f63 100644 --- a/public/javascript/redmic/modules/store/RequestJoiner/_RequestJoinerItfc.js +++ b/client-app/src/component/store/RequestJoiner/_RequestJoinerItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/public/javascript/redmic/modules/store/RestManager.js b/client-app/src/component/store/RestManager.js similarity index 99% rename from public/javascript/redmic/modules/store/RestManager.js rename to client-app/src/component/store/RestManager.js index a939f1bdd903c6052c78c89b66cafa40eeb155c3..3e10a94316b86bfe2545b82b55d5b2ebd234a84c 100644 --- a/public/javascript/redmic/modules/store/RestManager.js +++ b/client-app/src/component/store/RestManager.js @@ -1,8 +1,8 @@ define([ - 'app/redmicConfig' + 'src/redmicConfig' , 'dojo/_base/declare' , 'dojo/_base/lang' - , 'redmic/modules/base/_Module' + , 'src/component/base/_Module' , './_RestManagerItfc' ], function( redmicConfig diff --git a/public/javascript/redmic/modules/store/RestManagerImpl.js b/client-app/src/component/store/RestManagerImpl.js similarity index 99% rename from public/javascript/redmic/modules/store/RestManagerImpl.js rename to client-app/src/component/store/RestManagerImpl.js index a684a8f087b34fc685e4d7a811a905941e87fe98..0b640f0b29b17cf31fcf00ce67f7ab489f718790 100644 --- a/public/javascript/redmic/modules/store/RestManagerImpl.js +++ b/client-app/src/component/store/RestManagerImpl.js @@ -1,11 +1,11 @@ define([ - 'app/redmicConfig' + 'src/redmicConfig' , 'dojo/_base/declare' , 'dojo/_base/lang' , 'dojo/request' , 'dojo/request/notify' , 'dojo/request/registry' - , 'redmic/base/Credentials' + , 'src/util/Credentials' , './RestManager' ], function( redmicConfig diff --git a/public/javascript/redmic/modules/store/_RestManagerItfc.js b/client-app/src/component/store/_RestManagerItfc.js similarity index 94% rename from public/javascript/redmic/modules/store/_RestManagerItfc.js rename to client-app/src/component/store/_RestManagerItfc.js index 458086a28e0300fa3844edec324536af5824f48e..67ea0e91da6924af3d4888e9b1a9243871c0cf02 100644 --- a/public/javascript/redmic/modules/store/_RestManagerItfc.js +++ b/client-app/src/component/store/_RestManagerItfc.js @@ -1,7 +1,7 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' - , 'redmic/modules/base/_Itfc' + , 'src/component/base/_Itfc' ], function( declare , lang diff --git a/client-app/src/component/taskAction/Report.js b/client-app/src/component/taskAction/Report.js new file mode 100644 index 0000000000000000000000000000000000000000..a38993a138bf0f61a3f0e3c06e7c2edc7d22466b --- /dev/null +++ b/client-app/src/component/taskAction/Report.js @@ -0,0 +1,91 @@ +define([ + 'alertify' + , 'dojo/_base/declare' + , 'dojo/_base/lang' + , 'src/component/base/_Module' + , 'src/util/Credentials' +], function( + alertify + , declare + , lang + , _Module + , Credentials +) { + + return declare(_Module, { + // summary: + // Componente de petición de tareas para la acción de generar informes. + + constructor: function(args) { + + this.config = { + ownChannel: 'reportTaskAction', + events: { + GENERATE_REPORT_TASK: 'generateReportTask' + }, + actions: { + GENERATE_REPORT: 'generateReport', + GET_REPORT: 'getReport' + } + }; + + lang.mixin(this, this.config, args); + }, + + _defineSubscriptions: function() { + + this.subscriptionsConfig.push({ + channel : this.getChannel('GENERATE_REPORT'), + callback: '_subGenerateReport', + options: { + predicate: lang.hitch(this, this._chkGenerateReport) + } + }); + }, + + _definePublications: function() { + + this.publicationsConfig.push({ + event: 'GENERATE_REPORT_TASK', + channel: this._buildChannel(this.taskChannel, 'GET_REPORT') + }); + }, + + _chkGenerateReport: function(req) { + + if (Credentials.userIsGuest()) { + this._denyAccessToGuestUsers(); + return false; + } + + var condition = req && req.selectionTarget && req.reportService; + + if (!condition) { + console.warn('Missing props at GENERATE_REPORT publication, received:', req); + } + + return !!condition; + }, + + _subGenerateReport: function(req) { + + var reportConfig = { + target: req.selectionTarget, + serviceTag: req.reportService, + id: req.id + }; + + this._emitEvt('GENERATE_REPORT_TASK', reportConfig); + }, + + _denyAccessToGuestUsers: function() { + + var banIcon = '', + banMessage = '' + this.i18n.banGuestMessage + + ' ' + this.i18n.registerAuthFailed + ' ' + this.i18n.banGuestMessage2 + + ' ' + this.i18n.useCondition + ' '; + + alertify.alert(this.i18n.titleAlert, banIcon + banMessage); + } + }); +}); diff --git a/public/javascript/redmic/modules/tree/CbtreeImpl.js b/client-app/src/component/tree/CbtreeImpl.js similarity index 99% rename from public/javascript/redmic/modules/tree/CbtreeImpl.js rename to client-app/src/component/tree/CbtreeImpl.js index ee814e4ba5e371b91ee1da8a24595a7c28155226..da0d38505507e9125a750840cf07c84846ec6302 100644 --- a/public/javascript/redmic/modules/tree/CbtreeImpl.js +++ b/client-app/src/component/tree/CbtreeImpl.js @@ -110,7 +110,7 @@ define([ this.tree.on("checkBoxClick", lang.hitch(this, this._groupEventArgs, 'CHECKBOXCLICK')); }, - _getNodeToShow: function() { + getNodeToShow: function() { return this.tree.domNode; }, diff --git a/public/javascript/redmic/modules/tree/Tree.js b/client-app/src/component/tree/Tree.js similarity index 98% rename from public/javascript/redmic/modules/tree/Tree.js rename to client-app/src/component/tree/Tree.js index c32c30a352af8a72ee7d9b5453fc2af6a58a70bc..b978c0efca4dd2ee5649dc05552e946688bd534c 100644 --- a/public/javascript/redmic/modules/tree/Tree.js +++ b/client-app/src/component/tree/Tree.js @@ -1,9 +1,9 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Module" - , "redmic/modules/base/_Selection" - , "redmic/modules/base/_Show" + , "src/component/base/_Module" + , "src/component/base/_Selection" + , "src/component/base/_Show" , "./_TreeItfc" ], function( declare diff --git a/public/javascript/redmic/modules/tree/_HierarchicalFilter.js b/client-app/src/component/tree/_HierarchicalFilter.js similarity index 100% rename from public/javascript/redmic/modules/tree/_HierarchicalFilter.js rename to client-app/src/component/tree/_HierarchicalFilter.js diff --git a/public/javascript/redmic/modules/tree/_LazyLoad.js b/client-app/src/component/tree/_LazyLoad.js similarity index 97% rename from public/javascript/redmic/modules/tree/_LazyLoad.js rename to client-app/src/component/tree/_LazyLoad.js index b00ef940236c403eb834f7367225b13a25745d73..480da9482ba0bcc9712e555793ea1e62d9ff73da 100644 --- a/public/javascript/redmic/modules/tree/_LazyLoad.js +++ b/client-app/src/component/tree/_LazyLoad.js @@ -2,8 +2,8 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "redmic/modules/base/_Filter" - , "redmic/modules/base/_Store" + , "src/component/base/_Filter" + , "src/component/base/_Store" ], function( declare , lang diff --git a/public/javascript/redmic/modules/tree/_LeafSelection.js b/client-app/src/component/tree/_LeafSelection.js similarity index 100% rename from public/javascript/redmic/modules/tree/_LeafSelection.js rename to client-app/src/component/tree/_LeafSelection.js diff --git a/public/javascript/redmic/modules/tree/_SelectionBox.js b/client-app/src/component/tree/_SelectionBox.js similarity index 93% rename from public/javascript/redmic/modules/tree/_SelectionBox.js rename to client-app/src/component/tree/_SelectionBox.js index 8a6a14d721f471d125b76f2c4bce2d7c4a253731..c171a90d6fdf1bd5aa3217e77d37f148329126b5 100644 --- a/public/javascript/redmic/modules/tree/_SelectionBox.js +++ b/client-app/src/component/tree/_SelectionBox.js @@ -4,8 +4,8 @@ define([ , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "redmic/modules/selection/SelectionBox" - , "put-selector/put" + , "src/component/selection/SelectionBox" + , 'put-selector' ], function( LayoutContainer , ContentPane @@ -74,15 +74,14 @@ define([ var target = this.selectionTarget ? this.selectionTarget : this.target; this._publish(this.selectionBox.getChannel("REFRESH"), { - selectionTarget: target, - perms: this.perms + selectionTarget: target }); if (this._getPreviouslyShown()) this._emitEvt('REFRESH'); }, - _getNodeToShow: function() { + getNodeToShow: function() { return this.contentNode.domNode; }/*, diff --git a/public/javascript/redmic/modules/tree/_TreeItfc.js b/client-app/src/component/tree/_TreeItfc.js similarity index 95% rename from public/javascript/redmic/modules/tree/_TreeItfc.js rename to client-app/src/component/tree/_TreeItfc.js index 80d3c29dabf313cd22c815f35bb017ea6e7036a7..310269d829af1d264ac50e2beb92d09e2265724a 100644 --- a/public/javascript/redmic/modules/tree/_TreeItfc.js +++ b/client-app/src/component/tree/_TreeItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/public/javascript/redmic/modules/user/FullscreenToggle.js b/client-app/src/component/user/FullscreenToggle.js similarity index 95% rename from public/javascript/redmic/modules/user/FullscreenToggle.js rename to client-app/src/component/user/FullscreenToggle.js index 74bd396c44a941317a842a2fd52ccb254c7704fc..adbb7d0ed2c533e3b590ee3877633f5846d924fb 100644 --- a/public/javascript/redmic/modules/user/FullscreenToggle.js +++ b/client-app/src/component/user/FullscreenToggle.js @@ -2,9 +2,9 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' , 'dojo/on' - , 'put-selector/put' - , 'redmic/modules/base/_Module' - , 'redmic/modules/base/_Show' + , 'put-selector' + , 'src/component/base/_Module' + , 'src/component/base/_Show' ], function( declare , lang @@ -97,7 +97,7 @@ define([ this._fullscreenStatus = !this._fullscreenStatus; }, - _getNodeToShow: function() { + getNodeToShow: function() { return this.domNode; } diff --git a/public/javascript/redmic/modules/user/LanguageSelector.js b/client-app/src/component/user/LanguageSelector.js similarity index 55% rename from public/javascript/redmic/modules/user/LanguageSelector.js rename to client-app/src/component/user/LanguageSelector.js index fe80bf0767ddce9c24941c99ef54d4d3e70a6e16..370cb0fb52d392753f9c6b2c0b7ef4dd3371adfc 100644 --- a/public/javascript/redmic/modules/user/LanguageSelector.js +++ b/client-app/src/component/user/LanguageSelector.js @@ -1,17 +1,15 @@ define([ - 'app/redmicConfig' - , 'dojo/_base/declare' + 'dojo/_base/declare' , 'dojo/_base/kernel' , 'dojo/_base/lang' - , 'put-selector/put' - , 'redmic/modules/base/_Module' - , 'redmic/modules/base/_Show' - , 'redmic/modules/base/_ShowInTooltip' - , 'redmic/modules/base/_ShowOnEvt' - , 'redmic/modules/layout/listMenu/ListMenu' + , 'put-selector' + , 'src/component/base/_Module' + , 'src/component/base/_Show' + , 'src/component/base/_ShowInTooltip' + , 'src/component/base/_ShowOnEvt' + , 'src/component/layout/listMenu/ListMenu' ], function( - redmicConfig - , declare + declare , kernel , lang , put @@ -43,13 +41,11 @@ define([ this.listMenuConfig = this._merge([{ parentChannel: this.getChannel(), items: [{ - icon: 'flag-icon-background.flag-icon-es', - label: this.i18n.es, + label: 'Español', callback: '_changeLanguage', value: 'es' },{ - icon: 'flag-icon-background.flag-icon-gb', - label: this.i18n.en, + label: 'English', callback: '_changeLanguage', value: 'en' }] @@ -58,7 +54,9 @@ define([ _initialize: function() { - this.listMenu = new declare([ListMenu, _ShowOnEvt]).extend(_ShowInTooltip)(this.listMenuConfig); + var LanguageTooltipDefinition = declare([ListMenu, _ShowOnEvt]).extend(_ShowInTooltip); + + this.listMenu = new LanguageTooltipDefinition(this.listMenuConfig); }, _defineSubscriptions: function() { @@ -75,7 +73,7 @@ define([ put(this.domNode, '[title=$]', this.i18n.language); - var languageIcon = this._getLanguageIcon(window.lang); + var languageIcon = 'fa.fa-language'; put(this.domNode, 'i.' + languageIcon); this._publish(this.listMenu.getChannel('ADD_EVT'), { @@ -93,32 +91,11 @@ define([ _changeLanguage: function(itemObj) { var language = itemObj.value, - currentUrl = window.location, - protocol = currentUrl.protocol, - hostname = currentUrl.hostname, + protocol = globalThis.location.protocol, + hostname = globalThis.location.hostname, hostnameWithoutLang = hostname.replace(kernel.locale + '.', ''); - window.location.href = protocol + '//' + language + '.' + hostnameWithoutLang; - }, - - _getLanguageIcon: function(currentLanguage) { - - var iconClasses; - - if (currentLanguage === 'es') { - iconClasses = 'flag.flag-icon-background.flag-icon-es'; - } else if (currentLanguage === 'en') { - iconClasses = 'flag.flag-icon-background.flag-icon-gb'; - } else { - iconClasses = 'fa.fa-language'; - } - - return iconClasses; - }, - - _getNodeToShow: function() { - - return this.domNode; + globalThis.location.href = protocol + '//' + language + '.' + hostnameWithoutLang; } }); }); diff --git a/public/javascript/redmic/modules/user/UserArea.js b/client-app/src/component/user/UserArea.js similarity index 93% rename from public/javascript/redmic/modules/user/UserArea.js rename to client-app/src/component/user/UserArea.js index 89eedfc64b11eb6588004fbdd7de60e3abff5bd2..96956e5aa064dfc5fb03aafcee6f42ee818278f7 100644 --- a/public/javascript/redmic/modules/user/UserArea.js +++ b/client-app/src/component/user/UserArea.js @@ -1,16 +1,16 @@ define([ - 'app/redmicConfig' + 'src/redmicConfig' , 'dojo/_base/declare' , 'dojo/_base/lang' - , 'put-selector/put' - , 'redmic/modules/base/_Module' - , 'redmic/modules/base/_Show' - , 'redmic/modules/base/_ShowInTooltip' - , 'redmic/modules/base/_ShowOnEvt' - , 'redmic/modules/base/_Store' - , 'redmic/modules/layout/listMenu/ListMenu' - , 'redmic/modules/layout/templateDisplayer/TemplateDisplayer' - , 'redmic/base/Credentials' + , 'put-selector' + , 'src/component/base/_Module' + , 'src/component/base/_Show' + , 'src/component/base/_ShowInTooltip' + , 'src/component/base/_ShowOnEvt' + , 'src/component/base/_Store' + , 'src/component/layout/listMenu/ListMenu' + , 'src/component/layout/templateDisplayer/TemplateDisplayer' + , 'src/util/Credentials' , 'templates/UserTopbarImage' , 'templates/UserTopbarMenu' ], function( @@ -219,7 +219,7 @@ define([ _checkUserIsRegistered: function() { - return Credentials.get('userRole') !== 'ROLE_GUEST'; + return !Credentials.userIsGuest(); }, _startLoading: function() { diff --git a/client-app/src/detail/_GenerateReport.js b/client-app/src/detail/_GenerateReport.js new file mode 100644 index 0000000000000000000000000000000000000000..0be7703c292ef379acf91f736c6ac868cbfc5ed0 --- /dev/null +++ b/client-app/src/detail/_GenerateReport.js @@ -0,0 +1,71 @@ +define([ + 'dojo/_base/declare' + , 'dojo/_base/lang' + , 'dojo/aspect' + , 'src/component/taskAction/Report' +], function( + declare + , lang + , aspect + , Report +) { + + return declare(null, { + // summary: + // Extensión de vistas de detalle para añadir funcionalidad relativa a la generación y descarga de + // informes. + + constructor: function(args) { + + this.config = { + _generateReportButtonConfig: { + icon: 'fa-print', + btnId: 'generateReport', + title: this.i18n.printToPdf + } + }; + + lang.mixin(this, this.config, args); + + aspect.after(this, '_setConfigurations', lang.hitch(this, this._setGenerateReportConfigurations)); + aspect.before(this, '_initialize', lang.hitch(this, this._initializeGenerateReport)); + }, + + _setGenerateReportConfigurations: function() { + + if (!this.reportService) { + console.warn('Tried to add report download button, but "reportService" was not defined at view "%s"', + this.getChannel()); + + return; + } + + if (!this.titleRightButtonsList) { + this.titleRightButtonsList = []; + } + + this.titleRightButtonsList.push(this._generateReportButtonConfig); + }, + + _initializeGenerateReport: function() { + + this._reportTaskAction = new Report({ + parentChannel: this.getChannel() + }); + }, + + _generateReportOnClick: function() { + + this._publish(this._reportTaskAction.getChannel('GENERATE_REPORT'), { + selectionTarget: this._getReportSelectionTarget(), + reportService: this.reportService, + id: parseInt(this.pathVariableId, 10) + }); + }, + + _getReportSelectionTarget: function() { + + return this.selectionTarget || this.target; + } + }); +}); diff --git a/client-app/src/detail/_WidgetDefinition.js b/client-app/src/detail/_WidgetDefinition.js new file mode 100644 index 0000000000000000000000000000000000000000..fc9f72fc1320d5282f581ede90cea27909fa5a88 --- /dev/null +++ b/client-app/src/detail/_WidgetDefinition.js @@ -0,0 +1,365 @@ +define([ + 'dojo/_base/declare' + , 'dojo/_base/lang' + , 'app/designs/details/main/ActivityTrackingMap' + , 'app/details/views/ActivityAreaMapBase' + , 'app/details/views/ActivityCitationMapBase' + , 'app/details/views/ActivityFixedTimeseriesChart' + , 'src/detail/activity/widget/ActivityFixedObservationSeriesMap' + , 'app/details/views/ActivityFixedTimeseriesMap' + , 'app/details/views/ActivityInfrastructureMapBase' + , 'app/details/views/ActivityLayerMapBase' + , 'src/util/Credentials' + , 'src/component/base/_Filter' + , 'src/component/browser/_ButtonsInRow' + , 'src/component/browser/_Framework' + , 'src/component/browser/ListImpl' + , 'src/component/browser/bars/Pagination' + , 'src/component/browser/bars/Total' + , 'src/component/layout/genericDisplayer/GenericDisplayer' + , 'src/component/layout/templateDisplayer/TemplateDisplayer' + , 'src/component/map/_ImportWkt' + , 'src/component/map/LeafletImpl' + , 'templates/ContactSet' + , 'templates/DocumentList' + , 'templates/OrganisationSet' + , 'templates/PlatformSet' +], function( + declare + , lang + , ActivityTrackingMap + , ActivityAreaMapBase + , ActivityCitationMapBase + , ActivityFixedTimeseriesChart + , ActivityFixedObservationSeriesMap + , ActivityFixedTimeseriesMap + , ActivityInfrastructureMapBase + , ActivityLayerMapBase + , Credentials + , _Filter + , _ButtonsInRow + , _Framework + , ListImpl + , Pagination + , Total + , GenericDisplayer + , TemplateDisplayer + , _ImportWkt + , LeafletImpl + , TemplateContacts + , TemplateDocuments + , TemplateOrganisation + , TemplatePlatform +) { + + return declare(null, { + // summary: + // Bloques de configuración de widgets para vistas detalle, para permitir instanciarlos. + + constructor: function(args) { + + this.config = { + documentTarget: 'documents', + contactTarget: 'contacts', + organisationTarget: 'organisations', + platformTarget: 'platforms' + }; + + lang.mixin(this, this.config, args); + }, + + _getOrganisationsConfig: function(config) { + + return { + width: 3, + height: 4, + type: declare([ListImpl, _Framework, _ButtonsInRow]), + props: { + title: 'organisations', + target: this.organisationTarget, + template: TemplateOrganisation, + bars: [{ + instance: Total + }], + rowConfig: { + buttonsConfig: { + listButton: [{ + icon: 'fa-info-circle', + btnId: 'details', + title: this.i18n.info, + href: this.viewPathsWidgets.organisations, + pathToItem: 'organisation' + }] + } + } + } + }; + }, + + _getPlatformsConfig: function(config) { + + return { + width: 3, + height: 4, + type: declare([ListImpl, _Framework, _ButtonsInRow]), + props: { + title: 'platforms', + target: this.platformTarget, + template: TemplatePlatform, + bars: [{ + instance: Total + }], + rowConfig: { + buttonsConfig: { + listButton: [{ + icon: 'fa-info-circle', + btnId: 'details', + title: this.i18n.info, + href: this.viewPathsWidgets.platforms, + pathToItem: 'platform' + }] + } + } + } + }; + }, + + _getContactsConfig: function(config) { + + return { + width: 3, + height: 4, + type: declare([ListImpl, _Framework]), + props: { + title: 'contacts', + target: this.contactTarget, + template: TemplateContacts, + bars: [{ + instance: Total + }] + } + }; + }, + + _getDocumentsConfig: function(config) { + + return { + width: 3, + height: 4, + type: declare([ListImpl, _Framework, _ButtonsInRow]), + props: { + title: 'documents', + target: this.documentTarget, + template: TemplateDocuments, + bars: [{ + instance: Total + }], + rowConfig: { + buttonsConfig: { + listButton: [{ + icon: 'fa-info-circle', + btnId: 'details', + title: this.i18n.info, + href: this.viewPathsWidgets.documents + }] + } + } + } + }; + }, + + _getActivitiesOrProjectsConfig: function(config) { + + return { + width: config.width || 3, + height: config.height || 4, + type: declare([ListImpl, _Framework, _ButtonsInRow, _Filter]), + props: { + title: config.title, + bars: [{ + instance: Total + },{ + instance: Pagination + }], + target: config.target, + template: config.template, + rowConfig: { + buttonsConfig: { + listButton: [{ + icon: 'fa-info-circle', + btnId: 'details', + title: this.i18n.info, + href: config.href, + condition: function(item) { + + var accessibilityId = item && item.accessibility && item.accessibility.id, + browseableAccesibilities = [2], // libre + accessibilityIsBrowseable = accessibilityId && + browseableAccesibilities.indexOf(accessibilityId) !== -1; + + return accessibilityIsBrowseable || Credentials.userIsEditor(); + } + }] + } + } + } + }; + }, + + _getInfoConfig: function(config) { + + return { + width: config.width || 3, + height: config.height || 'fitContent', + type: TemplateDisplayer, + props: { + title: 'info', + template: config.template, + 'class': 'containerDetails', + classEmptyTemplate: 'contentListNoData', + target: config.target || this.infoTarget || this.target, + associatedIds: [this.ownChannel], + shownOption: this.shownOptionInfo + } + }; + }, + + _getSpatialExtensionConfig: function(config) { + + return { + width: 3, + height: 2, + hidden: true, + type: declare([LeafletImpl, _ImportWkt]), + props: { + title: 'spatialExtension', + omitContainerSizeCheck: true, + maxZoom: 15, + coordinatesViewer: false, + navBar: false, + miniMap: false, + scaleBar: false, + measureTools: false + } + }; + }, + + _getActivityCitationConfig: function(config) { + + return { + width: 6, + height: 6, + type: ActivityCitationMapBase, + props: { + title: 'citations', + pathVariableId: this._activityData.id + } + }; + }, + + _getActivityMapLayerConfig: function(config) { + + return { + width: 6, + height: 6, + type: ActivityLayerMapBase, + props: { + title: 'layers', + pathVariableId: this._activityData.id + } + }; + }, + + _getActivityTrackingConfig: function(config) { + + return { + width: 6, + height: 6, + type: ActivityTrackingMap, + props: { + title: 'tracking', + pathVariableId: this._activityData.id + } + }; + }, + + _getActivityInfrastructureConfig: function(config) { + + return { + width: 6, + height: 6, + type: ActivityInfrastructureMapBase, + props: { + title: 'infrastructures', + pathVariableId: this._activityData.id + } + }; + }, + + _getActivityAreaConfig: function(config) { + + return { + width: 6, + height: 6, + type: ActivityAreaMapBase, + props: { + title: 'area', + pathVariableId: this._activityData.id + } + }; + }, + + _getActivityFixedObservationSeriesMapConfig: function(config) { + + return { + width: 6, + height: 6, + type: ActivityFixedObservationSeriesMap, + props: { + title: 'associatedObservationStation', + pathVariableId: this._activityData.id + } + }; + }, + + _getActivityFixedTimeseriesMapConfig: function(config) { + + return { + width: 6, + height: 6, + type: ActivityFixedTimeseriesMap, + props: { + title: 'associatedSurveyStation', + pathVariableId: this._activityData.id + } + }; + }, + + _getActivityFixedTimeseriesChartConfig: function(mapKey, config) { + + return { + width: 6, + height: 6, + type: ActivityFixedTimeseriesChart, + props: { + title: 'charts', + pathVariableId: this._activityData.id, + timeseriesDataChannel: this._getWidgetInstance(mapKey).getChannel('TIMESERIES_DATA') + } + }; + }, + + _getActivityEmbeddedContentsConfig: function(node, i, config) { + + return { + width: 6, + height: 6, + type: GenericDisplayer, + props: { + title: this.i18n.embeddedContent + ' #' + (i + 1), + content: node + } + }; + } + }); +}); diff --git a/client-app/src/detail/activity/ActivityDetailView.js b/client-app/src/detail/activity/ActivityDetailView.js new file mode 100644 index 0000000000000000000000000000000000000000..fa75b676de5af4159cb6e2ffd4fefb123d9843f9 --- /dev/null +++ b/client-app/src/detail/activity/ActivityDetailView.js @@ -0,0 +1,189 @@ +define([ + 'src/redmicConfig' + , 'app/designs/details/main/_ActivityBase' + , 'dojo/_base/declare' + , 'dojo/_base/lang' + , 'src/component/base/_ExternalConfig' + , 'src/detail/_GenerateReport' + , 'src/detail/activity/_ActivityLayoutWidget' + , 'app/designs/details/_AddWidgetSelector' + , 'templates/ActivityInfo' +], function( + redmicConfig + , _ActivityBase + , declare + , lang + , _ExternalConfig + , _GenerateReport + , _ActivityLayoutWidget + , _AddWidgetSelector + , TemplateInfo +) { + + return declare([_ActivityBase, _AddWidgetSelector, _ActivityLayoutWidget, _ExternalConfig, _GenerateReport], { + // summary: + // Vista de detalle de actividades. + + constructor: function(args) { + + this.config = { + activityTarget: redmicConfig.services.activity, + reportService: 'activity', + ancestorsTarget: redmicConfig.services.activityAncestors, + infoTarget: 'infoWidgetTarget', + externalConfigPropName: 'detailLayouts.activity' + }; + + lang.mixin(this, this.config, args); + }, + + _setMainConfigurations: function() { + + this.target = [this.activityTarget]; + + this.viewPathsWidgets = { + organisations: redmicConfig.viewPaths.organisationCatalogDetails, + platforms: redmicConfig.viewPaths.platformCatalogDetails, + documents: redmicConfig.viewPaths.bibliographyDetails + }; + + this.pathParent = redmicConfig.viewPaths.activityCatalog; + + this.widgetConfigs = this._merge([{ + info: this._getInfoConfig({ + template: TemplateInfo + }), + spatialExtension: this._getSpatialExtensionConfig(), + organisationList: this._getOrganisationsConfig(), + platformList: this._getPlatformsConfig(), + contactList: this._getContactsConfig(), + documentList: this._getDocumentsConfig() + }, this.widgetConfigs || {}]); + }, + + _setMainOwnCallbacksForEvents: function() { + + this._onEvt('GOT_EXTERNAL_CONFIG', lang.hitch(this._onGotExternalConfig)); + this._onEvt('ME_OR_ANCESTOR_HIDDEN', lang.hitch(this, this._onActivityDetailsHidden)); + }, + + _onGotExternalConfig: function(evt) { + + var configValue = evt[this.externalConfigPropName]; + + this._publish(this.getChannel('SET_PROPS'), { + detailLayouts: configValue + }); + }, + + _addTargetToArray: function(target) { + + if (this.target && this.target instanceof Array && !this.target.includes(target)) { + this.target.push(target); + } + }, + + _removeTargetFromArray: function(target) { + + if (this.target && this.target instanceof Array && this.target.includes(target)) { + this.target.splice(this.target.indexOf(target), 1); + } + }, + + _itemAvailable: function(res) { + + var path = res.data.path; + + this._activityData = res.data; + + this._ancestorsTarget = lang.replace(this.ancestorsTarget, { path: path }); + this._addTargetToArray(this._ancestorsTarget); + + this._emitEvt('INJECT_DATA', { + data: this._activityData, + target: this.infoTarget + }); + + this._emitEvt('REQUEST', { + method: 'POST', + target: this._ancestorsTarget, + action: '_search', + query: { + returnFields: ['id', 'path', 'name'] + } + }); + + this._prepareSpatialExtension(); + + this._emitEvt('GET_EXTERNAL_CONFIG', { + propertyName: this.externalConfigPropName + }); + + this._prepareCustomWidgets(); + + this.inherited(arguments); + }, + + _dataAvailable: function(res) { + + this._removeTargetFromArray(this._ancestorsTarget); + + var data = res.data, + ancestors = data.data; + + this._activityData.ancestors = ancestors; + + this._emitEvt('INJECT_DATA', { + data: this._activityData, + target: this.infoTarget + }); + + this._updateInteractive(); + }, + + _prepareSpatialExtension: function() { + + var wkt = this._activityData.spatialExtension; + if (!wkt) { + return; + } + + var mapInstance = this._getWidgetInstance('spatialExtension'); + this._once(mapInstance.getChannel('BBOX_CHANGED'), lang.hitch(this, this._showSpatialExtension, wkt)); + + this._showWidget('spatialExtension'); + }, + + _showSpatialExtension: function(wkt) { + + var mapInstance = this._getWidgetInstance('spatialExtension'); + + this._once(mapInstance.getChannel('WKT_ADDED'), lang.hitch(this, function(res) { + + this._lastWktLayer = res.layer; + })); + + this._publish(mapInstance.getChannel('ADD_WKT'), { + wkt: wkt, + id: 'spatialExtension' + }); + }, + + _onActivityDetailsHidden: function() { + + this.target = [this.activityTarget]; + + if (this._lastWktLayer) { + var mapInstance = this._getWidgetInstance('spatialExtension'); + + this._publish(mapInstance.getChannel('REMOVE_LAYER'), { + layer: this._lastWktLayer + }); + } + + this._hideWidget('spatialExtension'); + + this._removeCustomWidgets(); + } + }); +}); diff --git a/client-app/src/detail/activity/_ActivityLayoutWidget.js b/client-app/src/detail/activity/_ActivityLayoutWidget.js new file mode 100644 index 0000000000000000000000000000000000000000..a0def9d0102c8a53f69e33fdcf5f7cd7699bd77f --- /dev/null +++ b/client-app/src/detail/activity/_ActivityLayoutWidget.js @@ -0,0 +1,291 @@ +define([ + 'dojo/_base/declare' + , 'dojo/_base/lang' + , 'dojo/Deferred' + , 'src/detail/_WidgetDefinition' +], function( + declare + , lang + , Deferred + , _WidgetDefinition +) { + + return declare(_WidgetDefinition, { + // summary: + // Aplicación de componentes adicionales para la vista detalle de Activity, en función del tipo de layout + // establecido según su identificador. Si no está establecido, se decide según su categoría. + + constructor: function(args) { + + this.config = { + mainActions: { + GET_USER_GRANTS_FOR_ACTIVITY: 'getUserGrantsForActivity', + GOT_USER_GRANTS_FOR_ACTIVITY: 'gotUserGrantsForActivity' + } + }; + + lang.mixin(this, this.config, args); + }, + + _onDetailLayoutsPropSet: function(evt) { + + var currentElementId = this.pathVariableId, + activityDetailLayouts = evt.value && evt.value[currentElementId]; + + if (!activityDetailLayouts || !activityDetailLayouts.length) { + return; + } + + this._processActivityDetailLayouts(currentElementId, activityDetailLayouts); + }, + + _processActivityDetailLayouts: function(activityId, layouts) { + + layouts.forEach(lang.hitch(this, function(layout) { + + var layoutType = layout.type, + layoutConfig = layout.config || {}, + layoutCheckGrants = layout.checkGrants || false; + + if (!layoutType) { + return; + } + + var grantedCallback = lang.hitch(this, this._prepareDetailLayoutWidgets, layoutType, layoutConfig); + + if (layoutCheckGrants) { + var notGrantedCallback = lang.hitch(this, this._onLayoutNotGranted), + dfd = new Deferred(); + + dfd.then(grantedCallback, notGrantedCallback); + + this._checkUserGrantsForActivityData(activityId, dfd); + } else { + grantedCallback(); + } + })); + }, + + _checkUserGrantsForActivityData: function(activityId, dfd) { + + var channelToSubscribe = this._buildChannel(this.credentialsChannel, 'GOT_USER_GRANTS_FOR_ACTIVITY'); + + this._once(channelToSubscribe, lang.hitch(this, function(grantsDfd, res) { + + if (res.accessGranted) { + grantsDfd.resolve(); + } else { + grantsDfd.reject(); + } + }, dfd)); + + var channelToPublish = this._buildChannel(this.credentialsChannel, 'GET_USER_GRANTS_FOR_ACTIVITY'); + this._publish(channelToPublish, { + activityId: activityId + }); + }, + + _onLayoutNotGranted: function(res) { + + // TODO mostrar al usuario un aviso de que existen datos en la actividad, pero no tiene permiso. + // Ofrecerle identificarse. + }, + + _prepareCustomWidgets: function() { + // TODO medida temporal por retrocompatibilidad con activityCategory + + var currentElementId = this.pathVariableId, + detailLayout = this.detailLayouts && this.detailLayouts[currentElementId], + detailLayoutWidgetsCount = this._detailLayoutWidgets && this._detailLayoutWidgets.length; + + if (!detailLayout || !detailLayoutWidgetsCount) { + this._prepareActivityCategoryCustomWidgets(); + } + }, + + _prepareDetailLayoutWidgets: function(detailLayout, layoutConfig) { + + if (!this._detailLayoutWidgets) { + this._detailLayoutWidgets = []; + } + + var prepareWidgetsMethod; + + if (detailLayout === 'citationMap') { + prepareWidgetsMethod = '_prepareCitationActivityWidgets'; + } else if (detailLayout === 'ogcLayerMap') { + prepareWidgetsMethod = '_prepareMapLayerActivityWidgets'; + } else if (detailLayout === 'trackingMap') { + prepareWidgetsMethod = '_prepareTrackingActivityWidgets'; + } else if (detailLayout === 'infrastructureMap') { + prepareWidgetsMethod = '_prepareInfrastructureActivityWidgets'; + } else if (detailLayout === 'areaMap') { + prepareWidgetsMethod = '_prepareAreaActivityWidgets'; + } else if (detailLayout === 'featureMap') { + prepareWidgetsMethod = '_prepareFixedObservationSeriesActivityWidgets'; + } else if (detailLayout === 'featureTimeseriesMapChart') { + prepareWidgetsMethod = '_prepareFixedTimeseriesActivityWidgets'; + } else if (detailLayout === 'embeddedContent') { + prepareWidgetsMethod = '_prepareEmbeddedContentsActivityWidgets'; + } + + if (!prepareWidgetsMethod) { + console.warn('Tried to get widgets for "%s" detail layout, but none found!', detailLayout); + return; + } + + var widgetKey = this[prepareWidgetsMethod](layoutConfig); + + if (widgetKey instanceof Array) { + this._detailLayoutWidgets = this._detailLayoutWidgets.concat(widgetKey); + } else { + this._detailLayoutWidgets.push(widgetKey); + } + }, + + _prepareActivityCategoryCustomWidgets: function() { + // TODO borrar cuando se deje de usar activityCategory + + if (!this._detailLayoutWidgets) { + this._detailLayoutWidgets = []; + } + + var activityCategory = this._activityData.activityCategory, + widgetKey; + + if (activityCategory === 'ci') { + widgetKey = this._prepareCitationActivityWidgets(); + } else if (activityCategory === 'ml') { + widgetKey = this._prepareMapLayerActivityWidgets(); + } else if (['tr', 'at', 'pt'].indexOf(activityCategory) !== -1) { + widgetKey = this._prepareTrackingActivityWidgets(); + } else if (activityCategory === 'if') { + widgetKey = this._prepareInfrastructureActivityWidgets(); + } else if (activityCategory === 'ar') { + widgetKey = this._prepareAreaActivityWidgets(); + } else if (activityCategory === 'ft') { + widgetKey = this._prepareFixedTimeseriesActivityWidgets(); + } else if (activityCategory === 'ec') { + widgetKey = this._prepareEmbeddedContentsActivityWidgets(); + } + + if (widgetKey) { + if (widgetKey instanceof Array) { + this._detailLayoutWidgets = this._detailLayoutWidgets.concat(widgetKey); + } else { + this._detailLayoutWidgets.push(widgetKey); + } + } + }, + + _prepareCitationActivityWidgets: function(layoutConfig) { + + var key = 'activityCitation', + config = this._getActivityCitationConfig(layoutConfig); + + this._addWidget(key, config); + + return key; + }, + + _prepareMapLayerActivityWidgets: function(layoutConfig) { + + var key = 'activityMapLayer', + config = this._getActivityMapLayerConfig(layoutConfig); + + this._addWidget(key, config); + + return key; + }, + + _prepareTrackingActivityWidgets: function(layoutConfig) { + + var key = 'activityTracking', + config = this._getActivityTrackingConfig(layoutConfig); + + this._addWidget(key, config); + + return key; + }, + + _prepareInfrastructureActivityWidgets: function(layoutConfig) { + + var key = 'activityInfrastructure', + config = this._getActivityInfrastructureConfig(layoutConfig); + + this._addWidget(key, config); + + return key; + }, + + _prepareAreaActivityWidgets: function(layoutConfig) { + + var key = 'activityArea', + config = this._getActivityAreaConfig(layoutConfig); + + this._addWidget(key, config); + + return key; + }, + + _prepareFixedObservationSeriesActivityWidgets: function(layoutConfig) { + + var key = 'activityFixedObservationSeriesMap', + config = this._getActivityFixedObservationSeriesMapConfig(layoutConfig); + + this._addWidget(key, config); + + return key; + }, + + _prepareFixedTimeseriesActivityWidgets: function(layoutConfig) { + + var mapKey = 'activityFixedTimeseriesMap', + mapConfig = this._getActivityFixedTimeseriesMapConfig(layoutConfig); + + this._addWidget(mapKey, mapConfig); + + var chartKey = 'activityFixedTimeseriesChart', + chartConfig = this._getActivityFixedTimeseriesChartConfig(mapKey, layoutConfig); + + this._addWidget(chartKey, chartConfig); + + return [mapKey, chartKey]; + }, + + _prepareEmbeddedContentsActivityWidgets: function(layoutConfig) { + + var embeddedContents = this._activityData.embeddedContents, + keys = []; + + for (var i = 0; i < embeddedContents.length; i++) { + var embeddedContentObj = embeddedContents[i], + embeddedContentValue = embeddedContentObj.embeddedContent, + embeddedContentParentNode = globalThis.document.createElement('object'); + + embeddedContentParentNode.innerHTML = embeddedContentValue; + + var key = 'embeddedContent' + i, + config = this._getActivityEmbeddedContentsConfig(embeddedContentParentNode.firstChild, i, layoutConfig); + + keys.push(key); + + this._addWidget(key, config); + } + + return keys; + }, + + _removeCustomWidgets: function() { + + if (!this._detailLayoutWidgets) { + return; + } + + while (this._detailLayoutWidgets.length) { + var key = this._detailLayoutWidgets.pop(); + this._destroyWidget(key); + } + } + }); +}); diff --git a/client-app/src/detail/activity/_Edition.js b/client-app/src/detail/activity/_Edition.js new file mode 100644 index 0000000000000000000000000000000000000000..cd42919b3cd0dd2d1fcdd2c20361ff3ea9d35073 --- /dev/null +++ b/client-app/src/detail/activity/_Edition.js @@ -0,0 +1,45 @@ +define([ + 'dojo/_base/declare' + , 'dojo/_base/lang' + , 'dojo/aspect' + , 'src/redmicConfig' +], function( + declare + , lang + , aspect + , redmicConfig +) { + + return declare(null, { + // summary: + // Extensión de vista de detalle de actividades para añadir funcionalidad relativa a la edición de + // registros. + + constructor: function(args) { + + this.config = { + }; + + lang.mixin(this, this.config, args); + + aspect.after(this, '_setConfigurations', lang.hitch(this, this._setActivityEditionConfigurations)); + }, + + _setActivityEditionConfigurations: function() { + + if (!this._titleRightButtonsList) { + this._titleRightButtonsList = []; + } + + this._titleRightButtonsList.push({ + icon: 'fa-edit', + href: redmicConfig.viewPaths.activityEdit, + title: this.i18n.edit + }); + + this.shownOptionInfo = { + id: true + }; + } + }); +}); diff --git a/client-app/src/detail/activity/widget/ActivityFixedObservationSeriesMap.js b/client-app/src/detail/activity/widget/ActivityFixedObservationSeriesMap.js new file mode 100644 index 0000000000000000000000000000000000000000..498109d43ab198bcf37c5e434c6c10b90aab0569 --- /dev/null +++ b/client-app/src/detail/activity/widget/ActivityFixedObservationSeriesMap.js @@ -0,0 +1,111 @@ +define([ + "app/designs/details/main/ActivityMap" + , 'src/redmicConfig' + , "dojo/_base/declare" + , "dojo/_base/lang" + , "dojo/aspect" + , "templates/InfrastructurePopup" + , "templates/InfrastructureList" +], function( + ActivityMap + , redmicConfig + , declare + , lang + , aspect + , TemplatePopup + , TemplateList +){ + return declare(ActivityMap, { + // summary: + // + + constructor: function (args) { + + this.config = { + target: redmicConfig.services.activity, + templateTargetChange: redmicConfig.services.activityObservationSeriesStations, + templatePopup: TemplatePopup, + _activeRadius: false, + }; + + lang.mixin(this, this.config, args); + + aspect.before(this, "_afterSetConfigurations", lang.hitch(this, this._setBaseConfigurations)); + }, + + _setBaseConfigurations: function() { + + this.widgetConfigs = this._merge([{ + geographic: { + props: { + browserConfig: { + template: TemplateList, + rowConfig: { + buttonsConfig: { + listButton: [{ + icon: 'fa-bar-chart', + btnId: 'showObservations', + returnItem: true, + title: this.i18n.observations + }] + } + } + } + } + } + }, this.widgetConfigs || {}], { + arrayMergingStrategy: 'concatenate' + }); + }, + + _afterShow: function() { + + this.inherited(arguments); + + this._subscribe(this.getChildChannel('layerInstance', 'POPUP_LOADED'), + lang.hitch(this, this._onStationPopupLoaded)); + + this._subscribe(this._getWidgetInstance('geographic').getChildChannel('browser', 'BUTTON_EVENT'), + lang.hitch(this, this._onBrowserButtonEvent)); + }, + + _onStationPopupLoaded: function(res) { + + if (!res) { + return; + } + + var popupNode = res._contentNode, + popupData = res._source.feature.properties; + + if (popupNode && popupData) { + var showChartsNode = query('.' + this._showChartsButtonClass, popupNode)[0]; + if (!showChartsNode) { + return; + } + + showChartsNode.onclick = lang.hitch(this, this._loadObservationSeriesData, popupData); + } + }, + + _getPopupContent: function(data) { + + return this.templatePopup({ + i18n: this.i18n, + feature: data.feature + }); + }, + + _onBrowserButtonEvent: function(evt) { + + if (evt.btnId === 'showObservations') { + this._loadObservationSeriesData(evt.item); + } + }, + + _loadObservationSeriesData: function(item) { + + console.log('cargo los datos de observaciones', item); + } + }); +}); diff --git a/client-app/src/detail/animal/AnimalDetailView.js b/client-app/src/detail/animal/AnimalDetailView.js new file mode 100644 index 0000000000000000000000000000000000000000..62ca96f0c07411d10bab798f486798e710604974 --- /dev/null +++ b/client-app/src/detail/animal/AnimalDetailView.js @@ -0,0 +1,103 @@ +define([ + 'src/redmicConfig' + , 'dojo/_base/declare' + , 'dojo/_base/lang' + , 'src/component/browser/_Framework' + , 'src/component/browser/ListImpl' + , 'src/component/browser/bars/Total' + , 'templates/AnimalSpecimenTag' + , 'templates/AnimalInfo' + , 'app/designs/details/main/_DetailsBase' +], function( + redmicConfig + , declare + , lang + , _Framework + , ListImpl + , Total + , TemplateAnimalSpecimenTag + , TemplateInfo + , _DetailsBase +) { + + return declare(_DetailsBase, { + // summary: + // Vista de detalle de animales. + + constructor: function(args) { + + this.config = { + target: redmicConfig.services.animal, + activitiesTargetBase: redmicConfig.services.activityAnimals, + templateInfo: TemplateInfo, + pathParent: redmicConfig.viewPaths.animalCatalog, + specimenTagsTarget: 'specimenTags' + }; + + lang.mixin(this, this.config, args); + }, + + _setConfigurations: function() { + + this.viewPathsWidgets = { + activities: redmicConfig.viewPaths.activityDetails + }; + }, + + _setMainConfigurations: function() { + + this.widgetConfigs = this._merge([{ + specimenTagList: this._getSpecimenTagsConfig() + }, this.widgetConfigs || {}]); + + this.inherited(arguments); + }, + + _getSpecimenTagsConfig: function() { + + return { + width: 3, + height: 2, + type: declare([ListImpl, _Framework]), + props: { + title: 'specimenTags', + target: this.specimenTagsTarget, + template: TemplateAnimalSpecimenTag, + bars: [{ + instance: Total + }] + } + }; + }, + + _clearModules: function() { + + this.inherited(arguments); + + this._publish(this._getWidgetInstance('specimenTagList').getChannel('CLEAR')); + }, + + _itemAvailable: function(res, resWrapper) { + + if (resWrapper.target === this.target[0]) { + this._dataToSpecimenTags(res); + return; + } + + this.inherited(arguments); + }, + + _dataToSpecimenTags: function(response) { + + var data = response.data, + specimenTags = data.specimenTags; + + if (specimenTags && specimenTags.length) { + this._emitEvt('INJECT_DATA', { + data: specimenTags, + target: this.specimenTagsTarget + }); + } + } + }); +}); diff --git a/client-app/src/detail/animal/_Edition.js b/client-app/src/detail/animal/_Edition.js new file mode 100644 index 0000000000000000000000000000000000000000..9cd1921a07abb4179d37c1470f5b752124007b9e --- /dev/null +++ b/client-app/src/detail/animal/_Edition.js @@ -0,0 +1,41 @@ +define([ + 'dojo/_base/declare' + , 'dojo/_base/lang' + , 'dojo/aspect' + , 'src/redmicConfig' +], function( + declare + , lang + , aspect + , redmicConfig +) { + + return declare(null, { + // summary: + // Extensión de vista de detalle de animales para añadir funcionalidad relativa a la edición de + // registros. + + constructor: function(args) { + + this.config = { + }; + + lang.mixin(this, this.config, args); + + aspect.after(this, '_setConfigurations', lang.hitch(this, this._setAnimalEditionConfigurations)); + }, + + _setAnimalEditionConfigurations: function() { + + if (!this._titleRightButtonsList) { + this._titleRightButtonsList = []; + } + + this._titleRightButtonsList.push({ + icon: 'fa-edit', + href: redmicConfig.viewPaths.animalEdit, + title: this.i18n.edit + }); + } + }); +}); diff --git a/public/javascript/app/designs/details/main/Document.js b/client-app/src/detail/bibliography/BibliographyDetailView.js similarity index 76% rename from public/javascript/app/designs/details/main/Document.js rename to client-app/src/detail/bibliography/BibliographyDetailView.js index 8fc5059555caf6e827483f6f2336dac3d46a1979..8a7019b890eb1b5715b94c27939fd2af79fcf188 100644 --- a/public/javascript/app/designs/details/main/Document.js +++ b/client-app/src/detail/bibliography/BibliographyDetailView.js @@ -1,37 +1,32 @@ define([ - 'app/redmicConfig' + 'src/redmicConfig' , 'dojo/_base/declare' , 'dojo/_base/lang' - , 'redmic/base/Credentials' + , 'src/detail/_GenerateReport' , 'templates/DocumentInfo' - , './_DetailsBase' - , './DocumentPDF' + , 'app/designs/details/main/_DetailsBase' + , 'src/detail/bibliography/DocumentPDF' ], function( redmicConfig , declare , lang - , Credentials + , _GenerateReport , TemplateInfo , _DetailsBase , DocumentPDF ) { - return declare(_DetailsBase, { + return declare([_DetailsBase, _GenerateReport], { // summary: // Vista detalle de Document. constructor: function(args) { this.config = { - _titleRightButtonsList: [{ - icon: 'fa-print', - btnId: 'report', - title: this.i18n.printToPdf - }], - target: redmicConfig.services.document, activitiesTargetBase: redmicConfig.services.activityDocuments, templateInfo: TemplateInfo, + pathParent: redmicConfig.viewPaths.bibliography, reportService: 'document' }; @@ -44,6 +39,13 @@ define([ this._onEvt('ME_OR_ANCESTOR_HIDDEN', lang.hitch(this, this._onDocumentDetailsHidden)); }, + _setConfigurations: function() { + + this.viewPathsWidgets = { + activities: redmicConfig.viewPaths.activityDetails + }; + }, + _setMainConfigurations: function() { this.inherited(arguments); @@ -63,7 +65,7 @@ define([ hidden: true, type: DocumentPDF, props: { - title: this.i18n.document, + title: 'document', pathVariableId: this.pathVariableId } } @@ -79,13 +81,18 @@ define([ return; } + this._evaluateItemToShowOrHidePdf(res); + }, + + _evaluateItemToShowOrHidePdf: function(res) { + var documentData = res.data, pdfUrl = documentData.internalUrl, privatePdf = documentData.privateInternalUrl; - if (!pdfUrl || (privatePdf && Credentials.get('userRole') !== 'ROLE_ADMINISTRATOR')) { + if (!pdfUrl || privatePdf) { this._hideWidget('pdf'); - } else { + } else if (pdfUrl) { this._showWidget('pdf'); } }, diff --git a/public/javascript/app/designs/details/main/DocumentPDF.js b/client-app/src/detail/bibliography/DocumentPDF.js similarity index 96% rename from public/javascript/app/designs/details/main/DocumentPDF.js rename to client-app/src/detail/bibliography/DocumentPDF.js index 46793740c9d2f6d2c4a108f1152e3502a4570570..43b5271ad9d02fac16afb0f438fb1d4f21ea0d15 100644 --- a/public/javascript/app/designs/details/main/DocumentPDF.js +++ b/client-app/src/detail/bibliography/DocumentPDF.js @@ -2,10 +2,10 @@ define([ 'app/designs/base/_Main' , 'app/designs/details/Controller' , 'app/designs/details/Layout' - , 'app/redmicConfig' + , 'src/redmicConfig' , 'dojo/_base/declare' , 'dojo/_base/lang' - , 'redmic/modules/components/PDFViewer/PDFViewer' + , 'src/component/components/PDFViewer/PDFViewer' ], function( _Main , Controller diff --git a/client-app/src/detail/bibliography/_Edition.js b/client-app/src/detail/bibliography/_Edition.js new file mode 100644 index 0000000000000000000000000000000000000000..9e23fee3229b21e042f2ce0dff2b7fb23ecf078e --- /dev/null +++ b/client-app/src/detail/bibliography/_Edition.js @@ -0,0 +1,57 @@ +define([ + 'dojo/_base/declare' + , 'dojo/_base/lang' + , 'dojo/aspect' + , 'src/redmicConfig' +], function( + declare + , lang + , aspect + , redmicConfig +) { + + return declare(null, { + // summary: + // Extensión de vista de detalle de bibliografía para añadir funcionalidad relativa a la edición de + // registros. + + constructor: function(args) { + + this.config = { + }; + + lang.mixin(this, this.config, args); + + aspect.after(this, '_setConfigurations', lang.hitch(this, this._setBibliographyEditionConfigurations)); + }, + + _setBibliographyEditionConfigurations: function() { + + if (!this._titleRightButtonsList) { + this._titleRightButtonsList = []; + } + + this._titleRightButtonsList.push({ + icon: 'fa-edit', + href: redmicConfig.viewPaths.bibliographyEdit, + title: this.i18n.edit + }); + + this.shownOptionInfo = { + remark: true + }; + }, + + _evaluateItemToShowOrHidePdf: function(res) { + + var documentData = res.data, + pdfUrl = documentData.internalUrl; + + if (!pdfUrl) { + this._hideWidget('pdf'); + } else { + this._showWidget('pdf'); + } + } + }); +}); diff --git a/public/javascript/app/designs/details/main/ServiceOGC.js b/client-app/src/detail/ogcService/OgcServiceDetailView.js similarity index 76% rename from public/javascript/app/designs/details/main/ServiceOGC.js rename to client-app/src/detail/ogcService/OgcServiceDetailView.js index d3adcdd91ff325d801a7b862a29de8e029e570cb..239c50f6640f87592101b1102872afb19434db42 100644 --- a/public/javascript/app/designs/details/main/ServiceOGC.js +++ b/client-app/src/detail/ogcService/OgcServiceDetailView.js @@ -1,18 +1,18 @@ define([ - "app/designs/base/_Main" - , "app/redmicConfig" - , "dojo/_base/declare" - , "dojo/_base/lang" - , 'redmic/modules/layout/templateDisplayer/TemplateDisplayer' - , 'redmic/modules/atlas/_AtlasLayersManagement' - , "redmic/modules/map/LeafletImpl" - , "redmic/modules/map/layer/WmsLayerImpl" - , "RWidgets/RedmicUtilities" - , "templates/ServiceOGCTitle" - , "templates/ServiceOGCInfo" - , "templates/ServiceOGCSourceInfo" - , "templates/ServiceOGCImage" - , "./_DetailsBase" + 'app/designs/base/_Main' + , 'src/redmicConfig' + , 'dojo/_base/declare' + , 'dojo/_base/lang' + , 'src/component/layout/templateDisplayer/TemplateDisplayer' + , 'src/component/atlas/_AtlasLayersManagement' + , 'src/component/map/LeafletImpl' + , 'src/component/map/layer/WmsLayerImpl' + , 'RWidgets/RedmicUtilities' + , 'templates/ServiceOGCTitle' + , 'templates/ServiceOGCInfo' + , 'templates/ServiceOGCSourceInfo' + , 'templates/ServiceOGCImage' + , 'app/designs/details/main/_DetailsBase' ], function( _Main , redmicConfig @@ -36,21 +36,30 @@ define([ constructor: function(args) { - this.atlasTarget = redmicConfig.services.atlasLayer; - this.activityTarget = redmicConfig.services.activity; - this.target = this.atlasTarget; - this.selectionTarget = redmicConfig.services.atlasLayerSelection; - - this.activityLocalTarget = "activitiesLayer"; - this.infoLayerTarget = 'infoLayerTarget'; - this.sourceInfoLayerTarget = 'sourceInfoLayerTarget'; this.config = { + atlasTarget: redmicConfig.services.atlasLayer, + activityTarget: redmicConfig.services.activity, + selectionTarget: redmicConfig.services.atlasLayerSelection, + activeTitleParent: true, + pathParent: redmicConfig.viewPaths.ogcServiceCatalog, + activityLocalTarget: 'activitiesLayer', + infoLayerTarget: 'infoLayerTarget', + sourceInfoLayerTarget: 'sourceInfoLayerTarget', templateTitle: TemplateTitle, templateInfo: TemplateInfo }; lang.mixin(this, this.config, args); + + this.target = this.atlasTarget; + }, + + _setConfigurations: function() { + + this.viewPathsWidgets = { + activities: '/catalog/{rank}-info/{id}' + }; }, _setMainConfigurations: function() { @@ -71,11 +80,11 @@ define([ height: 6, type: TemplateDisplayer, props: { - title: this.i18n.sourceInfo, + title: 'sourceInfo', template: TemplateSourceInfo, target: this.sourceInfoLayerTarget, - "class": "containerDetails", - classEmptyTemplate: "contentListNoData", + 'class': 'containerDetails', + classEmptyTemplate: 'contentListNoData', associatedIds: [this.ownChannel], shownOption: this.shownOptionInfo } @@ -83,16 +92,16 @@ define([ activityList: { height: 3, props: { - title: this.i18n.dataSource, + title: 'dataSource', target: this.activityLocalTarget } }, - spatialExtensionMap: { + spatialExtension: { width: 3, height: 3, type: LeafletImpl, props: { - title: this.i18n.geograficFrame, + title: 'geograficFrame', omitContainerSizeCheck: true, maxZoom: 15, coordinatesViewer: false, @@ -107,9 +116,9 @@ define([ height: 4, type: TemplateDisplayer, props: { - title: this.i18n.legend, + title: 'legend', template: TemplateImage, - "class": "imageContainer", + 'class': 'imageContainer', target: this.atlasTarget, associatedIds: [this.ownChannel] } @@ -119,7 +128,7 @@ define([ _publishMapBox: function(action, obj) { - this._publish(this._getWidgetInstance('spatialExtensionMap').getChannel(action), obj); + this._publish(this._getWidgetInstance('spatialExtension').getChannel(action), obj); }, _clearModules: function() { @@ -230,7 +239,7 @@ define([ this.layer = new WmsLayerImpl({ parentChannel: this.getChannel(), - mapChannel: this._getWidgetInstance('spatialExtensionMap').getChannel(), + mapChannel: this._getWidgetInstance('spatialExtension').getChannel(), layerDefinition: layerDefinition }); diff --git a/client-app/src/detail/ogcService/_Edition.js b/client-app/src/detail/ogcService/_Edition.js new file mode 100644 index 0000000000000000000000000000000000000000..4eb5443083816be6cec00aa2e941cc6ffdaeb31a --- /dev/null +++ b/client-app/src/detail/ogcService/_Edition.js @@ -0,0 +1,41 @@ +define([ + 'dojo/_base/declare' + , 'dojo/_base/lang' + , 'dojo/aspect' + , 'src/redmicConfig' +], function( + declare + , lang + , aspect + , redmicConfig +) { + + return declare(null, { + // summary: + // Extensión de vista de detalle de servicios OGC para añadir funcionalidad relativa a la edición de + // registros. + + constructor: function(args) { + + this.config = { + }; + + lang.mixin(this, this.config, args); + + aspect.after(this, '_setConfigurations', lang.hitch(this, this._setOgcServiceEditionConfigurations)); + }, + + _setOgcServiceEditionConfigurations: function() { + + if (!this._titleRightButtonsList) { + this._titleRightButtonsList = []; + } + + this._titleRightButtonsList.push({ + icon: 'fa-edit', + href: redmicConfig.viewPaths.ogcServiceEdit, + title: this.i18n.edit + }); + } + }); +}); diff --git a/client-app/src/detail/organisation/OrganisationDetailView.js b/client-app/src/detail/organisation/OrganisationDetailView.js new file mode 100644 index 0000000000000000000000000000000000000000..b3afcea7116c6c87d4baaf6b81de878a857980d6 --- /dev/null +++ b/client-app/src/detail/organisation/OrganisationDetailView.js @@ -0,0 +1,39 @@ +define([ + 'src/redmicConfig' + , 'dojo/_base/declare' + , 'dojo/_base/lang' + , 'templates/OrganisationInfo' + , 'app/designs/details/main/_DetailsBase' +], function( + redmicConfig + , declare + , lang + , TemplateInfo + , _DetailsBase +) { + + return declare(_DetailsBase, { + // summary: + // Vista detalle de organizaciones. + + + constructor: function(args) { + + this.config = { + target: redmicConfig.services.organisation, + activitiesTargetBase: redmicConfig.services.activityOrganisations, + templateInfo: TemplateInfo, + pathParent: redmicConfig.viewPaths.organisationCatalog + }; + + lang.mixin(this, this.config, args); + }, + + _setConfigurations: function() { + + this.viewPathsWidgets = { + activities: redmicConfig.viewPaths.activityDetails + }; + } + }); +}); diff --git a/client-app/src/detail/organisation/_Edition.js b/client-app/src/detail/organisation/_Edition.js new file mode 100644 index 0000000000000000000000000000000000000000..68608f4ce05223e3db61e6f69613547a97921825 --- /dev/null +++ b/client-app/src/detail/organisation/_Edition.js @@ -0,0 +1,41 @@ +define([ + 'dojo/_base/declare' + , 'dojo/_base/lang' + , 'dojo/aspect' + , 'src/redmicConfig' +], function( + declare + , lang + , aspect + , redmicConfig +) { + + return declare(null, { + // summary: + // Extensión de vista de detalle de organizaciones para añadir funcionalidad relativa a la edición de + // registros. + + constructor: function(args) { + + this.config = { + }; + + lang.mixin(this, this.config, args); + + aspect.after(this, '_setConfigurations', lang.hitch(this, this._setOrganisationEditionConfigurations)); + }, + + _setOrganisationEditionConfigurations: function() { + + if (!this._titleRightButtonsList) { + this._titleRightButtonsList = []; + } + + this._titleRightButtonsList.push({ + icon: 'fa-edit', + href: redmicConfig.viewPaths.organisationEdit, + title: this.i18n.edit + }); + } + }); +}); diff --git a/public/javascript/app/designs/details/main/Platform.js b/client-app/src/detail/platform/PlatformDetailView.js similarity index 66% rename from public/javascript/app/designs/details/main/Platform.js rename to client-app/src/detail/platform/PlatformDetailView.js index e2204d74efbb6a252c2576fdcfeec983d7d98567..87246b9744e666894ed78100cfc68c876b0d8c6d 100644 --- a/public/javascript/app/designs/details/main/Platform.js +++ b/client-app/src/detail/platform/PlatformDetailView.js @@ -1,13 +1,13 @@ define([ - "app/redmicConfig" - , "dojo/_base/declare" - , "dojo/_base/lang" - , "redmic/modules/browser/_Framework" - , "redmic/modules/browser/ListImpl" - , "redmic/modules/browser/bars/Total" - , "templates/ContactSet" - , "templates/PlatformInfo" - , "./_DetailsBase" + 'src/redmicConfig' + , 'dojo/_base/declare' + , 'dojo/_base/lang' + , 'src/component/browser/_Framework' + , 'src/component/browser/ListImpl' + , 'src/component/browser/bars/Total' + , 'templates/ContactSet' + , 'templates/PlatformInfo' + , 'app/designs/details/main/_DetailsBase' ], function( redmicConfig , declare @@ -18,10 +18,11 @@ define([ , TemplateContacts , TemplateInfo , _DetailsBase -){ - return declare([_DetailsBase], { +) { + + return declare(_DetailsBase, { // summary: - // Vista detalle de plataformas. + // Vista de detalle de plataformas. constructor: function(args) { @@ -29,29 +30,37 @@ define([ target: redmicConfig.services.platform, activitiesTargetBase: redmicConfig.services.activityPlatforms, templateInfo: TemplateInfo, - contactTarget: "contacts" + pathParent: redmicConfig.viewPaths.platformCatalog, + contactTarget: 'contacts' }; lang.mixin(this, this.config, args); }, + _setConfigurations: function() { + + this.viewPathsWidgets = { + activities: redmicConfig.viewPaths.activityDetails + }; + }, + _setMainConfigurations: function() { this.widgetConfigs = this._merge([{ - contactList: this._contactsConfig() + contactList: this._getContactsConfig() }, this.widgetConfigs || {}]); this.inherited(arguments); }, - _contactsConfig: function() { + _getContactsConfig: function() { return { width: 3, height: 2, type: declare([ListImpl, _Framework]), props: { - title: this.i18n.contacts, + title: 'contacts', target: this.contactTarget, template: TemplateContacts, bars: [{ diff --git a/client-app/src/detail/platform/_Edition.js b/client-app/src/detail/platform/_Edition.js new file mode 100644 index 0000000000000000000000000000000000000000..fb362b1b5bff378b49ead505c97338e29ac9d8aa --- /dev/null +++ b/client-app/src/detail/platform/_Edition.js @@ -0,0 +1,41 @@ +define([ + 'dojo/_base/declare' + , 'dojo/_base/lang' + , 'dojo/aspect' + , 'src/redmicConfig' +], function( + declare + , lang + , aspect + , redmicConfig +) { + + return declare(null, { + // summary: + // Extensión de vista de detalle de plataformas para añadir funcionalidad relativa a la edición de + // registros. + + constructor: function(args) { + + this.config = { + }; + + lang.mixin(this, this.config, args); + + aspect.after(this, '_setConfigurations', lang.hitch(this, this._setPlatformEditionConfigurations)); + }, + + _setPlatformEditionConfigurations: function() { + + if (!this._titleRightButtonsList) { + this._titleRightButtonsList = []; + } + + this._titleRightButtonsList.push({ + icon: 'fa-edit', + href: redmicConfig.viewPaths.platformEdit, + title: this.i18n.edit + }); + } + }); +}); diff --git a/client-app/src/detail/program/ProgramDetailView.js b/client-app/src/detail/program/ProgramDetailView.js new file mode 100644 index 0000000000000000000000000000000000000000..64c5075e30c0e8d2c1f964d0ba9f2bf8e4da8212 --- /dev/null +++ b/client-app/src/detail/program/ProgramDetailView.js @@ -0,0 +1,73 @@ +define([ + 'dojo/_base/declare' + , 'dojo/_base/lang' + , 'src/detail/_GenerateReport' + , 'app/designs/details/main/_DetailsBase' + , 'src/redmicConfig' + , 'templates/ProgramInfo' + , 'templates/ProjectList' +], function( + declare + , lang + , _GenerateReport + , _DetailsBase + , redmicConfig + , TemplateInfo + , TemplateProjects +) { + + return declare([_DetailsBase, _GenerateReport], { + // summary: + // Vista de detalle de programas. + + constructor: function(args) { + + this.config = { + target: redmicConfig.services.program, + activitiesTargetBase: redmicConfig.services.projectProgram, + reportService: 'program', + pathParent: redmicConfig.viewPaths.programCatalog + }; + + lang.mixin(this, this.config, args); + }, + + _setMainConfigurations: function() { + + this.target = [this.target]; + + this.widgetConfigs = this._merge([{ + info: this._getInfoConfig({ + template: TemplateInfo, + target: this.target[0] + }), + projectList: this._getActivitiesOrProjectsConfig({ + title: 'projects', + target: this.activityTarget, + template: TemplateProjects, + href: redmicConfig.viewPaths.projectDetails, + height: 6 + }) + }, this.widgetConfigs || {}]); + }, + + _getActivityTargetData: function() { + + this._emitEvt('REQUEST', { + method: 'POST', + target: this.target[1], + action: '_search', + query: { + returnFields: redmicConfig.returnFields.project + } + }); + }, + + _dataAvailable: function(res, resWrapper) { + + if (resWrapper.target === this.target[1]) { + this._dataToActivities(res); + } + } + }); +}); diff --git a/client-app/src/detail/program/_Edition.js b/client-app/src/detail/program/_Edition.js new file mode 100644 index 0000000000000000000000000000000000000000..d84414e8a9b3f2b4ebc07ad5fe11d1651b05b405 --- /dev/null +++ b/client-app/src/detail/program/_Edition.js @@ -0,0 +1,41 @@ +define([ + 'dojo/_base/declare' + , 'dojo/_base/lang' + , 'dojo/aspect' + , 'src/redmicConfig' +], function( + declare + , lang + , aspect + , redmicConfig +) { + + return declare(null, { + // summary: + // Extensión de vista de detalle de programas para añadir funcionalidad relativa a la edición de + // registros. + + constructor: function(args) { + + this.config = { + }; + + lang.mixin(this, this.config, args); + + aspect.after(this, '_setConfigurations', lang.hitch(this, this._setProgramEditionConfigurations)); + }, + + _setProgramEditionConfigurations: function() { + + if (!this._titleRightButtonsList) { + this._titleRightButtonsList = []; + } + + this._titleRightButtonsList.push({ + icon: 'fa-edit', + href: redmicConfig.viewPaths.programEdit, + title: this.i18n.edit + }); + } + }); +}); diff --git a/client-app/src/detail/project/ProjectDetailView.js b/client-app/src/detail/project/ProjectDetailView.js new file mode 100644 index 0000000000000000000000000000000000000000..0f237c06b2909918517cb5b8da67acb2605dfa3f --- /dev/null +++ b/client-app/src/detail/project/ProjectDetailView.js @@ -0,0 +1,73 @@ +define([ + 'dojo/_base/declare' + , 'dojo/_base/lang' + , 'src/detail/_GenerateReport' + , 'app/designs/details/main/_DetailsBase' + , 'src/redmicConfig' + , 'templates/ActivityList' + , 'templates/ProjectInfo' +], function( + declare + , lang + , _GenerateReport + , _DetailsBase + , redmicConfig + , TemplateActivities + , TemplateInfo +) { + + return declare([_DetailsBase, _GenerateReport], { + // summary: + // Vista de detalle de proyectos. + + constructor: function(args) { + + this.config = { + target: redmicConfig.services.project, + activitiesTargetBase: redmicConfig.services.activityProject, + reportService: 'project', + pathParent: redmicConfig.viewPaths.projectCatalog + }; + + lang.mixin(this, this.config, args); + }, + + _setMainConfigurations: function() { + + this.target = [this.target]; + + this.widgetConfigs = this._merge([{ + info: this._getInfoConfig({ + template: TemplateInfo, + target: this.target[0] + }), + activityList: this._getActivitiesOrProjectsConfig({ + title: 'activities', + target: this.activityTarget, + template: TemplateActivities, + href: redmicConfig.viewPaths.activityDetails, + height: 6 + }) + }, this.widgetConfigs || {}]); + }, + + _getActivityTargetData: function() { + + this._emitEvt('REQUEST', { + method: 'POST', + target: this.target[1], + action: '_search', + query: { + returnFields: redmicConfig.returnFields.activity + } + }); + }, + + _dataAvailable: function(res, resWrapper) { + + if (resWrapper.target === this.target[1]) { + this._dataToActivities(res); + } + } + }); +}); diff --git a/client-app/src/detail/project/_Edition.js b/client-app/src/detail/project/_Edition.js new file mode 100644 index 0000000000000000000000000000000000000000..bfd638a85077bb639d6d76559e3af8de3b5861c3 --- /dev/null +++ b/client-app/src/detail/project/_Edition.js @@ -0,0 +1,41 @@ +define([ + 'dojo/_base/declare' + , 'dojo/_base/lang' + , 'dojo/aspect' + , 'src/redmicConfig' +], function( + declare + , lang + , aspect + , redmicConfig +) { + + return declare(null, { + // summary: + // Extensión de vista de detalle de proyectos para añadir funcionalidad relativa a la edición de + // registros. + + constructor: function(args) { + + this.config = { + }; + + lang.mixin(this, this.config, args); + + aspect.after(this, '_setConfigurations', lang.hitch(this, this._setProjectEditionConfigurations)); + }, + + _setProjectEditionConfigurations: function() { + + if (!this._titleRightButtonsList) { + this._titleRightButtonsList = []; + } + + this._titleRightButtonsList.push({ + icon: 'fa-edit', + href: redmicConfig.viewPaths.projectEdit, + title: this.i18n.edit + }); + } + }); +}); diff --git a/public/javascript/app/designs/details/main/Species.js b/client-app/src/detail/species/SpeciesDetailView.js similarity index 69% rename from public/javascript/app/designs/details/main/Species.js rename to client-app/src/detail/species/SpeciesDetailView.js index 98e36c614235e658baed67269b70e5afada3e7ac..b7dd8a7fc9a9ba5e103f685f19fbe4bb2e4a5416 100644 --- a/public/javascript/app/designs/details/main/Species.js +++ b/client-app/src/detail/species/SpeciesDetailView.js @@ -1,26 +1,22 @@ define([ - "app/redmicConfig" - , "dojo/_base/declare" - , "dojo/_base/lang" - , "redmic/modules/browser/_ButtonsInRow" - , "redmic/modules/browser/_Framework" - , "redmic/modules/browser/ListImpl" - , "redmic/modules/browser/bars/Total" - , "templates/DocumentList" - , "templates/LoadingCustom" - , "templates/SpeciesInfo" - , "templates/SpeciesTitle" - , "./_DetailsBase" - , "./SpeciesLocation" + 'src/redmicConfig' + , 'dojo/_base/declare' + , 'dojo/_base/lang' + , 'src/component/browser/_ButtonsInRow' + , 'src/component/browser/_Framework' + , 'src/detail/_GenerateReport' + , 'templates/LoadingCustom' + , 'templates/SpeciesInfo' + , 'templates/SpeciesTitle' + , 'app/designs/details/main/_DetailsBase' + , 'app/designs/details/main/SpeciesLocation' ], function( redmicConfig , declare , lang , _ButtonsInRow , _Framework - , ListImpl - , Total - , TemplateDocuments + , _GenerateReport , TemplateCustom , TemplateInfo , TemplateTitle @@ -28,32 +24,36 @@ define([ , SpeciesLocation ) { - return declare([_DetailsBase], { + return declare([_DetailsBase, _GenerateReport], { // summary: // Vista detalle de especies. constructor: function(args) { this.config = { - _titleRightButtonsList: [{ - icon: "fa-print", - btnId: "report", - title: this.i18n.printToPdf - }], templateTitle: TemplateTitle, templateInfo: TemplateInfo, target: redmicConfig.services.species, - reportService: "species", + reportService: 'species', ancestorsTarget: redmicConfig.services.taxonAncestors, - documentTarget: "documents", - activityTarget: "activities", - infoTarget: "infoTarget", - titleWidgetTarget: "titleWidgetTarget" + documentTarget: 'documents', + activityTarget: 'activities', + infoTarget: 'infoTarget', + titleWidgetTarget: 'titleWidgetTarget', + pathParent: redmicConfig.viewPaths.speciesCatalog }; lang.mixin(this, this.config, args); }, + _setConfigurations: function() { + + this.viewPathsWidgets = { + documents: redmicConfig.viewPaths.bibliographyDetails, + activities: redmicConfig.viewPaths.activityDetails + }; + }, + _setMainConfigurations: function() { this.inherited(arguments); @@ -62,6 +62,18 @@ define([ target: this.titleWidgetTarget }, this.titleWidgetConfig || {}]); + var documentListConfig = this._merge([ + this._getDocumentsConfig(), + { + props: { + noDataMessage: TemplateCustom({ + message: this.i18n.noAssociatedDocuments, + iconClass: 'fr fr-no-data' + }) + } + } + ]); + this.widgetConfigs = this._merge([ this.widgetConfigs || {}, { @@ -74,13 +86,13 @@ define([ activityList: { height: 3 }, - documentList: this._documentsConfig(), + documentList: documentListConfig, map: { width: 6, height: 4, type: SpeciesLocation, props: { - title: this.i18n.location, + title: 'location', pathVariableId: this.pathVariableId } } @@ -88,43 +100,6 @@ define([ ]); }, - _documentsConfig: function() { - - return { - width: 3, - height: 2, - type: declare([ListImpl, _Framework, _ButtonsInRow]), - props: { - title: this.i18n.documents, - target: this.documentTarget, - template: TemplateDocuments, - bars: [{ - instance: Total - }], - rowConfig: { - buttonsConfig: { - listButton: [{ - icon: "fa-file-pdf-o", - btnId: "downloadPdf", - title: this.i18n.download, - condition: "url", - href: redmicConfig.viewPaths.bibliographyDetails - },{ - icon: "fa-info-circle", - btnId: "details", - title: this.i18n.info, - href: this.viewPathsWidgets.documents - }] - } - }, - noDataMessage: TemplateCustom({ - message: this.i18n.noAssociatedDocuments, - iconClass: "fr fr-no-data" - }) - } - }; - }, - _clearModules: function() { this.inherited(arguments); @@ -188,7 +163,7 @@ define([ this._speciesData = lang.clone(res.data); this._emitEvt('REQUEST', { - method: "POST", + method: 'POST', target: this.target[3], action: '_search', query: { diff --git a/client-app/src/detail/species/_Edition.js b/client-app/src/detail/species/_Edition.js new file mode 100644 index 0000000000000000000000000000000000000000..68cfd3f0ca9fb345aea291e36be0ccabb76d5b17 --- /dev/null +++ b/client-app/src/detail/species/_Edition.js @@ -0,0 +1,41 @@ +define([ + 'dojo/_base/declare' + , 'dojo/_base/lang' + , 'dojo/aspect' + , 'src/redmicConfig' +], function( + declare + , lang + , aspect + , redmicConfig +) { + + return declare(null, { + // summary: + // Extensión de vista de detalle de especies para añadir funcionalidad relativa a la edición de + // registros. + + constructor: function(args) { + + this.config = { + }; + + lang.mixin(this, this.config, args); + + aspect.after(this, '_setConfigurations', lang.hitch(this, this._setSpeciesEditionConfigurations)); + }, + + _setSpeciesEditionConfigurations: function() { + + if (!this._titleRightButtonsList) { + this._titleRightButtonsList = []; + } + + this._titleRightButtonsList.push({ + icon: 'fa-edit', + href: redmicConfig.viewPaths.speciesEdit, + title: this.i18n.edit + }); + } + }); +}); diff --git a/client-app/src/dojoConfig.js b/client-app/src/dojoConfig.js new file mode 100644 index 0000000000000000000000000000000000000000..79a3465e2a84108f6de80a5ff775c96179c8a41c --- /dev/null +++ b/client-app/src/dojoConfig.js @@ -0,0 +1,171 @@ +dojoConfig = { + baseUrl: '/client-app', + + packages: [{ + name: 'src', + location: 'src' + },{ + name: 'test', + location: 'test' + },{ + name: 'app', + location: 'src/oldapp' + },{ + name: 'RWidgets', + location: 'src/util/widgets' + },{ + name: 'dojo', + location: 'dep/dojo' + },{ + name: 'dijit', + location: 'dep/dijit' + },{ + name: 'dojox', + location: 'dep/dojox' + },{ + name: 'put-selector', + location: 'dep/put-selector', + main: 'put' + },{ + name: 'alertify', + location: 'dep/alertify/build', + main: 'alertify.min' + },{ + name: 'dropzone', + location: 'dep/dropzone/dist/min', + main: 'dropzone-amd-module.min' + },{ + name: 'leaflet', + location: 'dep/leaflet/dist', + main: 'leaflet' + },{ + name: 'L-draw', + location: 'dep/leaflet-draw/dist', + main: 'leaflet.draw' + },{ + name: 'L-miniMap', + location: 'dep/leaflet-minimap/dist', + main: 'Control.MiniMap.min' + },{ + name: 'L-coordinates', + location: 'dep/leaflet-coordinates/dist', + main: 'Leaflet.Coordinates-0.1.5.min' + },{ + name: 'L-navBar', + location: 'dep/leaflet-nav', + main: 'index' + },{ + name: 'L-areaselect', + location: 'dep/leaflet-areaselect/src', + main: 'leaflet-areaselect' + },{ + name: 'L-timeDimension', + location: 'dep/leaflet-timedimension/dist', + main: 'leaflet.timedimension.min' + },{ + name: 'iso8601-js-period', + location: 'dep/iso8601-js-period', + main: 'iso8601' + },{ + name: 'd3', + location: 'dep/d3/dist', + main: 'd3.min' + },{ + name: 'd3Tip', + location: 'dep/d3-v6-tip/build', + main: 'd3-v6-tip.min' + },{ + name: 'tv4', + location: 'dep/tv4', + main: 'tv4' + },{ + name: 'mediatorjs', + location: 'dep/mediatorjs', + main: 'mediator.min' + },{ + name: 'cbtree', + location: 'dep/cbtree' + },{ + name: 'proj4', + location: 'dep/proj4/dist', + main: 'proj4' + },{ + name: 'handlebars', + location: 'dep/handlebars/dist', + main: 'handlebars.runtime.min' + },{ + name: 'awesome-markers', + location: 'dep/leaflet.awesome-markers/dist', + main: 'leaflet.awesome-markers.min' + },{ + name: 'pruneCluster', + location: 'dep/pruneCluster/dist', + main: 'PruneCluster.amd.min' + },{ + name: 'templates', + location: 'dep/templates/dist' + },{ + name: 'packery', + location: 'dep/packery/dist', + main: 'packery.pkgd.min' + },{ + name: 'draggabilly', + location: 'dep/draggabilly/dist', + main: 'draggabilly.pkgd.min' + },{ + name: 'moment', + location: 'dep/moment/min', + main: 'moment.min' + },{ + name: 'leaflet-measure', + location: 'dep/leaflet-measure/dist' + },{ + name: 'sockjs', + location: 'dep/sockjs/dist', + main: 'sockjs.min' + },{ + name: 'stomp-websocket', + location: 'dep/stomp-websocket/lib', + main: 'stomp.min' + },{ + name: 'deepmerge', + location: 'dep/deepmerge/dist', + main: 'umd' + },{ + name: 'colorjs', + location: 'dep/color-js', + main: 'color' + },{ + name: 'uuid', + location: 'dep/uuid/dist/umd', + main: 'uuidv4.min' + },{ + name: 'json-schema-ref-parser', + location: 'dep/json-schema-ref-parser/dist', + main: 'ref-parser.min' + },{ + name: 'leaflet-nontiledlayer', + location: 'dep/leaflet-nontiledlayer/dist', + main: 'NonTiledLayer' + },{ + name: 'wicket', + location: 'dep/wicket', + main: 'wicket-leaflet.min' + }], + + map: { + 'd3Tip/d3-v6-tip.min': { + 'd3-selection': 'd3' + }, + 'wicket': { + 'wicket': 'wicket/wicket.min' + } + }, + + deps: ['leaflet'], + + async: true, + waitSeconds: 5, + requestProvider: 'dojo/request/registry', + selectorEngine: 'lite' +}; diff --git a/client-app/src/dojoConfigBuild.js b/client-app/src/dojoConfigBuild.js new file mode 100644 index 0000000000000000000000000000000000000000..4873472df1c35629da540baa2232dacf5b0cb431 --- /dev/null +++ b/client-app/src/dojoConfigBuild.js @@ -0,0 +1,16 @@ +dojoConfig = { + packages: [{ + name: 'app' + },{ + name: 'src' + },{ + name: 'dojo' + },{ + name: 'dojox' + },{ + name: 'colorjs', + main: 'color' + },{ + name: 'leaflet-measure' + }] +}; diff --git a/public/javascript/app/edition/views/ActivityEditionView.js b/client-app/src/edition/activity/ActivityEditionView.js similarity index 84% rename from public/javascript/app/edition/views/ActivityEditionView.js rename to client-app/src/edition/activity/ActivityEditionView.js index 1baf49505a85c12cf73950ee472b152669f2dc74..2c9fc939c4fc48a1f7b75db62dfb046aea635dcc 100644 --- a/public/javascript/app/edition/views/ActivityEditionView.js +++ b/client-app/src/edition/activity/ActivityEditionView.js @@ -1,34 +1,35 @@ define([ - "app/maintenance/domains/admin/views/ActivityTypesView" - , "app/components/steps/ContactSetStep" - , "app/components/steps/DocumentSetStep" - , "app/components/steps/EmbeddedContentSetStep" + "src/maintenance/domain/definition/ActivityTypes" , "app/components/steps/MainDataStep" - , "app/components/steps/OrganisationSetStep" - , "app/components/steps/PlatformSetStep" - , "app/components/steps/ResourceSetStep" , "app/designs/edition/Controller" , "app/designs/edition/Layout" - , "app/redmicConfig" , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/layout/wizard/_CompleteBySelection" + , "src/component/layout/wizard/_CompleteBySelection" + , 'src/edition/activity/step/DocumentSetStep' + , 'src/edition/activity/step/EmbeddedContentSetStep' + , 'src/edition/activity/step/OrganisationSetStep' + , 'src/edition/activity/step/PlatformSetStep' + , 'src/edition/activity/step/ResourceSetStep' + , 'src/edition/step/ContactSetStep' + , 'src/redmicConfig' ], function( ActivityType - , ContactSetStep - , DocumentSetStep - , EmbeddedContentSetStep , ActivityMainDataStep - , OrganisationSetStep - , PlatformSetStep - , ResourceSetStep , Controller , Layout - , redmicConfig , declare , lang , _CompleteBySelection -){ + , DocumentSetStep + , EmbeddedContentSetStep + , OrganisationSetStep + , PlatformSetStep + , ResourceSetStep + , ContactSetStep + , redmicConfig +) { + return declare([Layout, Controller], { // summary: // Vista de edición de Activity. diff --git a/public/javascript/app/components/steps/DocumentSetStep.js b/client-app/src/edition/activity/step/DocumentSetStep.js similarity index 98% rename from public/javascript/app/components/steps/DocumentSetStep.js rename to client-app/src/edition/activity/step/DocumentSetStep.js index 3a3a9967f06d52c1fc9f5f5961cdf742647e5511..bed0f26be063f992e8922c21567d7ff999c1f6e6 100644 --- a/public/javascript/app/components/steps/DocumentSetStep.js +++ b/client-app/src/edition/activity/step/DocumentSetStep.js @@ -1,6 +1,6 @@ define([ "app/designs/doubleList/main/textSearchAndDoubleList" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "templates/DocumentList" @@ -10,7 +10,8 @@ define([ , declare , lang , templateList -){ +) { + return declare(Main, { // summary: // Step de ActivityDocument. diff --git a/public/javascript/app/components/steps/EmbeddedContentSetStep.js b/client-app/src/edition/activity/step/EmbeddedContentSetStep.js similarity index 100% rename from public/javascript/app/components/steps/EmbeddedContentSetStep.js rename to client-app/src/edition/activity/step/EmbeddedContentSetStep.js diff --git a/public/javascript/app/components/steps/OrganisationSetStep.js b/client-app/src/edition/activity/step/OrganisationSetStep.js similarity index 93% rename from public/javascript/app/components/steps/OrganisationSetStep.js rename to client-app/src/edition/activity/step/OrganisationSetStep.js index 5b89efb1670f9aab6d0f8587f1a1ff663c97b973..77ca52174b15c662e8b7c41fa0f7d6d1138ac268 100644 --- a/public/javascript/app/components/steps/OrganisationSetStep.js +++ b/client-app/src/edition/activity/step/OrganisationSetStep.js @@ -1,12 +1,11 @@ define([ "app/base/views/extensions/_EditionFormList" , "app/components/steps/_RememberDeleteItems" - ,"app/designs/formList/layout/Layout" + , "app/designs/formList/layout/Layout" , "app/designs/formList/main/FormListByStep" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" - , "dojo/Deferred" , "templates/OrganisationSet" ], function ( _EditionFormList @@ -16,9 +15,9 @@ define([ , redmicConfig , declare , lang - , Deferred , TemplateList -){ +) { + return declare([Layout, Controller, _EditionFormList, _RememberDeleteItems], { // summary: // Step de ActivityOrganisation. diff --git a/public/javascript/app/components/steps/PlatformSetStep.js b/client-app/src/edition/activity/step/PlatformSetStep.js similarity index 93% rename from public/javascript/app/components/steps/PlatformSetStep.js rename to client-app/src/edition/activity/step/PlatformSetStep.js index 97733bc6f3d15afd0d29c28bbb78f05a0cbc0b8e..aeef302f0d6fe2deabacc3298bb72cbe0b352220 100644 --- a/public/javascript/app/components/steps/PlatformSetStep.js +++ b/client-app/src/edition/activity/step/PlatformSetStep.js @@ -1,12 +1,11 @@ define([ "app/base/views/extensions/_EditionFormList" , "app/components/steps/_RememberDeleteItems" - ,"app/designs/formList/layout/Layout" + , "app/designs/formList/layout/Layout" , "app/designs/formList/main/FormListByStep" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" - , "dojo/Deferred" , "templates/PlatformSet" ], function ( _EditionFormList @@ -16,9 +15,9 @@ define([ , redmicConfig , declare , lang - , Deferred , TemplateList -){ +) { + return declare([Layout, Controller, _EditionFormList, _RememberDeleteItems], { // summary: // Step de ActivityPlatform. diff --git a/public/javascript/app/components/steps/ResourceSetStep.js b/client-app/src/edition/activity/step/ResourceSetStep.js similarity index 100% rename from public/javascript/app/components/steps/ResourceSetStep.js rename to client-app/src/edition/activity/step/ResourceSetStep.js diff --git a/public/javascript/app/edition/views/PlatformEditionView.js b/client-app/src/edition/platform/PlatformEditionView.js similarity index 86% rename from public/javascript/app/edition/views/PlatformEditionView.js rename to client-app/src/edition/platform/PlatformEditionView.js index ca3db7d73d2452774dfc05170d6afb8be4aee1c4..e6d1c170498da7e6b04e49e7e2129d8c1fafc3ba 100644 --- a/public/javascript/app/edition/views/PlatformEditionView.js +++ b/client-app/src/edition/platform/PlatformEditionView.js @@ -1,20 +1,21 @@ define([ - "app/components/steps/ContactSetStep" - , "app/components/steps/MainDataStep" + "app/components/steps/MainDataStep" , "app/designs/edition/Controller" , "app/designs/edition/Layout" - , "app/redmicConfig" , "dojo/_base/declare" , "dojo/_base/lang" + , 'src/edition/step/ContactSetStep' + , 'src/redmicConfig' ], function( - ContactSetStep - , PlatformMainDataStep + MainDataStep , Controller , Layout - , redmicConfig , declare , lang -){ + , ContactSetStep + , redmicConfig +) { + return declare([Layout, Controller], { // summary: // Vista de edición de Platform. @@ -44,7 +45,7 @@ define([ }, modelTarget: this.target, steps: [{ - definition: PlatformMainDataStep, + definition: MainDataStep, props: { formTemplate: "administrative/views/templates/forms/Platform", label: this.i18n.platform diff --git a/public/javascript/app/edition/views/ProgramEditionView.js b/client-app/src/edition/program/ProgramEditionView.js similarity index 56% rename from public/javascript/app/edition/views/ProgramEditionView.js rename to client-app/src/edition/program/ProgramEditionView.js index d3fa9e719b0426203c525ecfbc226c65e757973b..f6d6c4215263e1041379a6d787c26b0c05937c15 100644 --- a/public/javascript/app/edition/views/ProgramEditionView.js +++ b/client-app/src/edition/program/ProgramEditionView.js @@ -1,26 +1,19 @@ define([ - "app/components/steps/ContactSetStep" - , "app/components/steps/DocumentSetStep" - , "app/components/steps/MainDataStep" - , "app/components/steps/OrganisationSetStep" - //, "app/components/steps/PlatformSetStep" + "app/components/steps/MainDataStep" , "app/designs/edition/Controller" , "app/designs/edition/Layout" - , "app/redmicConfig" , "dojo/_base/declare" , "dojo/_base/lang" + , 'src/redmicConfig' ], function( - ContactSetStep - , DocumentSetStep - , ProgramMainDataStep - , OrganisationSetStep - //, PlatformSetStep + MainDataStep , Controller , Layout - , redmicConfig , declare , lang -){ + , redmicConfig +) { + return declare([Layout, Controller], { // summary: // Vista de edición de Program. @@ -50,35 +43,11 @@ define([ }, modelTarget: this.target, steps: [{ - definition: ProgramMainDataStep, + definition: MainDataStep, props: { formTemplate: "administrative/views/templates/forms/Program", label: this.i18n.program } - },{ - definition: OrganisationSetStep, - props: { - propertyName: 'organisations' - }, - skippable: true - },{ - definition: ContactSetStep, - props: { - propertyName: 'contacts' - }, - skippable: true - }/*,{ - definition: PlatformSetStep, - props: { - propertyName: 'platforms' - }, - skippable: true - }*/,{ - definition: DocumentSetStep, - props: { - propertyName: 'documents' - }, - skippable: true }] }, this.editorConfig || {}]); } diff --git a/public/javascript/app/edition/views/ProjectEditionView.js b/client-app/src/edition/project/ProjectEditionView.js similarity index 56% rename from public/javascript/app/edition/views/ProjectEditionView.js rename to client-app/src/edition/project/ProjectEditionView.js index dd6ae9c6fe15362799234ef8088c1dfa429b1ee4..fcd6bb7ed051e72837e8e8ff5c6a49d7cb0dd67a 100644 --- a/public/javascript/app/edition/views/ProjectEditionView.js +++ b/client-app/src/edition/project/ProjectEditionView.js @@ -1,26 +1,19 @@ define([ - "app/components/steps/ContactSetStep" - , "app/components/steps/DocumentSetStep" - , "app/components/steps/MainDataStep" - , "app/components/steps/OrganisationSetStep" - //, "app/components/steps/PlatformSetStep" + 'app/components/steps/MainDataStep' , "app/designs/edition/Controller" , "app/designs/edition/Layout" - , "app/redmicConfig" , "dojo/_base/declare" , "dojo/_base/lang" + , 'src/redmicConfig' ], function( - ContactSetStep - , DocumentSetStep - , ProjectMainDataStep - , OrganisationSetStep - //, PlatformSetStep + MainDataStep , Controller , Layout - , redmicConfig , declare , lang -){ + , redmicConfig +) { + return declare([Layout, Controller], { // summary: // Vista de edición de Project. @@ -50,35 +43,11 @@ define([ }, modelTarget: this.target, steps: [{ - definition: ProjectMainDataStep, + definition: MainDataStep, props: { formTemplate: "administrative/views/templates/forms/Project", label: this.i18n.project } - },{ - definition: OrganisationSetStep, - props: { - propertyName: 'organisations' - }, - skippable: true - },{ - definition: ContactSetStep, - props: { - propertyName: 'contacts' - }, - skippable: true - }/*,{ - definition: PlatformSetStep, - props: { - propertyName: 'platforms' - }, - skippable: true - }*/,{ - definition: DocumentSetStep, - props: { - propertyName: 'documents' - }, - skippable: true }] }, this.editorConfig || {}]); } diff --git a/public/javascript/app/components/steps/ContactSetStep.js b/client-app/src/edition/step/ContactSetStep.js similarity index 93% rename from public/javascript/app/components/steps/ContactSetStep.js rename to client-app/src/edition/step/ContactSetStep.js index afd5fc33d6d4145090fd8a4f87b48184ab5aec5b..b9e69b2a216be0568a2dff3600de276d2b8bf97c 100644 --- a/public/javascript/app/components/steps/ContactSetStep.js +++ b/client-app/src/edition/step/ContactSetStep.js @@ -1,12 +1,11 @@ define([ "app/base/views/extensions/_EditionFormList" , "app/components/steps/_RememberDeleteItems" - ,"app/designs/formList/layout/Layout" + , "app/designs/formList/layout/Layout" , "app/designs/formList/main/FormListByStep" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" - , "dojo/Deferred" , "templates/ContactSet" ], function ( _EditionFormList @@ -16,9 +15,9 @@ define([ , redmicConfig , declare , lang - , Deferred , TemplateList -){ +) { + return declare([Layout, Controller, _EditionFormList, _RememberDeleteItems], { // summary: // Step de ActivityContact. diff --git a/client-app/src/error/404.js b/client-app/src/error/404.js new file mode 100644 index 0000000000000000000000000000000000000000..8664b818e5a4a4731ac4fb3c71d9bb3447d99722 --- /dev/null +++ b/client-app/src/error/404.js @@ -0,0 +1,29 @@ +define([ + 'dijit/form/Button' + , 'dojo/_base/declare' + , 'src/util/CookieLoader' +], function( + Button + , declare + , CookieLoader +) { + + return declare(null, { + + constructor: function() { + + new Button({ + 'class': 'primary', + label: 'Go back', + onClick: function() { + + globalThis.location.href = '/'; + } + }).placeAt('goBack'); + + new CookieLoader({ + omitWarning: true + }); + } + }); +}); diff --git a/client-app/src/error/NoSupportBrowser.js b/client-app/src/error/NoSupportBrowser.js new file mode 100644 index 0000000000000000000000000000000000000000..8600c096e2c500b1fa99b80b329d0c401569e832 --- /dev/null +++ b/client-app/src/error/NoSupportBrowser.js @@ -0,0 +1,49 @@ +define([ + 'dijit/_WidgetBase' + , 'dojo/_base/declare' + , 'dojo/i18n!app/nls/translation' + , 'put-selector' + , 'src/util/CookieLoader' +], function( + _WidgetBase + , declare + , i18n + , put + , CookieLoader +) { + + return declare(_WidgetBase, { + // summary: + // Widget para cuando el navegador no soporta la aplicación. + // + // description: + // Contiene enlace a la actualización de los navegadores + + constructor: function() { + + new CookieLoader({ + omitWarning: true + }); + }, + + postCreate: function() { + + this.inherited(arguments); + + var containerNode = put(this.domNode, 'div.fHeight.fWidth.noSupport'); + put(containerNode, 'h2.textNoSupport.titleRedmic', i18n.noSupport); + + var firefoxNode = put(containerNode, 'a[href="https://www.mozilla.org/firefox/"][target="_blank"]'); + put(firefoxNode, 'img.iconMargin[src="/res/images/browsers/firefox.png"]'); + + var chromeNode = put(containerNode, 'a[href="https://www.google.com/chrome/"][target="_blank"]'); + put(chromeNode, 'img.iconMargin[src="/res/images/browsers/chrome.png"]'); + + var edgeNode = put(containerNode, 'a[href="https://www.microsoft.com/edge/download/"][target="_blank"]'); + put(edgeNode, 'img.iconMargin[src="/res/images/browsers/edge.png"]'); + + var operaNode = put(containerNode, 'a[href="http://www.opera.com/"][target="_blank"]'); + put(operaNode, 'img.iconMargin[src="/res/images/browsers/opera.png"]'); + } + }); +}); diff --git a/public/javascript/app/home/views/HomeView.js b/client-app/src/home/HomeView.js similarity index 88% rename from public/javascript/app/home/views/HomeView.js rename to client-app/src/home/HomeView.js index 4289f9d943516a4810d5b94efc1ea1e1c12f667d..5db9de1306c773d3a8486270501b4ab82cae3883 100644 --- a/public/javascript/app/home/views/HomeView.js +++ b/client-app/src/home/HomeView.js @@ -1,19 +1,19 @@ define([ 'app/designs/details/Controller' , 'app/designs/details/Layout' - , 'app/home/views/ProductWidget' - , 'app/home/views/SearchBarWidget' - , 'app/home/views/SearchFastFilterWidget' - , 'app/home/views/SearchFilterWidget' - , 'app/home/views/SearchResultsWidget' - , 'app/home/views/SocialWidget' - , 'app/home/views/StatsWidget' - , 'app/redmicConfig' + , 'src/home/item/ProductWidget' + , 'src/home/item/SearchBarWidget' + , 'src/home/item/SearchFastFilterWidget' + , 'src/home/item/SearchFilterWidget' + , 'src/home/item/SearchResultsWidget' + , 'src/home/item/SocialWidget' + , 'src/home/item/StatsWidget' + , 'src/redmicConfig' , 'dojo/_base/declare' , 'dojo/_base/lang' - , 'redmic/base/Credentials' - , 'redmic/modules/base/_Filter' - , 'redmic/modules/layout/templateDisplayer/TemplateDisplayer' + , 'src/util/Credentials' + , 'src/component/base/_Filter' + , 'src/component/layout/templateDisplayer/TemplateDisplayer' , 'templates/InitialInfo' ], function( Controller @@ -79,7 +79,7 @@ define([ height: 4, type: SearchFastFilterWidget, props: { - windowTitle: 'fastFilters', + title: 'fastFilters', omitTitleCloseButton: true, facetsSearchConfig: { query: { @@ -98,7 +98,7 @@ define([ type: SearchResultsWidget, props: { queryChannel: 'stub', - windowTitle: 'starredActivities', + title: 'starredActivities', omitTitleCloseButton: true } }, @@ -107,7 +107,7 @@ define([ height: 2, type: TemplateDisplayer, props: { - windowTitle: 'info', + title: 'info', template: TemplateInfo, 'class': 'mediumSolidContainer.borderRadiusBottom', target: 'initial_info' @@ -118,7 +118,7 @@ define([ height: 6, type: ProductWidget, props: { - windowTitle: 'products' + title: 'products' } }, stats: { @@ -126,7 +126,7 @@ define([ height: 3, type: StatsWidget, props: { - windowTitle: 'statistics' + title: 'statistics' } }, social: { @@ -134,7 +134,7 @@ define([ height: 1, type: SocialWidget, props: { - windowTitle: 'followUs' + title: 'followUs' } } }; @@ -168,7 +168,7 @@ define([ this._once(addedToQueryChannel, lang.hitch(this, function() { this._publish(this._getWidgetInstance('searchResults').getChannel('SET_PROPS'), { - windowTitle: 'searchResults' + title: 'searchResults' }); })); })); @@ -245,7 +245,7 @@ define([ info: '' }; - if (Credentials.get('userRole') === 'ROLE_GUEST') { + if (Credentials.userIsGuest()) { obj.roleGuest = this.i18n.contentInfo1 + ' '; obj.roleGuest += this.i18n.visitor; obj.roleGuest += this.i18n.contentInfo2; diff --git a/public/javascript/app/home/views/ProductWidget.js b/client-app/src/home/item/ProductWidget.js similarity index 93% rename from public/javascript/app/home/views/ProductWidget.js rename to client-app/src/home/item/ProductWidget.js index 60e352879a5d5846cdc4a61f46636035deeeb6a0..f5d460d98d84766dcbde495338c8fdafd465e5da 100644 --- a/public/javascript/app/home/views/ProductWidget.js +++ b/client-app/src/home/item/ProductWidget.js @@ -1,11 +1,11 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' - , 'redmic/modules/base/_Module' - , 'redmic/modules/base/_Show' - , 'redmic/modules/base/_Store' - , 'redmic/modules/browser/_ButtonsInRow' - , 'redmic/modules/browser/ListImpl' + , 'src/component/base/_Module' + , 'src/component/base/_Show' + , 'src/component/base/_Store' + , 'src/component/browser/_ButtonsInRow' + , 'src/component/browser/ListImpl' , 'templates/ProductList' ], function( declare @@ -38,7 +38,7 @@ define([ href: 'atlas' },{ id: 3, - name: 'serviceOgc', + name: 'ogcService', href: 'service-ogc-catalog' },{ id: 4, diff --git a/public/javascript/app/home/views/SearchBarWidget.js b/client-app/src/home/item/SearchBarWidget.js similarity index 93% rename from public/javascript/app/home/views/SearchBarWidget.js rename to client-app/src/home/item/SearchBarWidget.js index e22d227756ae28a6d1af5071a0aa5cd7466d6955..ddaaba1a3a3d48ed2ad591852e69a7efeb5444e3 100644 --- a/public/javascript/app/home/views/SearchBarWidget.js +++ b/client-app/src/home/item/SearchBarWidget.js @@ -1,12 +1,12 @@ define([ - 'app/redmicConfig' + 'src/redmicConfig' , 'dojo/_base/declare' , 'dojo/_base/lang' - , 'redmic/modules/base/_Filter' - , 'redmic/modules/base/_Module' - , 'redmic/modules/base/_Show' - , 'redmic/modules/layout/dataDisplayer/DataDisplayer' - , 'redmic/modules/search/TextImpl' + , 'src/component/base/_Filter' + , 'src/component/base/_Module' + , 'src/component/base/_Show' + , 'src/component/layout/dataDisplayer/DataDisplayer' + , 'src/component/search/TextImpl' ], function( redmicConfig , declare diff --git a/public/javascript/app/home/views/SearchFastFilterWidget.js b/client-app/src/home/item/SearchFastFilterWidget.js similarity index 92% rename from public/javascript/app/home/views/SearchFastFilterWidget.js rename to client-app/src/home/item/SearchFastFilterWidget.js index 3288bb275b8a19b1f4af958738b459090ef7b11d..27d3cc6fc64c2017bc0509df645ff47a341365f2 100644 --- a/public/javascript/app/home/views/SearchFastFilterWidget.js +++ b/client-app/src/home/item/SearchFastFilterWidget.js @@ -1,10 +1,10 @@ define([ - 'app/redmicConfig' + 'src/redmicConfig' , 'dojo/_base/declare' , 'dojo/_base/lang' - , 'redmic/modules/base/_Module' - , 'redmic/modules/base/_Show' - , 'redmic/modules/search/FacetsImpl' + , 'src/component/base/_Module' + , 'src/component/base/_Show' + , 'src/component/search/FacetsImpl' ], function( redmicConfig , declare diff --git a/public/javascript/app/home/views/SearchFilterWidget.js b/client-app/src/home/item/SearchFilterWidget.js similarity index 93% rename from public/javascript/app/home/views/SearchFilterWidget.js rename to client-app/src/home/item/SearchFilterWidget.js index b11125d566cc8ba4f8c132366eb5edfc36ef8ce5..ca1ecff6897ff05547dc2692c7cbe633f0f6fe56 100644 --- a/public/javascript/app/home/views/SearchFilterWidget.js +++ b/client-app/src/home/item/SearchFilterWidget.js @@ -1,9 +1,9 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' - , 'redmic/modules/base/_Module' - , 'redmic/modules/base/_Show' - , 'redmic/modules/search/CompositeImpl' + , 'src/component/base/_Module' + , 'src/component/base/_Show' + , 'src/component/search/CompositeImpl' ], function( declare , lang diff --git a/public/javascript/app/home/views/SearchResultsWidget.js b/client-app/src/home/item/SearchResultsWidget.js similarity index 82% rename from public/javascript/app/home/views/SearchResultsWidget.js rename to client-app/src/home/item/SearchResultsWidget.js index f387ef80a4acad1044a4c78d44da915696bf5f90..b6597990f39d57195e2f9f4a099bd09df169540a 100644 --- a/public/javascript/app/home/views/SearchResultsWidget.js +++ b/client-app/src/home/item/SearchResultsWidget.js @@ -1,16 +1,16 @@ define([ - 'app/redmicConfig' + 'src/redmicConfig' , 'dojo/_base/declare' , 'dojo/_base/lang' - , 'redmic/modules/base/_Filter' - , 'redmic/modules/base/_Module' - , 'redmic/modules/base/_Show' - , 'redmic/modules/browser/bars/Order' - , 'redmic/modules/browser/bars/Pagination' - , 'redmic/modules/browser/bars/Total' - , 'redmic/modules/browser/_ButtonsInRow' - , 'redmic/modules/browser/_Framework' - , 'redmic/modules/browser/ListImpl' + , 'src/component/base/_Filter' + , 'src/component/base/_Module' + , 'src/component/base/_Show' + , 'src/component/browser/bars/Order' + , 'src/component/browser/bars/Pagination' + , 'src/component/browser/bars/Total' + , 'src/component/browser/_ButtonsInRow' + , 'src/component/browser/_Framework' + , 'src/component/browser/ListImpl' , 'templates/ActivityList' ], function( redmicConfig @@ -58,13 +58,15 @@ define([ },{ instance: Order, config: { + defaultOrderField: 'starred', options: [ {value: 'name'}, {value: 'code'}, {value: 'activityType.name', label: this.i18n.activityType}, {value: 'startDate'}, {value: 'endDate'}, - {value: 'updated'} + {value: 'updated'}, + {value: 'starred'} ] } },{ @@ -80,7 +82,7 @@ define([ icon: 'fa-info-circle', btnId: 'info', title: 'info', - href: redmicConfig.viewPaths.activityCatalogDetails + href: redmicConfig.viewPaths.activityDetails }] } } diff --git a/public/javascript/app/home/views/SocialWidget.js b/client-app/src/home/item/SocialWidget.js similarity index 94% rename from public/javascript/app/home/views/SocialWidget.js rename to client-app/src/home/item/SocialWidget.js index 444580d44a0ac4ce88690fe1d688ff2ca4cd85a2..cbeb2464062e19a44921934638e2cd44b697d270 100644 --- a/public/javascript/app/home/views/SocialWidget.js +++ b/client-app/src/home/item/SocialWidget.js @@ -1,12 +1,10 @@ define([ - 'app/home/views/_DashboardItem' - , 'app/base/views/Module' + 'src/home/item/_DashboardItem' , 'dojo/_base/declare' , 'dojo/_base/lang' - , 'put-selector/put' + , 'put-selector' ], function( _DashboardItem - , Module , declare , lang , put diff --git a/public/javascript/app/home/views/StatsWidget.js b/client-app/src/home/item/StatsWidget.js similarity index 94% rename from public/javascript/app/home/views/StatsWidget.js rename to client-app/src/home/item/StatsWidget.js index 7b04f57afdfd293ee7b142a9aa41b1630f2f01b5..e1d711a1b3e2b1336864292e671730fbfad217a9 100644 --- a/public/javascript/app/home/views/StatsWidget.js +++ b/client-app/src/home/item/StatsWidget.js @@ -1,14 +1,14 @@ define([ - 'app/redmicConfig' + 'src/redmicConfig' , 'dojo/_base/declare' , 'dojo/_base/lang' - , 'redmic/modules/base/_Module' - , 'redmic/modules/base/_Show' - , 'redmic/modules/base/_ShowInTooltip' - , 'redmic/modules/base/_Store' - , 'redmic/modules/browser/_ButtonsInRow' - , 'redmic/modules/browser/ListImpl' - , 'redmic/modules/layout/dataDisplayer/DataDisplayer' + , 'src/component/base/_Module' + , 'src/component/base/_Show' + , 'src/component/base/_ShowInTooltip' + , 'src/component/base/_Store' + , 'src/component/browser/_ButtonsInRow' + , 'src/component/browser/ListImpl' + , 'src/component/layout/dataDisplayer/DataDisplayer' , 'templates/StatisticsList' ], function( redmicConfig diff --git a/public/javascript/app/home/views/_DashboardItem.js b/client-app/src/home/item/_DashboardItem.js similarity index 86% rename from public/javascript/app/home/views/_DashboardItem.js rename to client-app/src/home/item/_DashboardItem.js index 0ec75258d30548c473de076437435f6567deb31b..fe929f14b23e03bb72efd72d9d71b73c6202699e 100644 --- a/public/javascript/app/home/views/_DashboardItem.js +++ b/client-app/src/home/item/_DashboardItem.js @@ -1,9 +1,9 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "put-selector/put" - , "redmic/modules/base/_Module" - , "redmic/modules/base/_Show" + , 'put-selector' + , "src/component/base/_Module" + , "src/component/base/_Show" ], function( declare , lang @@ -50,7 +50,7 @@ define([ this.contentNode = put(this.containerNode, "div.boxItems.fHeight"); }, - _getNodeToShow: function() { + getNodeToShow: function() { return this.containerNode; } diff --git a/client-app/src/maintenance/domain/DomainMaintenanceView.js b/client-app/src/maintenance/domain/DomainMaintenanceView.js new file mode 100644 index 0000000000000000000000000000000000000000..de79509731e691a62d8c4ed07fbade232f333099 --- /dev/null +++ b/client-app/src/maintenance/domain/DomainMaintenanceView.js @@ -0,0 +1,242 @@ +define([ + 'dojo/_base/declare' + , 'dojo/_base/lang' + , 'dojo/Deferred' + , 'src/component/base/_Module' + , 'src/component/base/_Show' + , 'src/maintenance/domain/definition/Accessibility' + , 'src/maintenance/domain/definition/ActivityFields' + , 'src/maintenance/domain/definition/ActivityTypes' +// , 'src/maintenance/domain/definition/AreaTypes' + , 'src/maintenance/domain/definition/AttributeTypes' + , 'src/maintenance/domain/definition/CanaryProtection' + , 'src/maintenance/domain/definition/CensingStatus' + , 'src/maintenance/domain/definition/Confidence' + , 'src/maintenance/domain/definition/ContactRoles' + , 'src/maintenance/domain/definition/Countries' + , 'src/maintenance/domain/definition/Destiny' + , 'src/maintenance/domain/definition/DeviceTypes' + , 'src/maintenance/domain/definition/DocumentTypes' + , 'src/maintenance/domain/definition/Ecology' + , 'src/maintenance/domain/definition/Endemicity' + , 'src/maintenance/domain/definition/Ending' + , 'src/maintenance/domain/definition/EUProtection' +// , 'src/maintenance/domain/definition/EventGroups' + , 'src/maintenance/domain/definition/InfrastructureType' + , 'src/maintenance/domain/definition/InspireThemes' + , 'src/maintenance/domain/definition/Interest' + , 'src/maintenance/domain/definition/LifeStages' + , 'src/maintenance/domain/definition/LineTypes' +// , 'src/maintenance/domain/definition/MeshTypes' +// , 'src/maintenance/domain/definition/MetricGroups' +// , 'src/maintenance/domain/definition/MetricsDefinitions' + , 'src/maintenance/domain/definition/ObjectTypes' +// , 'src/maintenance/domain/definition/ObservationTypes' + , 'src/maintenance/domain/definition/OrganisationRoles' + , 'src/maintenance/domain/definition/OrganisationTypes' + , 'src/maintenance/domain/definition/Origin' + , 'src/maintenance/domain/definition/Parameters' + , 'src/maintenance/domain/definition/ParameterTypes' + , 'src/maintenance/domain/definition/Permanence' + , 'src/maintenance/domain/definition/PlatformTypes' + , 'src/maintenance/domain/definition/ProjectGroups' + , 'src/maintenance/domain/definition/Rank' +// , 'src/maintenance/domain/definition/RasterTypes' +// , 'src/maintenance/domain/definition/RecordingTypes' + , 'src/maintenance/domain/definition/SampleTypes' + , 'src/maintenance/domain/definition/Scopes' + , 'src/maintenance/domain/definition/SeaConditions' + , 'src/maintenance/domain/definition/Sex' +// , 'src/maintenance/domain/definition/ShorelineTypes' + , 'src/maintenance/domain/definition/SpainProtection' + , 'src/maintenance/domain/definition/Status' + , 'src/maintenance/domain/definition/ThematicType' + , 'src/maintenance/domain/definition/ToponymTypes' + , 'src/maintenance/domain/definition/TrophicRegime' + , 'src/maintenance/domain/definition/Units' + , 'src/maintenance/domain/definition/UnitTypes' +], function( + declare + , lang + , Deferred + , _Module + , _Show + , AccessibilityDomainDefinition + , ActivityFieldsDomainDefinition + , ActivityTypesDomainDefinition +// , AreaTypesDomainDefinition + , AttributeTypesDomainDefinition + , CanaryProtectionDomainDefinition + , CensingStatusDomainDefinition + , ConfidenceDomainDefinition + , ContactRolesDomainDefinition + , CountriesDomainDefinition + , DestinyDomainDefinition + , DeviceTypesDomainDefinition + , DocumentTypesDomainDefinition + , EcologyDomainDefinition + , EndemicityDomainDefinition + , EndingDomainDefinition + , EUProtectionDomainDefinition +// , EventGroupsDomainDefinition + , InfrastructureTypeDomainDefinition + , InspireThemesDomainDefinition + , InterestDomainDefinition + , LifeStagesDomainDefinition + , LineTypesDomainDefinition +// , MeshTypesDomainDefinition +// , MetricGroupsDomainDefinition +// , MetricsDefinitionsDomainDefinition + , ObjectTypesDomainDefinition +// , ObservationTypesDomainDefinition + , OrganisationRolesDomainDefinition + , OrganisationTypesDomainDefinition + , OriginDomainDefinition + , ParametersDomainDefinition + , ParameterTypesDomainDefinition + , PermanenceDomainDefinition + , PlatformTypesDomainDefinition + , ProjectGroupsDomainDefinition + , RankDomainDefinition +// , RasterTypesDomainDefinition +// , RecordingTypesDomainDefinition + , SampleTypesDomainDefinition + , ScopesDomainDefinition + , SeaConditionsDomainDefinition + , SexDomainDefinition +// , ShorelineTypesDomainDefinition + , SpainProtectionDomainDefinition + , StatusDomainDefinition + , ThematicTypeDomainDefinition + , ToponymTypesDomainDefinition + , TrophicRegimeDomainDefinition + , UnitsDomainDefinition + , UnitTypesDomainDefinition +) { + + return declare([_Module, _Show], { + + // summary: + // Vista común de mantenimiento de dominio. + + constructor: function(args) { + + this.config = { + ownChannel: 'domainMaintenance', + _domainDefinitionByName: { + 'accessibility': AccessibilityDomainDefinition + , 'activity-fields': ActivityFieldsDomainDefinition + , 'activity-types': ActivityTypesDomainDefinition +// , '': AreaTypesDomainDefinition // TODO no se ha enlazado + , 'attribute-types': AttributeTypesDomainDefinition + , 'canary-protection': CanaryProtectionDomainDefinition + , 'censusing-status': CensingStatusDomainDefinition + , 'confidence': ConfidenceDomainDefinition + , 'contact-roles': ContactRolesDomainDefinition + , 'countries': CountriesDomainDefinition + , 'destiny': DestinyDomainDefinition + , 'device-types': DeviceTypesDomainDefinition + , 'document-types': DocumentTypesDomainDefinition + , 'ecology': EcologyDomainDefinition + , 'endemicity': EndemicityDomainDefinition + , 'ending': EndingDomainDefinition + , 'eu-protection': EUProtectionDomainDefinition +// , '': EventGroupsDomainDefinition // TODO no se ha enlazado + , 'infrastructure-type': InfrastructureTypeDomainDefinition + , 'inspire-themes': InspireThemesDomainDefinition + , 'interest': InterestDomainDefinition + , 'life-stages': LifeStagesDomainDefinition + , 'line-types': LineTypesDomainDefinition +// , '': MeshTypesDomainDefinition // TODO no se ha enlazado +// , '': MetricGroupsDomainDefinition // TODO no se ha enlazado +// , '': MetricsDefinitionsDomainDefinition // TODO no se ha enlazado + , 'object-types': ObjectTypesDomainDefinition +// , '': ObservationTypesDomainDefinition // TODO no se ha enlazado + , 'organisation-roles': OrganisationRolesDomainDefinition + , 'organisation-types': OrganisationTypesDomainDefinition + , 'origin': OriginDomainDefinition + , 'parameters': ParametersDomainDefinition + , 'parameter-types': ParameterTypesDomainDefinition + , 'permanence': PermanenceDomainDefinition + , 'platform-types': PlatformTypesDomainDefinition + , 'project-groups': ProjectGroupsDomainDefinition + , 'rank': RankDomainDefinition +// , '': RasterTypesDomainDefinition // TODO no se ha enlazado +// , '': RecordingTypesDomainDefinition // TODO no se ha enlazado + , 'sample-types': SampleTypesDomainDefinition + , 'scopes': ScopesDomainDefinition + , 'sea-conditions': SeaConditionsDomainDefinition + , 'sex': SexDomainDefinition +// , '': ShorelineTypesDomainDefinition // TODO no se ha enlazado + , 'spain-protection': SpainProtectionDomainDefinition + , 'status': StatusDomainDefinition + , 'thematic-type': ThematicTypeDomainDefinition + , 'toponym-types': ToponymTypesDomainDefinition // TODO no funciona la petición hacia api + , 'trophic-regime': TrophicRegimeDomainDefinition + , 'units': UnitsDomainDefinition + , 'unit-types': UnitTypesDomainDefinition + } + }; + + lang.mixin(this, this.config, args); + }, + + _beforeShow: function() { + + this._cleanOldDomainInstance(); + + this._domainInstanceDfd = new Deferred(); + + this._createDomainInstance(); + + return this._domainInstanceDfd; + }, + + _cleanOldDomainInstance: function() { + + if (this._domainInstanceDfd && !this._domainInstanceDfd.isFulfilled()) { + this._domainInstanceDfd.reject(); + } + + if (this._domainInstance) { + this._publish(this._domainInstance.getChannel('DESTROY')); + } + }, + + _createDomainInstance: function() { + + var pathSplitted = globalThis.location.pathname.split('/'), + domainName = pathSplitted.pop(), + DomainDefinition = this._getDefinitionForSpecificDomain(domainName); + + this._domainInstance = new DomainDefinition({ + parentChannel: this.getChannel() + }); + + this._once(this._domainInstance.getChannel('SHOWN'), lang.hitch(this, function() { + + this._domainInstanceDfd.resolve(); + })); + + this._publish(this._domainInstance.getChannel('SHOW'), { + node: this.domNode + }); + }, + + _getDefinitionForSpecificDomain: function(domainName) { + + var domainDefinition = this._domainDefinitionByName[domainName]; + + if (!domainDefinition) { + console.error('Tried to load definition for unknown domain "%s"', domainName); + } + + return domainDefinition; + }, + + getNodeToShow: function() { + + return this._domainInstance.getNodeToShow(); + } + }); +}); diff --git a/public/javascript/app/maintenance/domains/_HierarchicalDomain.js b/client-app/src/maintenance/domain/_HierarchicalDomain.js similarity index 92% rename from public/javascript/app/maintenance/domains/_HierarchicalDomain.js rename to client-app/src/maintenance/domain/_HierarchicalDomain.js index 2b57948833ef8ff86fade8b685a594d01bd9f23c..1325a615a791e3a806b318086c98ec570e0b4c39 100644 --- a/public/javascript/app/maintenance/domains/_HierarchicalDomain.js +++ b/client-app/src/maintenance/domain/_HierarchicalDomain.js @@ -3,7 +3,7 @@ define([ , 'dojo/_base/declare' , 'dojo/_base/lang' , 'dojo/aspect' - , "redmic/modules/browser/HierarchicalImpl" + , "src/component/browser/HierarchicalImpl" ], function( DomainMain , declare @@ -39,7 +39,7 @@ define([ }, this.filterConfig || {}]); this.formConfig = this._merge([{ - template: 'maintenance/domains/templates/forms/HierarchicalDomain' + template: 'src/maintenance/domain/form/HierarchicalDomain' }, this.formConfig || {}]); this.browserConfig = this._merge([{ diff --git a/public/javascript/app/maintenance/domains/admin/views/AccessibilityView.js b/client-app/src/maintenance/domain/definition/Accessibility.js similarity index 59% rename from public/javascript/app/maintenance/domains/admin/views/AccessibilityView.js rename to client-app/src/maintenance/domain/definition/Accessibility.js index 67f317a6bf337d165b142d52115fc3d28f563d97..2195aaaadc9e061879ab6e9e5866637c8c8281d4 100644 --- a/public/javascript/app/maintenance/domains/admin/views/AccessibilityView.js +++ b/client-app/src/maintenance/domain/definition/Accessibility.js @@ -1,17 +1,14 @@ define([ - "app/designs/textSearchList/main/Domain" - , "dojo/_base/declare" - , "dojo/_base/lang" + 'app/designs/textSearchList/main/Domain' + , 'dojo/_base/declare' + , 'dojo/_base/lang' ], function( DomainMain , declare , lang -){ +) { + return declare(DomainMain, { - // summary: - // Vista de Accessibility. - // description: - // Muestra la información. constructor: function(args) { diff --git a/public/javascript/app/maintenance/domains/admin/views/ActivityFieldsView.js b/client-app/src/maintenance/domain/definition/ActivityFields.js similarity index 100% rename from public/javascript/app/maintenance/domains/admin/views/ActivityFieldsView.js rename to client-app/src/maintenance/domain/definition/ActivityFields.js diff --git a/public/javascript/app/maintenance/domains/admin/views/ActivityTypesView.js b/client-app/src/maintenance/domain/definition/ActivityTypes.js similarity index 92% rename from public/javascript/app/maintenance/domains/admin/views/ActivityTypesView.js rename to client-app/src/maintenance/domain/definition/ActivityTypes.js index 1bb82a8579ff26b477d41f5fb49d72d9862e1b0d..195a3da5ffdf606e58a2a6b77006fe4cb693cbac 100644 --- a/public/javascript/app/maintenance/domains/admin/views/ActivityTypesView.js +++ b/client-app/src/maintenance/domain/definition/ActivityTypes.js @@ -2,7 +2,7 @@ define([ "app/base/views/extensions/_EditionView" , "app/base/views/extensions/_FormInDialogView" , "app/designs/textSearchFacetsList/main/Domain" - , 'app/redmicConfig' + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "templates/ActivityTypeList" @@ -40,7 +40,7 @@ define([ _setConfigurations: function() { this.formConfig = this._merge([{ - template: "maintenance/domains/admin/views/templates/forms/ActivityTypes" + template: 'src/maintenance/domain/form/ActivityTypes' }, this.formConfig || {}]); this.browserConfig = this._merge([{ diff --git a/public/javascript/app/maintenance/domains/geometry/views/AreaTypesView.js b/client-app/src/maintenance/domain/definition/AreaTypes.js similarity index 100% rename from public/javascript/app/maintenance/domains/geometry/views/AreaTypesView.js rename to client-app/src/maintenance/domain/definition/AreaTypes.js diff --git a/public/javascript/app/maintenance/domains/observations/views/AttributeTypesView.js b/client-app/src/maintenance/domain/definition/AttributeTypes.js similarity index 89% rename from public/javascript/app/maintenance/domains/observations/views/AttributeTypesView.js rename to client-app/src/maintenance/domain/definition/AttributeTypes.js index 3d8ceb584bd511cd1e24bc21b03b930c7514bf5d..36acd7fb28abece659dd33fc025b41cc15c4e9d3 100644 --- a/public/javascript/app/maintenance/domains/observations/views/AttributeTypesView.js +++ b/client-app/src/maintenance/domain/definition/AttributeTypes.js @@ -1,5 +1,5 @@ define([ - 'app/maintenance/domains/_HierarchicalDomain' + 'src/maintenance/domain/_HierarchicalDomain' , 'dojo/_base/declare' , "dojo/_base/lang" ], function( diff --git a/public/javascript/app/maintenance/domains/taxon/views/CanaryProtectionView.js b/client-app/src/maintenance/domain/definition/CanaryProtection.js similarity index 100% rename from public/javascript/app/maintenance/domains/taxon/views/CanaryProtectionView.js rename to client-app/src/maintenance/domain/definition/CanaryProtection.js diff --git a/public/javascript/app/maintenance/domains/observations/views/CensingStatusView.js b/client-app/src/maintenance/domain/definition/CensingStatus.js similarity index 100% rename from public/javascript/app/maintenance/domains/observations/views/CensingStatusView.js rename to client-app/src/maintenance/domain/definition/CensingStatus.js diff --git a/public/javascript/app/maintenance/domains/observations/views/ConfidenceView.js b/client-app/src/maintenance/domain/definition/Confidence.js similarity index 100% rename from public/javascript/app/maintenance/domains/observations/views/ConfidenceView.js rename to client-app/src/maintenance/domain/definition/Confidence.js diff --git a/public/javascript/app/maintenance/domains/admin/views/ContactRolesView.js b/client-app/src/maintenance/domain/definition/ContactRoles.js similarity index 100% rename from public/javascript/app/maintenance/domains/admin/views/ContactRolesView.js rename to client-app/src/maintenance/domain/definition/ContactRoles.js diff --git a/public/javascript/app/maintenance/domains/admin/views/CountriesView.js b/client-app/src/maintenance/domain/definition/Countries.js similarity index 91% rename from public/javascript/app/maintenance/domains/admin/views/CountriesView.js rename to client-app/src/maintenance/domain/definition/Countries.js index b57309db9e53817f91bcf90d593309656c43a490..86517e2e8c6ed847cb25102a1e056e63f142114d 100644 --- a/public/javascript/app/maintenance/domains/admin/views/CountriesView.js +++ b/client-app/src/maintenance/domain/definition/Countries.js @@ -28,7 +28,7 @@ define([ _setConfigurations: function() { this.formConfig = this._merge([{ - template: "maintenance/domains/admin/views/templates/forms/Countries" + template: 'src/maintenance/domain/form/Countries' }, this.formConfig || {}]); this.browserConfig = this._merge([{ diff --git a/public/javascript/app/maintenance/domains/geometry/views/DestinyView.js b/client-app/src/maintenance/domain/definition/Destiny.js similarity index 100% rename from public/javascript/app/maintenance/domains/geometry/views/DestinyView.js rename to client-app/src/maintenance/domain/definition/Destiny.js diff --git a/public/javascript/app/maintenance/domains/admin/views/DeviceTypesView.js b/client-app/src/maintenance/domain/definition/DeviceTypes.js similarity index 100% rename from public/javascript/app/maintenance/domains/admin/views/DeviceTypesView.js rename to client-app/src/maintenance/domain/definition/DeviceTypes.js diff --git a/public/javascript/app/maintenance/domains/admin/views/DocumentTypesView.js b/client-app/src/maintenance/domain/definition/DocumentTypes.js similarity index 100% rename from public/javascript/app/maintenance/domains/admin/views/DocumentTypesView.js rename to client-app/src/maintenance/domain/definition/DocumentTypes.js diff --git a/public/javascript/app/maintenance/domains/taxon/views/EUProtectionView.js b/client-app/src/maintenance/domain/definition/EUProtection.js similarity index 100% rename from public/javascript/app/maintenance/domains/taxon/views/EUProtectionView.js rename to client-app/src/maintenance/domain/definition/EUProtection.js diff --git a/public/javascript/app/maintenance/domains/taxon/views/EcologyView.js b/client-app/src/maintenance/domain/definition/Ecology.js similarity index 100% rename from public/javascript/app/maintenance/domains/taxon/views/EcologyView.js rename to client-app/src/maintenance/domain/definition/Ecology.js diff --git a/public/javascript/app/maintenance/domains/taxon/views/EndemicityView.js b/client-app/src/maintenance/domain/definition/Endemicity.js similarity index 100% rename from public/javascript/app/maintenance/domains/taxon/views/EndemicityView.js rename to client-app/src/maintenance/domain/definition/Endemicity.js diff --git a/public/javascript/app/maintenance/domains/geometry/views/EndingView.js b/client-app/src/maintenance/domain/definition/Ending.js similarity index 100% rename from public/javascript/app/maintenance/domains/geometry/views/EndingView.js rename to client-app/src/maintenance/domain/definition/Ending.js diff --git a/public/javascript/app/maintenance/domains/observations/views/EventGroupsView.js b/client-app/src/maintenance/domain/definition/EventGroups.js similarity index 100% rename from public/javascript/app/maintenance/domains/observations/views/EventGroupsView.js rename to client-app/src/maintenance/domain/definition/EventGroups.js diff --git a/public/javascript/app/maintenance/domains/observations/views/InfrastructureTypeView.js b/client-app/src/maintenance/domain/definition/InfrastructureType.js similarity index 89% rename from public/javascript/app/maintenance/domains/observations/views/InfrastructureTypeView.js rename to client-app/src/maintenance/domain/definition/InfrastructureType.js index 1a26719f978588e709225330900870d97c3b3380..ec1030a00db92432874784cf5e4b97a14b1cb334 100644 --- a/public/javascript/app/maintenance/domains/observations/views/InfrastructureTypeView.js +++ b/client-app/src/maintenance/domain/definition/InfrastructureType.js @@ -1,5 +1,5 @@ define([ - 'app/maintenance/domains/_HierarchicalDomain' + 'src/maintenance/domain/_HierarchicalDomain' , 'dojo/_base/declare' , 'dojo/_base/lang' ], function( diff --git a/public/javascript/app/maintenance/domains/geometry/views/InspireThemesView.js b/client-app/src/maintenance/domain/definition/InspireThemes.js similarity index 92% rename from public/javascript/app/maintenance/domains/geometry/views/InspireThemesView.js rename to client-app/src/maintenance/domain/definition/InspireThemes.js index 33810e382ab517061dbebf7a1a5abe2241221c19..f0469ccd913e482772d2ce54da54fa893f339612 100644 --- a/public/javascript/app/maintenance/domains/geometry/views/InspireThemesView.js +++ b/client-app/src/maintenance/domain/definition/InspireThemes.js @@ -29,7 +29,7 @@ define([ _setConfigurations: function() { this.formConfig = this._merge([{ - template: "maintenance/domains/geometry/views/templates/forms/InspireThemes" + template: 'src/maintenance/domain/form/InspireThemes' }, this.formConfig || {}]); this.browserConfig = this._merge([{ diff --git a/public/javascript/app/maintenance/domains/taxon/views/InterestView.js b/client-app/src/maintenance/domain/definition/Interest.js similarity index 100% rename from public/javascript/app/maintenance/domains/taxon/views/InterestView.js rename to client-app/src/maintenance/domain/definition/Interest.js diff --git a/public/javascript/app/maintenance/domains/taxon/views/LifeStagesView.js b/client-app/src/maintenance/domain/definition/LifeStages.js similarity index 100% rename from public/javascript/app/maintenance/domains/taxon/views/LifeStagesView.js rename to client-app/src/maintenance/domain/definition/LifeStages.js diff --git a/public/javascript/app/maintenance/domains/geometry/views/LineTypesView.js b/client-app/src/maintenance/domain/definition/LineTypes.js similarity index 83% rename from public/javascript/app/maintenance/domains/geometry/views/LineTypesView.js rename to client-app/src/maintenance/domain/definition/LineTypes.js index 3b4db0c500708b3f345be146e9adb64ca769b3ac..5c10e87dbd573a3a46b92861e9ff70f71d0e625a 100644 --- a/public/javascript/app/maintenance/domains/geometry/views/LineTypesView.js +++ b/client-app/src/maintenance/domain/definition/LineTypes.js @@ -1,5 +1,5 @@ define([ - 'app/maintenance/domains/_HierarchicalDomain' + 'src/maintenance/domain/_HierarchicalDomain' , 'dojo/_base/declare' , 'dojo/_base/lang' , 'templates/LineTypeList' @@ -26,7 +26,7 @@ define([ _setConfigurations: function() { this.formConfig = this._merge([{ - template: 'maintenance/domains/geometry/views/templates/forms/LineTypes' + template: 'src/maintenance/domain/form/LineTypes' }, this.formConfig || {}]); this.browserConfig = this._merge([{ diff --git a/public/javascript/app/maintenance/domains/geometry/views/MeshTypesView.js b/client-app/src/maintenance/domain/definition/MeshTypes.js similarity index 100% rename from public/javascript/app/maintenance/domains/geometry/views/MeshTypesView.js rename to client-app/src/maintenance/domain/definition/MeshTypes.js diff --git a/public/javascript/app/maintenance/domains/observations/views/MetricGroupsView.js b/client-app/src/maintenance/domain/definition/MetricGroups.js similarity index 100% rename from public/javascript/app/maintenance/domains/observations/views/MetricGroupsView.js rename to client-app/src/maintenance/domain/definition/MetricGroups.js diff --git a/public/javascript/app/maintenance/domains/observations/views/MetricsDefinitionsView.js b/client-app/src/maintenance/domain/definition/MetricsDefinitions.js similarity index 98% rename from public/javascript/app/maintenance/domains/observations/views/MetricsDefinitionsView.js rename to client-app/src/maintenance/domain/definition/MetricsDefinitions.js index b7ed2fde24fd98b870af347ceea87738a166954e..a26dbfea72916696b5420c3452f626d8e8ad051f 100644 --- a/public/javascript/app/maintenance/domains/observations/views/MetricsDefinitionsView.js +++ b/client-app/src/maintenance/domain/definition/MetricsDefinitions.js @@ -1,7 +1,7 @@ define([ "app/designs/textSearchFacetsList/main/Domain" , "app/base/views/extensions/_EditionWizardView" - , 'app/redmicConfig' + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "templates/ConditionList" diff --git a/public/javascript/app/maintenance/domains/observations/views/ObjectTypesView.js b/client-app/src/maintenance/domain/definition/ObjectTypes.js similarity index 92% rename from public/javascript/app/maintenance/domains/observations/views/ObjectTypesView.js rename to client-app/src/maintenance/domain/definition/ObjectTypes.js index d7fb22dd66aa802c9ec942e5fc1cfa462423ffd8..accc899bc37cd0cfb1de67d4727f776b03eea107 100644 --- a/public/javascript/app/maintenance/domains/observations/views/ObjectTypesView.js +++ b/client-app/src/maintenance/domain/definition/ObjectTypes.js @@ -1,5 +1,5 @@ define([ - 'app/maintenance/domains/_HierarchicalDomain' + 'src/maintenance/domain/_HierarchicalDomain' , 'dojo/_base/declare' , 'dojo/_base/lang' , 'templates/ObjectTypeList' diff --git a/public/javascript/app/maintenance/domains/observations/views/ObservationTypesView.js b/client-app/src/maintenance/domain/definition/ObservationTypes.js similarity index 100% rename from public/javascript/app/maintenance/domains/observations/views/ObservationTypesView.js rename to client-app/src/maintenance/domain/definition/ObservationTypes.js diff --git a/public/javascript/app/maintenance/domains/admin/views/OrganisationRolesView.js b/client-app/src/maintenance/domain/definition/OrganisationRoles.js similarity index 100% rename from public/javascript/app/maintenance/domains/admin/views/OrganisationRolesView.js rename to client-app/src/maintenance/domain/definition/OrganisationRoles.js diff --git a/public/javascript/app/maintenance/domains/admin/views/OrganisationTypesView.js b/client-app/src/maintenance/domain/definition/OrganisationTypes.js similarity index 100% rename from public/javascript/app/maintenance/domains/admin/views/OrganisationTypesView.js rename to client-app/src/maintenance/domain/definition/OrganisationTypes.js diff --git a/public/javascript/app/maintenance/domains/taxon/views/OriginView.js b/client-app/src/maintenance/domain/definition/Origin.js similarity index 100% rename from public/javascript/app/maintenance/domains/taxon/views/OriginView.js rename to client-app/src/maintenance/domain/definition/Origin.js diff --git a/public/javascript/app/maintenance/domains/observations/views/ParameterTypesView.js b/client-app/src/maintenance/domain/definition/ParameterTypes.js similarity index 100% rename from public/javascript/app/maintenance/domains/observations/views/ParameterTypesView.js rename to client-app/src/maintenance/domain/definition/ParameterTypes.js diff --git a/public/javascript/app/maintenance/domains/observations/views/ParametersView.js b/client-app/src/maintenance/domain/definition/Parameters.js similarity index 98% rename from public/javascript/app/maintenance/domains/observations/views/ParametersView.js rename to client-app/src/maintenance/domain/definition/Parameters.js index d4bc58731fa082dbb22c21331157be998dd26b3f..991042f26147f2ef2f003ffd680f7d4e51b68dba 100644 --- a/public/javascript/app/maintenance/domains/observations/views/ParametersView.js +++ b/client-app/src/maintenance/domain/definition/Parameters.js @@ -1,7 +1,7 @@ define([ "app/designs/textSearchFacetsList/main/Domain" , "app/base/views/extensions/_EditionWizardView" - , 'app/redmicConfig' + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "templates/ParameterList" diff --git a/public/javascript/app/maintenance/domains/taxon/views/PermanenceView.js b/client-app/src/maintenance/domain/definition/Permanence.js similarity index 100% rename from public/javascript/app/maintenance/domains/taxon/views/PermanenceView.js rename to client-app/src/maintenance/domain/definition/Permanence.js diff --git a/public/javascript/app/maintenance/domains/admin/views/PlatformTypesView.js b/client-app/src/maintenance/domain/definition/PlatformTypes.js similarity index 100% rename from public/javascript/app/maintenance/domains/admin/views/PlatformTypesView.js rename to client-app/src/maintenance/domain/definition/PlatformTypes.js diff --git a/public/javascript/app/maintenance/domains/admin/views/ProjectGroupsView.js b/client-app/src/maintenance/domain/definition/ProjectGroups.js similarity index 100% rename from public/javascript/app/maintenance/domains/admin/views/ProjectGroupsView.js rename to client-app/src/maintenance/domain/definition/ProjectGroups.js diff --git a/public/javascript/app/maintenance/domains/taxon/views/RankView.js b/client-app/src/maintenance/domain/definition/Rank.js similarity index 100% rename from public/javascript/app/maintenance/domains/taxon/views/RankView.js rename to client-app/src/maintenance/domain/definition/Rank.js diff --git a/public/javascript/app/maintenance/domains/geometry/views/RasterTypesView.js b/client-app/src/maintenance/domain/definition/RasterTypes.js similarity index 100% rename from public/javascript/app/maintenance/domains/geometry/views/RasterTypesView.js rename to client-app/src/maintenance/domain/definition/RasterTypes.js diff --git a/public/javascript/app/maintenance/domains/geometry/views/RecordingTypesView.js b/client-app/src/maintenance/domain/definition/RecordingTypes.js similarity index 100% rename from public/javascript/app/maintenance/domains/geometry/views/RecordingTypesView.js rename to client-app/src/maintenance/domain/definition/RecordingTypes.js diff --git a/public/javascript/app/maintenance/domains/observations/views/SampleTypesView.js b/client-app/src/maintenance/domain/definition/SampleTypes.js similarity index 100% rename from public/javascript/app/maintenance/domains/observations/views/SampleTypesView.js rename to client-app/src/maintenance/domain/definition/SampleTypes.js diff --git a/public/javascript/app/maintenance/domains/admin/views/ScopesView.js b/client-app/src/maintenance/domain/definition/Scopes.js similarity index 100% rename from public/javascript/app/maintenance/domains/admin/views/ScopesView.js rename to client-app/src/maintenance/domain/definition/Scopes.js diff --git a/public/javascript/app/maintenance/domains/observations/views/SeaConditionsView.js b/client-app/src/maintenance/domain/definition/SeaConditions.js similarity index 100% rename from public/javascript/app/maintenance/domains/observations/views/SeaConditionsView.js rename to client-app/src/maintenance/domain/definition/SeaConditions.js diff --git a/public/javascript/app/maintenance/domains/taxon/views/SexView.js b/client-app/src/maintenance/domain/definition/Sex.js similarity index 100% rename from public/javascript/app/maintenance/domains/taxon/views/SexView.js rename to client-app/src/maintenance/domain/definition/Sex.js diff --git a/public/javascript/app/maintenance/domains/geometry/views/ShorelineTypesView.js b/client-app/src/maintenance/domain/definition/ShorelineTypes.js similarity index 100% rename from public/javascript/app/maintenance/domains/geometry/views/ShorelineTypesView.js rename to client-app/src/maintenance/domain/definition/ShorelineTypes.js diff --git a/public/javascript/app/maintenance/domains/taxon/views/SpainProtectionView.js b/client-app/src/maintenance/domain/definition/SpainProtection.js similarity index 100% rename from public/javascript/app/maintenance/domains/taxon/views/SpainProtectionView.js rename to client-app/src/maintenance/domain/definition/SpainProtection.js diff --git a/public/javascript/app/maintenance/domains/taxon/views/StatusView.js b/client-app/src/maintenance/domain/definition/Status.js similarity index 100% rename from public/javascript/app/maintenance/domains/taxon/views/StatusView.js rename to client-app/src/maintenance/domain/definition/Status.js diff --git a/public/javascript/app/maintenance/domains/geometry/views/ThematicTypeView.js b/client-app/src/maintenance/domain/definition/ThematicType.js similarity index 90% rename from public/javascript/app/maintenance/domains/geometry/views/ThematicTypeView.js rename to client-app/src/maintenance/domain/definition/ThematicType.js index 5432c224c9cc788710412b5f92085c5eddee0dc2..5a8db10426f58aa74520ef74e50fbf25d1e7aa13 100644 --- a/public/javascript/app/maintenance/domains/geometry/views/ThematicTypeView.js +++ b/client-app/src/maintenance/domain/definition/ThematicType.js @@ -1,5 +1,5 @@ define([ - 'app/maintenance/domains/_HierarchicalDomain' + 'src/maintenance/domain/_HierarchicalDomain' , 'dojo/_base/declare' , 'dojo/_base/lang' , 'templates/ThematicTypeList' @@ -26,7 +26,7 @@ define([ _setConfigurations: function() { this.formConfig = this._merge([{ - template: 'maintenance/domains/geometry/views/templates/forms/ThematicType' + template: 'src/maintenance/domain/form/ThematicType' }, this.formConfig || {}]); this.browserConfig = this._merge([{ diff --git a/public/javascript/app/maintenance/domains/geometry/views/ToponymTypesView.js b/client-app/src/maintenance/domain/definition/ToponymTypes.js similarity index 100% rename from public/javascript/app/maintenance/domains/geometry/views/ToponymTypesView.js rename to client-app/src/maintenance/domain/definition/ToponymTypes.js diff --git a/public/javascript/app/maintenance/domains/taxon/views/TrophicRegimeView.js b/client-app/src/maintenance/domain/definition/TrophicRegime.js similarity index 100% rename from public/javascript/app/maintenance/domains/taxon/views/TrophicRegimeView.js rename to client-app/src/maintenance/domain/definition/TrophicRegime.js diff --git a/public/javascript/app/maintenance/domains/observations/views/UnitTypesView.js b/client-app/src/maintenance/domain/definition/UnitTypes.js similarity index 100% rename from public/javascript/app/maintenance/domains/observations/views/UnitTypesView.js rename to client-app/src/maintenance/domain/definition/UnitTypes.js diff --git a/public/javascript/app/maintenance/domains/observations/views/UnitsView.js b/client-app/src/maintenance/domain/definition/Units.js similarity index 98% rename from public/javascript/app/maintenance/domains/observations/views/UnitsView.js rename to client-app/src/maintenance/domain/definition/Units.js index b9d1fd94a2393a8abb88dae61525c4fe713aa63e..204ad91a9873da48c7ac79ca437039ad7a75249a 100644 --- a/public/javascript/app/maintenance/domains/observations/views/UnitsView.js +++ b/client-app/src/maintenance/domain/definition/Units.js @@ -1,7 +1,7 @@ define([ "app/designs/textSearchFacetsList/main/Domain" , "app/base/views/extensions/_EditionWizardView" - , 'app/redmicConfig' + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "templates/UnitList" diff --git a/public/javascript/app/maintenance/domains/admin/views/templates/forms/ActivityTypesForm.html b/client-app/src/maintenance/domain/form/ActivityTypesForm.html similarity index 100% rename from public/javascript/app/maintenance/domains/admin/views/templates/forms/ActivityTypesForm.html rename to client-app/src/maintenance/domain/form/ActivityTypesForm.html diff --git a/public/javascript/app/maintenance/domains/admin/views/templates/forms/CountriesForm.html b/client-app/src/maintenance/domain/form/CountriesForm.html similarity index 100% rename from public/javascript/app/maintenance/domains/admin/views/templates/forms/CountriesForm.html rename to client-app/src/maintenance/domain/form/CountriesForm.html diff --git a/public/javascript/app/maintenance/domains/templates/forms/DomainForm.html b/client-app/src/maintenance/domain/form/DomainForm.html similarity index 100% rename from public/javascript/app/maintenance/domains/templates/forms/DomainForm.html rename to client-app/src/maintenance/domain/form/DomainForm.html diff --git a/public/javascript/app/maintenance/domains/templates/forms/HierarchicalDomainForm.html b/client-app/src/maintenance/domain/form/HierarchicalDomainForm.html similarity index 100% rename from public/javascript/app/maintenance/domains/templates/forms/HierarchicalDomainForm.html rename to client-app/src/maintenance/domain/form/HierarchicalDomainForm.html diff --git a/public/javascript/app/maintenance/domains/geometry/views/templates/forms/InspireThemesForm.html b/client-app/src/maintenance/domain/form/InspireThemesForm.html similarity index 100% rename from public/javascript/app/maintenance/domains/geometry/views/templates/forms/InspireThemesForm.html rename to client-app/src/maintenance/domain/form/InspireThemesForm.html diff --git a/public/javascript/app/maintenance/domains/geometry/views/templates/forms/LineTypesForm.html b/client-app/src/maintenance/domain/form/LineTypesForm.html similarity index 100% rename from public/javascript/app/maintenance/domains/geometry/views/templates/forms/LineTypesForm.html rename to client-app/src/maintenance/domain/form/LineTypesForm.html diff --git a/public/javascript/app/maintenance/domains/geometry/views/templates/forms/ThematicTypeForm.html b/client-app/src/maintenance/domain/form/ThematicTypeForm.html similarity index 100% rename from public/javascript/app/maintenance/domains/geometry/views/templates/forms/ThematicTypeForm.html rename to client-app/src/maintenance/domain/form/ThematicTypeForm.html diff --git a/public/javascript/app/administrative/taxonomy/views/ClassView.js b/client-app/src/oldapp/administrative/taxonomy/views/ClassView.js similarity index 100% rename from public/javascript/app/administrative/taxonomy/views/ClassView.js rename to client-app/src/oldapp/administrative/taxonomy/views/ClassView.js diff --git a/public/javascript/app/administrative/taxonomy/views/FamilyView.js b/client-app/src/oldapp/administrative/taxonomy/views/FamilyView.js similarity index 100% rename from public/javascript/app/administrative/taxonomy/views/FamilyView.js rename to client-app/src/oldapp/administrative/taxonomy/views/FamilyView.js diff --git a/public/javascript/app/administrative/taxonomy/views/GenusView.js b/client-app/src/oldapp/administrative/taxonomy/views/GenusView.js similarity index 100% rename from public/javascript/app/administrative/taxonomy/views/GenusView.js rename to client-app/src/oldapp/administrative/taxonomy/views/GenusView.js diff --git a/public/javascript/app/administrative/taxonomy/views/KingdomView.js b/client-app/src/oldapp/administrative/taxonomy/views/KingdomView.js similarity index 100% rename from public/javascript/app/administrative/taxonomy/views/KingdomView.js rename to client-app/src/oldapp/administrative/taxonomy/views/KingdomView.js diff --git a/public/javascript/app/administrative/taxonomy/views/MisIdentificationView.js b/client-app/src/oldapp/administrative/taxonomy/views/MisIdentificationView.js similarity index 89% rename from public/javascript/app/administrative/taxonomy/views/MisIdentificationView.js rename to client-app/src/oldapp/administrative/taxonomy/views/MisIdentificationView.js index 8758c8a708129a242efe24694661deae2669acdb..daeb310ef44b2d5794db1464ccbaaf0f3c630eb3 100644 --- a/public/javascript/app/administrative/taxonomy/views/MisIdentificationView.js +++ b/client-app/src/oldapp/administrative/taxonomy/views/MisIdentificationView.js @@ -4,13 +4,13 @@ define([ , "app/designs/base/_Main" , "app/designs/textSearchList/Controller" , "app/designs/textSearchList/layout/BasicAndButtonsTopZone" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/browser/_Select" - , "redmic/modules/browser/bars/SelectionBox" - , "redmic/modules/browser/bars/Pagination" - , "redmic/modules/browser/bars/Total" + , "src/component/browser/_Select" + , "src/component/browser/bars/SelectionBox" + , "src/component/browser/bars/Pagination" + , "src/component/browser/bars/Total" , "templates/MisidentificationList" ], function( _EditionWizardView diff --git a/public/javascript/app/administrative/taxonomy/views/OrderView.js b/client-app/src/oldapp/administrative/taxonomy/views/OrderView.js similarity index 100% rename from public/javascript/app/administrative/taxonomy/views/OrderView.js rename to client-app/src/oldapp/administrative/taxonomy/views/OrderView.js diff --git a/public/javascript/app/administrative/taxonomy/views/PhylumView.js b/client-app/src/oldapp/administrative/taxonomy/views/PhylumView.js similarity index 100% rename from public/javascript/app/administrative/taxonomy/views/PhylumView.js rename to client-app/src/oldapp/administrative/taxonomy/views/PhylumView.js diff --git a/public/javascript/app/administrative/taxonomy/views/SubphylumView.js b/client-app/src/oldapp/administrative/taxonomy/views/SubphylumView.js similarity index 100% rename from public/javascript/app/administrative/taxonomy/views/SubphylumView.js rename to client-app/src/oldapp/administrative/taxonomy/views/SubphylumView.js diff --git a/public/javascript/app/administrative/taxonomy/views/TaxonomyView.js b/client-app/src/oldapp/administrative/taxonomy/views/TaxonomyView.js similarity index 100% rename from public/javascript/app/administrative/taxonomy/views/TaxonomyView.js rename to client-app/src/oldapp/administrative/taxonomy/views/TaxonomyView.js diff --git a/public/javascript/app/administrative/taxonomy/views/_AddCompositeTaxon.js b/client-app/src/oldapp/administrative/taxonomy/views/_AddCompositeTaxon.js similarity index 100% rename from public/javascript/app/administrative/taxonomy/views/_AddCompositeTaxon.js rename to client-app/src/oldapp/administrative/taxonomy/views/_AddCompositeTaxon.js diff --git a/public/javascript/app/administrative/taxonomy/views/templates/forms/KingdomForm.html b/client-app/src/oldapp/administrative/taxonomy/views/templates/forms/KingdomForm.html similarity index 100% rename from public/javascript/app/administrative/taxonomy/views/templates/forms/KingdomForm.html rename to client-app/src/oldapp/administrative/taxonomy/views/templates/forms/KingdomForm.html diff --git a/public/javascript/app/administrative/taxonomy/views/templates/forms/MisIdentificationForm.html b/client-app/src/oldapp/administrative/taxonomy/views/templates/forms/MisIdentificationForm.html similarity index 100% rename from public/javascript/app/administrative/taxonomy/views/templates/forms/MisIdentificationForm.html rename to client-app/src/oldapp/administrative/taxonomy/views/templates/forms/MisIdentificationForm.html diff --git a/public/javascript/app/administrative/taxonomy/views/templates/forms/PeculiarityForm.html b/client-app/src/oldapp/administrative/taxonomy/views/templates/forms/PeculiarityForm.html similarity index 100% rename from public/javascript/app/administrative/taxonomy/views/templates/forms/PeculiarityForm.html rename to client-app/src/oldapp/administrative/taxonomy/views/templates/forms/PeculiarityForm.html diff --git a/public/javascript/app/administrative/taxonomy/views/templates/forms/RecoveryForm.html b/client-app/src/oldapp/administrative/taxonomy/views/templates/forms/RecoveryForm.html similarity index 100% rename from public/javascript/app/administrative/taxonomy/views/templates/forms/RecoveryForm.html rename to client-app/src/oldapp/administrative/taxonomy/views/templates/forms/RecoveryForm.html diff --git a/public/javascript/app/administrative/taxonomy/views/templates/forms/SpeciesForm.html b/client-app/src/oldapp/administrative/taxonomy/views/templates/forms/SpeciesForm.html similarity index 100% rename from public/javascript/app/administrative/taxonomy/views/templates/forms/SpeciesForm.html rename to client-app/src/oldapp/administrative/taxonomy/views/templates/forms/SpeciesForm.html diff --git a/public/javascript/app/administrative/taxonomy/views/templates/forms/SpecimenTagForm.html b/client-app/src/oldapp/administrative/taxonomy/views/templates/forms/SpecimenTagForm.html similarity index 100% rename from public/javascript/app/administrative/taxonomy/views/templates/forms/SpecimenTagForm.html rename to client-app/src/oldapp/administrative/taxonomy/views/templates/forms/SpecimenTagForm.html diff --git a/public/javascript/app/administrative/taxonomy/views/templates/forms/TaxonForm.html b/client-app/src/oldapp/administrative/taxonomy/views/templates/forms/TaxonForm.html similarity index 100% rename from public/javascript/app/administrative/taxonomy/views/templates/forms/TaxonForm.html rename to client-app/src/oldapp/administrative/taxonomy/views/templates/forms/TaxonForm.html diff --git a/public/javascript/app/administrative/views/ContactView.js b/client-app/src/oldapp/administrative/views/ContactView.js similarity index 94% rename from public/javascript/app/administrative/views/ContactView.js rename to client-app/src/oldapp/administrative/views/ContactView.js index 15eb9646c0dbbd8154bf248778fd7a7577992cdd..e8b2033c65ab9f7419425f6dfe6cdb34d0b70571 100644 --- a/public/javascript/app/administrative/views/ContactView.js +++ b/client-app/src/oldapp/administrative/views/ContactView.js @@ -1,7 +1,7 @@ define([ "app/designs/textSearchFacetsList/main/Administrative" , "app/base/views/extensions/_EditionWizardView" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "templates/ContactList" @@ -24,8 +24,7 @@ define([ this.config = { target: redmicConfig.services.contact, title: this.i18n.contacts, - addPath: this.viewPaths.contactAdd, - perms: null + addPath: this.viewPaths.contactAdd }; lang.mixin(this, this.config, args); diff --git a/public/javascript/app/administrative/views/DeviceView.js b/client-app/src/oldapp/administrative/views/DeviceView.js similarity index 98% rename from public/javascript/app/administrative/views/DeviceView.js rename to client-app/src/oldapp/administrative/views/DeviceView.js index a8036d039ee4238afc5c1bce191318ca3c66eee8..f538d2a19ce0ea9cc0425061053a02964bee7dbc 100644 --- a/public/javascript/app/administrative/views/DeviceView.js +++ b/client-app/src/oldapp/administrative/views/DeviceView.js @@ -1,7 +1,7 @@ define([ 'app/designs/textSearchFacetsList/main/Administrative' , 'app/base/views/extensions/_EditionWizardView' - , 'app/redmicConfig' + , 'src/redmicConfig' , 'dojo/_base/declare' , 'dojo/_base/lang' , 'templates/DeviceList' diff --git a/public/javascript/app/administrative/views/templates/forms/ActivityContactForm.html b/client-app/src/oldapp/administrative/views/templates/forms/ActivityContactForm.html similarity index 100% rename from public/javascript/app/administrative/views/templates/forms/ActivityContactForm.html rename to client-app/src/oldapp/administrative/views/templates/forms/ActivityContactForm.html diff --git a/public/javascript/app/administrative/views/templates/forms/ActivityEmbeddedContentForm.html b/client-app/src/oldapp/administrative/views/templates/forms/ActivityEmbeddedContentForm.html similarity index 100% rename from public/javascript/app/administrative/views/templates/forms/ActivityEmbeddedContentForm.html rename to client-app/src/oldapp/administrative/views/templates/forms/ActivityEmbeddedContentForm.html diff --git a/public/javascript/app/administrative/views/templates/forms/ActivityForm.html b/client-app/src/oldapp/administrative/views/templates/forms/ActivityForm.html similarity index 100% rename from public/javascript/app/administrative/views/templates/forms/ActivityForm.html rename to client-app/src/oldapp/administrative/views/templates/forms/ActivityForm.html diff --git a/public/javascript/app/administrative/views/templates/forms/ActivityOrganisationForm.html b/client-app/src/oldapp/administrative/views/templates/forms/ActivityOrganisationForm.html similarity index 100% rename from public/javascript/app/administrative/views/templates/forms/ActivityOrganisationForm.html rename to client-app/src/oldapp/administrative/views/templates/forms/ActivityOrganisationForm.html diff --git a/public/javascript/app/administrative/views/templates/forms/ActivityPlatformForm.html b/client-app/src/oldapp/administrative/views/templates/forms/ActivityPlatformForm.html similarity index 100% rename from public/javascript/app/administrative/views/templates/forms/ActivityPlatformForm.html rename to client-app/src/oldapp/administrative/views/templates/forms/ActivityPlatformForm.html diff --git a/public/javascript/app/administrative/views/templates/forms/ActivityResourceForm.html b/client-app/src/oldapp/administrative/views/templates/forms/ActivityResourceForm.html similarity index 100% rename from public/javascript/app/administrative/views/templates/forms/ActivityResourceForm.html rename to client-app/src/oldapp/administrative/views/templates/forms/ActivityResourceForm.html diff --git a/public/javascript/app/administrative/views/templates/forms/AnimalForm.html b/client-app/src/oldapp/administrative/views/templates/forms/AnimalForm.html similarity index 100% rename from public/javascript/app/administrative/views/templates/forms/AnimalForm.html rename to client-app/src/oldapp/administrative/views/templates/forms/AnimalForm.html diff --git a/public/javascript/app/administrative/views/templates/forms/CalibrationForm.html b/client-app/src/oldapp/administrative/views/templates/forms/CalibrationForm.html similarity index 100% rename from public/javascript/app/administrative/views/templates/forms/CalibrationForm.html rename to client-app/src/oldapp/administrative/views/templates/forms/CalibrationForm.html diff --git a/public/javascript/app/administrative/views/templates/forms/ConditionForm.html b/client-app/src/oldapp/administrative/views/templates/forms/ConditionForm.html similarity index 100% rename from public/javascript/app/administrative/views/templates/forms/ConditionForm.html rename to client-app/src/oldapp/administrative/views/templates/forms/ConditionForm.html diff --git a/public/javascript/app/administrative/views/templates/forms/ContactForm.html b/client-app/src/oldapp/administrative/views/templates/forms/ContactForm.html similarity index 100% rename from public/javascript/app/administrative/views/templates/forms/ContactForm.html rename to client-app/src/oldapp/administrative/views/templates/forms/ContactForm.html diff --git a/public/javascript/app/administrative/views/templates/forms/DeviceForm.html b/client-app/src/oldapp/administrative/views/templates/forms/DeviceForm.html similarity index 100% rename from public/javascript/app/administrative/views/templates/forms/DeviceForm.html rename to client-app/src/oldapp/administrative/views/templates/forms/DeviceForm.html diff --git a/public/javascript/app/administrative/views/templates/forms/DocumentForm.html b/client-app/src/oldapp/administrative/views/templates/forms/DocumentForm.html similarity index 100% rename from public/javascript/app/administrative/views/templates/forms/DocumentForm.html rename to client-app/src/oldapp/administrative/views/templates/forms/DocumentForm.html diff --git a/public/javascript/app/administrative/views/templates/forms/MetricsDefinitionForm.html b/client-app/src/oldapp/administrative/views/templates/forms/MetricsDefinitionForm.html similarity index 100% rename from public/javascript/app/administrative/views/templates/forms/MetricsDefinitionForm.html rename to client-app/src/oldapp/administrative/views/templates/forms/MetricsDefinitionForm.html diff --git a/public/javascript/app/administrative/views/templates/forms/OrganisationForm.html b/client-app/src/oldapp/administrative/views/templates/forms/OrganisationForm.html similarity index 100% rename from public/javascript/app/administrative/views/templates/forms/OrganisationForm.html rename to client-app/src/oldapp/administrative/views/templates/forms/OrganisationForm.html diff --git a/public/javascript/app/administrative/views/templates/forms/ParameterForm.html b/client-app/src/oldapp/administrative/views/templates/forms/ParameterForm.html similarity index 100% rename from public/javascript/app/administrative/views/templates/forms/ParameterForm.html rename to client-app/src/oldapp/administrative/views/templates/forms/ParameterForm.html diff --git a/public/javascript/app/administrative/views/templates/forms/PlatformForm.html b/client-app/src/oldapp/administrative/views/templates/forms/PlatformForm.html similarity index 100% rename from public/javascript/app/administrative/views/templates/forms/PlatformForm.html rename to client-app/src/oldapp/administrative/views/templates/forms/PlatformForm.html diff --git a/public/javascript/app/administrative/views/templates/forms/ProgramForm.html b/client-app/src/oldapp/administrative/views/templates/forms/ProgramForm.html similarity index 100% rename from public/javascript/app/administrative/views/templates/forms/ProgramForm.html rename to client-app/src/oldapp/administrative/views/templates/forms/ProgramForm.html diff --git a/public/javascript/app/administrative/views/templates/forms/ProjectForm.html b/client-app/src/oldapp/administrative/views/templates/forms/ProjectForm.html similarity index 100% rename from public/javascript/app/administrative/views/templates/forms/ProjectForm.html rename to client-app/src/oldapp/administrative/views/templates/forms/ProjectForm.html diff --git a/public/javascript/app/administrative/views/templates/forms/UnitForm.html b/client-app/src/oldapp/administrative/views/templates/forms/UnitForm.html similarity index 100% rename from public/javascript/app/administrative/views/templates/forms/UnitForm.html rename to client-app/src/oldapp/administrative/views/templates/forms/UnitForm.html diff --git a/public/javascript/app/base/views/EditorLayerWithVariableForm.js b/client-app/src/oldapp/base/views/EditorLayerWithVariableForm.js similarity index 98% rename from public/javascript/app/base/views/EditorLayerWithVariableForm.js rename to client-app/src/oldapp/base/views/EditorLayerWithVariableForm.js index 03a3e252461c60bfd5f8f8d9ba601210b6755f4e..0640c799ac5c965344de9874926b7ef3deaeca5c 100644 --- a/public/javascript/app/base/views/EditorLayerWithVariableForm.js +++ b/client-app/src/oldapp/base/views/EditorLayerWithVariableForm.js @@ -4,9 +4,9 @@ define([ , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/dom-class" - , 'put-selector/put' - , "redmic/modules/base/_Module" - , "redmic/modules/base/_Show" + , 'put-selector' + , "src/component/base/_Module" + , "src/component/base/_Show" ], function ( _AddForm , _AddSelectInput @@ -189,7 +189,7 @@ define([ }; }, - _getNodeToShow: function() { + getNodeToShow: function() { return this.domNode; }, diff --git a/public/javascript/app/base/views/Module.js b/client-app/src/oldapp/base/views/Module.js similarity index 98% rename from public/javascript/app/base/views/Module.js rename to client-app/src/oldapp/base/views/Module.js index 21477aaaf079f2428c061427ef25291ce07505be..354f7250d9a0368a7e4959886ef7daf8dcabff92 100644 --- a/public/javascript/app/base/views/Module.js +++ b/client-app/src/oldapp/base/views/Module.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , 'put-selector/put' + , 'put-selector' ], function( declare , lang diff --git a/public/javascript/app/base/views/_ViewListBase.js b/client-app/src/oldapp/base/views/_ViewListBase.js similarity index 93% rename from public/javascript/app/base/views/_ViewListBase.js rename to client-app/src/oldapp/base/views/_ViewListBase.js index 06e1594fe5550b2d6e31fc734c951b3112116cdb..dedd4608b8b932da63f1ad9793e443dda875afdd 100644 --- a/public/javascript/app/base/views/_ViewListBase.js +++ b/client-app/src/oldapp/base/views/_ViewListBase.js @@ -1,12 +1,12 @@ define([ - "redmic/modules/base/_Module" - , "redmic/modules/base/_Show" + "src/component/base/_Module" + , "src/component/base/_Show" , "app/base/views/Module" , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "put-selector/put" - , "redmic/base/Credentials" + , 'put-selector' + , "src/util/Credentials" ], function ( _Module , _Show @@ -26,8 +26,7 @@ define([ constructor: function(args) { this.config = { - title: "noTitle", - mask: {} + title: "noTitle" }; lang.mixin(this, this.config, args); @@ -100,7 +99,7 @@ define([ } }, - _getNodeToShow: function() { + getNodeToShow: function() { return this.containerNode; } diff --git a/public/javascript/app/base/views/extensions/_ActivityClosed.js b/client-app/src/oldapp/base/views/extensions/_ActivityClosed.js similarity index 98% rename from public/javascript/app/base/views/extensions/_ActivityClosed.js rename to client-app/src/oldapp/base/views/extensions/_ActivityClosed.js index 507156f98384a9df8961135a725c5693ea256967..b16d536fa213f11fc67144be93426784e938f3e4 100644 --- a/public/javascript/app/base/views/extensions/_ActivityClosed.js +++ b/client-app/src/oldapp/base/views/extensions/_ActivityClosed.js @@ -1,10 +1,10 @@ define([ - 'alertify/alertify.min' - , "app/redmicConfig" + 'alertify' + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "redmic/modules/model/ModelImpl" + , "src/component/model/ModelImpl" , "RWidgets/Button" ], function( alertify diff --git a/public/javascript/app/base/views/extensions/_AddAtlasCategory.js b/client-app/src/oldapp/base/views/extensions/_AddAtlasCategory.js similarity index 78% rename from public/javascript/app/base/views/extensions/_AddAtlasCategory.js rename to client-app/src/oldapp/base/views/extensions/_AddAtlasCategory.js index 78527586c48b72b22a3ccc8a2c056182b963a119..6a39042208c4f8df488ef67e70dac98ebe30819a 100644 --- a/public/javascript/app/base/views/extensions/_AddAtlasCategory.js +++ b/client-app/src/oldapp/base/views/extensions/_AddAtlasCategory.js @@ -2,20 +2,22 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' , 'dojo/aspect' - , "redmic/modules/base/_Persistence" - , 'redmic/modules/form/FormContainerImpl' - , "redmic/modules/form/_ListenModelHasChanged" - , 'redmic/modules/form/_PublicateChanges' - , "redmic/modules/form/_ShowInDialog" + , "src/component/base/_Persistence" + , 'src/component/form/FormContainerImpl' + , 'src/component/form/_CreateInternalKeypad' + , "src/component/form/_ListenModelHasChanged" + , 'src/component/form/_PublicateChanges' + , 'src/component/base/_ShowInPopup' ], function( declare , lang , aspect , _Persistence , FormContainerImpl + , _CreateInternalKeypad , _ListenModelHasChanged , _PublicateChanges - , _ShowInDialog + , _ShowInPopup ) { return declare(_Persistence, { @@ -44,19 +46,18 @@ define([ this.categoryFormConfig = this._merge([{ parentChannel: this.getChannel(), template: 'maintenance/views/templates/forms/CategoryLayer', - modelTarget: this.editionTarget + modelTarget: this.editionTarget, + lockBackground: true }, this.categoryFormConfig || {}]); }, _initializeAddAtlasCategory: function() { - var formDefinition = declare([ - FormContainerImpl, - _ListenModelHasChanged, - _ShowInDialog - ]); + var FormDefinition = declare([ + FormContainerImpl, _ListenModelHasChanged, _CreateInternalKeypad + ]).extend(_ShowInPopup); - this._categoryForm = new formDefinition(this.categoryFormConfig); + this._categoryForm = new FormDefinition(this.categoryFormConfig); }, _defineAddAtlasCategorySubscriptions: function () { diff --git a/public/javascript/app/base/views/extensions/_AddCompositeSearchInTooltipFromTextSearch.js b/client-app/src/oldapp/base/views/extensions/_AddCompositeSearchInTooltipFromTextSearch.js similarity index 100% rename from public/javascript/app/base/views/extensions/_AddCompositeSearchInTooltipFromTextSearch.js rename to client-app/src/oldapp/base/views/extensions/_AddCompositeSearchInTooltipFromTextSearch.js diff --git a/public/javascript/app/base/views/extensions/_AddForm.js b/client-app/src/oldapp/base/views/extensions/_AddForm.js similarity index 96% rename from public/javascript/app/base/views/extensions/_AddForm.js rename to client-app/src/oldapp/base/views/extensions/_AddForm.js index 4b5ab01008d7ed7627b10e388feac9d77f906582..98d91d2ec982b5b9dcc9929f593ad9299db5c77b 100644 --- a/public/javascript/app/base/views/extensions/_AddForm.js +++ b/client-app/src/oldapp/base/views/extensions/_AddForm.js @@ -2,9 +2,9 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "redmic/modules/form/_CreateKeypad" - , "redmic/modules/form/FormContainerImpl" - , "redmic/modules/form/_ListenModelHasChanged" + , "src/component/form/_CreateKeypad" + , "src/component/form/FormContainerImpl" + , "src/component/form/_ListenModelHasChanged" , "./_AddFormItfc" ], function ( diff --git a/public/javascript/app/base/views/extensions/_AddFormItfc.js b/client-app/src/oldapp/base/views/extensions/_AddFormItfc.js similarity index 94% rename from public/javascript/app/base/views/extensions/_AddFormItfc.js rename to client-app/src/oldapp/base/views/extensions/_AddFormItfc.js index 5bd5405c2b9031bace966c80c9730dfe5291a2ed..fddd6a3aa09b628d7757f98490aa4d81468edb5c 100644 --- a/public/javascript/app/base/views/extensions/_AddFormItfc.js +++ b/client-app/src/oldapp/base/views/extensions/_AddFormItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/public/javascript/app/base/views/extensions/_AddSelectInput.js b/client-app/src/oldapp/base/views/extensions/_AddSelectInput.js similarity index 96% rename from public/javascript/app/base/views/extensions/_AddSelectInput.js rename to client-app/src/oldapp/base/views/extensions/_AddSelectInput.js index bd889db38456755af0f738b589262e54199d837e..30a42938509c81035d421c0cac5fee2d766b7ee1 100644 --- a/public/javascript/app/base/views/extensions/_AddSelectInput.js +++ b/client-app/src/oldapp/base/views/extensions/_AddSelectInput.js @@ -2,7 +2,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "redmic/modules/form/input/SelectImpl" + , "src/component/form/input/SelectImpl" , "./_AddSelectInputItfc" ], function( diff --git a/public/javascript/app/base/views/extensions/_AddSelectInputItfc.js b/client-app/src/oldapp/base/views/extensions/_AddSelectInputItfc.js similarity index 91% rename from public/javascript/app/base/views/extensions/_AddSelectInputItfc.js rename to client-app/src/oldapp/base/views/extensions/_AddSelectInputItfc.js index 71b5e9658468570b879c7d6bf192918fdb9b01db..c6ad0c5ae6d3739627e732e36525486f07130c85 100644 --- a/public/javascript/app/base/views/extensions/_AddSelectInputItfc.js +++ b/client-app/src/oldapp/base/views/extensions/_AddSelectInputItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang @@ -20,4 +20,4 @@ define([ }); } }); -}); \ No newline at end of file +}); diff --git a/public/javascript/app/base/views/extensions/_AddSelectionHandlerKeypad.js b/client-app/src/oldapp/base/views/extensions/_AddSelectionHandlerKeypad.js similarity index 97% rename from public/javascript/app/base/views/extensions/_AddSelectionHandlerKeypad.js rename to client-app/src/oldapp/base/views/extensions/_AddSelectionHandlerKeypad.js index 7eb416a9109793abdc130226707319d7c9188b89..792e6289c5511beb44dcd34e4cf56ca34dae994f 100644 --- a/public/javascript/app/base/views/extensions/_AddSelectionHandlerKeypad.js +++ b/client-app/src/oldapp/base/views/extensions/_AddSelectionHandlerKeypad.js @@ -4,7 +4,7 @@ define([ , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "redmic/modules/components/Keypad/TrizoneKeypadImpl" + , "src/component/components/Keypad/TrizoneKeypadImpl" ], function( LayoutContainer , ContentPane @@ -144,7 +144,7 @@ define([ this._emitEvt("SELECT_CONFIRM", obj); }, - _getNodeToShow: function() { + getNodeToShow: function() { return this.contentView.domNode; }, @@ -186,4 +186,4 @@ define([ this.inherited(arguments); } }); -}); \ No newline at end of file +}); diff --git a/public/javascript/app/base/views/extensions/_AddTextSearchInput.js b/client-app/src/oldapp/base/views/extensions/_AddTextSearchInput.js similarity index 96% rename from public/javascript/app/base/views/extensions/_AddTextSearchInput.js rename to client-app/src/oldapp/base/views/extensions/_AddTextSearchInput.js index 38e7f0d0a13d39f94b104a4840fc37d30e1d7c69..b68ad1d2ca76be858db666fc7bbed7ea6fb8ad99 100644 --- a/public/javascript/app/base/views/extensions/_AddTextSearchInput.js +++ b/client-app/src/oldapp/base/views/extensions/_AddTextSearchInput.js @@ -2,8 +2,8 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' , 'dojo/aspect' - , 'redmic/modules/form/FormContainerImpl' - , 'redmic/modules/form/_PublicateChanges' + , 'src/component/form/FormContainerImpl' + , 'src/component/form/_PublicateChanges' , './_AddTextSearchInputItfc' ], function( declare diff --git a/public/javascript/app/base/views/extensions/_AddTextSearchInputItfc.js b/client-app/src/oldapp/base/views/extensions/_AddTextSearchInputItfc.js similarity index 91% rename from public/javascript/app/base/views/extensions/_AddTextSearchInputItfc.js rename to client-app/src/oldapp/base/views/extensions/_AddTextSearchInputItfc.js index 1a0ba97768d6b12b4c12495f60b438255e6b0a02..56ce1961941bb5a996d274ee1af035e60123cdb7 100644 --- a/public/javascript/app/base/views/extensions/_AddTextSearchInputItfc.js +++ b/client-app/src/oldapp/base/views/extensions/_AddTextSearchInputItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang @@ -20,4 +20,4 @@ define([ }); } }); -}); \ No newline at end of file +}); diff --git a/public/javascript/app/base/views/extensions/_CompositeInTooltipFromIconKeypad.js b/client-app/src/oldapp/base/views/extensions/_CompositeInTooltipFromIconKeypad.js similarity index 97% rename from public/javascript/app/base/views/extensions/_CompositeInTooltipFromIconKeypad.js rename to client-app/src/oldapp/base/views/extensions/_CompositeInTooltipFromIconKeypad.js index e23bdca4332f8d4113db826147ae83945ad8b744..698ead9b47819778f01bba13a41d7920aaf5ab1f 100644 --- a/public/javascript/app/base/views/extensions/_CompositeInTooltipFromIconKeypad.js +++ b/client-app/src/oldapp/base/views/extensions/_CompositeInTooltipFromIconKeypad.js @@ -3,8 +3,8 @@ define([ , 'dojo/_base/declare' , 'dojo/_base/lang' , 'dojo/aspect' - , 'put-selector/put' - , 'redmic/modules/components/Keypad/IconKeypadImpl' + , 'put-selector' + , 'src/component/components/Keypad/IconKeypadImpl' ], function( _CompositeSearchInTooltip , declare diff --git a/public/javascript/app/base/views/extensions/_CompositeSearchInTooltip.js b/client-app/src/oldapp/base/views/extensions/_CompositeSearchInTooltip.js similarity index 90% rename from public/javascript/app/base/views/extensions/_CompositeSearchInTooltip.js rename to client-app/src/oldapp/base/views/extensions/_CompositeSearchInTooltip.js index f548f522a8fa3c064df6759e932819d7d5014ea4..d324f3d06ccb6107be98412f9853408efe5bd9ac 100644 --- a/public/javascript/app/base/views/extensions/_CompositeSearchInTooltip.js +++ b/client-app/src/oldapp/base/views/extensions/_CompositeSearchInTooltip.js @@ -2,10 +2,10 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' , 'dojo/aspect' - , 'redmic/modules/base/_ShowInTooltip' - , 'redmic/modules/base/_ShowOnEvt' - , 'redmic/modules/search/CompositeImpl' - , 'redmic/modules/search/_HideFormByAction' + , 'src/component/base/_ShowInTooltip' + , 'src/component/base/_ShowOnEvt' + , 'src/component/search/CompositeImpl' + , 'src/component/search/_HideFormByAction' ], function( declare , lang diff --git a/public/javascript/app/base/views/extensions/_Edition.js b/client-app/src/oldapp/base/views/extensions/_Edition.js similarity index 60% rename from public/javascript/app/base/views/extensions/_Edition.js rename to client-app/src/oldapp/base/views/extensions/_Edition.js index 75c3efa7b93ebacb126d65bf3263f17196399e4a..68102a57aa771cb56b4cc899d8c537eb02d88f2e 100644 --- a/public/javascript/app/base/views/extensions/_Edition.js +++ b/client-app/src/oldapp/base/views/extensions/_Edition.js @@ -1,5 +1,5 @@ define([ - 'alertify/alertify.min' + 'alertify' , "app/base/views/extensions/_EditionCommons" , "dojo/_base/declare" , "dojo/_base/lang" @@ -29,13 +29,15 @@ define([ }, editionViewActions: { UPDATE_TARGET_FORM: "updateTargetForm" - } + }, + + _editionGroupId: 'edition' }; lang.mixin(this, this.config); aspect.before(this, "_mixEventsAndActions", lang.hitch(this, this._mixEditionEventsAndActions)); - aspect.before(this, "_afterSetConfigurations", lang.hitch(this, this._addListButtonsEdition)); + aspect.after(this, "_afterSetConfigurations", lang.hitch(this, this._addListButtonsEdition)); aspect.after(this, "_mixEventsAndActions", lang.hitch(this, this._setEditionOwnCallbacksForEvents)); aspect.after(this, "_defineSubscriptions", lang.hitch(this, this._defineEditionSubscriptions)); aspect.after(this, "_definePublications", lang.hitch(this, this._defineEditionPublications)); @@ -43,44 +45,58 @@ define([ _addListButtonsEdition: function() { - if (this._existListButton()) { - for (var i = (this._getListButton().length - 1); i >= 0; i--) { - for (var s = (this.listButtonsEdition.length - 1); s >= 0; s--) { - if (this._getListButton()[i].groupId == this.listButtonsEdition[s].groupId) { - for (var k = (this.listButtonsEdition[s].icons.length - 1); k >= 0; k--) { - this._getListButton()[i].icons.unshift(this.listButtonsEdition[s].icons[k]); - } - - this.listButtonsEdition.splice(s, 1); - } - } - } + var browserRowButtons = this._getBrowserButtons(), + buttons; - for (var n = (this.listButtonsEdition.length - 1); n >= 0; n--) { - this._getListButton().unshift(this.listButtonsEdition[n]); - } + if (browserRowButtons && browserRowButtons.length) { + buttons = this._mergeInEditionButtons(browserRowButtons); } else { - this._setListButton(lang.clone(this.listButtonsEdition)); + buttons = lang.clone(this.listButtonsEdition); } + this._setBrowserButtons(buttons); delete this.listButtonsEdition; }, - _existListButton: function() { + _mergeInEditionButtons: function(browserRowButtons) { + + var findIndexCallback = lang.hitch(this, function(button) { + + return button.groupId && button.groupId === this._editionGroupId; + }); + + var rowButtonIndex = browserRowButtons.findIndex(findIndexCallback); + + if (rowButtonIndex !== -1) { + var rowButtonEditionGroup = browserRowButtons[rowButtonIndex]; - var browserConfig = this._getBrowserConfig(); + var editionButtonIndex = this.listButtonsEdition.findIndex(findIndexCallback); - if (browserConfig && browserConfig.rowConfig && browserConfig.rowConfig.buttonsConfig && - browserConfig.rowConfig.buttonsConfig.listButton) { - return true; + if (editionButtonIndex !== -1) { + var editionButtonEditionGroup = this.listButtonsEdition[editionButtonIndex]; + + rowButtonEditionGroup.icons = rowButtonEditionGroup.icons.concat(editionButtonEditionGroup.icons); + this.listButtonsEdition.splice(editionButtonIndex, 1); + } + } else if (this.listButtonsEdition.length) { + browserRowButtons = browserRowButtons.concat(this.listButtonsEdition); } - return null; + return browserRowButtons; }, - _getListButton: function() { + _getBrowserButtons: function() { + + var browserConfig = this._getBrowserConfig(), + rowConfig = browserConfig && browserConfig.rowConfig, + buttonsConfig = rowConfig && rowConfig.buttonsConfig, + buttonsList = buttonsConfig && buttonsConfig.listButton; - return this._getBrowserConfig().rowConfig.buttonsConfig.listButton; + if (buttonsList) { + return buttonsList; + } + + return []; }, _getBrowserConfig: function() { @@ -93,15 +109,22 @@ define([ this.browserConfig = browserConfig; }, - _setListButton: function(listButton) { + _setBrowserButtons: function(listButton) { - this._setBrowserConfig(this._merge([{ - rowConfig: { - buttonsConfig: { - listButton: listButton + if (!this.browserConfig || !this.browserConfig.rowConfig || !this.browserConfig.rowConfig.buttonsConfig) { + this._setBrowserConfig(this._merge([{ + rowConfig: { + buttonsConfig: {} } - } - }, this._getBrowserConfig() || {}])); + }, this._getBrowserConfig() || {}])); + } + + this._setBrowserButtonsList(listButton); + }, + + _setBrowserButtonsList: function(listButton) { + + this.browserConfig.rowConfig.buttonsConfig.listButton = listButton; }, _mixEditionEventsAndActions: function() { diff --git a/public/javascript/app/base/views/extensions/_EditionCommons.js b/client-app/src/oldapp/base/views/extensions/_EditionCommons.js similarity index 100% rename from public/javascript/app/base/views/extensions/_EditionCommons.js rename to client-app/src/oldapp/base/views/extensions/_EditionCommons.js diff --git a/public/javascript/app/base/views/extensions/_EditionFormList.js b/client-app/src/oldapp/base/views/extensions/_EditionFormList.js similarity index 77% rename from public/javascript/app/base/views/extensions/_EditionFormList.js rename to client-app/src/oldapp/base/views/extensions/_EditionFormList.js index f12f711ea8726933ab5128e33a18c4b67f698977..9108a96dea631fd9bb854b72296d9c4c537b8886 100644 --- a/public/javascript/app/base/views/extensions/_EditionFormList.js +++ b/client-app/src/oldapp/base/views/extensions/_EditionFormList.js @@ -3,7 +3,7 @@ define([ , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "redmic/modules/base/_Store" + , "src/component/base/_Store" ], function( _Edition , declare @@ -59,14 +59,25 @@ define([ _getBrowserConfig: function() { + // TODO esto causa confusión, el nivel superior de config se aplica a diseño que contiene componente browser + // TODO el primer nivel no debería llamarse 'browserConfig' para evitar la confusión return this.browserConfig.browserConfig; }, _setBrowserConfig: function(browserConfig) { + // TODO esto causa confusión, el nivel superior de config se aplica a diseño que contiene componente browser + // TODO el primer nivel no debería llamarse 'browserConfig' para evitar la confusión this.browserConfig.browserConfig = browserConfig; }, + _setBrowserButtonsList: function(listButton) { + + // TODO esto causa confusión, el nivel superior de config se aplica a diseño que contiene componente browser + // TODO el primer nivel no debería llamarse 'browserConfig' para evitar la confusión + this.browserConfig.browserConfig.rowConfig.buttonsConfig.listButton = listButton; + }, + _getNodeForForm: function() { return this.domNode; diff --git a/public/javascript/app/base/views/extensions/_EditionView.js b/client-app/src/oldapp/base/views/extensions/_EditionView.js similarity index 97% rename from public/javascript/app/base/views/extensions/_EditionView.js rename to client-app/src/oldapp/base/views/extensions/_EditionView.js index b0bb0e991bd84107ab8119a7d7f2b4e5ee320a02..6fab52ac047fbeb86098b2a133e3196c9095fe30 100644 --- a/public/javascript/app/base/views/extensions/_EditionView.js +++ b/client-app/src/oldapp/base/views/extensions/_EditionView.js @@ -2,8 +2,8 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "redmic/modules/base/_Store" - , "redmic/modules/base/_Persistence" + , "src/component/base/_Store" + , "src/component/base/_Persistence" , "app/base/views/extensions/_Edition" , "RWidgets/Button" ], function( diff --git a/public/javascript/app/base/views/extensions/_EditionWizardView.js b/client-app/src/oldapp/base/views/extensions/_EditionWizardView.js similarity index 97% rename from public/javascript/app/base/views/extensions/_EditionWizardView.js rename to client-app/src/oldapp/base/views/extensions/_EditionWizardView.js index bc580da55b3041e71bfcf5f8bd9d3b12a8cb6b8b..d559f8a1e17f96eafd2d5a42d3eacb78f4f4a1b5 100644 --- a/public/javascript/app/base/views/extensions/_EditionWizardView.js +++ b/client-app/src/oldapp/base/views/extensions/_EditionWizardView.js @@ -2,7 +2,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "redmic/modules/base/_Persistence" + , "src/component/base/_Persistence" , "app/base/views/extensions/_Edition" , "RWidgets/Button" ], function( diff --git a/public/javascript/app/base/views/extensions/_FormInDialogView.js b/client-app/src/oldapp/base/views/extensions/_FormInDialogView.js similarity index 74% rename from public/javascript/app/base/views/extensions/_FormInDialogView.js rename to client-app/src/oldapp/base/views/extensions/_FormInDialogView.js index c97739b1dc3580865746acc8196e0d1924b5c5d2..60518a68f64d77fdf3d5c94a7195da09c6313297 100644 --- a/public/javascript/app/base/views/extensions/_FormInDialogView.js +++ b/client-app/src/oldapp/base/views/extensions/_FormInDialogView.js @@ -2,17 +2,20 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "redmic/modules/form/FormContainerImpl" - , "redmic/modules/form/_ListenModelHasChanged" - , "redmic/modules/form/_ShowInDialog" + , "src/component/form/FormContainerImpl" + , 'src/component/form/_CreateInternalKeypad' + , "src/component/form/_ListenModelHasChanged" + , 'src/component/base/_ShowInPopup' ], function( declare , lang , aspect , FormContainerImpl + , _CreateInternalKeypad , _ListenModelHasChanged - , _ShowInDialog -){ + , _ShowInPopup +) { + return declare(null, { // summary: // Extensión para las vistas con formulario en un Dialog. @@ -45,8 +48,11 @@ define([ _initializeFormInDialogView: function() { - var formDef = declare([FormContainerImpl, _ListenModelHasChanged, _ShowInDialog]); - this.editor = new formDef(this.formConfig); + var FormDefinition = declare([ + FormContainerImpl, _ListenModelHasChanged, _CreateInternalKeypad + ]).extend(_ShowInPopup); + + this.editor = new FormDefinition(this.formConfig); }, _afterSaved: function(results) { diff --git a/public/javascript/app/base/views/extensions/_GetActivityData.js b/client-app/src/oldapp/base/views/extensions/_GetActivityData.js similarity index 98% rename from public/javascript/app/base/views/extensions/_GetActivityData.js rename to client-app/src/oldapp/base/views/extensions/_GetActivityData.js index b05d0e237ee4200b470a51f26c73f595807925e2..ad63fc86e8d2f2db6f922f2dcf2974877dd59219 100644 --- a/public/javascript/app/base/views/extensions/_GetActivityData.js +++ b/client-app/src/oldapp/base/views/extensions/_GetActivityData.js @@ -1,5 +1,5 @@ define([ - "app/redmicConfig" + 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" diff --git a/public/javascript/app/base/views/extensions/_GetActivityDataItfc.js b/client-app/src/oldapp/base/views/extensions/_GetActivityDataItfc.js similarity index 92% rename from public/javascript/app/base/views/extensions/_GetActivityDataItfc.js rename to client-app/src/oldapp/base/views/extensions/_GetActivityDataItfc.js index af8d04c6d3b6f0ea19732ad05e1d0c93419f07e2..e3bc333564cb0daaf04cee8f9cfe168f9c611132 100644 --- a/public/javascript/app/base/views/extensions/_GetActivityDataItfc.js +++ b/client-app/src/oldapp/base/views/extensions/_GetActivityDataItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/public/javascript/app/base/views/extensions/_InterceptCloseUpView.js b/client-app/src/oldapp/base/views/extensions/_InterceptCloseUpView.js similarity index 98% rename from public/javascript/app/base/views/extensions/_InterceptCloseUpView.js rename to client-app/src/oldapp/base/views/extensions/_InterceptCloseUpView.js index e3052242074f8323810e93a2a2998e0c58375265..bfdadc44af5c0a1b1e3244ab1e8e3f6d50a43f70 100644 --- a/public/javascript/app/base/views/extensions/_InterceptCloseUpView.js +++ b/client-app/src/oldapp/base/views/extensions/_InterceptCloseUpView.js @@ -1,5 +1,5 @@ define([ - 'alertify/alertify.min' + 'alertify' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/Deferred" diff --git a/public/javascript/app/base/views/extensions/_ListenActivityDataAndAccessByActivityCategory.js b/client-app/src/oldapp/base/views/extensions/_ListenActivityDataAndAccessByActivityCategory.js similarity index 98% rename from public/javascript/app/base/views/extensions/_ListenActivityDataAndAccessByActivityCategory.js rename to client-app/src/oldapp/base/views/extensions/_ListenActivityDataAndAccessByActivityCategory.js index 184865d04b4771a58dbaf8cde7504d796084d460..d24ef062e7e69a25f5144b6dd26a6e0989a3240b 100644 --- a/public/javascript/app/base/views/extensions/_ListenActivityDataAndAccessByActivityCategory.js +++ b/client-app/src/oldapp/base/views/extensions/_ListenActivityDataAndAccessByActivityCategory.js @@ -1,5 +1,5 @@ define([ - "app/redmicConfig" + 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" diff --git a/public/javascript/app/base/views/extensions/_LocalSelectionView.js b/client-app/src/oldapp/base/views/extensions/_LocalSelectionView.js similarity index 97% rename from public/javascript/app/base/views/extensions/_LocalSelectionView.js rename to client-app/src/oldapp/base/views/extensions/_LocalSelectionView.js index 499eca25998211e2c68d5ed27c55796f9f9b3dc7..618534f663fd97937ca569cd750b7042abfa6be3 100644 --- a/public/javascript/app/base/views/extensions/_LocalSelectionView.js +++ b/client-app/src/oldapp/base/views/extensions/_LocalSelectionView.js @@ -3,8 +3,8 @@ define([ , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "redmic/modules/base/_SelectionBase" - , "redmic/modules/gateway/LocalSelectorGatewayImpl" + , "src/component/base/_SelectionBase" + , "src/component/gateway/LocalSelectorGatewayImpl" ], function ( _LocalSelectionViewItfc , declare diff --git a/public/javascript/app/base/views/extensions/_LocalSelectionViewItfc.js b/client-app/src/oldapp/base/views/extensions/_LocalSelectionViewItfc.js similarity index 94% rename from public/javascript/app/base/views/extensions/_LocalSelectionViewItfc.js rename to client-app/src/oldapp/base/views/extensions/_LocalSelectionViewItfc.js index 280dcf271c361e6d79fd9a7baa006f1b247c1aae..414c0d93adeb7551de7e7e5f525145a7e4a89b16 100644 --- a/public/javascript/app/base/views/extensions/_LocalSelectionViewItfc.js +++ b/client-app/src/oldapp/base/views/extensions/_LocalSelectionViewItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/public/javascript/app/base/views/extensions/_OnShownAndRefresh.js b/client-app/src/oldapp/base/views/extensions/_OnShownAndRefresh.js similarity index 100% rename from public/javascript/app/base/views/extensions/_OnShownAndRefresh.js rename to client-app/src/oldapp/base/views/extensions/_OnShownAndRefresh.js diff --git a/public/javascript/app/base/views/extensions/_ProcessInterval.js b/client-app/src/oldapp/base/views/extensions/_ProcessInterval.js similarity index 100% rename from public/javascript/app/base/views/extensions/_ProcessInterval.js rename to client-app/src/oldapp/base/views/extensions/_ProcessInterval.js diff --git a/public/javascript/app/base/views/extensions/_SelectInDoubleList.js b/client-app/src/oldapp/base/views/extensions/_SelectInDoubleList.js similarity index 98% rename from public/javascript/app/base/views/extensions/_SelectInDoubleList.js rename to client-app/src/oldapp/base/views/extensions/_SelectInDoubleList.js index cda72a87ace42b7a989bc23aa155b7592fdd7687..c247c411b21f52e70be0dcfebc4279b9bce72a84 100644 --- a/public/javascript/app/base/views/extensions/_SelectInDoubleList.js +++ b/client-app/src/oldapp/base/views/extensions/_SelectInDoubleList.js @@ -3,7 +3,7 @@ define([ , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "redmic/modules/browser/_Select" + , "src/component/browser/_Select" ], function( _LocalSelectionView , declare diff --git a/public/javascript/app/components/steps/AccessSetStep.js b/client-app/src/oldapp/components/steps/AccessSetStep.js similarity index 98% rename from public/javascript/app/components/steps/AccessSetStep.js rename to client-app/src/oldapp/components/steps/AccessSetStep.js index 47b6d15e1d1d3d1b337715bfc2bf60fe2cf8cfc1..b3f28ee9e257c28b8f36e8b6ec43b7ca10ed081c 100644 --- a/public/javascript/app/components/steps/AccessSetStep.js +++ b/client-app/src/oldapp/components/steps/AccessSetStep.js @@ -2,7 +2,7 @@ define([ "app/maintenance/models/AccessModel" , "app/designs/formList/layout/Layout" , "app/designs/formList/main/FormListByStep" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/Deferred" diff --git a/public/javascript/app/components/steps/ActivitySetStep.js b/client-app/src/oldapp/components/steps/ActivitySetStep.js similarity index 98% rename from public/javascript/app/components/steps/ActivitySetStep.js rename to client-app/src/oldapp/components/steps/ActivitySetStep.js index db6560a7a8e1b7a73a904eb578dbfaff5a6f12f5..16d65b0ae290c9280dfcbf29ad236d137bbb254e 100644 --- a/public/javascript/app/components/steps/ActivitySetStep.js +++ b/client-app/src/oldapp/components/steps/ActivitySetStep.js @@ -1,6 +1,6 @@ define([ 'app/designs/doubleList/main/textSearchAndDoubleList' - , 'app/redmicConfig' + , 'src/redmicConfig' , 'dojo/_base/declare' , 'dojo/_base/lang' , 'templates/ActivityList' diff --git a/public/javascript/app/components/steps/AddGeomSiteStep.js b/client-app/src/oldapp/components/steps/AddGeomSiteStep.js similarity index 98% rename from public/javascript/app/components/steps/AddGeomSiteStep.js rename to client-app/src/oldapp/components/steps/AddGeomSiteStep.js index 035f02828540e5245d9e5ba5f24ab6f91e30b947..445fcd06f4d78df12c9b38ebabb7331f578e8197 100644 --- a/public/javascript/app/components/steps/AddGeomSiteStep.js +++ b/client-app/src/oldapp/components/steps/AddGeomSiteStep.js @@ -3,7 +3,7 @@ define([ , "app/designs/mapWithSideContent/layout/MapAndContent" , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/map/_LeafletDraw" + , "src/component/map/_LeafletDraw" ], function( Controller , Layout diff --git a/public/javascript/app/components/steps/AreaClassificationsSetStep.js b/client-app/src/oldapp/components/steps/AreaClassificationsSetStep.js similarity index 98% rename from public/javascript/app/components/steps/AreaClassificationsSetStep.js rename to client-app/src/oldapp/components/steps/AreaClassificationsSetStep.js index 2d65693f887c82baa654fec64b87dc9f3d663b5f..1075ecd3ccb4b11a4b8082fd01052a72197e98db 100644 --- a/public/javascript/app/components/steps/AreaClassificationsSetStep.js +++ b/client-app/src/oldapp/components/steps/AreaClassificationsSetStep.js @@ -3,7 +3,7 @@ define([ , "app/components/steps/_RememberDeleteItems" ,"app/designs/formList/layout/Layout" , "app/designs/formList/main/FormListByStep" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/Deferred" diff --git a/public/javascript/app/components/steps/CalibrationSetStep.js b/client-app/src/oldapp/components/steps/CalibrationSetStep.js similarity index 98% rename from public/javascript/app/components/steps/CalibrationSetStep.js rename to client-app/src/oldapp/components/steps/CalibrationSetStep.js index 511ee587e63d24e9d9679f18e6cd824e791ca8e7..e5db8e9dbb4341c9644b7d652a97b7705ac60bc6 100644 --- a/public/javascript/app/components/steps/CalibrationSetStep.js +++ b/client-app/src/oldapp/components/steps/CalibrationSetStep.js @@ -3,7 +3,7 @@ define([ , "app/components/steps/_RememberDeleteItems" , "app/designs/formList/layout/Layout" , "app/designs/formList/main/FormListByStep" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/Deferred" diff --git a/public/javascript/app/components/steps/CitationStep.js b/client-app/src/oldapp/components/steps/CitationStep.js similarity index 96% rename from public/javascript/app/components/steps/CitationStep.js rename to client-app/src/oldapp/components/steps/CitationStep.js index 19a90e63df4635d783c9a5ac4c3022508761d32e..c6dbd1577c1cff3ace8163202d9f726340e00e18 100644 --- a/public/javascript/app/components/steps/CitationStep.js +++ b/client-app/src/oldapp/components/steps/CitationStep.js @@ -1,14 +1,14 @@ define([ "app/designs/mapWithSideContent/main/Geographic" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "templates/SpeciesDistributionPopup" - , "redmic/modules/base/_Store" - , "redmic/modules/browser/_Select" - , "redmic/modules/map/layer/GeoJsonLayerImpl" - , "redmic/modules/map/layer/_Selectable" - , "redmic/modules/map/layer/_SelectOnClick" + , "src/component/base/_Store" + , "src/component/browser/_Select" + , "src/component/map/layer/GeoJsonLayerImpl" + , "src/component/map/layer/_Selectable" + , "src/component/map/layer/_SelectOnClick" ], function ( Geographic , redmicConfig diff --git a/public/javascript/app/components/steps/ClassificationsStep.js b/client-app/src/oldapp/components/steps/ClassificationsStep.js similarity index 92% rename from public/javascript/app/components/steps/ClassificationsStep.js rename to client-app/src/oldapp/components/steps/ClassificationsStep.js index a13a675137bafdc37af9e40e13f4d50d2a5f791d..a34db3485c973c5b820d7529d53d4c812fd7c594 100644 --- a/public/javascript/app/components/steps/ClassificationsStep.js +++ b/client-app/src/oldapp/components/steps/ClassificationsStep.js @@ -2,12 +2,12 @@ define([ "app/designs/list/_AddFilter" , "app/designs/list/Controller" , "app/designs/list/layout/Layout" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/browser/_Select" - , "redmic/modules/browser/bars/Pagination" - , "redmic/modules/layout/wizard/_CompleteBySelection" + , "src/component/browser/_Select" + , "src/component/browser/bars/Pagination" + , "src/component/layout/wizard/_CompleteBySelection" , "templates/DomainList" ], function( _AddFilter diff --git a/public/javascript/app/components/steps/DataDefinitionSetStep.js b/client-app/src/oldapp/components/steps/DataDefinitionSetStep.js similarity index 97% rename from public/javascript/app/components/steps/DataDefinitionSetStep.js rename to client-app/src/oldapp/components/steps/DataDefinitionSetStep.js index c7975529f17b0d20b3faf78e4b061aa68476df95..1b2629274353516410fd9b2e96d17ea4fa79b09c 100644 --- a/public/javascript/app/components/steps/DataDefinitionSetStep.js +++ b/client-app/src/oldapp/components/steps/DataDefinitionSetStep.js @@ -4,10 +4,10 @@ define([ , "app/designs/formList/main/FormListByStep" , "app/designs/formList/layout/Layout" , "app/edition/views/ParameterEditionView" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_ShowInPopup" + , "src/component/base/_ShowInPopup" , "templates/DataDefinitionList" ], function ( _EditionFormList diff --git a/public/javascript/app/components/steps/DescribeSiteStep.js b/client-app/src/oldapp/components/steps/DescribeSiteStep.js similarity index 95% rename from public/javascript/app/components/steps/DescribeSiteStep.js rename to client-app/src/oldapp/components/steps/DescribeSiteStep.js index 06ba129f93aa36067ca8932f7597ade9805ffd0d..6a64d08064d96694caedcc16c9f01432422bfe66 100644 --- a/public/javascript/app/components/steps/DescribeSiteStep.js +++ b/client-app/src/oldapp/components/steps/DescribeSiteStep.js @@ -3,15 +3,15 @@ define([ , "app/components/steps/_MainData" , "app/components/viewCustomization/describeSite/views/_AdditionalKeyGetter" , "app/components/viewCustomization/describeSite/views/SelectStationByActivity" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_ShowInPopup" - , "redmic/modules/base/_Store" - , "redmic/modules/components/Keypad/TrizoneKeypadImpl" - , "redmic/modules/form/FormContainerImpl" + , "src/component/base/_ShowInPopup" + , "src/component/base/_Store" + , "src/component/components/Keypad/TrizoneKeypadImpl" + , "src/component/form/FormContainerImpl" , "RWidgets/Utilities" - , "put-selector/put" + , 'put-selector' ], function ( _AddSelectionHandlerKeypad , _MainData diff --git a/public/javascript/app/components/steps/DocumentStepFiltered.js b/client-app/src/oldapp/components/steps/DocumentStepFiltered.js similarity index 99% rename from public/javascript/app/components/steps/DocumentStepFiltered.js rename to client-app/src/oldapp/components/steps/DocumentStepFiltered.js index 783bde1fc6fbaff678ad1cf377e36e0a8f83c699..b3bdb342f4484e824794a5ee39f9ccfdca17d906 100644 --- a/public/javascript/app/components/steps/DocumentStepFiltered.js +++ b/client-app/src/oldapp/components/steps/DocumentStepFiltered.js @@ -3,12 +3,12 @@ define([ , "app/designs/doubleList/layout/TopLeftContentAndDoubleList" , "app/designs/doubleList/Controller" , "RWidgets/Utilities" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "templates/DocumentList" , "templates/SpeciesFilter" - , "redmic/modules/form/input/FilteringSelectImpl" + , "src/component/form/input/FilteringSelectImpl" , "templates/LoadingCustom" ], function ( _SelectInDoubleList diff --git a/public/javascript/app/components/steps/DownloadsSetStep.js b/client-app/src/oldapp/components/steps/DownloadsSetStep.js similarity index 100% rename from public/javascript/app/components/steps/DownloadsSetStep.js rename to client-app/src/oldapp/components/steps/DownloadsSetStep.js diff --git a/public/javascript/app/components/steps/MainDataStep.js b/client-app/src/oldapp/components/steps/MainDataStep.js similarity index 91% rename from public/javascript/app/components/steps/MainDataStep.js rename to client-app/src/oldapp/components/steps/MainDataStep.js index 4702be1796ed5657438319a221282223b542e118..c28d9c8ffd0b545fec17a99e61b69bac17160fc4 100644 --- a/public/javascript/app/components/steps/MainDataStep.js +++ b/client-app/src/oldapp/components/steps/MainDataStep.js @@ -2,8 +2,8 @@ define([ "app/components/steps/_MainData" , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/form/FormContainerImpl" - , "redmic/modules/form/_PublicateChanges" + , "src/component/form/FormContainerImpl" + , "src/component/form/_PublicateChanges" ], function ( _MainData , declare diff --git a/public/javascript/app/components/steps/MapSelectAreaStep.js b/client-app/src/oldapp/components/steps/MapSelectAreaStep.js similarity index 96% rename from public/javascript/app/components/steps/MapSelectAreaStep.js rename to client-app/src/oldapp/components/steps/MapSelectAreaStep.js index 6df79ef8e2b9359d994488578947644939ce8ea8..46c0b47c5356188c44b6d9d6c0aec08dde501b1b 100644 --- a/public/javascript/app/components/steps/MapSelectAreaStep.js +++ b/client-app/src/oldapp/components/steps/MapSelectAreaStep.js @@ -2,19 +2,17 @@ define([ "dijit/layout/ContentPane" , "dojo/_base/declare" , "dojo/_base/lang" - , "dojo/aspect" - , 'leaflet/leaflet' - , "put-selector/put" - , "redmic/modules/base/_Module" - , "redmic/modules/base/_Show" + , 'put-selector' + , "src/component/base/_Module" + , "src/component/base/_Show" , "RWidgets/Button" , "RWidgets/Map" + + , 'leaflet' ], function ( ContentPane , declare , lang - , aspect - , L , put , _Module , _Show @@ -90,7 +88,7 @@ define([ this._createContainerImage(); }, - _getNodeToShow: function() { + getNodeToShow: function() { return this.containerNode; }, @@ -235,4 +233,4 @@ define([ this._instanceDataToResult(this._defaultData); } }); -}); \ No newline at end of file +}); diff --git a/public/javascript/app/components/steps/PreLoadMainDataStep.js b/client-app/src/oldapp/components/steps/PreLoadMainDataStep.js similarity index 100% rename from public/javascript/app/components/steps/PreLoadMainDataStep.js rename to client-app/src/oldapp/components/steps/PreLoadMainDataStep.js diff --git a/public/javascript/app/components/steps/ProtocolsSetStep.js b/client-app/src/oldapp/components/steps/ProtocolsSetStep.js similarity index 100% rename from public/javascript/app/components/steps/ProtocolsSetStep.js rename to client-app/src/oldapp/components/steps/ProtocolsSetStep.js diff --git a/public/javascript/app/components/steps/RecoverySetStep.js b/client-app/src/oldapp/components/steps/RecoverySetStep.js similarity index 98% rename from public/javascript/app/components/steps/RecoverySetStep.js rename to client-app/src/oldapp/components/steps/RecoverySetStep.js index d45b482894a5d9507e719ed7a37bcde9011ef6f9..d3f045db875c7c59b1d9ccaacfaafa7ac2206012 100644 --- a/public/javascript/app/components/steps/RecoverySetStep.js +++ b/client-app/src/oldapp/components/steps/RecoverySetStep.js @@ -3,7 +3,7 @@ define([ , "app/components/steps/_RememberDeleteItems" , "app/designs/formList/layout/Layout" , "app/designs/formList/main/FormListByStep" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/Deferred" diff --git a/public/javascript/app/components/steps/RelationDataSetStep.js b/client-app/src/oldapp/components/steps/RelationDataSetStep.js similarity index 98% rename from public/javascript/app/components/steps/RelationDataSetStep.js rename to client-app/src/oldapp/components/steps/RelationDataSetStep.js index e5d55296f4c025130d3ba6adbd33809e52c0352d..222c1cc6303b80910cf35dfc06128db16c85f3d1 100644 --- a/public/javascript/app/components/steps/RelationDataSetStep.js +++ b/client-app/src/oldapp/components/steps/RelationDataSetStep.js @@ -2,14 +2,14 @@ define([ "app/base/views/extensions/_AddSelectInput" , "app/designs/formList/layout/LayoutWithTopForm" , "app/designs/formList/Controller" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" - , 'moment/moment.min' - , "redmic/modules/browser/_ButtonsInRow" - , "redmic/modules/browser/_Framework" - , "redmic/modules/browser/_MultiTemplate" - , "redmic/modules/browser/HierarchicalImpl" + , 'moment' + , "src/component/browser/_ButtonsInRow" + , "src/component/browser/_Framework" + , "src/component/browser/_MultiTemplate" + , "src/component/browser/HierarchicalImpl" , "RWidgets/Utilities" , "templates/RelationDataParentList" , "templates/RelationDataChildList" diff --git a/public/javascript/app/components/steps/SelectActivityCategoryStep.js b/client-app/src/oldapp/components/steps/SelectActivityCategoryStep.js similarity index 98% rename from public/javascript/app/components/steps/SelectActivityCategoryStep.js rename to client-app/src/oldapp/components/steps/SelectActivityCategoryStep.js index 367c37a3c3719701caa9f506b2cc4d91b89fd0eb..8b1cb66f9f95ab58089d6b0107d53d51fdbfce9b 100644 --- a/public/javascript/app/components/steps/SelectActivityCategoryStep.js +++ b/client-app/src/oldapp/components/steps/SelectActivityCategoryStep.js @@ -2,7 +2,7 @@ define([ "app/components/steps/_SelectOptionBox" , "dojo/_base/declare" , "dojo/_base/lang" - , "put-selector/put" + , 'put-selector' ], function ( _SelectOptionBox , declare diff --git a/public/javascript/app/components/steps/SelectLayerStep.js b/client-app/src/oldapp/components/steps/SelectLayerStep.js similarity index 95% rename from public/javascript/app/components/steps/SelectLayerStep.js rename to client-app/src/oldapp/components/steps/SelectLayerStep.js index 5a73d44c926b33816c5f4fb47909a29ebdb22fd9..bbe8455f9ce1f6954bf31fdc834408b386016a92 100644 --- a/public/javascript/app/components/steps/SelectLayerStep.js +++ b/client-app/src/oldapp/components/steps/SelectLayerStep.js @@ -3,12 +3,12 @@ define([ , "app/base/views/extensions/_LocalSelectionView" , "app/designs/list/layout/ListWithTopContent" , "app/designs/list/Controller" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Store" - , "redmic/modules/browser/ListImpl" - , "redmic/modules/browser/_Select" + , "src/component/base/_Store" + , "src/component/browser/ListImpl" + , "src/component/browser/_Select" , "templates/ServiceOGCAtlasList" ], function( _AddTextSearchInput diff --git a/public/javascript/app/components/steps/SelectRegisterTypeStep.js b/client-app/src/oldapp/components/steps/SelectRegisterTypeStep.js similarity index 100% rename from public/javascript/app/components/steps/SelectRegisterTypeStep.js rename to client-app/src/oldapp/components/steps/SelectRegisterTypeStep.js diff --git a/public/javascript/app/components/steps/SpeciesMainDataStep.js b/client-app/src/oldapp/components/steps/SpeciesMainDataStep.js similarity index 98% rename from public/javascript/app/components/steps/SpeciesMainDataStep.js rename to client-app/src/oldapp/components/steps/SpeciesMainDataStep.js index aef4a534367832ff82fda18e0f26b72283c985d3..232001f7fa9eaca1851f90a50d0fc9251dc19918 100644 --- a/public/javascript/app/components/steps/SpeciesMainDataStep.js +++ b/client-app/src/oldapp/components/steps/SpeciesMainDataStep.js @@ -1,11 +1,11 @@ define([ "app/components/steps/MainDataStep" , "app/designs/externalTextSearchList/main/Worms" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "redmic/modules/base/_ShowInPopup" + , "src/component/base/_ShowInPopup" ], function( MainDataStep , Worms diff --git a/public/javascript/app/components/steps/SpecimenTagSetStep.js b/client-app/src/oldapp/components/steps/SpecimenTagSetStep.js similarity index 98% rename from public/javascript/app/components/steps/SpecimenTagSetStep.js rename to client-app/src/oldapp/components/steps/SpecimenTagSetStep.js index 6d4a9299509abd97f285c8fde84ccb0c1d48b058..c68d5e12e7841d78627924a7ee3933c66b1e5acf 100644 --- a/public/javascript/app/components/steps/SpecimenTagSetStep.js +++ b/client-app/src/oldapp/components/steps/SpecimenTagSetStep.js @@ -3,7 +3,7 @@ define([ , "app/components/steps/_RememberDeleteItems" , "app/designs/formList/layout/Layout" , "app/designs/formList/main/FormListByStep" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/Deferred" diff --git a/public/javascript/app/components/steps/UnitSetStep.js b/client-app/src/oldapp/components/steps/UnitSetStep.js similarity index 98% rename from public/javascript/app/components/steps/UnitSetStep.js rename to client-app/src/oldapp/components/steps/UnitSetStep.js index ed5dcde13dee62975660c2dac0773334ddcf6c00..3151fffc0b8cbf85f71c67d602e1dd6b856d7b96 100644 --- a/public/javascript/app/components/steps/UnitSetStep.js +++ b/client-app/src/oldapp/components/steps/UnitSetStep.js @@ -1,6 +1,6 @@ define([ "app/designs/doubleList/main/textSearchAndDoubleList" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "templates/UnitList" diff --git a/public/javascript/app/components/steps/_ClassificationsRelationData.js b/client-app/src/oldapp/components/steps/_ClassificationsRelationData.js similarity index 99% rename from public/javascript/app/components/steps/_ClassificationsRelationData.js rename to client-app/src/oldapp/components/steps/_ClassificationsRelationData.js index 583e35cd12869c799833458160e51000d1af1e8d..c554cef750c89ea69ecf19ba42437a947de0b4b4 100644 --- a/public/javascript/app/components/steps/_ClassificationsRelationData.js +++ b/client-app/src/oldapp/components/steps/_ClassificationsRelationData.js @@ -1,6 +1,6 @@ define([ "app/designs/formList/main/_RequestAndParseData" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "RWidgets/Utilities" @@ -331,4 +331,4 @@ define([ return idsReturn; } }); -}); \ No newline at end of file +}); diff --git a/public/javascript/app/components/steps/_DataListAndSaveRelationData.js b/client-app/src/oldapp/components/steps/_DataListAndSaveRelationData.js similarity index 96% rename from public/javascript/app/components/steps/_DataListAndSaveRelationData.js rename to client-app/src/oldapp/components/steps/_DataListAndSaveRelationData.js index 2f89b44a8068d61c2eb891127b90dbcbc36965c9..d840a74a176e6d0c932130564db224ca0db391fe 100644 --- a/public/javascript/app/components/steps/_DataListAndSaveRelationData.js +++ b/client-app/src/oldapp/components/steps/_DataListAndSaveRelationData.js @@ -1,9 +1,9 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_ShowInPopup" - , "redmic/modules/browser/ListImpl" - , "redmic/modules/browser/_Table" + , "src/component/base/_ShowInPopup" + , "src/component/browser/ListImpl" + , "src/component/browser/_Table" , "RWidgets/Button" ], function ( declare diff --git a/public/javascript/app/components/steps/_DateRelationData.js b/client-app/src/oldapp/components/steps/_DateRelationData.js similarity index 99% rename from public/javascript/app/components/steps/_DateRelationData.js rename to client-app/src/oldapp/components/steps/_DateRelationData.js index c30fedee70aafbf3f7eb0318d3b04e967a10e0a3..ea72f949e4fce39ae492a1f161cbcd4ed3b6e457 100644 --- a/public/javascript/app/components/steps/_DateRelationData.js +++ b/client-app/src/oldapp/components/steps/_DateRelationData.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , 'moment/moment.min' + , 'moment' ], function ( declare , lang @@ -161,4 +161,4 @@ define([ return format; } }); -}); \ No newline at end of file +}); diff --git a/public/javascript/app/components/steps/_MainData.js b/client-app/src/oldapp/components/steps/_MainData.js similarity index 94% rename from public/javascript/app/components/steps/_MainData.js rename to client-app/src/oldapp/components/steps/_MainData.js index ec38bca77c651c3a2a896c786c59ca9964f1741e..6e1fa392c8f31f6404fad73d3dd71d6fc7cd2189 100644 --- a/public/javascript/app/components/steps/_MainData.js +++ b/client-app/src/oldapp/components/steps/_MainData.js @@ -4,8 +4,8 @@ define([ , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "redmic/modules/base/_Module" - , "redmic/modules/base/_Show" + , "src/component/base/_Module" + , "src/component/base/_Show" ], function ( _AddForm , ContentPane @@ -79,7 +79,7 @@ define([ }); }, - _getNodeToShow: function() { + getNodeToShow: function() { return this.containerNode; }, diff --git a/public/javascript/app/components/steps/_ParametersRelationData.js b/client-app/src/oldapp/components/steps/_ParametersRelationData.js similarity index 100% rename from public/javascript/app/components/steps/_ParametersRelationData.js rename to client-app/src/oldapp/components/steps/_ParametersRelationData.js diff --git a/public/javascript/app/components/steps/_RememberDeleteItems.js b/client-app/src/oldapp/components/steps/_RememberDeleteItems.js similarity index 100% rename from public/javascript/app/components/steps/_RememberDeleteItems.js rename to client-app/src/oldapp/components/steps/_RememberDeleteItems.js diff --git a/public/javascript/app/components/steps/_SelectOptionBox.js b/client-app/src/oldapp/components/steps/_SelectOptionBox.js similarity index 96% rename from public/javascript/app/components/steps/_SelectOptionBox.js rename to client-app/src/oldapp/components/steps/_SelectOptionBox.js index f8b30e155c2ec887043e2ea57938872b9835ec8d..a4cf5544087e0729f91eeb186927d99db610a718 100644 --- a/public/javascript/app/components/steps/_SelectOptionBox.js +++ b/client-app/src/oldapp/components/steps/_SelectOptionBox.js @@ -2,9 +2,9 @@ define([ "dijit/layout/ContentPane" , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Module" - , "redmic/modules/base/_Show" - , "put-selector/put" + , "src/component/base/_Module" + , "src/component/base/_Show" + , 'put-selector' ], function ( ContentPane , declare @@ -158,7 +158,7 @@ define([ node.onclick = lang.hitch(this, this._onClickBox, key); }, - _getNodeToShow: function() { + getNodeToShow: function() { return this.containerNode; }, diff --git a/public/javascript/app/components/viewCustomization/addGeomSite/views/Line.js b/client-app/src/oldapp/components/viewCustomization/addGeomSite/views/Line.js similarity index 97% rename from public/javascript/app/components/viewCustomization/addGeomSite/views/Line.js rename to client-app/src/oldapp/components/viewCustomization/addGeomSite/views/Line.js index 67c8db375591645e1e9087365ea82026e3832c53..22e23d0cef91abf64bd030fcce1c1f465f6bd671 100644 --- a/public/javascript/app/components/viewCustomization/addGeomSite/views/Line.js +++ b/client-app/src/oldapp/components/viewCustomization/addGeomSite/views/Line.js @@ -2,7 +2,7 @@ define([ "app/components/viewCustomization/addGeomSite/views/_BaseGeometryForm" , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/map/layer/DrawingLayerImpl" + , "src/component/map/layer/DrawingLayerImpl" ], function ( _BaseGeometryForm , declare diff --git a/public/javascript/app/components/viewCustomization/addGeomSite/views/MultiPolygon.js b/client-app/src/oldapp/components/viewCustomization/addGeomSite/views/MultiPolygon.js similarity index 97% rename from public/javascript/app/components/viewCustomization/addGeomSite/views/MultiPolygon.js rename to client-app/src/oldapp/components/viewCustomization/addGeomSite/views/MultiPolygon.js index e93512b4b628c44301231bb1234df8f82891eea1..5f139baa00bb8f2052a0d810fc5ef931930b492f 100644 --- a/public/javascript/app/components/viewCustomization/addGeomSite/views/MultiPolygon.js +++ b/client-app/src/oldapp/components/viewCustomization/addGeomSite/views/MultiPolygon.js @@ -2,7 +2,7 @@ define([ "app/components/viewCustomization/addGeomSite/views/_BaseGeometryForm" , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/map/layer/DrawingLayerImpl" + , "src/component/map/layer/DrawingLayerImpl" ], function ( _BaseGeometryForm , declare @@ -110,4 +110,4 @@ define([ }); }*/ }); -}); \ No newline at end of file +}); diff --git a/public/javascript/app/components/viewCustomization/addGeomSite/views/Point.js b/client-app/src/oldapp/components/viewCustomization/addGeomSite/views/Point.js similarity index 96% rename from public/javascript/app/components/viewCustomization/addGeomSite/views/Point.js rename to client-app/src/oldapp/components/viewCustomization/addGeomSite/views/Point.js index bcbecbd7b875f00deef0ff64f421d6e2a3c3b9a2..e1122c6fc9f2e9edb54483266d51e699d89a134a 100644 --- a/public/javascript/app/components/viewCustomization/addGeomSite/views/Point.js +++ b/client-app/src/oldapp/components/viewCustomization/addGeomSite/views/Point.js @@ -3,8 +3,8 @@ define([ , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "redmic/modules/map/layer/GeoJsonLayerImpl" - , "redmic/modules/map/layer/_Editable" + , "src/component/map/layer/GeoJsonLayerImpl" + , "src/component/map/layer/_Editable" ], function ( _BaseGeometryForm , declare diff --git a/public/javascript/app/components/viewCustomization/addGeomSite/views/_BaseGeometryForm.js b/client-app/src/oldapp/components/viewCustomization/addGeomSite/views/_BaseGeometryForm.js similarity index 100% rename from public/javascript/app/components/viewCustomization/addGeomSite/views/_BaseGeometryForm.js rename to client-app/src/oldapp/components/viewCustomization/addGeomSite/views/_BaseGeometryForm.js diff --git a/public/javascript/app/components/viewCustomization/addGeomSite/views/templates/LineForm.html b/client-app/src/oldapp/components/viewCustomization/addGeomSite/views/templates/LineForm.html similarity index 100% rename from public/javascript/app/components/viewCustomization/addGeomSite/views/templates/LineForm.html rename to client-app/src/oldapp/components/viewCustomization/addGeomSite/views/templates/LineForm.html diff --git a/public/javascript/app/components/viewCustomization/addGeomSite/views/templates/PointForm.html b/client-app/src/oldapp/components/viewCustomization/addGeomSite/views/templates/PointForm.html similarity index 100% rename from public/javascript/app/components/viewCustomization/addGeomSite/views/templates/PointForm.html rename to client-app/src/oldapp/components/viewCustomization/addGeomSite/views/templates/PointForm.html diff --git a/public/javascript/app/components/viewCustomization/describeSite/views/SelectStationByActivity.js b/client-app/src/oldapp/components/viewCustomization/describeSite/views/SelectStationByActivity.js similarity index 98% rename from public/javascript/app/components/viewCustomization/describeSite/views/SelectStationByActivity.js rename to client-app/src/oldapp/components/viewCustomization/describeSite/views/SelectStationByActivity.js index 2f412827ad1d7de6884e8fdebcd007b9415e706a..f34a8666f1d8bc6f9a67c7c4c8ad452abfba69f1 100644 --- a/public/javascript/app/components/viewCustomization/describeSite/views/SelectStationByActivity.js +++ b/client-app/src/oldapp/components/viewCustomization/describeSite/views/SelectStationByActivity.js @@ -1,7 +1,7 @@ define([ "app/base/views/extensions/_LocalSelectionView" , "app/designs/mapWithSideContent/main/FilterAndGeographic" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "templates/SurveyStationList" diff --git a/public/javascript/app/components/viewCustomization/describeSite/views/_AdditionalKeyGetter.js b/client-app/src/oldapp/components/viewCustomization/describeSite/views/_AdditionalKeyGetter.js similarity index 100% rename from public/javascript/app/components/viewCustomization/describeSite/views/_AdditionalKeyGetter.js rename to client-app/src/oldapp/components/viewCustomization/describeSite/views/_AdditionalKeyGetter.js diff --git a/public/javascript/app/components/viewCustomization/describeSite/views/templates/ARForm.html b/client-app/src/oldapp/components/viewCustomization/describeSite/views/templates/ARForm.html similarity index 100% rename from public/javascript/app/components/viewCustomization/describeSite/views/templates/ARForm.html rename to client-app/src/oldapp/components/viewCustomization/describeSite/views/templates/ARForm.html diff --git a/public/javascript/app/components/viewCustomization/describeSite/views/templates/DescribeSiteForm.html b/client-app/src/oldapp/components/viewCustomization/describeSite/views/templates/DescribeSiteForm.html similarity index 100% rename from public/javascript/app/components/viewCustomization/describeSite/views/templates/DescribeSiteForm.html rename to client-app/src/oldapp/components/viewCustomization/describeSite/views/templates/DescribeSiteForm.html diff --git a/public/javascript/app/components/viewCustomization/describeSite/views/templates/IFForm.html b/client-app/src/oldapp/components/viewCustomization/describeSite/views/templates/IFForm.html similarity index 100% rename from public/javascript/app/components/viewCustomization/describeSite/views/templates/IFForm.html rename to client-app/src/oldapp/components/viewCustomization/describeSite/views/templates/IFForm.html diff --git a/public/javascript/app/components/viewCustomization/loadFile/models/LoadFileModel.js b/client-app/src/oldapp/components/viewCustomization/loadFile/models/LoadFileModel.js similarity index 95% rename from public/javascript/app/components/viewCustomization/loadFile/models/LoadFileModel.js rename to client-app/src/oldapp/components/viewCustomization/loadFile/models/LoadFileModel.js index c3999ac059574eb8b2ad3f0e3b00a54295860778..ef0fb0dd940b51c2b750d39b239f2887572ad974 100644 --- a/public/javascript/app/components/viewCustomization/loadFile/models/LoadFileModel.js +++ b/client-app/src/oldapp/components/viewCustomization/loadFile/models/LoadFileModel.js @@ -1,5 +1,5 @@ define([ - "app/redmicConfig" + 'src/redmicConfig' ], function ( redmicConfig ){ diff --git a/public/javascript/app/components/viewCustomization/loadFile/views/templates/ARFileForm.html b/client-app/src/oldapp/components/viewCustomization/loadFile/views/templates/ARFileForm.html similarity index 100% rename from public/javascript/app/components/viewCustomization/loadFile/views/templates/ARFileForm.html rename to client-app/src/oldapp/components/viewCustomization/loadFile/views/templates/ARFileForm.html diff --git a/public/javascript/app/components/viewCustomization/loadFile/views/templates/LoadFileForm.html b/client-app/src/oldapp/components/viewCustomization/loadFile/views/templates/LoadFileForm.html similarity index 100% rename from public/javascript/app/components/viewCustomization/loadFile/views/templates/LoadFileForm.html rename to client-app/src/oldapp/components/viewCustomization/loadFile/views/templates/LoadFileForm.html diff --git a/public/javascript/app/components/viewCustomization/parameter/views/templates/FTForm.html b/client-app/src/oldapp/components/viewCustomization/parameter/views/templates/FTForm.html similarity index 100% rename from public/javascript/app/components/viewCustomization/parameter/views/templates/FTForm.html rename to client-app/src/oldapp/components/viewCustomization/parameter/views/templates/FTForm.html diff --git a/public/javascript/app/components/viewCustomization/parameter/views/templates/OCForm.html b/client-app/src/oldapp/components/viewCustomization/parameter/views/templates/OCForm.html similarity index 100% rename from public/javascript/app/components/viewCustomization/parameter/views/templates/OCForm.html rename to client-app/src/oldapp/components/viewCustomization/parameter/views/templates/OCForm.html diff --git a/public/javascript/app/components/viewCustomization/relationData/views/templates/AreaTypeForm.html b/client-app/src/oldapp/components/viewCustomization/relationData/views/templates/AreaTypeForm.html similarity index 100% rename from public/javascript/app/components/viewCustomization/relationData/views/templates/AreaTypeForm.html rename to client-app/src/oldapp/components/viewCustomization/relationData/views/templates/AreaTypeForm.html diff --git a/public/javascript/app/components/viewCustomization/relationData/views/templates/DateForm.html b/client-app/src/oldapp/components/viewCustomization/relationData/views/templates/DateForm.html similarity index 100% rename from public/javascript/app/components/viewCustomization/relationData/views/templates/DateForm.html rename to client-app/src/oldapp/components/viewCustomization/relationData/views/templates/DateForm.html diff --git a/public/javascript/app/components/viewCustomization/relationData/views/templates/DefaultForm.html b/client-app/src/oldapp/components/viewCustomization/relationData/views/templates/DefaultForm.html similarity index 100% rename from public/javascript/app/components/viewCustomization/relationData/views/templates/DefaultForm.html rename to client-app/src/oldapp/components/viewCustomization/relationData/views/templates/DefaultForm.html diff --git a/public/javascript/app/components/viewCustomization/relationData/views/templates/DeviceForm.html b/client-app/src/oldapp/components/viewCustomization/relationData/views/templates/DeviceForm.html similarity index 100% rename from public/javascript/app/components/viewCustomization/relationData/views/templates/DeviceForm.html rename to client-app/src/oldapp/components/viewCustomization/relationData/views/templates/DeviceForm.html diff --git a/public/javascript/app/components/viewCustomization/relationData/views/templates/PointGeometryForm.html b/client-app/src/oldapp/components/viewCustomization/relationData/views/templates/PointGeometryForm.html similarity index 100% rename from public/javascript/app/components/viewCustomization/relationData/views/templates/PointGeometryForm.html rename to client-app/src/oldapp/components/viewCustomization/relationData/views/templates/PointGeometryForm.html diff --git a/public/javascript/app/dataLoader/areas/views/AreaView.js b/client-app/src/oldapp/dataLoader/areas/views/AreaView.js similarity index 98% rename from public/javascript/app/dataLoader/areas/views/AreaView.js rename to client-app/src/oldapp/dataLoader/areas/views/AreaView.js index 7e9da1a7988553411beff1c23d4d176025cf6ad2..ccc4e0047facdcefbcc5d84fca6afd0a63094abc 100644 --- a/public/javascript/app/dataLoader/areas/views/AreaView.js +++ b/client-app/src/oldapp/dataLoader/areas/views/AreaView.js @@ -1,6 +1,6 @@ define([ "app/dataLoader/base/_GeographicBase" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" diff --git a/public/javascript/app/dataLoader/areas/views/templates/AreaClassificationsForm.html b/client-app/src/oldapp/dataLoader/areas/views/templates/AreaClassificationsForm.html similarity index 100% rename from public/javascript/app/dataLoader/areas/views/templates/AreaClassificationsForm.html rename to client-app/src/oldapp/dataLoader/areas/views/templates/AreaClassificationsForm.html diff --git a/public/javascript/app/dataLoader/base/_GeographicBase.js b/client-app/src/oldapp/dataLoader/base/_GeographicBase.js similarity index 95% rename from public/javascript/app/dataLoader/base/_GeographicBase.js rename to client-app/src/oldapp/dataLoader/base/_GeographicBase.js index b102089f769638ae96a10d9d65b3751ab3ac7c93..9e3aca83ef965e967be30c3cc2e775048368654a 100644 --- a/public/javascript/app/dataLoader/base/_GeographicBase.js +++ b/client-app/src/oldapp/dataLoader/base/_GeographicBase.js @@ -9,12 +9,12 @@ define([ , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "redmic/modules/browser/_Select" - , "redmic/modules/browser/bars/Pagination" - , "redmic/modules/layout/dataDisplayer/DataDisplayer" - , "redmic/modules/map/layer/_Selectable" - , "redmic/modules/map/layer/_SelectOnClick" - , "redmic/modules/map/layer/GeoJsonLayerImpl" + , "src/component/browser/_Select" + , "src/component/browser/bars/Pagination" + , "src/component/layout/dataDisplayer/DataDisplayer" + , "src/component/map/layer/_Selectable" + , "src/component/map/layer/_SelectOnClick" + , "src/component/map/layer/GeoJsonLayerImpl" //, "RWidgets/Utilities" ], function( _CompositeInTooltipFromIconKeypad diff --git a/public/javascript/app/dataLoader/citation/views/CitationView.js b/client-app/src/oldapp/dataLoader/citation/views/CitationView.js similarity index 97% rename from public/javascript/app/dataLoader/citation/views/CitationView.js rename to client-app/src/oldapp/dataLoader/citation/views/CitationView.js index 20ab123c233a9f21939e3e9ca6d86ffecb4f52f2..c1c8037d62513037ad30b291666a3a0564bf09c9 100644 --- a/public/javascript/app/dataLoader/citation/views/CitationView.js +++ b/client-app/src/oldapp/dataLoader/citation/views/CitationView.js @@ -1,12 +1,12 @@ define([ "app/base/views/extensions/_ActivityClosed" , "app/designs/mapWithSideContent/main/GeographicEditor" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/Deferred" - , "redmic/modules/browser/bars/Pagination" - , "put-selector/put" + , "src/component/browser/bars/Pagination" + , 'put-selector' ], function( _ActivityClosed , GeographicEditor diff --git a/public/javascript/app/dataLoader/citation/views/templates/CitationForm.html b/client-app/src/oldapp/dataLoader/citation/views/templates/CitationForm.html similarity index 100% rename from public/javascript/app/dataLoader/citation/views/templates/CitationForm.html rename to client-app/src/oldapp/dataLoader/citation/views/templates/CitationForm.html diff --git a/public/javascript/app/dataLoader/infrastructure/views/InfrastructureAttributesView.js b/client-app/src/oldapp/dataLoader/infrastructure/views/InfrastructureAttributesView.js similarity index 99% rename from public/javascript/app/dataLoader/infrastructure/views/InfrastructureAttributesView.js rename to client-app/src/oldapp/dataLoader/infrastructure/views/InfrastructureAttributesView.js index 890ec42247fee973f32a60ea6a81f89a2a244f83..b1cbfe9759b9328cfe3e8757c0388cb7a99d85cc 100644 --- a/public/javascript/app/dataLoader/infrastructure/views/InfrastructureAttributesView.js +++ b/client-app/src/oldapp/dataLoader/infrastructure/views/InfrastructureAttributesView.js @@ -4,7 +4,7 @@ define([ , 'app/designs/base/_Main' , 'app/designs/textSearchList/Controller' , 'app/designs/textSearchList/layout/BasicAndButtonsTopZone' - , 'app/redmicConfig' + , 'src/redmicConfig' , 'dojo/_base/declare' , 'dojo/_base/lang' , 'templates/InfrastructureAttributesList' @@ -121,4 +121,4 @@ define([ this._updateTitle(lang.replace(this.title, properties)); } }); -}); \ No newline at end of file +}); diff --git a/public/javascript/app/dataLoader/infrastructure/views/InfrastructureView.js b/client-app/src/oldapp/dataLoader/infrastructure/views/InfrastructureView.js similarity index 98% rename from public/javascript/app/dataLoader/infrastructure/views/InfrastructureView.js rename to client-app/src/oldapp/dataLoader/infrastructure/views/InfrastructureView.js index 15015a638a29f3ad3b46cb373fb82fad77db3eb6..8f8edaaaac68bd54a5b38a76e7516c2d18919870 100644 --- a/public/javascript/app/dataLoader/infrastructure/views/InfrastructureView.js +++ b/client-app/src/oldapp/dataLoader/infrastructure/views/InfrastructureView.js @@ -1,6 +1,6 @@ define([ "app/dataLoader/base/_GeographicBase" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" diff --git a/public/javascript/app/dataLoader/infrastructure/views/templates/form/AttributesForm.html b/client-app/src/oldapp/dataLoader/infrastructure/views/templates/form/AttributesForm.html similarity index 100% rename from public/javascript/app/dataLoader/infrastructure/views/templates/form/AttributesForm.html rename to client-app/src/oldapp/dataLoader/infrastructure/views/templates/form/AttributesForm.html diff --git a/public/javascript/app/dataLoader/sightings/models/SightingsModel.js b/client-app/src/oldapp/dataLoader/sightings/models/SightingsModel.js similarity index 99% rename from public/javascript/app/dataLoader/sightings/models/SightingsModel.js rename to client-app/src/oldapp/dataLoader/sightings/models/SightingsModel.js index fa91dbdf119d82e2cf74f74ed65f9a5637f86d85..7c0cab6fc0d47facee1825479133761e16a0ba81 100644 --- a/public/javascript/app/dataLoader/sightings/models/SightingsModel.js +++ b/client-app/src/oldapp/dataLoader/sightings/models/SightingsModel.js @@ -1,5 +1,5 @@ define([ - "app/redmicConfig" + 'src/redmicConfig' ], function ( redmicConfig ){ diff --git a/public/javascript/app/dataLoader/sightings/views/SightingsView.js b/client-app/src/oldapp/dataLoader/sightings/views/SightingsView.js similarity index 98% rename from public/javascript/app/dataLoader/sightings/views/SightingsView.js rename to client-app/src/oldapp/dataLoader/sightings/views/SightingsView.js index e364b8bcb2aa2cf23898dd676e3e8a5967e53f11..4083afe1f06000c04784cb197ac0b8e93372a53c 100644 --- a/public/javascript/app/dataLoader/sightings/views/SightingsView.js +++ b/client-app/src/oldapp/dataLoader/sightings/views/SightingsView.js @@ -1,7 +1,7 @@ define([ "app/dataLoader/sightings/models/SightingsModel" , "app/designs/mapWithSideContent/main/GeographicEditor" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" ], diff --git a/public/javascript/app/dataLoader/sightings/views/templates/SightingsForm.html b/client-app/src/oldapp/dataLoader/sightings/views/templates/SightingsForm.html similarity index 100% rename from public/javascript/app/dataLoader/sightings/views/templates/SightingsForm.html rename to client-app/src/oldapp/dataLoader/sightings/views/templates/SightingsForm.html diff --git a/public/javascript/app/dataLoader/surveyParameters/views/ObjectCollectingSeriesDataView.js b/client-app/src/oldapp/dataLoader/surveyParameters/views/ObjectCollectingSeriesDataView.js similarity index 87% rename from public/javascript/app/dataLoader/surveyParameters/views/ObjectCollectingSeriesDataView.js rename to client-app/src/oldapp/dataLoader/surveyParameters/views/ObjectCollectingSeriesDataView.js index 8379ec7964eac39a323dc3c0bc33d938ad9490ff..d5a887133d704a91b364d4284fbf9f1b926da9ab 100644 --- a/public/javascript/app/dataLoader/surveyParameters/views/ObjectCollectingSeriesDataView.js +++ b/client-app/src/oldapp/dataLoader/surveyParameters/views/ObjectCollectingSeriesDataView.js @@ -1,14 +1,14 @@ define([ "app/dataLoader/surveyParameters/views/_SeriesDataView" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" - , 'moment/moment.min' - , "redmic/modules/chart/ChartsContainer/_InfoOnMouseOver" - , "redmic/modules/chart/ChartsContainer/_LegendBar" - , "redmic/modules/chart/ChartsContainer/_TemporalAxisWithGridDrawing" - , "redmic/modules/chart/ChartsContainer/_VerticalAxesWithGridDrawing" - , "redmic/modules/chart/ChartsContainer/_ZoomByDragging" + , 'moment' + , "src/component/chart/ChartsContainer/_InfoOnMouseOver" + , "src/component/chart/ChartsContainer/_LegendBar" + , "src/component/chart/ChartsContainer/_TemporalAxisWithGridDrawing" + , "src/component/chart/ChartsContainer/_VerticalAxesWithGridDrawing" + , "src/component/chart/ChartsContainer/_ZoomByDragging" , "templates/DataDefinitionObjectCollectingLabelColumn" ], function( _SeriesDataView diff --git a/public/javascript/app/dataLoader/surveyParameters/views/ObjectCollectionView.js b/client-app/src/oldapp/dataLoader/surveyParameters/views/ObjectCollectionView.js similarity index 97% rename from public/javascript/app/dataLoader/surveyParameters/views/ObjectCollectionView.js rename to client-app/src/oldapp/dataLoader/surveyParameters/views/ObjectCollectionView.js index 4dc1917defec9e46db1a91a5babb4529d46c8317..7b20b3ceace8fa70d064e34dcfd626609a128b99 100644 --- a/public/javascript/app/dataLoader/surveyParameters/views/ObjectCollectionView.js +++ b/client-app/src/oldapp/dataLoader/surveyParameters/views/ObjectCollectionView.js @@ -1,6 +1,6 @@ define([ "app/dataLoader/surveyParameters/views/_DataLoadedByStationManagement" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "templates/ObjectCollectionList" diff --git a/public/javascript/app/dataLoader/surveyParameters/views/SurveyStationSeriesDataView.js b/client-app/src/oldapp/dataLoader/surveyParameters/views/SurveyStationSeriesDataView.js similarity index 86% rename from public/javascript/app/dataLoader/surveyParameters/views/SurveyStationSeriesDataView.js rename to client-app/src/oldapp/dataLoader/surveyParameters/views/SurveyStationSeriesDataView.js index 9b93844dc46f5cfdf5bb23fc41702a53f65b34e4..05daaaf107799a5175da47774c4f0cd045b6b6a2 100644 --- a/public/javascript/app/dataLoader/surveyParameters/views/SurveyStationSeriesDataView.js +++ b/client-app/src/oldapp/dataLoader/surveyParameters/views/SurveyStationSeriesDataView.js @@ -1,14 +1,14 @@ define([ "app/dataLoader/surveyParameters/views/_SeriesDataView" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" - , 'moment/moment.min' - , "redmic/modules/chart/ChartsContainer/_InfoOnMouseOver" - , "redmic/modules/chart/ChartsContainer/_LegendBar" - , "redmic/modules/chart/ChartsContainer/_TemporalAxisWithGridDrawing" - , "redmic/modules/chart/ChartsContainer/_VerticalAxesWithGridDrawing" - , "redmic/modules/chart/ChartsContainer/_ZoomByDragging" + , 'moment' + , "src/component/chart/ChartsContainer/_InfoOnMouseOver" + , "src/component/chart/ChartsContainer/_LegendBar" + , "src/component/chart/ChartsContainer/_TemporalAxisWithGridDrawing" + , "src/component/chart/ChartsContainer/_VerticalAxesWithGridDrawing" + , "src/component/chart/ChartsContainer/_ZoomByDragging" ], function( _SeriesDataView , redmicConfig diff --git a/public/javascript/app/dataLoader/surveyParameters/views/SurveyStationView.js b/client-app/src/oldapp/dataLoader/surveyParameters/views/SurveyStationView.js similarity index 97% rename from public/javascript/app/dataLoader/surveyParameters/views/SurveyStationView.js rename to client-app/src/oldapp/dataLoader/surveyParameters/views/SurveyStationView.js index ac7aa0e5a370c970b22d1a9c1dfac2f851076a5c..66c69d9efd8ccf49c6a74a0317b7fcf9f7c1d448 100644 --- a/public/javascript/app/dataLoader/surveyParameters/views/SurveyStationView.js +++ b/client-app/src/oldapp/dataLoader/surveyParameters/views/SurveyStationView.js @@ -1,6 +1,6 @@ define([ "app/dataLoader/surveyParameters/views/_DataLoadedByStationManagement" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "templates/SurveyStationList" diff --git a/public/javascript/app/dataLoader/surveyParameters/views/_DataLoadedByStationManagement.js b/client-app/src/oldapp/dataLoader/surveyParameters/views/_DataLoadedByStationManagement.js similarity index 100% rename from public/javascript/app/dataLoader/surveyParameters/views/_DataLoadedByStationManagement.js rename to client-app/src/oldapp/dataLoader/surveyParameters/views/_DataLoadedByStationManagement.js diff --git a/public/javascript/app/dataLoader/surveyParameters/views/_SeriesDataView.js b/client-app/src/oldapp/dataLoader/surveyParameters/views/_SeriesDataView.js similarity index 98% rename from public/javascript/app/dataLoader/surveyParameters/views/_SeriesDataView.js rename to client-app/src/oldapp/dataLoader/surveyParameters/views/_SeriesDataView.js index 8342ce358171cfa1c20b40d730009027047e0116..853efe56574fd6321bc820cddf14277b80f17c1e 100644 --- a/public/javascript/app/dataLoader/surveyParameters/views/_SeriesDataView.js +++ b/client-app/src/oldapp/dataLoader/surveyParameters/views/_SeriesDataView.js @@ -9,18 +9,18 @@ define([ , "app/designs/list/Controller" , "app/designs/list/layout/Layout" , "app/details/views/_ActivityTimeSeriesDataManagement" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" , "dojo/Deferred" , "dojo/promise/all" - , "redmic/modules/base/_Store" - , "redmic/modules/base/_Filter" - , "redmic/modules/browser/_Select" - , "redmic/modules/browser/_EditionTable" - , "redmic/modules/browser/bars/Pagination" - , "redmic/modules/browser/bars/Total" + , "src/component/base/_Store" + , "src/component/base/_Filter" + , "src/component/browser/_Select" + , "src/component/browser/_EditionTable" + , "src/component/browser/bars/Pagination" + , "src/component/browser/bars/Total" , "templates/DataDefinitionList" , "templates/LoadingEmpty" ], function( diff --git a/public/javascript/app/dataLoader/surveyParameters/views/templates/ObjectCollectingForm.html b/client-app/src/oldapp/dataLoader/surveyParameters/views/templates/ObjectCollectingForm.html similarity index 100% rename from public/javascript/app/dataLoader/surveyParameters/views/templates/ObjectCollectingForm.html rename to client-app/src/oldapp/dataLoader/surveyParameters/views/templates/ObjectCollectingForm.html diff --git a/public/javascript/app/dataLoader/surveyParameters/views/templates/TimeSeriesForm.html b/client-app/src/oldapp/dataLoader/surveyParameters/views/templates/TimeSeriesForm.html similarity index 100% rename from public/javascript/app/dataLoader/surveyParameters/views/templates/TimeSeriesForm.html rename to client-app/src/oldapp/dataLoader/surveyParameters/views/templates/TimeSeriesForm.html diff --git a/public/javascript/app/dataLoader/tracking/views/TrackingDataView.js b/client-app/src/oldapp/dataLoader/tracking/views/TrackingDataView.js similarity index 96% rename from public/javascript/app/dataLoader/tracking/views/TrackingDataView.js rename to client-app/src/oldapp/dataLoader/tracking/views/TrackingDataView.js index 5baf424f6f5de945b6a338b8822b686f95e72d81..326c142af0619c1a6768a5319ec3cbbb94a9c22c 100644 --- a/public/javascript/app/dataLoader/tracking/views/TrackingDataView.js +++ b/client-app/src/oldapp/dataLoader/tracking/views/TrackingDataView.js @@ -3,14 +3,14 @@ define([ , "app/designs/list/_AddFilter" , "app/designs/list/Controller" , "app/designs/list/layout/Layout" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" - , 'moment/moment.min' - , "redmic/modules/base/_Store" - , "redmic/modules/browser/_EditionTable" - , "redmic/modules/browser/bars/Pagination" - , "redmic/modules/browser/bars/Total" + , 'moment' + , "src/component/base/_Store" + , "src/component/browser/_EditionTable" + , "src/component/browser/bars/Pagination" + , "src/component/browser/bars/Total" ], function( _CompositeInTooltipFromIconKeypad , _AddFilter diff --git a/public/javascript/app/dataLoader/tracking/views/TrackingView.js b/client-app/src/oldapp/dataLoader/tracking/views/TrackingView.js similarity index 98% rename from public/javascript/app/dataLoader/tracking/views/TrackingView.js rename to client-app/src/oldapp/dataLoader/tracking/views/TrackingView.js index 341b8af0f29229160007ae2d648cfbbeae18cc96..037c81c29682ec20323fc790d4fd81065c88dc86 100644 --- a/public/javascript/app/dataLoader/tracking/views/TrackingView.js +++ b/client-app/src/oldapp/dataLoader/tracking/views/TrackingView.js @@ -4,10 +4,10 @@ define([ , "app/base/views/extensions/_ListenActivityDataAndAccessByActivityCategory" , "app/designs/mapWithSideContent/main/Tracking" , "app/designs/mapWithSideContent/main/_TrackingWithListByFilter" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" - , "put-selector/put" + , 'put-selector' ], function( _EditionWizardView , _GetActivityData diff --git a/public/javascript/app/dataLoader/tracking/views/templates/form/TrackingPointForm.html b/client-app/src/oldapp/dataLoader/tracking/views/templates/form/TrackingPointForm.html similarity index 100% rename from public/javascript/app/dataLoader/tracking/views/templates/form/TrackingPointForm.html rename to client-app/src/oldapp/dataLoader/tracking/views/templates/form/TrackingPointForm.html diff --git a/public/javascript/app/designs/base/_Browser.js b/client-app/src/oldapp/designs/base/_Browser.js similarity index 91% rename from public/javascript/app/designs/base/_Browser.js rename to client-app/src/oldapp/designs/base/_Browser.js index 8f958948062a83eab1b124e5861b13cd7982072b..640f14d0f2560129ea5e9f88efa71d46be2ce467 100644 --- a/public/javascript/app/designs/base/_Browser.js +++ b/client-app/src/oldapp/designs/base/_Browser.js @@ -2,10 +2,10 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "redmic/modules/components/Keypad/IconKeypadImpl" - , "redmic/modules/browser/_ButtonsInRow" - , "redmic/modules/browser/_Framework" - , "redmic/modules/browser/ListImpl" + , "src/component/components/Keypad/IconKeypadImpl" + , "src/component/browser/_ButtonsInRow" + , "src/component/browser/_Framework" + , "src/component/browser/ListImpl" ], function ( declare , lang @@ -33,7 +33,7 @@ define([ }, browserExts: [], browserBase: [ListImpl, _Framework, _ButtonsInRow], - browserBars: [] + browserBars: {} }; lang.mixin(this, this.config, args); @@ -60,8 +60,7 @@ define([ parentChannel: this.getChannel(), idProperty: this.idProperty, target: this._getTarget(), - selectionTarget: this.selectionTarget, - perms: this.perms + selectionTarget: this.selectionTarget }, this.browserConfig || {}]); }, @@ -87,8 +86,8 @@ define([ return; } - for (var i = 0; i < this.browserBars.length; i++) { - var item = this.browserBars[i], + for (var key in this.browserBars) { + var item = this.browserBars[key], Definition = item.definition; var config = this._merge([{ @@ -96,7 +95,6 @@ define([ queryChannel: this.browserConfig.queryChannel, target: this._getTarget(), selectionTarget: this.selectionTarget, - perms: this.perms, selectorChannel: this.selectorChannel, browserChannel: this.browser.getChannel() }, item.config || {}]); diff --git a/public/javascript/app/designs/base/_Controller.js b/client-app/src/oldapp/designs/base/_Controller.js similarity index 97% rename from public/javascript/app/designs/base/_Controller.js rename to client-app/src/oldapp/designs/base/_Controller.js index 9b62852bc01bf8969d100388e5f956a2ca57f038..2644727f7a8dc69b0a5f2803cbdc9db72c8e7f84 100644 --- a/public/javascript/app/designs/base/_Controller.js +++ b/client-app/src/oldapp/designs/base/_Controller.js @@ -2,8 +2,8 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "redmic/modules/base/_Module" - , "redmic/modules/base/_Show" + , "src/component/base/_Module" + , "src/component/base/_Show" , "./_ControllerItfc" ], function ( declare diff --git a/public/javascript/app/designs/base/_ControllerItfc.js b/client-app/src/oldapp/designs/base/_ControllerItfc.js similarity index 95% rename from public/javascript/app/designs/base/_ControllerItfc.js rename to client-app/src/oldapp/designs/base/_ControllerItfc.js index 72b135d3612374b2d0a4dbdd036b90af1931c632..eb1d6babb5676633eaa41ddb05e0018b38fc3b0c 100644 --- a/public/javascript/app/designs/base/_ControllerItfc.js +++ b/client-app/src/oldapp/designs/base/_ControllerItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/public/javascript/app/designs/base/_Layout.js b/client-app/src/oldapp/designs/base/_Layout.js similarity index 97% rename from public/javascript/app/designs/base/_Layout.js rename to client-app/src/oldapp/designs/base/_Layout.js index 949d555fcd98ad189a753f57eb316e6c07e85514..e37fc5c9d9fa5f732fdf688958c82c10a97af0c6 100644 --- a/public/javascript/app/designs/base/_Layout.js +++ b/client-app/src/oldapp/designs/base/_Layout.js @@ -1,7 +1,7 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' - , 'put-selector/put' + , 'put-selector' , './_LayoutItfc' ], function( declare @@ -93,7 +93,7 @@ define([ this._addNodeToLayout(child); }, - _getNodeToShow: function() { + getNodeToShow: function() { return this.domNode; } diff --git a/public/javascript/app/designs/base/_LayoutItfc.js b/client-app/src/oldapp/designs/base/_LayoutItfc.js similarity index 92% rename from public/javascript/app/designs/base/_LayoutItfc.js rename to client-app/src/oldapp/designs/base/_LayoutItfc.js index 5cce8295dd6b34d666648e13837b9d471b255c37..83a83d912498070fac35a57d0190538bb6401383 100644 --- a/public/javascript/app/designs/base/_LayoutItfc.js +++ b/client-app/src/oldapp/designs/base/_LayoutItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/public/javascript/app/designs/base/_Main.js b/client-app/src/oldapp/designs/base/_Main.js similarity index 100% rename from public/javascript/app/designs/base/_Main.js rename to client-app/src/oldapp/designs/base/_Main.js diff --git a/public/javascript/app/designs/base/_MainItfc.js b/client-app/src/oldapp/designs/base/_MainItfc.js similarity index 94% rename from public/javascript/app/designs/base/_MainItfc.js rename to client-app/src/oldapp/designs/base/_MainItfc.js index 5627bf78acee4d890629629d0167edbbbff6973c..c99ba5a38dbef530a812ccae3ec32a26fda216aa 100644 --- a/public/javascript/app/designs/base/_MainItfc.js +++ b/client-app/src/oldapp/designs/base/_MainItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/public/javascript/app/designs/chart/Controller.js b/client-app/src/oldapp/designs/chart/Controller.js similarity index 93% rename from public/javascript/app/designs/chart/Controller.js rename to client-app/src/oldapp/designs/chart/Controller.js index a3376567ce22b007051fb1e87c54b0a47bf1a214..34a20234f4b4a89874725d509296afa809bea513 100644 --- a/public/javascript/app/designs/chart/Controller.js +++ b/client-app/src/oldapp/designs/chart/Controller.js @@ -2,7 +2,7 @@ define([ "app/designs/base/_Controller" , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/chart/ChartsContainer/InfoChartsContainerImpl" + , "src/component/chart/ChartsContainer/InfoChartsContainerImpl" ], function ( _Controller , declare diff --git a/public/javascript/app/designs/chart/layout/SideAndTopAndBottomContent.js b/client-app/src/oldapp/designs/chart/layout/SideAndTopAndBottomContent.js similarity index 98% rename from public/javascript/app/designs/chart/layout/SideAndTopAndBottomContent.js rename to client-app/src/oldapp/designs/chart/layout/SideAndTopAndBottomContent.js index dc8d827263e8ef5921501614411fa326d5686585..eda34b0fcf4592bf81029434fa2ce29c65a88167 100644 --- a/public/javascript/app/designs/chart/layout/SideAndTopAndBottomContent.js +++ b/client-app/src/oldapp/designs/chart/layout/SideAndTopAndBottomContent.js @@ -2,7 +2,7 @@ define([ 'app/designs/base/_Layout' , 'dojo/_base/declare' , 'dojo/_base/lang' - , 'put-selector/put' + , 'put-selector' ], function( _Layout , declare diff --git a/public/javascript/app/designs/chart/layout/TopAndBottomContent.js b/client-app/src/oldapp/designs/chart/layout/TopAndBottomContent.js similarity index 98% rename from public/javascript/app/designs/chart/layout/TopAndBottomContent.js rename to client-app/src/oldapp/designs/chart/layout/TopAndBottomContent.js index c6bd65cedefff685bcee921b21127628b999beb9..13aa1bf7f07157caf9dff3b7f92ceb61c85efc9f 100644 --- a/public/javascript/app/designs/chart/layout/TopAndBottomContent.js +++ b/client-app/src/oldapp/designs/chart/layout/TopAndBottomContent.js @@ -2,7 +2,7 @@ define([ 'app/designs/base/_Layout' , 'dojo/_base/declare' , 'dojo/_base/lang' - , 'put-selector/put' + , 'put-selector' ], function( _Layout , declare diff --git a/public/javascript/app/designs/chart/layout/TopContent.js b/client-app/src/oldapp/designs/chart/layout/TopContent.js similarity index 97% rename from public/javascript/app/designs/chart/layout/TopContent.js rename to client-app/src/oldapp/designs/chart/layout/TopContent.js index c028c625833280dc1540dca394082380f3dd0c19..1bdc75d260b5881c33060a5d3027eec994a4d494 100644 --- a/public/javascript/app/designs/chart/layout/TopContent.js +++ b/client-app/src/oldapp/designs/chart/layout/TopContent.js @@ -2,7 +2,7 @@ define([ 'app/designs/base/_Layout' , 'dojo/_base/declare' , 'dojo/_base/lang' - , 'put-selector/put' + , 'put-selector' ], function( _Layout , declare diff --git a/public/javascript/app/designs/chart/main/ChartsWithLegendAndToolbarsAndSlider.js b/client-app/src/oldapp/designs/chart/main/ChartsWithLegendAndToolbarsAndSlider.js similarity index 98% rename from public/javascript/app/designs/chart/main/ChartsWithLegendAndToolbarsAndSlider.js rename to client-app/src/oldapp/designs/chart/main/ChartsWithLegendAndToolbarsAndSlider.js index f12532f028b742cf718ecfedf5932fde189214b6..e087c55ae8267cb1e9dc76d708da095c8680107e 100644 --- a/public/javascript/app/designs/chart/main/ChartsWithLegendAndToolbarsAndSlider.js +++ b/client-app/src/oldapp/designs/chart/main/ChartsWithLegendAndToolbarsAndSlider.js @@ -4,7 +4,7 @@ define([ , 'dojo/_base/declare' , 'dojo/_base/lang' , 'dojo/Deferred' - , 'redmic/modules/chart/SmartLegend/TimeSeriesSmartLegendImpl' + , 'src/component/chart/SmartLegend/TimeSeriesSmartLegendImpl' ], function ( SideAndTopAndBottomContent , _ChartsWithToolbarsAndSlider diff --git a/public/javascript/app/designs/chart/main/ChartsWithToolbarsAndSlider.js b/client-app/src/oldapp/designs/chart/main/ChartsWithToolbarsAndSlider.js similarity index 100% rename from public/javascript/app/designs/chart/main/ChartsWithToolbarsAndSlider.js rename to client-app/src/oldapp/designs/chart/main/ChartsWithToolbarsAndSlider.js diff --git a/public/javascript/app/designs/chart/main/MultiPieChartWithToolbar.js b/client-app/src/oldapp/designs/chart/main/MultiPieChartWithToolbar.js similarity index 91% rename from public/javascript/app/designs/chart/main/MultiPieChartWithToolbar.js rename to client-app/src/oldapp/designs/chart/main/MultiPieChartWithToolbar.js index 6b69372e50e781e469d6dce8a60be75a2b5e6781..74399b0de73a71e48eed6f1de941a16cd7df9884 100644 --- a/public/javascript/app/designs/chart/main/MultiPieChartWithToolbar.js +++ b/client-app/src/oldapp/designs/chart/main/MultiPieChartWithToolbar.js @@ -4,13 +4,13 @@ define([ , "app/designs/chart/layout/TopContent" , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/chart/ChartsContainer/_InfoOnZeroValueData" - , "redmic/modules/chart/ChartsContainer/_LayerColorSelection" - , "redmic/modules/chart/layer/ChartLayer/MultiPieChartImpl" - , "redmic/modules/chart/layer/ChartLayer/_ObtainableValue" - , "redmic/modules/chart/layer/ChartLayer/_LevelNavigation" - , "redmic/modules/chart/layer/ChartLayer/_VariableRadiusByDepth" - , "redmic/modules/chart/Toolbar/DataSelectorImpl" + , "src/component/chart/ChartsContainer/_InfoOnZeroValueData" + , "src/component/chart/ChartsContainer/_LayerColorSelection" + , "src/component/chart/layer/ChartLayer/MultiPieChartImpl" + , "src/component/chart/layer/ChartLayer/_ObtainableValue" + , "src/component/chart/layer/ChartLayer/_LevelNavigation" + , "src/component/chart/layer/ChartLayer/_VariableRadiusByDepth" + , "src/component/chart/Toolbar/DataSelectorImpl" , "RWidgets/Utilities" ], function ( _Main @@ -223,4 +223,4 @@ define([ return layerInstance; } }); -}); \ No newline at end of file +}); diff --git a/public/javascript/app/designs/chart/main/MultiWindRoseChartWithToolbar.js b/client-app/src/oldapp/designs/chart/main/MultiWindRoseChartWithToolbar.js similarity index 96% rename from public/javascript/app/designs/chart/main/MultiWindRoseChartWithToolbar.js rename to client-app/src/oldapp/designs/chart/main/MultiWindRoseChartWithToolbar.js index 29dd75872e14bfb4c373a6dbbf3c505018a3b03d..bf45213f6042b4592b02ea287e6cdb0f6d84f296 100644 --- a/public/javascript/app/designs/chart/main/MultiWindRoseChartWithToolbar.js +++ b/client-app/src/oldapp/designs/chart/main/MultiWindRoseChartWithToolbar.js @@ -2,17 +2,17 @@ define([ 'app/designs/base/_Main' , 'app/designs/chart/Controller' , 'app/designs/chart/layout/TopContent' - , 'app/redmicConfig' - , 'd3/d3.min' + , 'src/redmicConfig' + , 'd3' , 'dojo/_base/declare' , 'dojo/_base/lang' - , 'moment/moment.min' - , 'redmic/modules/base/_Store' - , 'redmic/modules/chart/layer/ChartLayer/WindRoseChartImpl' - , 'redmic/modules/chart/layer/ChartLayer/_ObtainableValue' - , 'redmic/modules/chart/Toolbar/DateFilterImpl' - , 'redmic/modules/chart/Toolbar/GridManagementImpl' - , 'redmic/modules/chart/Toolbar/SliderSelectorImpl' + , 'moment' + , 'src/component/base/_Store' + , 'src/component/chart/layer/ChartLayer/WindRoseChartImpl' + , 'src/component/chart/layer/ChartLayer/_ObtainableValue' + , 'src/component/chart/Toolbar/DateFilterImpl' + , 'src/component/chart/Toolbar/GridManagementImpl' + , 'src/component/chart/Toolbar/SliderSelectorImpl' ], function ( _Main , Controller diff --git a/public/javascript/app/designs/chart/main/WindRoseChartWithToolbar.js b/client-app/src/oldapp/designs/chart/main/WindRoseChartWithToolbar.js similarity index 96% rename from public/javascript/app/designs/chart/main/WindRoseChartWithToolbar.js rename to client-app/src/oldapp/designs/chart/main/WindRoseChartWithToolbar.js index 711ab5321d808d4bdf1b96246fc962febe83c3aa..61bd938443243ee8b14010b18a946190c581d3ad 100644 --- a/public/javascript/app/designs/chart/main/WindRoseChartWithToolbar.js +++ b/client-app/src/oldapp/designs/chart/main/WindRoseChartWithToolbar.js @@ -4,10 +4,10 @@ define([ , "app/designs/chart/layout/TopContent" , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/chart/layer/ChartLayer/WindRoseChartImpl" - , "redmic/modules/chart/layer/ChartLayer/_ObtainableValue" - , "redmic/modules/chart/Toolbar/DataSelectorImpl" - , "redmic/modules/chart/Toolbar/GridManagementImpl" + , "src/component/chart/layer/ChartLayer/WindRoseChartImpl" + , "src/component/chart/layer/ChartLayer/_ObtainableValue" + , "src/component/chart/Toolbar/DataSelectorImpl" + , "src/component/chart/Toolbar/GridManagementImpl" , "RWidgets/Utilities" ], function ( _Main @@ -294,4 +294,4 @@ define([ return layerInstance; } }); -}); \ No newline at end of file +}); diff --git a/public/javascript/app/designs/chart/main/_ChartsWithToolbarsAndSlider.js b/client-app/src/oldapp/designs/chart/main/_ChartsWithToolbarsAndSlider.js similarity index 96% rename from public/javascript/app/designs/chart/main/_ChartsWithToolbarsAndSlider.js rename to client-app/src/oldapp/designs/chart/main/_ChartsWithToolbarsAndSlider.js index 6e1fb7686ab967f70157c34a07675af6752a450b..3b78f17b89e13127e2d724845920049fb23ab515 100644 --- a/public/javascript/app/designs/chart/main/_ChartsWithToolbarsAndSlider.js +++ b/client-app/src/oldapp/designs/chart/main/_ChartsWithToolbarsAndSlider.js @@ -4,13 +4,13 @@ define([ , 'app/designs/chart/main/_ChartsWithToolbarsAndSliderItfc' , 'dojo/_base/declare' , 'dojo/_base/lang' - , 'redmic/modules/chart/ChartsContainer/_InfoOnEmptyData' - , 'redmic/modules/chart/ChartsContainer/_LayerColorSelection' - , 'redmic/modules/chart/ChartsContainer/SliderChartsContainerImpl' - , 'redmic/modules/chart/layer/ChartLayer/_QueryableValue' - , 'redmic/modules/chart/layer/ChartLayer/LinearChartImpl' - , 'redmic/modules/chart/Toolbar/AggregationToolImpl' - , 'redmic/modules/chart/Toolbar/GridManagementImpl' + , 'src/component/chart/ChartsContainer/_InfoOnEmptyData' + , 'src/component/chart/ChartsContainer/_LayerColorSelection' + , 'src/component/chart/ChartsContainer/SliderChartsContainerImpl' + , 'src/component/chart/layer/ChartLayer/_QueryableValue' + , 'src/component/chart/layer/ChartLayer/LinearChartImpl' + , 'src/component/chart/Toolbar/AggregationToolImpl' + , 'src/component/chart/Toolbar/GridManagementImpl' ], function( _Main , Controller diff --git a/public/javascript/app/designs/chart/main/_ChartsWithToolbarsAndSliderItfc.js b/client-app/src/oldapp/designs/chart/main/_ChartsWithToolbarsAndSliderItfc.js similarity index 93% rename from public/javascript/app/designs/chart/main/_ChartsWithToolbarsAndSliderItfc.js rename to client-app/src/oldapp/designs/chart/main/_ChartsWithToolbarsAndSliderItfc.js index a66af705dd47294e4ac56928940b7ca18e4f158b..3fd028f92dcc4f1226335ba0b8b0acec7638b5ca 100644 --- a/public/javascript/app/designs/chart/main/_ChartsWithToolbarsAndSliderItfc.js +++ b/client-app/src/oldapp/designs/chart/main/_ChartsWithToolbarsAndSliderItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/public/javascript/app/designs/chart/main/_ProcessDataDefinitionAndGetTimeSeries.js b/client-app/src/oldapp/designs/chart/main/_ProcessDataDefinitionAndGetTimeSeries.js similarity index 99% rename from public/javascript/app/designs/chart/main/_ProcessDataDefinitionAndGetTimeSeries.js rename to client-app/src/oldapp/designs/chart/main/_ProcessDataDefinitionAndGetTimeSeries.js index dc0cb3e1b14d7378284b54e05f02c4eb40048944..4e4861ed9765d0025cfc24bef9bf1fee8d889969 100644 --- a/public/javascript/app/designs/chart/main/_ProcessDataDefinitionAndGetTimeSeries.js +++ b/client-app/src/oldapp/designs/chart/main/_ProcessDataDefinitionAndGetTimeSeries.js @@ -1,11 +1,11 @@ define([ - "app/redmicConfig" + 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" , "dojo/Deferred" - , "redmic/modules/base/_Filter" - , "redmic/modules/base/_Store" + , "src/component/base/_Filter" + , "src/component/base/_Store" ], function( redmicConfig , declare diff --git a/public/javascript/app/designs/details/Controller.js b/client-app/src/oldapp/designs/details/Controller.js similarity index 67% rename from public/javascript/app/designs/details/Controller.js rename to client-app/src/oldapp/designs/details/Controller.js index 111afa917e78432e00119d610b5a4780350e1647..4651d320e8cac1e08e3098d7556fcb8fbeefd897 100644 --- a/public/javascript/app/designs/details/Controller.js +++ b/client-app/src/oldapp/designs/details/Controller.js @@ -5,11 +5,11 @@ define([ , "dojo/aspect" , "dojo/Deferred" , "dojo/promise/all" - , 'draggabilly/draggabilly.pkgd.min' - , 'packery/packery.pkgd.min' - , "put-selector/put" - , "redmic/modules/base/_Store" - , "redmic/modules/base/_Window" + , 'draggabilly' + , 'packery' + , 'put-selector' + , "src/component/base/_Store" + , "src/component/base/_Window" , "./_ControllerItfc" ], function( _Controller @@ -35,19 +35,17 @@ define([ this.config = { controllerEvents: { - LAYOUT_COMPLETE: "layoutComplete", - BUTTON_EVENT: "btnEvent" // TODO esto es específico, reubicar - }, - controllerActions: { - GET_REPORT: "getReport" // TODO esto es específico, reubicar + LAYOUT_COMPLETE: "layoutComplete" }, idProperty: "id", hiddenClass: "hidden", + _heightFitContentValue: 'fitContent', _rowsParameterName: "data-rows", _colsParameterName: "data-cols", - _updateInteractiveTimeout: 100, + _transitionDuration: '0.4s', + _restoreTransitionTimeout: 500, _widgets: {}, _nodes: {}, @@ -85,8 +83,11 @@ define([ _initializeController: function() { this.packery = new packery(this.centerNode, { - isInitLayout: false + initLayout: false, + transitionDuration: 0 }); + + this._listenCenterNodeScrollShowUp(); }, _doControllerEvtFacade: function() { @@ -100,14 +101,45 @@ define([ this._onEvt('ME_OR_ANCESTOR_HIDDEN', lang.hitch(this, this._onControllerMeOrAncestorHidden)); this._onEvt('RESIZE', lang.hitch(this, this._onControllerResize)); this._onEvt('LAYOUT_COMPLETE', lang.hitch(this, this._onLayoutComplete)); - this._onEvt('BUTTON_EVENT', lang.hitch(this, this._onButtonEvent)); // TODO esto es específico, reubicar + }, + + _listenCenterNodeScrollShowUp: function() { + + this._detailsResizeObserver = new ResizeObserver(lang.hitch(this, this._onDetailsCenterNodeResize)); + this._detailsResizeObserver.observe(this.centerNode); + }, + + _onDetailsCenterNodeResize: function(resizeEntries) { + + for (var resizeEntry of resizeEntries) { + if (!resizeEntry.borderBoxSize && !resizeEntry.contentBoxSize) { + continue; + } + + var borderWidth = resizeEntry.borderBoxSize[0].inlineSize, + contentWidth = resizeEntry.contentBoxSize[0].inlineSize; + + if (borderWidth !== contentWidth) { + this._scrollPreviouslyDetected = true; + break; + } else if (this._scrollPreviouslyDetected) { + this._scrollPreviouslyDetected = false; + this._onCenterNodeScrollShowUp(); + break; + } + } + }, + + _onCenterNodeScrollShowUp: function() { + + this._updateInteractive(); }, _afterControllerShow: function() { if (!this._widgetsAlreadyGenerated) { this._generateWidgets(); - this._buildVisualization().then(lang.hitch(this, this._updateInteractive)); + this._buildVisualization().then(lang.hitch(this, this._afterBuildVisualization)); } }, @@ -150,32 +182,19 @@ define([ return this._showWidget(key, true); }, - _onControllerResize: function() { + _afterBuildVisualization: function() { - this._getShown() && this._updateInteractive(); + this._reloadInteractive(); + this._updateInteractive(); }, - _onButtonEvent: function(evt) { - // TODO: eso es para casos concretos, debería separarse + _onControllerResize: function() { - var methodName = "_" + evt + "Clicked"; - this[methodName] && this[methodName](evt); + this._updateInteractive(); }, - /*_onControllerShown: function() { - - if (this._getShown()) { - this._reloadInteractive(); - this._updateInteractive(); - } - - this._clearModules(); - this._refreshModules(); - },*/ - _reloadInteractive: function() { - this.packery.layout(); this.packery.reloadItems(); }, @@ -189,10 +208,8 @@ define([ _onControllerMeOrAncestorShown: function(res) { - if (this._getShown()) { - this._reloadInteractive(); - this._updateInteractive(); - } + this._reloadInteractive(); + this._updateInteractive(); this._clearModules(); this._refreshModules(); @@ -203,24 +220,20 @@ define([ this._clearModules(); }, - /*_getModuleRootNode: function() { - - return this.containerNode; - }, - - _getModuleMainNode: function() { + _prepareRestorePackeryTransitionDuration: function() { - return this.centerNode; - },*/ + if (this.packery.options.transitionDuration === this._transitionDuration) { + return; + } - _evaluateCondition: function(condition) { - // TODO: eso es para casos concretos (botones), debería separarse + clearTimeout(this._restoreTransitionTimeoutHandler); + this._restoreTransitionTimeoutHandler = setTimeout(lang.hitch(this, this._restorePackeryTransitionDuration), + this._restoreTransitionTimeout); + }, - if (typeof condition === "function") { - return condition(this.data); - } + _restorePackeryTransitionDuration: function() { - return condition && !!this.data[condition]; + this.packery.options.transitionDuration = this._transitionDuration; }, _getWidgetInstance: function(key) { @@ -241,23 +254,35 @@ define([ return; } - var moduleProps = this._merge([this.propsWidget || {}, config.props || {}]); - moduleProps.ownChannel = key; - moduleProps.parentChannel = this.getChannel(); + var moduleProps = this._merge([{ + ownChannel: key, + parentChannel: this.getChannel(), + windowId: key, + title: key, + fitHeightToContent: config.height === this._heightFitContentValue + }, + this.propsWidget || {}, + config.props || {} + ]); var moduleType = config.type, - moduleDefinition = declare(moduleType).extend(_Window), - moduleInstance = new moduleDefinition(moduleProps); + WidgetDefinition = declare(moduleType).extend(_Window), + widgetInstance = new WidgetDefinition(moduleProps); - this._widgets[key] = moduleInstance; - this._listenModule(moduleInstance); + this._widgets[key] = widgetInstance; + this._listenWidget(widgetInstance); }, - _listenModule: function(moduleInstance) { + _listenWidget: function(widgetInstance) { this._setSubscription({ - channel: moduleInstance.getChannel("RESIZED"), - callback: "_subModuleResized" + channel: widgetInstance.getChannel("RESIZED"), + callback: "_subWidgetResized" + }); + + this._setSubscription({ + channel: widgetInstance.getChannel("HIDDEN"), + callback: "_subWidgetHidden" }); }, @@ -292,15 +317,7 @@ define([ var dfd = new Deferred(); - this._once(instance.getChannel("SHOWN"), lang.hitch(this, function(args) { - - put(args.node, "!" + this.hiddenClass); - this._addWidgetInteractivity(args.key); - args.dfd.resolve(); - if (!args.omitReload) { - this._reloadInteractive(); - } - }, { + this._once(instance.getChannel("SHOWN"), lang.hitch(this, this._onceWidgetShown, { key: key, node: node, dfd: dfd, @@ -314,7 +331,20 @@ define([ return dfd; }, - _hideWidget: function(key, omitReload) { + _onceWidgetShown: function(args) { + + put(args.node, "!" + this.hiddenClass); + this._addWidgetInteractivity(args.key); + + args.dfd.resolve(); + + if (!args.omitReload) { + this._updateInteractive(); + this._reloadInteractive(); + } + }, + + _hideWidget: function(key) { var instance = this._getWidgetInstance(key), node = this._nodes[key]; @@ -324,19 +354,6 @@ define([ return; } - this._once(instance.getChannel("HIDDEN"), lang.hitch(this, function(args) { - - put(args.node, "." + this.hiddenClass); - this._removeWidgetInteractivity(args.key); - if (!args.omitReload) { - this._reloadInteractive(); - } - }, { - key: key, - node: node, - omitReload: omitReload - })); - this._publish(instance.getChannel("HIDE"), { node: node }); @@ -414,16 +431,40 @@ define([ delete this._nodesHandlers[key]; }, - _subModuleResized: function() { + _getWidgetKeyByChannel: function(widgetChannel) { + + for (var widgetKey in this._widgets) { + if (this._widgets[widgetKey].getChannel() === widgetChannel) { + return widgetKey; + } + } + + console.error('Tried to get key for non-existent widget channel "%s"', widgetChannel); + }, + + _subWidgetResized: function(res) { + + this._updateInteractive(); + }, + + _subWidgetHidden: function(res, channelObj) { + + var widgetChannel = channelObj._parent.namespace, + widgetKey = this._getWidgetKeyByChannel(widgetChannel), + widgetNode = this._nodes[widgetKey]; + put(widgetNode, '.' + this.hiddenClass); + this._removeWidgetInteractivity(widgetKey); this._updateInteractive(); }, _updateInteractive: function() { - clearTimeout(this._updateInteractiveTimeoutHandler); - this._updateInteractiveTimeoutHandler = setTimeout(lang.hitch(this.packery, this.packery.layout), - this._updateInteractiveTimeout); + if (!this._getShown()) { + return; + } + + this.packery.layout(); }, _onLayoutComplete: function(laidOutItems) { @@ -439,18 +480,7 @@ define([ this._emitEvt("RESIZE"); } - //this._emitEvt("LOADED"); - }, - - _reportClicked: function() { - // TODO: eso es para casos concretos, debería separarse - - this._publish(this._buildChannel(this.taskChannel, this.actions.GET_REPORT), { - target: this.selectionTarget ? this.selectionTarget : this.target, - serviceTag: this.reportService, - format: "pdf", - id: parseInt(this.pathVariableId, 10) - }); + this._prepareRestorePackeryTransitionDuration(); } }); }); diff --git a/public/javascript/app/designs/details/Layout.js b/client-app/src/oldapp/designs/details/Layout.js similarity index 95% rename from public/javascript/app/designs/details/Layout.js rename to client-app/src/oldapp/designs/details/Layout.js index f3ca5bb8a73c10b9c27d15650f0f489d2a73beab..1f259f80a88ce328b1a8600819de279ba894f274 100644 --- a/public/javascript/app/designs/details/Layout.js +++ b/client-app/src/oldapp/designs/details/Layout.js @@ -2,7 +2,7 @@ define([ 'app/designs/base/_Layout' , 'dojo/_base/declare' , 'dojo/_base/lang' - , 'put-selector/put' + , 'put-selector' ], function ( _Layout , declare diff --git a/public/javascript/app/designs/details/_AddBasicTitle.js b/client-app/src/oldapp/designs/details/_AddBasicTitle.js similarity index 100% rename from public/javascript/app/designs/details/_AddBasicTitle.js rename to client-app/src/oldapp/designs/details/_AddBasicTitle.js diff --git a/public/javascript/app/designs/details/_AddTitle.js b/client-app/src/oldapp/designs/details/_AddTitle.js similarity index 72% rename from public/javascript/app/designs/details/_AddTitle.js rename to client-app/src/oldapp/designs/details/_AddTitle.js index ec3981eeda48a5a98e73dfe6bee4395ba4c57f99..30738bdcedec58db926672ef61b337e6e7ee68f8 100644 --- a/public/javascript/app/designs/details/_AddTitle.js +++ b/client-app/src/oldapp/designs/details/_AddTitle.js @@ -3,8 +3,8 @@ define([ , "dojo/_base/lang" , "dojo/aspect" , "dojo/query" - , "put-selector/put" - , "redmic/modules/layout/templateDisplayer/TemplateDisplayer" + , 'put-selector' + , "src/component/layout/templateDisplayer/TemplateDisplayer" , "templates/DefaultDetailsTitle" ], function ( declare @@ -103,6 +103,7 @@ define([ _updateDataTitle: function() { + // TODO no setear a lo bruto, es un component!! this.data = this.titleWidget.data; }, @@ -111,7 +112,13 @@ define([ var leftButtons = this._titleLeftButtonsList.concat(this.titleLeftButtonsList || []), rightButtons = this._titleRightButtonsList.concat(this.titleRightButtonsList || []); - this._insertButtonsIcons(leftButtons.reverse(), rightButtons.reverse()); + var evaluateButton = lang.hitch(this, this._evaluateButton), + filteredLeftButtons = leftButtons.filter(evaluateButton), + filteredRightButtons = rightButtons.filter(evaluateButton); + + put(this._titleRightNode, (filteredRightButtons.length ? '!' : '.') + this.hiddenClass); + + this._insertButtonsIcons(filteredLeftButtons.reverse(), filteredRightButtons.reverse()); }, _createTitle: function() { @@ -171,48 +178,43 @@ define([ _insertButtonsIcons: function(leftButtons, rightButtons) { - var i; + var getIconNode = lang.hitch(this, this._getIconNode); + leftButtonsNodes = leftButtons.map(getIconNode), + rightButtonsNodes = rightButtons.map(getIconNode); - if (this._titleLeftNode.children.length !== 0) { - for (i = 0; i < this._titleLeftNode.children.length; i++) { - put('!', this._titleLeftNode.children[i]); - } - } - for (i = 0; i < leftButtons.length; i++) { - this._preInsertIcon(leftButtons[i], this._titleLeftNode); - } + this._titleLeftNode.replaceChildren.apply(this._titleLeftNode, leftButtonsNodes); + this._titleRightNode.replaceChildren.apply(this._titleRightNode, rightButtonsNodes); + }, - if (this._titleRightNode.children.length !== 0) { - for (i = 0; i < this._titleRightNode.children.length; i++) { - put('!', this._titleRightNode.children[i]); - } - } + _evaluateButton: function(config) { + + return this._evaluateCondition(config.condition); + }, - if (rightButtons.length === 0) { - put(this._titleRightNode, '.' + this.hiddenClass); - } else { - put(this._titleRightNode, '!' + this.hiddenClass); + _evaluateCondition: function(condition) { + + if (condition === undefined || condition === null) { + return true; } - for (i = 0; i < rightButtons.length; i++) { - this._preInsertIcon(rightButtons[i], this._titleRightNode); + if (typeof condition === 'boolean') { + return !!condition; } - }, - _preInsertIcon: function(buttonProp, node) { + if (this.data) { + if (typeof condition === 'function') { + return condition(this.data); + } - if (!buttonProp.condition || (this.data && this.data[buttonProp.condition])) { - this._insertIcon(buttonProp, node); + return condition && !!this.data[condition]; } - }, - _insertIcon: function(config, node) { + return true; + }, - if (config.condition && this._evaluateCondition(config.condition)) { - return; - } + _getIconNode: function(config) { - var iconNode = put(node, (config.href ? 'a' : 'i') + ".iconList." + config.icon.split("-")[0] + "." + config.icon); + var iconNode = put((config.href ? 'a' : 'i') + ".iconList." + config.icon.split("-")[0] + "." + config.icon); if (config.title) { iconNode.setAttribute("title", config.title); @@ -224,8 +226,15 @@ define([ } if (config.btnId) { - iconNode.onclick = lang.hitch(this, this._emitEvt, 'BUTTON_EVENT', config.btnId); + var methodName = '_' + config.btnId + 'OnClick', + callback = this[methodName]; + + if (callback) { + iconNode.onclick = lang.hitch(this, callback); + } } + + return iconNode; } }); }); diff --git a/client-app/src/oldapp/designs/details/_AddWidgetSelector.js b/client-app/src/oldapp/designs/details/_AddWidgetSelector.js new file mode 100644 index 0000000000000000000000000000000000000000..d2ca806179956018ad56959765979e6637310af6 --- /dev/null +++ b/client-app/src/oldapp/designs/details/_AddWidgetSelector.js @@ -0,0 +1,187 @@ +define([ + 'dojo/_base/declare' + , 'dojo/_base/lang' + , 'dojo/aspect' + , 'put-selector' + , 'src/component/form/input/SelectImpl' +], function ( + declare + , lang + , aspect + , put + , SelectImpl +) { + + return declare(null, { + // summary: + // Extensión para añadir un componente selector de widget a enfocar + + constructor: function(args) { + + this.config = { + _widgetSelector: null, + widgetSelectorClass: 'detailWidgetSelector', + _restoreTransitionWithSelectorTimeout: 2000 + }; + + lang.mixin(this, this.config, args); + + aspect.after(this, '_addWidget', lang.hitch(this, this._afterAddWidgetUpdateSelector)); + aspect.after(this, '_addDataInTitle', lang.hitch(this, this._afterAddDataInTitleShowSelector)); + aspect.after(this, '_onLayoutComplete', lang.hitch(this, this._afterLayoutCompleteApplyAnchor)); + aspect.before(this, '_prepareRestorePackeryTransitionDuration', + lang.hitch(this, this._beforePrepareRestoreTransitionUpdateTimeout)); + aspect.after(this, '_onControllerMeOrAncestorShown', + lang.hitch(this, this._afterControllerOrAncestorShownUpdateSelectorInstance)); + }, + + _afterAddWidgetUpdateSelector: function(retValue, params) { + + this._addWidgetToSelector(params[0]); + }, + + _afterAddDataInTitleShowSelector: function() { + + this._showWidgetSelector(); + }, + + _beforePrepareRestoreTransitionUpdateTimeout: function() { + + if (!globalThis.location.hash || this._restoreTransitionTimeoutUpdated) { + return; + } + + this._restoreTransitionTimeout = this._restoreTransitionWithSelectorTimeout; + this._restoreTransitionTimeoutUpdated = true; + }, + + _afterLayoutCompleteApplyAnchor: function() { + + this._applyCurrentAnchor(); + }, + + _afterControllerOrAncestorShownUpdateSelectorInstance: function() { + + this._addWidgetsToSelector(); + }, + + _applyHrefValueWithoutHistory: function(hrefValue) { + + globalThis.history.replaceState(null, null, hrefValue); + }, + + _getHrefWithoutHashValue: function() { + + return globalThis.location.origin + globalThis.location.pathname + globalThis.location.search; + }, + + _applyCurrentAnchor: function() { + + var hash = globalThis.location.hash; + + if (!hash || !this._widgetSelector) { + return; + } + + this._publish(this._widgetSelector.getChannel('SET_VALUE'), { + name: hash.substring(1) + }); + }, + + _addWidgetsToSelector: function() { + + if (this._widgetSelector) { + this._publish(this._widgetSelector.getChannel('DESTROY')); + } + + this._widgetKeys = Object.keys(this._widgets); + + this._widgetSelector = new SelectImpl({ + parentChannel: this.getChannel(), + includeEmptyValue: true, + emptyValueLabel: '' + this.i18n.noFixedContent + '' + }); + + this._setWidgetKeysAsSelectorOptions(); + + this._setSubscription({ + channel: this._widgetSelector.getChannel('VALUE_CHANGED'), + callback: lang.hitch(this, this._onWidgetSelectorValueChanged) + }); + + if (this._getPreviouslyShown()) { + this._showWidgetSelector(); + } + }, + + _showWidgetSelector: function() { + + if (!this._titleLeftNode) { + return; + } + + if (!this._widgetSelectorNode) { + this._widgetSelectorNode = put('div.' + this.widgetSelectorClass); + } + + put(this._titleLeftNode, this._widgetSelectorNode); + + this._publish(this._widgetSelector.getChannel('SHOW'), { + node: this._widgetSelectorNode + }); + }, + + _addWidgetToSelector: function(key) { + + this._widgetKeys.push(key); + + this._setWidgetKeysAsSelectorOptions(); + }, + + _setWidgetKeysAsSelectorOptions: function() { + + var selectorOptions = this._widgetKeys.map(lang.hitch(this, this._getWidgetOptionObject)); + + this._publish(this._widgetSelector.getChannel('SET_OPTIONS'), { + options: selectorOptions + }); + }, + + _getWidgetOptionObject: function(widgetKey) { + + var widgetInstance = this._getWidgetInstance(widgetKey), + widgetLabel = (widgetInstance && widgetInstance.get('windowTitle')) || this.i18n[widgetKey]; + + return { + value: widgetKey, + label: widgetLabel || widgetKey + }; + }, + + _onWidgetSelectorValueChanged: function(res) { + + var value = res.value, + newHref = this._getHrefWithoutHashValue(); + + if (!value) { + this._applyHrefValueWithoutHistory(newHref); + return; + } + + var newAnchor = '#' + value; + + this._applyHrefValueWithoutHistory(newHref + newAnchor); + + var contentSelectedElement = globalThis.document.querySelector(newAnchor); + + if (!contentSelectedElement) { + console.warn('Tried to focus non-existant content:', newAnchor); + return; + } + + contentSelectedElement.scrollIntoView({ + behavior: 'smooth' + }); + } + }); +}); diff --git a/public/javascript/app/designs/details/_ControllerItfc.js b/client-app/src/oldapp/designs/details/_ControllerItfc.js similarity index 93% rename from public/javascript/app/designs/details/_ControllerItfc.js rename to client-app/src/oldapp/designs/details/_ControllerItfc.js index 6548f63e3d5095b86a91faf3e69e671ace034c81..e44835f6287379450dd350eb1138c1c356742a39 100644 --- a/public/javascript/app/designs/details/_ControllerItfc.js +++ b/client-app/src/oldapp/designs/details/_ControllerItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/public/javascript/app/designs/details/main/ActivityLayerMap.js b/client-app/src/oldapp/designs/details/main/ActivityLayerMap.js similarity index 99% rename from public/javascript/app/designs/details/main/ActivityLayerMap.js rename to client-app/src/oldapp/designs/details/main/ActivityLayerMap.js index ea083d0029a6936f529d49bb8ea5408045b797cd..3a03f55417e22035adf14c72594be007aeb62bb4 100644 --- a/public/javascript/app/designs/details/main/ActivityLayerMap.js +++ b/client-app/src/oldapp/designs/details/main/ActivityLayerMap.js @@ -44,7 +44,7 @@ define([ height: 6, type: Geographic, props: { - title: this.i18n.map, + title: 'map', target: this.targetChange, classWindowContent: "view", notTextSearch: true, diff --git a/public/javascript/app/designs/details/main/ActivityMap.js b/client-app/src/oldapp/designs/details/main/ActivityMap.js similarity index 95% rename from public/javascript/app/designs/details/main/ActivityMap.js rename to client-app/src/oldapp/designs/details/main/ActivityMap.js index 0d465549baadafbfe64987b5869a4fd06692cc54..e89fb4b28abfde413f978d2fc02db2cfb902c34e 100644 --- a/public/javascript/app/designs/details/main/ActivityMap.js +++ b/client-app/src/oldapp/designs/details/main/ActivityMap.js @@ -5,8 +5,8 @@ define([ , "app/designs/details/Layout" , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/map/layer/PruneClusterLayerImpl" - , "redmic/modules/map/layer/_RadiusOnClick" + , "src/component/map/layer/PruneClusterLayerImpl" + , "src/component/map/layer/_RadiusOnClick" , "app/designs/mapWithSideContent/main/Geographic" ], function( _ListenActivityDataAndAccessByActivityCategory @@ -49,7 +49,7 @@ define([ height: 6, type: Geographic, props: { - title: this.i18n.map, + title: 'map', target: this.targetChange, classWindowContent: "view", filterConfig: { @@ -71,7 +71,9 @@ define([ } } } - }, this.widgetConfigs || {}]); + }, this.widgetConfigs || {}], { + arrayMergingStrategy: 'concatenate' + }); this.layerConfig = this._merge([{ idProperty: 'uuid', diff --git a/public/javascript/app/designs/details/main/ActivityTrackingMap.js b/client-app/src/oldapp/designs/details/main/ActivityTrackingMap.js similarity index 98% rename from public/javascript/app/designs/details/main/ActivityTrackingMap.js rename to client-app/src/oldapp/designs/details/main/ActivityTrackingMap.js index e014645e63a85aaa629d0d4b01f7cf4b325189be..32094d7d11571db619c8c10879c0818bd6060487 100644 --- a/public/javascript/app/designs/details/main/ActivityTrackingMap.js +++ b/client-app/src/oldapp/designs/details/main/ActivityTrackingMap.js @@ -5,7 +5,7 @@ define([ , "app/designs/details/Layout" , "app/designs/mapWithSideContent/main/Tracking" , "app/designs/mapWithSideContent/main/_TrackingWithListByFilter" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" ], function( diff --git a/public/javascript/app/designs/details/main/Contact.js b/client-app/src/oldapp/designs/details/main/Contact.js similarity index 96% rename from public/javascript/app/designs/details/main/Contact.js rename to client-app/src/oldapp/designs/details/main/Contact.js index d22af63f9b129b1823e33d5684f89ca3f5a27a64..e8db7591a933668da64fdfdc5cae2edad4095efd 100644 --- a/public/javascript/app/designs/details/main/Contact.js +++ b/client-app/src/oldapp/designs/details/main/Contact.js @@ -1,5 +1,5 @@ define([ - "app/redmicConfig" + 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "templates/ContactInfo" diff --git a/public/javascript/app/designs/details/main/SpeciesLocation.js b/client-app/src/oldapp/designs/details/main/SpeciesLocation.js similarity index 92% rename from public/javascript/app/designs/details/main/SpeciesLocation.js rename to client-app/src/oldapp/designs/details/main/SpeciesLocation.js index b87ae440835dff460b088199b53ab041b0ea300d..a5b293fe36be5a8d8b2838c509496349a523b9fc 100644 --- a/public/javascript/app/designs/details/main/SpeciesLocation.js +++ b/client-app/src/oldapp/designs/details/main/SpeciesLocation.js @@ -3,17 +3,17 @@ define([ , "app/designs/base/_Main" , "app/designs/details/Controller" , "app/designs/details/Layout" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/Deferred" - , "redmic/modules/map/layer/PruneClusterLayerImpl" - , "redmic/modules/map/layer/_AddFilter" - , "redmic/modules/map/layer/_ListenBounds" - , "redmic/modules/map/layer/_ListenZoom" - , "redmic/modules/map/layer/_RadiusOnClick" - , "redmic/modules/map/LeafletImpl" - , "redmic/modules/map/_PlaceNamesButton" + , "src/component/map/layer/PruneClusterLayerImpl" + , "src/component/map/layer/_AddFilter" + , "src/component/map/layer/_ListenBounds" + , "src/component/map/layer/_ListenZoom" + , "src/component/map/layer/_RadiusOnClick" + , "src/component/map/LeafletImpl" + , "src/component/map/_PlaceNamesButton" , "templates/SpeciesTitle" , "templates/SpeciesDistributionPopup" , "templates/TrackingSecondaryList" @@ -70,7 +70,7 @@ define([ height: 6, type: declare([LeafletImpl, _PlaceNamesButton]), props: { - title: this.i18n.map, + title: 'map', omitContainerSizeCheck: true } } diff --git a/client-app/src/oldapp/designs/details/main/_ActivityBase.js b/client-app/src/oldapp/designs/details/main/_ActivityBase.js new file mode 100644 index 0000000000000000000000000000000000000000..0861e42ed026ee24cdb2709985165933890c413f --- /dev/null +++ b/client-app/src/oldapp/designs/details/main/_ActivityBase.js @@ -0,0 +1,106 @@ +define([ + "app/designs/base/_Main" + , "app/designs/details/Controller" + , "app/designs/details/Layout" + , "app/designs/details/_AddTitle" + , "dojo/_base/declare" + , "dojo/_base/lang" + +], function( + _Main + , Controller + , Layout + , _AddTitle + , declare + , lang +){ + return declare([Layout, Controller, _Main, _AddTitle], { + // summary: + // Base de vistas detalle de la rama de actividades. + + constructor: function(args) { + + this.config = { + documentTarget: "documents", + contactTarget: "contacts", + organisationTarget: "organisations", + platformTarget: "platforms" + }; + + lang.mixin(this, this.config, args); + }, + + _clearModules: function() { + + this._publish(this._getWidgetInstance('info').getChannel('CLEAR')); + this._publish(this._getWidgetInstance('organisationList').getChannel('CLEAR')); + this._publish(this._getWidgetInstance('contactList').getChannel('CLEAR')); + this._publish(this._getWidgetInstance('platformList').getChannel('CLEAR')); + this._publish(this._getWidgetInstance('documentList').getChannel('CLEAR')); + }, + + _refreshModules: function() { + + this._checkPathVariableId(); + + this._emitEvt('GET', { + target: this.activityTarget, + requesterId: this.ownChannel, + id: this.pathVariableId + }); + + this._targetListRank && this._refreshChildrenDataModules(); + }, + + _refreshChildrenDataModules: function() { + + var target = lang.replace(this._targetListRank, { + id: this.pathVariableId + }), + widgetInstance = this._getWidgetInstance('childActivitiesOrProjects'); + + this._publish(widgetInstance.getChannel("UPDATE_TARGET"), { + target: target + }); + + this._publish(widgetInstance.getChildChannel("filter", "REFRESH")); + }, + + _itemAvailable: function(res) { + + var documents = res.data.documents; + if (documents && documents.length) { + for (var i = 0; i < documents.length; i++) { + this._emitEvt('INJECT_ITEM', { + data: documents[i].document, + target: this.documentTarget + }); + } + } + + var contacts = res.data.contacts; + if (contacts && contacts.length) { + this._emitEvt('INJECT_DATA', { + data: contacts, + target: this.contactTarget + }); + } + + var platforms = res.data.platforms; + if (platforms && platforms.length) { + this._emitEvt('INJECT_DATA', { + data: platforms, + target: this.platformTarget + }); + } + + var organisations = res.data.organisations; + if (organisations && organisations.length) { + this._emitEvt('INJECT_DATA', { + data: organisations, + target: this.organisationTarget + }); + } + } + }); +}); diff --git a/public/javascript/app/designs/details/main/_DetailsBase.js b/client-app/src/oldapp/designs/details/main/_DetailsBase.js similarity index 55% rename from public/javascript/app/designs/details/main/_DetailsBase.js rename to client-app/src/oldapp/designs/details/main/_DetailsBase.js index ac5610b247dedaf4aa0ccd8515ad1642c359c1d4..dae7c6e9b0743097f25fcafbad0fa2fc3a8ae990 100644 --- a/public/javascript/app/designs/details/main/_DetailsBase.js +++ b/client-app/src/oldapp/designs/details/main/_DetailsBase.js @@ -3,34 +3,22 @@ define([ , "app/designs/details/Controller" , "app/designs/details/Layout" , "app/designs/details/_AddTitle" - , "app/redmicConfig" , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/browser/_ButtonsInRow" - , "redmic/modules/browser/_Framework" - , "redmic/modules/browser/_Select" - , "redmic/modules/browser/ListImpl" - , "redmic/modules/browser/bars/Total" - , "redmic/modules/layout/templateDisplayer/TemplateDisplayer" + , 'src/detail/_WidgetDefinition' , "templates/ActivityList" ], function( _Main , Controller , Layout , _AddTitle - , redmicConfig , declare , lang - , _ButtonsInRow - , _Framework - , _Select - , ListImpl - , Total - , TemplateDisplayer + , _WidgetDefinition , TemplateActivities ) { - return declare([Layout, Controller, _Main, _AddTitle], { + return declare([Layout, Controller, _Main, _AddTitle, _WidgetDefinition], { // summary: // Base de vistas detalle. @@ -52,50 +40,17 @@ define([ } this.widgetConfigs = this._merge([{ - info: { - width: 3, - height: 6, - type: TemplateDisplayer, - props: { - title: this.i18n.info, - template: this.templateInfo, - "class": "containerDetails", - classEmptyTemplate: "contentListNoData", - target: this.target[0], - associatedIds: [this.ownChannel], - shownOption: this.shownOptionInfo - } - }, - activityList: this._configAdditionalInfoActivity() - }, this.widgetConfigs || {}]); - }, - - _configAdditionalInfoActivity: function() { - - return { - type: declare([ListImpl, _Framework, _ButtonsInRow, _Select]), - width: 3, - height: 2, - props: { - title: this.i18n.activities, - selectionTarget: redmicConfig.services.activity, + info: this._getInfoConfig({ + template: this.templateInfo, + target: this.target[0] + }), + activityList: this._getActivitiesOrProjectsConfig({ + title: 'activities', target: this.activityTarget, template: TemplateActivities, - bars: [{ - instance: Total - }], - rowConfig: { - buttonsConfig: { - listButton: [{ - icon: "fa-info-circle", - btnId: "details", - title: this.i18n.info, - href: this.viewPathsWidgets.activities - }] - } - } - } - }; + href: this.viewPathsWidgets.activities + }) + }, this.widgetConfigs || {}]); }, _clearModules: function() { @@ -106,16 +61,28 @@ define([ _refreshModules: function() { this._checkPathVariableId(); + this._getMainTargetData(); + this._prepareActivityTarget(); + this._getActivityTargetData(); + }, + + _getMainTargetData: function() { this._emitEvt('GET', { target: this.target[0], requesterId: this.ownChannel, id: this.pathVariableId }); + }, + + _prepareActivityTarget: function() { this.target[1] = lang.replace(this.activitiesTargetBase, { id: this.pathVariableId }); + }, + + _getActivityTargetData: function() { this._emitEvt('GET', { target: this.target[1], diff --git a/public/javascript/app/designs/doubleList/Controller.js b/client-app/src/oldapp/designs/doubleList/Controller.js similarity index 95% rename from public/javascript/app/designs/doubleList/Controller.js rename to client-app/src/oldapp/designs/doubleList/Controller.js index 5d9c83923273af170daae60f7be0677d2379b82d..edc0e8cefbd2efd9776833b5e16200f67e4976bb 100644 --- a/public/javascript/app/designs/doubleList/Controller.js +++ b/client-app/src/oldapp/designs/doubleList/Controller.js @@ -4,10 +4,10 @@ define([ , "app/designs/list/layout/Layout" , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Store" - , "redmic/modules/base/_Module" - , "redmic/modules/base/_Show" - , "redmic/modules/browser/bars/Total" + , "src/component/base/_Store" + , "src/component/base/_Module" + , "src/component/base/_Show" + , "src/component/browser/bars/Total" , "app/base/views/extensions/_LocalSelectionView" ], function ( _Controller diff --git a/public/javascript/app/designs/doubleList/layout/Layout.js b/client-app/src/oldapp/designs/doubleList/layout/Layout.js similarity index 96% rename from public/javascript/app/designs/doubleList/layout/Layout.js rename to client-app/src/oldapp/designs/doubleList/layout/Layout.js index fca992245f2b98820b2184b9ebf9d32d0e26f563..3bba1814237ae8e44013a661dad70bfb3a3f0a71 100644 --- a/public/javascript/app/designs/doubleList/layout/Layout.js +++ b/client-app/src/oldapp/designs/doubleList/layout/Layout.js @@ -2,7 +2,7 @@ define([ 'app/designs/base/_Layout' , 'dojo/_base/declare' , 'dojo/_base/lang' - , 'put-selector/put' + , 'put-selector' ], function( _Layout , declare diff --git a/public/javascript/app/designs/doubleList/layout/TopLeftContentAndDoubleList.js b/client-app/src/oldapp/designs/doubleList/layout/TopLeftContentAndDoubleList.js similarity index 97% rename from public/javascript/app/designs/doubleList/layout/TopLeftContentAndDoubleList.js rename to client-app/src/oldapp/designs/doubleList/layout/TopLeftContentAndDoubleList.js index 141cdc6be1b77f259c59c9cd7b93fb408b0314c5..2099804414c74a7235f901381e336017e8e81147 100644 --- a/public/javascript/app/designs/doubleList/layout/TopLeftContentAndDoubleList.js +++ b/client-app/src/oldapp/designs/doubleList/layout/TopLeftContentAndDoubleList.js @@ -2,7 +2,7 @@ define([ 'app/designs/base/_Layout' , 'dojo/_base/declare' , 'dojo/_base/lang' - , 'put-selector/put' + , 'put-selector' ], function( _Layout , declare diff --git a/public/javascript/app/designs/doubleList/main/textSearchAndDoubleList.js b/client-app/src/oldapp/designs/doubleList/main/textSearchAndDoubleList.js similarity index 98% rename from public/javascript/app/designs/doubleList/main/textSearchAndDoubleList.js rename to client-app/src/oldapp/designs/doubleList/main/textSearchAndDoubleList.js index 598ddb65f0df050eca83f7f112554eb5b75fa481..dd3f4132668359b40f7eb7a8ad20f807ac4200a3 100644 --- a/public/javascript/app/designs/doubleList/main/textSearchAndDoubleList.js +++ b/client-app/src/oldapp/designs/doubleList/main/textSearchAndDoubleList.js @@ -7,9 +7,9 @@ define([ , "dojo/_base/declare" , "dojo/_base/lang" , "RWidgets/Utilities" - , "redmic/modules/base/_Filter" - , "redmic/modules/browser/bars/Pagination" - , "redmic/modules/search/TextImpl" + , "src/component/base/_Filter" + , "src/component/browser/bars/Pagination" + , "src/component/search/TextImpl" ], function ( _SelectInDoubleList , _RememberDeleteItems diff --git a/public/javascript/app/designs/dynamicDualContent/Controller.js b/client-app/src/oldapp/designs/dynamicDualContent/Controller.js similarity index 100% rename from public/javascript/app/designs/dynamicDualContent/Controller.js rename to client-app/src/oldapp/designs/dynamicDualContent/Controller.js diff --git a/public/javascript/app/designs/dynamicDualContent/layout/FacetsInLeftSecondaryContent.js b/client-app/src/oldapp/designs/dynamicDualContent/layout/FacetsInLeftSecondaryContent.js similarity index 95% rename from public/javascript/app/designs/dynamicDualContent/layout/FacetsInLeftSecondaryContent.js rename to client-app/src/oldapp/designs/dynamicDualContent/layout/FacetsInLeftSecondaryContent.js index f25bc2f0959d32370f510d138cbf8957e196f907..30b5ce3142b3cbf9f8c8ff89954c79aeada39fdf 100644 --- a/public/javascript/app/designs/dynamicDualContent/layout/FacetsInLeftSecondaryContent.js +++ b/client-app/src/oldapp/designs/dynamicDualContent/layout/FacetsInLeftSecondaryContent.js @@ -1,7 +1,7 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' - , 'put-selector/put' + , 'put-selector' , './_Layout' ], function( declare diff --git a/public/javascript/app/designs/dynamicDualContent/layout/LeftSecondaryContent.js b/client-app/src/oldapp/designs/dynamicDualContent/layout/LeftSecondaryContent.js similarity index 100% rename from public/javascript/app/designs/dynamicDualContent/layout/LeftSecondaryContent.js rename to client-app/src/oldapp/designs/dynamicDualContent/layout/LeftSecondaryContent.js diff --git a/public/javascript/app/designs/dynamicDualContent/layout/TopSecondaryContent.js b/client-app/src/oldapp/designs/dynamicDualContent/layout/TopSecondaryContent.js similarity index 100% rename from public/javascript/app/designs/dynamicDualContent/layout/TopSecondaryContent.js rename to client-app/src/oldapp/designs/dynamicDualContent/layout/TopSecondaryContent.js diff --git a/public/javascript/app/designs/dynamicDualContent/layout/_Layout.js b/client-app/src/oldapp/designs/dynamicDualContent/layout/_Layout.js similarity index 97% rename from public/javascript/app/designs/dynamicDualContent/layout/_Layout.js rename to client-app/src/oldapp/designs/dynamicDualContent/layout/_Layout.js index d6e136263cb2b1d4e925d2a442711c00dfcf6b98..33efcb838af68f86578f42b81e2863f6e80f51ae 100644 --- a/public/javascript/app/designs/dynamicDualContent/layout/_Layout.js +++ b/client-app/src/oldapp/designs/dynamicDualContent/layout/_Layout.js @@ -2,7 +2,7 @@ define([ 'app/designs/base/_Layout' , 'dojo/_base/declare' , 'dojo/_base/lang' - , 'put-selector/put' + , 'put-selector' ], function( _Layout , declare diff --git a/public/javascript/app/designs/dynamicDualContent/main/FacetsWithDynamicRightContent.js b/client-app/src/oldapp/designs/dynamicDualContent/main/FacetsWithDynamicRightContent.js similarity index 100% rename from public/javascript/app/designs/dynamicDualContent/main/FacetsWithDynamicRightContent.js rename to client-app/src/oldapp/designs/dynamicDualContent/main/FacetsWithDynamicRightContent.js diff --git a/public/javascript/app/designs/edition/Controller.js b/client-app/src/oldapp/designs/edition/Controller.js similarity index 95% rename from public/javascript/app/designs/edition/Controller.js rename to client-app/src/oldapp/designs/edition/Controller.js index 1f997aedb48dfa647a6aff76d7807d9e944d382c..ebfd6195358ff859575f5605d05805a4d063e700 100644 --- a/public/javascript/app/designs/edition/Controller.js +++ b/client-app/src/oldapp/designs/edition/Controller.js @@ -6,12 +6,12 @@ define([ , "dojo/aspect" , "dojo/Deferred" , "RWidgets/Utilities" - , 'redmic/modules/base/_ListenQueryParams' - , "redmic/modules/base/_Store" - , "redmic/modules/base/_Persistence" - , "redmic/modules/layout/wizard/Wizard" - , "redmic/modules/layout/wizard/_StepNavigation" - , "redmic/modules/layout/wizard/_StepBreadcrumbs" + , 'src/component/base/_ListenQueryParams' + , "src/component/base/_Store" + , "src/component/base/_Persistence" + , "src/component/layout/wizard/Wizard" + , "src/component/layout/wizard/_StepNavigation" + , "src/component/layout/wizard/_StepBreadcrumbs" ], function( _EditionCommons , _Controller @@ -287,7 +287,7 @@ define([ if (this.popupBody) { this._publish(this.getChannel("HIDE")); } else { - window.history.go(-1); + globalThis.history.go(-1); } }, diff --git a/public/javascript/app/designs/edition/Layout.js b/client-app/src/oldapp/designs/edition/Layout.js similarity index 100% rename from public/javascript/app/designs/edition/Layout.js rename to client-app/src/oldapp/designs/edition/Layout.js diff --git a/public/javascript/app/designs/embeddedContent/Controller.js b/client-app/src/oldapp/designs/embeddedContent/Controller.js similarity index 88% rename from public/javascript/app/designs/embeddedContent/Controller.js rename to client-app/src/oldapp/designs/embeddedContent/Controller.js index bd2e2096ce4f2b0000002f038c4269811734fab1..0bcc4e7922ecee52f997034585e9ea836783a01b 100644 --- a/public/javascript/app/designs/embeddedContent/Controller.js +++ b/client-app/src/oldapp/designs/embeddedContent/Controller.js @@ -2,8 +2,8 @@ define([ 'app/designs/base/_Controller' , 'dojo/_base/declare' , 'dojo/_base/lang' - , 'redmic/modules/base/_Store' - , 'redmic/modules/layout/templateDisplayer/TemplateDisplayer' + , 'src/component/base/_Store' + , 'src/component/layout/templateDisplayer/TemplateDisplayer' , 'templates/DefaultEmbeddedContent' ], function ( _Controller @@ -45,7 +45,7 @@ define([ }); this._publish(this._templateDisplayer.getChannel('SHOW'), { - node: this._getNodeToShow() + node: this.getNodeToShow() }); }, @@ -71,6 +71,11 @@ define([ _onEmbeddedContentUrlPropSet: function(evt) { this._updateEmbeddedContent(evt.value); + }, + + getNodeToShow: function() { + + return this.domNode; } }); }); diff --git a/public/javascript/app/designs/embeddedContent/Layout.js b/client-app/src/oldapp/designs/embeddedContent/Layout.js similarity index 100% rename from public/javascript/app/designs/embeddedContent/Layout.js rename to client-app/src/oldapp/designs/embeddedContent/Layout.js diff --git a/public/javascript/app/designs/embeddedContentWithTopbar/Controller.js b/client-app/src/oldapp/designs/embeddedContentWithTopbar/Controller.js similarity index 98% rename from public/javascript/app/designs/embeddedContentWithTopbar/Controller.js rename to client-app/src/oldapp/designs/embeddedContentWithTopbar/Controller.js index d00bb7d920c69c833b8f3029e85bfd3d7d8308cd..f337ec83733f667f14812e2f8cb7500f18cfb02d 100644 --- a/public/javascript/app/designs/embeddedContentWithTopbar/Controller.js +++ b/client-app/src/oldapp/designs/embeddedContentWithTopbar/Controller.js @@ -3,7 +3,7 @@ define([ , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/Deferred" - , "redmic/modules/components/Keypad/IconKeypadImpl" + , "src/component/components/Keypad/IconKeypadImpl" ], function ( _Controller , declare diff --git a/public/javascript/app/designs/embeddedContentWithTopbar/layout/TopAndCenterContent.js b/client-app/src/oldapp/designs/embeddedContentWithTopbar/layout/TopAndCenterContent.js similarity index 98% rename from public/javascript/app/designs/embeddedContentWithTopbar/layout/TopAndCenterContent.js rename to client-app/src/oldapp/designs/embeddedContentWithTopbar/layout/TopAndCenterContent.js index 345d01219db882a21ed9cd8503c8a71e4128ae0b..5fd8ebd63f06844f458e501b1bc18dcabe9015d3 100644 --- a/public/javascript/app/designs/embeddedContentWithTopbar/layout/TopAndCenterContent.js +++ b/client-app/src/oldapp/designs/embeddedContentWithTopbar/layout/TopAndCenterContent.js @@ -2,7 +2,7 @@ define([ 'app/designs/base/_Layout' , 'dojo/_base/declare' , 'dojo/_base/lang' - , 'put-selector/put' + , 'put-selector' ], function( _Layout , declare diff --git a/public/javascript/app/designs/embeddedContentWithTopbar/main/EmbeddedContentSelectionInTopbar.js b/client-app/src/oldapp/designs/embeddedContentWithTopbar/main/EmbeddedContentSelectionInTopbar.js similarity index 100% rename from public/javascript/app/designs/embeddedContentWithTopbar/main/EmbeddedContentSelectionInTopbar.js rename to client-app/src/oldapp/designs/embeddedContentWithTopbar/main/EmbeddedContentSelectionInTopbar.js diff --git a/public/javascript/app/designs/externalTextSearchList/Controller.js b/client-app/src/oldapp/designs/externalTextSearchList/Controller.js similarity index 96% rename from public/javascript/app/designs/externalTextSearchList/Controller.js rename to client-app/src/oldapp/designs/externalTextSearchList/Controller.js index 4561669f1452b0c94633731252e7fd002375bb7c..df84b5ea5ea51828ea2dfa963ce4828ecb14c95d 100644 --- a/public/javascript/app/designs/externalTextSearchList/Controller.js +++ b/client-app/src/oldapp/designs/externalTextSearchList/Controller.js @@ -3,8 +3,8 @@ define([ , "app/designs/base/_Controller" , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Store" - , "redmic/modules/search/TextImpl" + , "src/component/base/_Store" + , "src/component/search/TextImpl" ], function ( _Browser , _Controller diff --git a/public/javascript/app/designs/externalTextSearchList/Layout.js b/client-app/src/oldapp/designs/externalTextSearchList/Layout.js similarity index 97% rename from public/javascript/app/designs/externalTextSearchList/Layout.js rename to client-app/src/oldapp/designs/externalTextSearchList/Layout.js index 085136550875496b0c916d285aee4d142c8cfd37..968b6b9265c767552e4599df2e0c2c800b98b98e 100644 --- a/public/javascript/app/designs/externalTextSearchList/Layout.js +++ b/client-app/src/oldapp/designs/externalTextSearchList/Layout.js @@ -2,7 +2,7 @@ define([ 'app/designs/base/_Layout' , "dojo/_base/declare" , "dojo/_base/lang" - , "put-selector/put" + , 'put-selector' ], function ( _Layout , declare diff --git a/public/javascript/app/designs/externalTextSearchList/main/PlaceNames.js b/client-app/src/oldapp/designs/externalTextSearchList/main/PlaceNames.js similarity index 97% rename from public/javascript/app/designs/externalTextSearchList/main/PlaceNames.js rename to client-app/src/oldapp/designs/externalTextSearchList/main/PlaceNames.js index 6ee2cd59b703c4b18ef9667526fa385ae3bbb414..59a89c3a1aee481e34abe4d0a88e36db6989d2e8 100644 --- a/public/javascript/app/designs/externalTextSearchList/main/PlaceNames.js +++ b/client-app/src/oldapp/designs/externalTextSearchList/main/PlaceNames.js @@ -2,14 +2,14 @@ define([ "app/designs/base/_Main" , "app/designs/externalTextSearchList/Controller" , "app/designs/externalTextSearchList/Layout" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" - , "put-selector/put" + , 'put-selector' , "templates/PlaceNamesList" - , "redmic/modules/browser/bars/Pagination" - , "redmic/modules/browser/bars/Total" - , "redmic/modules/map/layer/GeoJsonLayerImpl" + , "src/component/browser/bars/Pagination" + , "src/component/browser/bars/Total" + , "src/component/map/layer/GeoJsonLayerImpl" , "RWidgets/Button" ], function( _Main @@ -253,7 +253,7 @@ define([ var info = put("div"), desiredPropsI18n = ["name", "location", "classification", "x", "y"]; - desiredProps = ["nombre", "localizacion", "clasificacion", "x", "y"]; + desiredProps = ["nombre", "localizacion", "clasificacion", "longitud", "latitud"]; for (var i = 0; i < desiredProps.length; i++) { var key = desiredProps[i], diff --git a/public/javascript/app/designs/externalTextSearchList/main/Worms.js b/client-app/src/oldapp/designs/externalTextSearchList/main/Worms.js similarity index 97% rename from public/javascript/app/designs/externalTextSearchList/main/Worms.js rename to client-app/src/oldapp/designs/externalTextSearchList/main/Worms.js index 0af996ffcb27b5e83948ba1086b9b1d2a9fb057c..4d495b0981affd3511a4fa1107fb3833949d0ba6 100644 --- a/public/javascript/app/designs/externalTextSearchList/main/Worms.js +++ b/client-app/src/oldapp/designs/externalTextSearchList/main/Worms.js @@ -2,12 +2,12 @@ define([ "app/designs/base/_Main" , "app/designs/externalTextSearchList/Controller" , "app/designs/externalTextSearchList/Layout" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "redmic/modules/browser/bars/Total" - , "redmic/modules/base/_Persistence" + , "src/component/browser/bars/Total" + , "src/component/base/_Persistence" , "templates/WormsList" ], function ( _Main diff --git a/public/javascript/app/designs/formList/Controller.js b/client-app/src/oldapp/designs/formList/Controller.js similarity index 97% rename from public/javascript/app/designs/formList/Controller.js rename to client-app/src/oldapp/designs/formList/Controller.js index 2abacb29ce7de4c9fa27626eeb9dc028c504422c..6c1d85d139d141fe4a38b513d689abbc12df7df8 100644 --- a/public/javascript/app/designs/formList/Controller.js +++ b/client-app/src/oldapp/designs/formList/Controller.js @@ -6,8 +6,8 @@ define([ , "app/designs/list/layout/Layout" , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Show" - , "redmic/modules/base/_Store" + , "src/component/base/_Show" + , "src/component/base/_Store" ], function ( _AddForm , _Controller diff --git a/public/javascript/app/designs/formList/_ControllerItfc.js b/client-app/src/oldapp/designs/formList/_ControllerItfc.js similarity index 93% rename from public/javascript/app/designs/formList/_ControllerItfc.js rename to client-app/src/oldapp/designs/formList/_ControllerItfc.js index 8735a619507588088f7e377bce4f613230010fc3..54d299b6353741d1c040033e2466c2ceba3168fe 100644 --- a/public/javascript/app/designs/formList/_ControllerItfc.js +++ b/client-app/src/oldapp/designs/formList/_ControllerItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/public/javascript/app/designs/formList/layout/Layout.js b/client-app/src/oldapp/designs/formList/layout/Layout.js similarity index 96% rename from public/javascript/app/designs/formList/layout/Layout.js rename to client-app/src/oldapp/designs/formList/layout/Layout.js index 5bb93a91ace81bfd39e4947ddf7c35682b68cf10..6a6fe092c90b45cf561902f1a5750c2a8cd8d6b6 100644 --- a/public/javascript/app/designs/formList/layout/Layout.js +++ b/client-app/src/oldapp/designs/formList/layout/Layout.js @@ -2,7 +2,7 @@ define([ 'app/designs/base/_Layout' , 'dojo/_base/declare' , 'dojo/_base/lang' - , 'put-selector/put' + , 'put-selector' ], function( _Layout , declare diff --git a/public/javascript/app/designs/formList/layout/LayoutWithTopForm.js b/client-app/src/oldapp/designs/formList/layout/LayoutWithTopForm.js similarity index 97% rename from public/javascript/app/designs/formList/layout/LayoutWithTopForm.js rename to client-app/src/oldapp/designs/formList/layout/LayoutWithTopForm.js index 912834cfa6683225220cb7da106e64e59ac110da..bf190c8f7da739bcea288a8d7e3a3edce9ea5b2c 100644 --- a/public/javascript/app/designs/formList/layout/LayoutWithTopForm.js +++ b/client-app/src/oldapp/designs/formList/layout/LayoutWithTopForm.js @@ -2,7 +2,7 @@ define([ 'app/designs/base/_Layout' , 'dojo/_base/declare' , 'dojo/_base/lang' - , 'put-selector/put' + , 'put-selector' ], function( _Layout , declare diff --git a/public/javascript/app/designs/formList/main/FormListByStep.js b/client-app/src/oldapp/designs/formList/main/FormListByStep.js similarity index 100% rename from public/javascript/app/designs/formList/main/FormListByStep.js rename to client-app/src/oldapp/designs/formList/main/FormListByStep.js diff --git a/public/javascript/app/designs/formList/main/_RequestAndParseData.js b/client-app/src/oldapp/designs/formList/main/_RequestAndParseData.js similarity index 100% rename from public/javascript/app/designs/formList/main/_RequestAndParseData.js rename to client-app/src/oldapp/designs/formList/main/_RequestAndParseData.js diff --git a/public/javascript/app/designs/list/Controller.js b/client-app/src/oldapp/designs/list/Controller.js similarity index 100% rename from public/javascript/app/designs/list/Controller.js rename to client-app/src/oldapp/designs/list/Controller.js diff --git a/public/javascript/app/designs/list/_AddFilter.js b/client-app/src/oldapp/designs/list/_AddFilter.js similarity index 90% rename from public/javascript/app/designs/list/_AddFilter.js rename to client-app/src/oldapp/designs/list/_AddFilter.js index 3093db9939c587ae53c0c6aa8884f578505f2435..1d29028f8825edbdcf40a55f4527874e7070515b 100644 --- a/public/javascript/app/designs/list/_AddFilter.js +++ b/client-app/src/oldapp/designs/list/_AddFilter.js @@ -1,6 +1,6 @@ define([ 'dojo/_base/declare' - , 'redmic/modules/base/_Filter' + , 'src/component/base/_Filter' ], function ( declare , _Filter diff --git a/public/javascript/app/designs/list/layout/Layout.js b/client-app/src/oldapp/designs/list/layout/Layout.js similarity index 97% rename from public/javascript/app/designs/list/layout/Layout.js rename to client-app/src/oldapp/designs/list/layout/Layout.js index 3760021d0a314638f6614471386d627b3813934b..bf6e2f5c41e78c70b78ee97c749dc0a52b47d6ab 100644 --- a/public/javascript/app/designs/list/layout/Layout.js +++ b/client-app/src/oldapp/designs/list/layout/Layout.js @@ -2,7 +2,7 @@ define([ 'app/designs/base/_Layout' , "dojo/_base/declare" , "dojo/_base/lang" - , "put-selector/put" + , 'put-selector' ], function ( _Layout , declare diff --git a/public/javascript/app/designs/list/layout/ListWithTopContent.js b/client-app/src/oldapp/designs/list/layout/ListWithTopContent.js similarity index 97% rename from public/javascript/app/designs/list/layout/ListWithTopContent.js rename to client-app/src/oldapp/designs/list/layout/ListWithTopContent.js index 60dd80896cc8a13f6be780b99104a228d8648eae..c18b766f6fa28a7abe9bed59822b499da07e7441 100644 --- a/public/javascript/app/designs/list/layout/ListWithTopContent.js +++ b/client-app/src/oldapp/designs/list/layout/ListWithTopContent.js @@ -2,7 +2,7 @@ define([ 'app/designs/base/_Layout' , 'dojo/_base/declare' , 'dojo/_base/lang' - , 'put-selector/put' + , 'put-selector' ], function( _Layout , declare diff --git a/public/javascript/app/designs/list/layout/NoTitle.js b/client-app/src/oldapp/designs/list/layout/NoTitle.js similarity index 95% rename from public/javascript/app/designs/list/layout/NoTitle.js rename to client-app/src/oldapp/designs/list/layout/NoTitle.js index 742fedf5035da5e48797900662c45346bd5e874b..a5e1936ce4f2e61919b8bb48e53edaae154c8367 100644 --- a/public/javascript/app/designs/list/layout/NoTitle.js +++ b/client-app/src/oldapp/designs/list/layout/NoTitle.js @@ -2,7 +2,7 @@ define([ 'app/designs/base/_Layout' , "dojo/_base/declare" , "dojo/_base/lang" - , "put-selector/put" + , 'put-selector' ], function ( _Layout , declare @@ -30,4 +30,4 @@ define([ this.listNode = put(this.domNode, "div.listZone" + this.classByList); } }); -}); \ No newline at end of file +}); diff --git a/public/javascript/app/designs/mapWithSideContent/Controller.js b/client-app/src/oldapp/designs/mapWithSideContent/Controller.js similarity index 89% rename from public/javascript/app/designs/mapWithSideContent/Controller.js rename to client-app/src/oldapp/designs/mapWithSideContent/Controller.js index dc3b343c1a3b5cbdb49392778dc45c5d67b03e0a..05082968cd96d85cc49f0cec7cb8d428f0cce964 100644 --- a/public/javascript/app/designs/mapWithSideContent/Controller.js +++ b/client-app/src/oldapp/designs/mapWithSideContent/Controller.js @@ -2,8 +2,8 @@ define([ "app/designs/base/_Controller" , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/map/LeafletImpl" - , "redmic/modules/map/_PlaceNamesButton" + , "src/component/map/LeafletImpl" + , "src/component/map/_PlaceNamesButton" ], function ( _Controller , declare @@ -60,11 +60,6 @@ define([ this._publish(this.map.getChannel("SHOW"), { node: this.mapNode }); - }, - - _getNodeToShowLoading: function() { - - return this.mapNode; } }); }); diff --git a/public/javascript/app/designs/mapWithSideContent/layout/MapAndContent.js b/client-app/src/oldapp/designs/mapWithSideContent/layout/MapAndContent.js similarity index 97% rename from public/javascript/app/designs/mapWithSideContent/layout/MapAndContent.js rename to client-app/src/oldapp/designs/mapWithSideContent/layout/MapAndContent.js index ceb65ca2da1f12de38c3d620d3862f721e08e40e..096d646bc45219de806412a0e6c09b13c1fe2de0 100644 --- a/public/javascript/app/designs/mapWithSideContent/layout/MapAndContent.js +++ b/client-app/src/oldapp/designs/mapWithSideContent/layout/MapAndContent.js @@ -2,7 +2,7 @@ define([ 'app/designs/base/_Layout' , 'dojo/_base/declare' , 'dojo/_base/lang' - , 'put-selector/put' + , 'put-selector' ], function( _Layout , declare diff --git a/public/javascript/app/designs/mapWithSideContent/layout/MapAndContentAndTopbar.js b/client-app/src/oldapp/designs/mapWithSideContent/layout/MapAndContentAndTopbar.js similarity index 97% rename from public/javascript/app/designs/mapWithSideContent/layout/MapAndContentAndTopbar.js rename to client-app/src/oldapp/designs/mapWithSideContent/layout/MapAndContentAndTopbar.js index 008fce38d80b26f626447226ad650e0c19c14bec..e650c2adfe9b45428550fc248f6580aeb95cec01 100644 --- a/public/javascript/app/designs/mapWithSideContent/layout/MapAndContentAndTopbar.js +++ b/client-app/src/oldapp/designs/mapWithSideContent/layout/MapAndContentAndTopbar.js @@ -2,7 +2,7 @@ define([ 'app/designs/base/_Layout' , 'dojo/_base/declare' , 'dojo/_base/lang' - , 'put-selector/put' + , 'put-selector' ], function( _Layout , declare diff --git a/public/javascript/app/designs/mapWithSideContent/main/FilterAndGeographic.js b/client-app/src/oldapp/designs/mapWithSideContent/main/FilterAndGeographic.js similarity index 92% rename from public/javascript/app/designs/mapWithSideContent/main/FilterAndGeographic.js rename to client-app/src/oldapp/designs/mapWithSideContent/main/FilterAndGeographic.js index 8b0fef729a2e2b1be599a8bedb372215ac57b590..e2aa007069d73c57149a192abf62d48bf0277e50 100644 --- a/public/javascript/app/designs/mapWithSideContent/main/FilterAndGeographic.js +++ b/client-app/src/oldapp/designs/mapWithSideContent/main/FilterAndGeographic.js @@ -4,15 +4,15 @@ define([ , "app/designs/mapWithSideContent/layout/MapAndContentAndTopbar" , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Filter" - , "redmic/modules/browser/ListImpl" - , "redmic/modules/browser/_ButtonsInRow" - , "redmic/modules/browser/_Select" - , "redmic/modules/browser/_GeoJsonParser" - , "redmic/modules/form/input/FilteringSelectImpl" - , "redmic/modules/map/layer/GeoJsonLayerImpl" - , "redmic/modules/map/layer/_Selectable" - , "redmic/modules/map/layer/_SelectOnClick" + , "src/component/base/_Filter" + , "src/component/browser/ListImpl" + , "src/component/browser/_ButtonsInRow" + , "src/component/browser/_Select" + , "src/component/browser/_GeoJsonParser" + , "src/component/form/input/FilteringSelectImpl" + , "src/component/map/layer/GeoJsonLayerImpl" + , "src/component/map/layer/_Selectable" + , "src/component/map/layer/_SelectOnClick" ], function( _Main , Controller diff --git a/public/javascript/app/designs/mapWithSideContent/main/Geographic.js b/client-app/src/oldapp/designs/mapWithSideContent/main/Geographic.js similarity index 89% rename from public/javascript/app/designs/mapWithSideContent/main/Geographic.js rename to client-app/src/oldapp/designs/mapWithSideContent/main/Geographic.js index 65c6c7363db64db648a3feba3f358830089fcb70..9330b5148ccba78aa6215506bbcc44b3258c8c50 100644 --- a/public/javascript/app/designs/mapWithSideContent/main/Geographic.js +++ b/client-app/src/oldapp/designs/mapWithSideContent/main/Geographic.js @@ -6,19 +6,19 @@ define([ , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "redmic/modules/atlas/Atlas" - , "redmic/modules/base/_Filter" - , "redmic/modules/base/_Store" - , "redmic/modules/browser/bars/Total" - , "redmic/modules/browser/_ButtonsInRow" - , "redmic/modules/browser/_Framework" - , "redmic/modules/browser/_GeoJsonParser" - , "redmic/modules/browser/ListImpl" - , "redmic/modules/gateway/MapCenteringGatewayImpl" - , 'redmic/modules/layout/genericDisplayer/GenericWithTopbarDisplayerImpl' - , 'redmic/modules/layout/TabsDisplayer' - , "redmic/modules/mapQuery/QueryOnMap" - , "redmic/modules/search/TextImpl" + , "src/component/atlas/Atlas" + , "src/component/base/_Filter" + , "src/component/base/_Store" + , "src/component/browser/bars/Total" + , "src/component/browser/_ButtonsInRow" + , "src/component/browser/_Framework" + , "src/component/browser/_GeoJsonParser" + , "src/component/browser/ListImpl" + , "src/component/gateway/MapCenteringGatewayImpl" + , 'src/component/layout/genericDisplayer/GenericWithTopbarDisplayerImpl' + , 'src/component/layout/TabsDisplayer' + , "src/component/mapQuery/QueryOnMap" + , "src/component/search/TextImpl" , "templates/CitationList" ], function( _LocalSelectionView @@ -127,7 +127,7 @@ define([ this._browserWithTopbar = new GenericWithTopbarDisplayerImpl({ parentChannel: this.getChannel(), content: this.browser, - title: this.i18n.geographicData + title: this.browserConfig.title || this.i18n.geographicData }); }, @@ -178,7 +178,7 @@ define([ this.inherited(arguments); this._publish(this._tabsDisplayer.getChannel('ADD_TAB'), { - title: this.i18n.geographicData, + title: this.browserConfig.title || this.i18n.geographicData, iconClass: 'fa fa-table', channel: this._browserWithTopbar.getChannel() }); @@ -196,7 +196,6 @@ define([ this.atlas = new Atlas({ parentChannel: this.getChannel(), - perms: this.perms, getMapChannel: getMapChannel, addTabChannel: this._tabsDisplayer.getChannel('ADD_TAB') }); diff --git a/public/javascript/app/designs/mapWithSideContent/main/GeographicEditor.js b/client-app/src/oldapp/designs/mapWithSideContent/main/GeographicEditor.js similarity index 92% rename from public/javascript/app/designs/mapWithSideContent/main/GeographicEditor.js rename to client-app/src/oldapp/designs/mapWithSideContent/main/GeographicEditor.js index 4fa24efa54a97147cd9f70f5ba428e06bd4f29bd..09bc32248becdcf08983e29ff44af7d57fc27bc5 100644 --- a/public/javascript/app/designs/mapWithSideContent/main/GeographicEditor.js +++ b/client-app/src/oldapp/designs/mapWithSideContent/main/GeographicEditor.js @@ -9,30 +9,30 @@ define([ , "dojo/_base/lang" , "dojo/aspect" , "RWidgets/Utilities" - , "redmic/modules/atlas/Atlas" - , "redmic/modules/base/_Filter" - , "redmic/modules/browser/_ButtonsInRow" - , "redmic/modules/browser/_Framework" - , "redmic/modules/browser/_Select" - , "redmic/modules/browser/_GeoJsonParser" - , "redmic/modules/browser/ListImpl" - , "redmic/modules/browser/bars/Order" - , "redmic/modules/browser/bars/Total" - , "redmic/modules/form/FormContainerImpl" - , "redmic/modules/form/_ListenModelHasChanged" - , "redmic/modules/form/_PublicateChanges" - , "redmic/modules/form/_CreateKeypad" - , "redmic/modules/gateway/MapCenteringGatewayImpl" - , "redmic/modules/layout/dataDisplayer/DataDisplayer" - , 'redmic/modules/layout/TabsDisplayer' - , 'redmic/modules/layout/genericDisplayer/GenericWithTopbarDisplayerImpl' - , "redmic/modules/map/layer/GeoJsonLayerImpl" - , "redmic/modules/map/layer/_Editable" - , "redmic/modules/map/layer/_RadiusOnSelect" - , "redmic/modules/map/layer/_Selectable" - , "redmic/modules/map/layer/_SelectOnClick" - , "redmic/modules/mapQuery/QueryOnMap" - , "redmic/modules/search/TextImpl" + , "src/component/atlas/Atlas" + , "src/component/base/_Filter" + , "src/component/browser/_ButtonsInRow" + , "src/component/browser/_Framework" + , "src/component/browser/_Select" + , "src/component/browser/_GeoJsonParser" + , "src/component/browser/ListImpl" + , "src/component/browser/bars/Order" + , "src/component/browser/bars/Total" + , "src/component/form/FormContainerImpl" + , "src/component/form/_ListenModelHasChanged" + , "src/component/form/_PublicateChanges" + , "src/component/form/_CreateKeypad" + , "src/component/gateway/MapCenteringGatewayImpl" + , "src/component/layout/dataDisplayer/DataDisplayer" + , 'src/component/layout/TabsDisplayer' + , 'src/component/layout/genericDisplayer/GenericWithTopbarDisplayerImpl' + , "src/component/map/layer/GeoJsonLayerImpl" + , "src/component/map/layer/_Editable" + , "src/component/map/layer/_RadiusOnSelect" + , "src/component/map/layer/_Selectable" + , "src/component/map/layer/_SelectOnClick" + , "src/component/mapQuery/QueryOnMap" + , "src/component/search/TextImpl" , "templates/CitationPopup" , "templates/TaxonList" ], function( @@ -364,7 +364,6 @@ define([ this.atlas = new Atlas({ parentChannel: this.getChannel(), - perms: this.perms, getMapChannel: getMapChannel, addTabChannel: this._tabsDisplayer.getChannel('ADD_TAB') }); diff --git a/public/javascript/app/designs/mapWithSideContent/main/Tracking.js b/client-app/src/oldapp/designs/mapWithSideContent/main/Tracking.js similarity index 94% rename from public/javascript/app/designs/mapWithSideContent/main/Tracking.js rename to client-app/src/oldapp/designs/mapWithSideContent/main/Tracking.js index cc4e9d97665c0acd58b0415dfc06e89fc41dbd03..2f29dde3a8792441219784f4aab8e59efa8cf9e2 100644 --- a/public/javascript/app/designs/mapWithSideContent/main/Tracking.js +++ b/client-app/src/oldapp/designs/mapWithSideContent/main/Tracking.js @@ -1,36 +1,32 @@ define([ - 'alertify/alertify.min' - , "app/designs/base/_Main" + "app/designs/base/_Main" , "app/designs/mapWithSideContent/Controller" , "app/designs/mapWithSideContent/layout/MapAndContentAndTopbar" - , "app/redmicConfig" - , 'd3/d3.min' + , 'src/redmicConfig' + , 'd3' , "dojo/_base/declare" , "dojo/_base/lang" - , "dojo/has" - , 'moment/moment.min' - , "put-selector/put" + , 'moment' + , 'put-selector' , "RWidgets/Utilities" - , "redmic/modules/base/_Store" - , "redmic/modules/components/ProgressSlider/ProgressSlider" - , "redmic/modules/atlas/Atlas" - , 'redmic/modules/form/FormContainerImpl' - , 'redmic/modules/layout/genericDisplayer/GenericWithTopbarDisplayerImpl' - , 'redmic/modules/layout/TabsDisplayer' - , "redmic/modules/map/layer/_AddFilter" - , "redmic/modules/map/layer/_PublishInfo" - , "redmic/modules/map/layer/TrackingLayerImpl" - , "redmic/modules/mapQuery/QueryOnMap" + , "src/component/base/_Store" + , "src/component/components/ProgressSlider/ProgressSlider" + , "src/component/atlas/Atlas" + , 'src/component/form/FormContainerImpl' + , 'src/component/layout/genericDisplayer/GenericWithTopbarDisplayerImpl' + , 'src/component/layout/TabsDisplayer' + , "src/component/map/layer/_AddFilter" + , "src/component/map/layer/_PublishInfo" + , "src/component/map/layer/TrackingLayerImpl" + , "src/component/mapQuery/QueryOnMap" ], function( - alertify - , _Main + _Main , Controller , Layout , redmicConfig , d3 , declare , lang - , has , moment , put , Utilities @@ -104,11 +100,6 @@ define([ }; lang.mixin(this, this.config, args); - - if (has("edge") || has("trident") || has("ie")) { - alertify.alert(this.i18n.browserPartiallySupported, this.i18n.browserPartiallySupportedMsg1 + ". " + - this.i18n.browserPartiallySupportedMsg2 + ".

" + this.i18n.recommendBrowser + "."); - } }, _setMainConfigurations: function() { @@ -221,7 +212,6 @@ define([ this.atlas = new Atlas({ parentChannel: this.getChannel(), - perms: this.perms, getMapChannel: getMapChannel, addTabChannel: this._tabsDisplayer.getChannel('ADD_TAB') }); diff --git a/public/javascript/app/designs/mapWithSideContent/main/_TrackingByFilter.js b/client-app/src/oldapp/designs/mapWithSideContent/main/_TrackingByFilter.js similarity index 98% rename from public/javascript/app/designs/mapWithSideContent/main/_TrackingByFilter.js rename to client-app/src/oldapp/designs/mapWithSideContent/main/_TrackingByFilter.js index ff3233c444f7111eca369c9496cb32dc5add52f7..118a1753d52bcc56c7fab54f2ef346bb4a760d5c 100644 --- a/public/javascript/app/designs/mapWithSideContent/main/_TrackingByFilter.js +++ b/client-app/src/oldapp/designs/mapWithSideContent/main/_TrackingByFilter.js @@ -3,7 +3,7 @@ define([ , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "redmic/modules/base/_Filter" + , "src/component/base/_Filter" ], function( _CompositeInTooltipFromIconKeypad , declare diff --git a/public/javascript/app/designs/mapWithSideContent/main/_TrackingWithList.js b/client-app/src/oldapp/designs/mapWithSideContent/main/_TrackingWithList.js similarity index 94% rename from public/javascript/app/designs/mapWithSideContent/main/_TrackingWithList.js rename to client-app/src/oldapp/designs/mapWithSideContent/main/_TrackingWithList.js index 544a853178cd52b45d9deb6a7ca79d225b1fd139..1c3f3dece64d37d7ab3c63e6f08dff4e29b03ab1 100644 --- a/public/javascript/app/designs/mapWithSideContent/main/_TrackingWithList.js +++ b/client-app/src/oldapp/designs/mapWithSideContent/main/_TrackingWithList.js @@ -1,16 +1,16 @@ define([ - "app/redmicConfig" + 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "redmic/modules/base/_SelectionBase" - , "redmic/modules/browser/bars/Total" - , "redmic/modules/browser/ListImpl" - , "redmic/modules/browser/_ButtonsInRow" - , "redmic/modules/browser/_Framework" - , "redmic/modules/browser/_MultiTemplate" - , "redmic/modules/browser/_Select" - , 'redmic/modules/layout/genericDisplayer/GenericWithTopbarDisplayerImpl' + , "src/component/base/_SelectionBase" + , "src/component/browser/bars/Total" + , "src/component/browser/ListImpl" + , "src/component/browser/_ButtonsInRow" + , "src/component/browser/_Framework" + , "src/component/browser/_MultiTemplate" + , "src/component/browser/_Select" + , 'src/component/layout/genericDisplayer/GenericWithTopbarDisplayerImpl' , "templates/ActivityList" , "templates/AnimalList" , "templates/TrackingPlatformList" @@ -81,7 +81,7 @@ define([ btnId: "details", title: "info", href: [ - redmicConfig.viewPaths.activityCatalogDetails, + redmicConfig.viewPaths.activityDetails, redmicConfig.viewPaths.platformCatalogDetails ], chooseHref: function(item) { diff --git a/public/javascript/app/designs/mapWithSideContent/main/_TrackingWithListByFilter.js b/client-app/src/oldapp/designs/mapWithSideContent/main/_TrackingWithListByFilter.js similarity index 100% rename from public/javascript/app/designs/mapWithSideContent/main/_TrackingWithListByFilter.js rename to client-app/src/oldapp/designs/mapWithSideContent/main/_TrackingWithListByFilter.js diff --git a/public/javascript/app/designs/textSearchFacetsList/Controller.js b/client-app/src/oldapp/designs/textSearchFacetsList/Controller.js similarity index 62% rename from public/javascript/app/designs/textSearchFacetsList/Controller.js rename to client-app/src/oldapp/designs/textSearchFacetsList/Controller.js index b959be0a50be20abf193a7ff58d0813577dc7aeb..9752edbf1c25debeda7a6420de90a3dabff82460 100644 --- a/public/javascript/app/designs/textSearchFacetsList/Controller.js +++ b/client-app/src/oldapp/designs/textSearchFacetsList/Controller.js @@ -2,13 +2,13 @@ define([ "app/base/views/extensions/_OnShownAndRefresh" , "app/designs/base/_Browser" , "app/designs/base/_Controller" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Store" - , "redmic/modules/browser/bars/Pagination" - , "redmic/modules/search/FacetsImpl" - , "redmic/modules/search/TextImpl" + , "src/component/base/_Store" + , "src/component/browser/bars/Pagination" + , "src/component/search/FacetsImpl" + , "src/component/search/TextImpl" , "./_AddFilter" ], function ( _OnShownAndRefresh @@ -31,19 +31,14 @@ define([ this.config = { viewPaths: redmicConfig.viewPaths, - controllerEvents: { - DOWNLOAD_FILE: "downloadFile" - }, - controllerActions: { - DOWNLOAD_FILE: "downloadFile", - GET_REPORT: "getReport" - }, - browserBars: [{ - definition: Pagination, - config: { - rowPerPage: 25 + browserBars: { + pagination: { + definition: Pagination, + config: { + rowPerPage: 25 + } } - }] + } }; lang.mixin(this, this.config, args); @@ -68,22 +63,11 @@ define([ this.facets = new FacetsImpl(this.facetsConfig); }, - _defineControllerSubscriptions: function() { - - this.subscriptionsConfig.push({ - channel : this._buildChannel(this.managerChannel, this.actions.DOWNLOAD_FILE), - callback: "_subDownloadFile" - }); - }, - _defineControllerPublications: function() { this.publicationsConfig.push({ event: 'UPDATE_TARGET', channel: this.textSearch.getChannel("UPDATE_TARGET") - },{ - event: 'DOWNLOAD_FILE', - channel: this._buildChannel(this.taskChannel, this.actions.GET_REPORT) }); }, @@ -97,22 +81,13 @@ define([ this._emitEvt('ADD_TO_QUERY', { query: { - size: 25 + size: this.browserBars.pagination.config.rowPerPage } }); this._publish(this.facets.getChannel("SHOW"), { node: this.facetsNode }); - }, - - _subDownloadFile: function(request) { - - this._emitEvt('DOWNLOAD_FILE', { - target: this.selectionTarget ? this.selectionTarget : this.target, - serviceTag: this.reportService, - format: request.format - }); } }); }); diff --git a/public/javascript/app/designs/textSearchFacetsList/Layout.js b/client-app/src/oldapp/designs/textSearchFacetsList/Layout.js similarity index 98% rename from public/javascript/app/designs/textSearchFacetsList/Layout.js rename to client-app/src/oldapp/designs/textSearchFacetsList/Layout.js index 23a72b52c7f91fd0826b7e91855b6cd55b890a31..9354b06596af294031d4e099d28585ff6dcd8383 100644 --- a/public/javascript/app/designs/textSearchFacetsList/Layout.js +++ b/client-app/src/oldapp/designs/textSearchFacetsList/Layout.js @@ -5,7 +5,7 @@ define([ , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "put-selector/put" + , 'put-selector' ], function( _Layout , ContentPane diff --git a/public/javascript/app/designs/textSearchFacetsList/_AddFilter.js b/client-app/src/oldapp/designs/textSearchFacetsList/_AddFilter.js similarity index 100% rename from public/javascript/app/designs/textSearchFacetsList/_AddFilter.js rename to client-app/src/oldapp/designs/textSearchFacetsList/_AddFilter.js diff --git a/public/javascript/app/designs/textSearchFacetsList/main/Administrative.js b/client-app/src/oldapp/designs/textSearchFacetsList/main/Administrative.js similarity index 83% rename from public/javascript/app/designs/textSearchFacetsList/main/Administrative.js rename to client-app/src/oldapp/designs/textSearchFacetsList/main/Administrative.js index 0e8bd37ac9cdcfb43d772f7be938ae222d022517..0774fe289e0df83fe1ad5cfc9045516d5c07666e 100644 --- a/public/javascript/app/designs/textSearchFacetsList/main/Administrative.js +++ b/client-app/src/oldapp/designs/textSearchFacetsList/main/Administrative.js @@ -2,13 +2,13 @@ define([ "app/designs/base/_Main" , "app/designs/textSearchFacetsList/Controller" , "app/designs/textSearchFacetsList/Layout" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/browser/_Select" - , "redmic/modules/browser/bars/SelectionBox" - , "redmic/modules/browser/bars/Order" - , "redmic/modules/browser/bars/Total" + , "src/component/browser/_Select" + , "src/component/browser/bars/SelectionBox" + , "src/component/browser/bars/Order" + , "src/component/browser/bars/Total" ], function( _Main , Controller diff --git a/public/javascript/app/designs/textSearchFacetsList/main/Domain.js b/client-app/src/oldapp/designs/textSearchFacetsList/main/Domain.js similarity index 80% rename from public/javascript/app/designs/textSearchFacetsList/main/Domain.js rename to client-app/src/oldapp/designs/textSearchFacetsList/main/Domain.js index 0f0717d8408fa02b7ae1fa08bc5b91c702244be6..57e4b4757c23da1152072ee4132183cd71f5ddb7 100644 --- a/public/javascript/app/designs/textSearchFacetsList/main/Domain.js +++ b/client-app/src/oldapp/designs/textSearchFacetsList/main/Domain.js @@ -2,11 +2,11 @@ define([ "app/designs/base/_Main" , "app/designs/textSearchFacetsList/Controller" , "app/designs/textSearchFacetsList/Layout" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/browser/bars/Order" - , "redmic/modules/browser/bars/Total" + , "src/component/browser/bars/Order" + , "src/component/browser/bars/Total" ], function( _Main , Controller @@ -40,7 +40,11 @@ define([ },{ instance: Order, config: 'orderConfig' - }] + }], + orderConfig: { + defaultOrderField: 'name', + defaultOrderDirection: 'ASC' + } }, this.browserConfig || {}]); } }); diff --git a/public/javascript/app/designs/textSearchFacetsList/main/Taxon.js b/client-app/src/oldapp/designs/textSearchFacetsList/main/Taxon.js similarity index 90% rename from public/javascript/app/designs/textSearchFacetsList/main/Taxon.js rename to client-app/src/oldapp/designs/textSearchFacetsList/main/Taxon.js index e6468e77eac9da00665d1a8b3d46e1853c23b8e2..6599582373b3da76bfb05c0455137e63de6c1b6b 100644 --- a/public/javascript/app/designs/textSearchFacetsList/main/Taxon.js +++ b/client-app/src/oldapp/designs/textSearchFacetsList/main/Taxon.js @@ -4,15 +4,15 @@ define([ , "app/designs/textSearchFacetsList/Layout" , "app/base/views/extensions/_EditionView" , "app/base/views/extensions/_FormInDialogView" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "templates/SpeciesList" - , "redmic/modules/base/_Persistence" - , "redmic/modules/browser/_Select" - , "redmic/modules/browser/bars/SelectionBox" - , "redmic/modules/browser/bars/Order" - , "redmic/modules/browser/bars/Total" + , "src/component/base/_Persistence" + , "src/component/browser/_Select" + , "src/component/browser/bars/SelectionBox" + , "src/component/browser/bars/Order" + , "src/component/browser/bars/Total" ], function( _Main , Controller diff --git a/public/javascript/app/designs/textSearchList/Controller.js b/client-app/src/oldapp/designs/textSearchList/Controller.js similarity index 79% rename from public/javascript/app/designs/textSearchList/Controller.js rename to client-app/src/oldapp/designs/textSearchList/Controller.js index bd32c2789a8054e8c27a53c8ea7c199f72312415..5f730ae1cc48ac193fa5ba6d54b67aaa0e722b6d 100644 --- a/public/javascript/app/designs/textSearchList/Controller.js +++ b/client-app/src/oldapp/designs/textSearchList/Controller.js @@ -1,11 +1,11 @@ define([ "app/designs/base/_Browser" , "app/designs/base/_Controller" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/browser/bars/Pagination" - , "redmic/modules/search/TextImpl" + , "src/component/browser/bars/Pagination" + , "src/component/search/TextImpl" , "./_AddFilter" ], function ( _Browser @@ -25,12 +25,14 @@ define([ this.config = { viewPaths: redmicConfig.viewPaths, - browserBars: [{ - definition: Pagination, - config: { - rowPerPage: 25 + browserBars: { + pagination: { + definition: Pagination, + config: { + rowPerPage: 25 + } } - }] + } }; lang.mixin(this, this.config, args); @@ -55,7 +57,7 @@ define([ this._emitEvt('ADD_TO_QUERY', { query: { - size: 25 + size: this.browserBars.pagination.config.rowPerPage } }); diff --git a/public/javascript/app/designs/textSearchList/_AddFilter.js b/client-app/src/oldapp/designs/textSearchList/_AddFilter.js similarity index 100% rename from public/javascript/app/designs/textSearchList/_AddFilter.js rename to client-app/src/oldapp/designs/textSearchList/_AddFilter.js diff --git a/public/javascript/app/designs/textSearchList/layout/BasicAndButtonsTopZone.js b/client-app/src/oldapp/designs/textSearchList/layout/BasicAndButtonsTopZone.js similarity index 97% rename from public/javascript/app/designs/textSearchList/layout/BasicAndButtonsTopZone.js rename to client-app/src/oldapp/designs/textSearchList/layout/BasicAndButtonsTopZone.js index d5fac361da8af8a4e278a039305585217d1452c6..2ae2ce0d5fbef56904280891081b5651288c3e8c 100644 --- a/public/javascript/app/designs/textSearchList/layout/BasicAndButtonsTopZone.js +++ b/client-app/src/oldapp/designs/textSearchList/layout/BasicAndButtonsTopZone.js @@ -2,7 +2,7 @@ define([ 'app/designs/base/_Layout' , 'dojo/_base/declare' , 'dojo/_base/lang' - , 'put-selector/put' + , 'put-selector' ], function( _Layout , declare diff --git a/public/javascript/app/designs/textSearchList/layout/BasicTopZone.js b/client-app/src/oldapp/designs/textSearchList/layout/BasicTopZone.js similarity index 97% rename from public/javascript/app/designs/textSearchList/layout/BasicTopZone.js rename to client-app/src/oldapp/designs/textSearchList/layout/BasicTopZone.js index 51f980672c0a1ee8d96b6f36ff93c94da0645d43..76d63bd00d9be991d5363db8c3c13151179c6a2e 100644 --- a/public/javascript/app/designs/textSearchList/layout/BasicTopZone.js +++ b/client-app/src/oldapp/designs/textSearchList/layout/BasicTopZone.js @@ -2,7 +2,7 @@ define([ 'app/designs/base/_Layout' , 'dojo/_base/declare' , 'dojo/_base/lang' - , 'put-selector/put' + , 'put-selector' ], function( _Layout , declare diff --git a/public/javascript/app/designs/textSearchList/main/Domain.js b/client-app/src/oldapp/designs/textSearchList/main/Domain.js similarity index 85% rename from public/javascript/app/designs/textSearchList/main/Domain.js rename to client-app/src/oldapp/designs/textSearchList/main/Domain.js index ab92be2917149a3d4f968d3c6c9a23f2fb2c86f1..4277d229493a26f1b4d45ef420bf931acbe0ffba 100644 --- a/public/javascript/app/designs/textSearchList/main/Domain.js +++ b/client-app/src/oldapp/designs/textSearchList/main/Domain.js @@ -5,12 +5,11 @@ define([ , 'app/designs/base/_Main' , 'app/designs/textSearchList/Controller' , 'app/designs/textSearchList/layout/BasicAndButtonsTopZone' - , 'app/redmicConfig' + , 'src/redmicConfig' , 'dojo/_base/declare' , 'dojo/_base/lang' - , "redmic/modules/browser/bars/Order" - , "redmic/modules/browser/bars/Pagination" - , "redmic/modules/browser/bars/Total" + , "src/component/browser/bars/Order" + , "src/component/browser/bars/Total" , 'templates/DomainList' ], function( _EditionView @@ -23,7 +22,6 @@ define([ , declare , lang , Order - , Pagination , Total , templateList ){ @@ -49,8 +47,6 @@ define([ },{ instance: Order, config: 'orderConfig' - },{ - instance: Pagination }], rowConfig: { buttonsConfig: { @@ -58,6 +54,8 @@ define([ } }, orderConfig: { + defaultOrderField: 'name', + defaultOrderDirection: 'ASC', options: [ {value: 'name'}, {value: 'name_en'} @@ -68,7 +66,7 @@ define([ }); this.formConfig = this._merge([{ - template: 'maintenance/domains/templates/forms/Domain' + template: 'src/maintenance/domain/form/Domain' }, this.formConfig || {}]); }, diff --git a/public/javascript/app/designs/textSearchList/main/Selection.js b/client-app/src/oldapp/designs/textSearchList/main/Selection.js similarity index 95% rename from public/javascript/app/designs/textSearchList/main/Selection.js rename to client-app/src/oldapp/designs/textSearchList/main/Selection.js index fe57d538db75762ec25efafd9d47df670ff76333..be58c03297eb4da9d9486c124ebab81b8e2e7e50 100644 --- a/public/javascript/app/designs/textSearchList/main/Selection.js +++ b/client-app/src/oldapp/designs/textSearchList/main/Selection.js @@ -1,13 +1,13 @@ define([ - 'alertify/alertify.min' + 'alertify' , "app/base/views/extensions/_OnShownAndRefresh" , "app/designs/base/_Main" , "app/designs/textSearchList/Controller" , "app/designs/textSearchList/layout/BasicTopZone" , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Store" - , "redmic/modules/base/_Persistence" + , "src/component/base/_Store" + , "src/component/base/_Persistence" , "templates/SelectionList" ], function( alertify @@ -105,7 +105,7 @@ define([ _shareCallback: function(data) { - var shareUrl = window.location + '?settings-id=' + data.id; + var shareUrl = globalThis.location + '?settings-id=' + data.id; alertify.confirm(shareUrl, lang.hitch(this, function(shareUrl) { diff --git a/public/javascript/app/details/views/ActivityAreaMapBase.js b/client-app/src/oldapp/details/views/ActivityAreaMapBase.js similarity index 95% rename from public/javascript/app/details/views/ActivityAreaMapBase.js rename to client-app/src/oldapp/details/views/ActivityAreaMapBase.js index 71a2c3dabfcc21e35642a0867171489fee6171ce..2850142128d406c10008d1615d728305ab7b4b18 100644 --- a/public/javascript/app/details/views/ActivityAreaMapBase.js +++ b/client-app/src/oldapp/details/views/ActivityAreaMapBase.js @@ -1,10 +1,10 @@ define([ "app/designs/details/main/ActivityMap" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "redmic/modules/map/layer/GeoJsonLayerImpl" + , "src/component/map/layer/GeoJsonLayerImpl" , "templates/AreaPopup" , "templates/AreaList" ], function( diff --git a/public/javascript/app/details/views/ActivityChart.js b/client-app/src/oldapp/details/views/ActivityChart.js similarity index 87% rename from public/javascript/app/details/views/ActivityChart.js rename to client-app/src/oldapp/details/views/ActivityChart.js index 111e78aba6e3105480950389321d5b446f622713..9bc1208cb0e3e1a5c8c364fb5e41a3b31c386f6f 100644 --- a/public/javascript/app/details/views/ActivityChart.js +++ b/client-app/src/oldapp/details/views/ActivityChart.js @@ -7,10 +7,10 @@ define([ , 'app/details/views/_ActivityTimeSeriesDataManagement' , 'dojo/_base/declare' , 'dojo/_base/lang' - , 'redmic/modules/chart/ChartsContainer/_InfoOnMouseOver' - , 'redmic/modules/chart/ChartsContainer/_TemporalAxisWithGridDrawing' - , 'redmic/modules/chart/ChartsContainer/_VerticalAxesWithGridDrawing' - , 'redmic/modules/chart/ChartsContainer/_ZoomByDragging' + , 'src/component/chart/ChartsContainer/_InfoOnMouseOver' + , 'src/component/chart/ChartsContainer/_TemporalAxisWithGridDrawing' + , 'src/component/chart/ChartsContainer/_VerticalAxesWithGridDrawing' + , 'src/component/chart/ChartsContainer/_ZoomByDragging' ], function( _Main , _ProcessDataDefinitionAndGetTimeSeries @@ -50,7 +50,7 @@ define([ height: 6, type: [ChartsWithLegendAndToolbarsAndSlider, _ProcessDataDefinitionAndGetTimeSeries], props: { - title: this.i18n.chart, + title: 'chart', target: this.target, filterConfig: { initQuery: { diff --git a/public/javascript/app/details/views/ActivityCitationMapBase.js b/client-app/src/oldapp/details/views/ActivityCitationMapBase.js similarity index 95% rename from public/javascript/app/details/views/ActivityCitationMapBase.js rename to client-app/src/oldapp/details/views/ActivityCitationMapBase.js index 3dbd2a0392353e02fb3a19ad68e50a8e75ca7a4f..14ed3c18edc14177cd8dce464cd3d9a5949e8bd3 100644 --- a/public/javascript/app/details/views/ActivityCitationMapBase.js +++ b/client-app/src/oldapp/details/views/ActivityCitationMapBase.js @@ -1,6 +1,6 @@ define([ "app/designs/details/main/ActivityMap" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "templates/SpeciesDistributionPopup" @@ -27,4 +27,4 @@ define([ lang.mixin(this, this.config, args); } }); -}); \ No newline at end of file +}); diff --git a/public/javascript/app/details/views/ActivityFixedTimeseriesChart.js b/client-app/src/oldapp/details/views/ActivityFixedTimeseriesChart.js similarity index 96% rename from public/javascript/app/details/views/ActivityFixedTimeseriesChart.js rename to client-app/src/oldapp/details/views/ActivityFixedTimeseriesChart.js index 88da64fe60b27a6929f9a09710055f4f39a10846..b70da0996f3dba12a8da55d452d4861dd0fed5dc 100644 --- a/public/javascript/app/details/views/ActivityFixedTimeseriesChart.js +++ b/client-app/src/oldapp/details/views/ActivityFixedTimeseriesChart.js @@ -1,6 +1,6 @@ define([ 'app/details/views/ActivityChart' - , 'app/redmicConfig' + , 'src/redmicConfig' , 'dojo/_base/declare' , 'dojo/_base/lang' ], function( diff --git a/public/javascript/app/details/views/ActivityFixedTimeseriesMap.js b/client-app/src/oldapp/details/views/ActivityFixedTimeseriesMap.js similarity index 91% rename from public/javascript/app/details/views/ActivityFixedTimeseriesMap.js rename to client-app/src/oldapp/details/views/ActivityFixedTimeseriesMap.js index 6ab8750365942b863d84ffa4b0eeb519428d556f..d93f975111b8aaad83ec62beca0f19c51ad5b5f0 100644 --- a/public/javascript/app/details/views/ActivityFixedTimeseriesMap.js +++ b/client-app/src/oldapp/details/views/ActivityFixedTimeseriesMap.js @@ -1,6 +1,6 @@ define([ 'app/designs/details/main/ActivityMap' - , 'app/redmicConfig' + , 'src/redmicConfig' , 'dojo/_base/declare' , 'dojo/_base/lang' , 'dojo/aspect' @@ -54,12 +54,7 @@ define([ icon: 'fa-bar-chart', title: this.i18n.charts, btnId: 'showCharts', - href: '#charts', - returnItem: true - },{ - icon: 'fa-map-marker', - title: this.i18n.map, - btnId: 'mapCentering', + href: '#activityFixedTimeseriesChart', returnItem: true }] } @@ -67,7 +62,9 @@ define([ } } } - }, this.widgetConfigs || {}]); + }, this.widgetConfigs || {}], { + arrayMergingStrategy: 'concatenate' + }); }, _afterShow: function() { @@ -79,7 +76,7 @@ define([ this._subscribe(this._getWidgetInstance('geographic').getChildChannel('browser', 'BUTTON_EVENT'), lang.hitch(this, this._onBrowserShowChartsButtonEvent)); - }, + }, _onStationPopupLoaded: function(res) { diff --git a/public/javascript/app/details/views/ActivityInfrastructureMapBase.js b/client-app/src/oldapp/details/views/ActivityInfrastructureMapBase.js similarity index 95% rename from public/javascript/app/details/views/ActivityInfrastructureMapBase.js rename to client-app/src/oldapp/details/views/ActivityInfrastructureMapBase.js index 3cdb4d9f0b2c18be49923550ad100d232b70c2ad..d6d1a1f28c43a2988b4e04d657f63fccea24d31e 100644 --- a/public/javascript/app/details/views/ActivityInfrastructureMapBase.js +++ b/client-app/src/oldapp/details/views/ActivityInfrastructureMapBase.js @@ -1,6 +1,6 @@ define([ "app/designs/details/main/ActivityMap" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" @@ -60,7 +60,7 @@ define([ }, urlWebcamCallback: function(obj) { - window.open(obj.item.url, '_blank'); + globalThis.open(obj.item.url, '_blank'); } } } diff --git a/public/javascript/app/details/views/ActivityLayerMapBase.js b/client-app/src/oldapp/details/views/ActivityLayerMapBase.js similarity index 88% rename from public/javascript/app/details/views/ActivityLayerMapBase.js rename to client-app/src/oldapp/details/views/ActivityLayerMapBase.js index 560f80a44059b436f8f5047991d9c6322b55a2a5..3598a5a29d82b26df0887570661eff3aa0471bcb 100644 --- a/public/javascript/app/details/views/ActivityLayerMapBase.js +++ b/client-app/src/oldapp/details/views/ActivityLayerMapBase.js @@ -1,9 +1,9 @@ define([ 'app/designs/details/main/ActivityLayerMap' - , 'app/redmicConfig' + , 'src/redmicConfig' , 'dojo/_base/declare' , 'dojo/_base/lang' - , 'redmic/modules/atlas/_AtlasLayersManagement' + , 'src/component/atlas/_AtlasLayersManagement' ], function( ActivityLayerMap , redmicConfig @@ -90,18 +90,18 @@ define([ _createLayer: function(widgetInstance, layer) { - var layerDefinition = this._getAtlasLayerDefinition(), - layerConfiguration = this._getAtlasLayerConfiguration(layer); + var LayerDefinition = this._getMapLayerComponentDefinition(), + layerConfiguration = this._getMapLayerComponentConfiguration(layer); layerConfiguration = this._merge([layerConfiguration, { mapChannel: widgetInstance.getChildChannel('map'), selectorChannel: widgetInstance.getChannel() }]); - var mapLayerInstance = new layerDefinition(layerConfiguration), - mapLayerId = this._getAtlasLayerId(layer); + var mapLayerInstance = new LayerDefinition(layerConfiguration), + atlasItemId = this._getAtlasItemId(layer); - this._activityLayers[mapLayerId] = mapLayerInstance; + this._activityLayers[atlasItemId] = mapLayerInstance; }, _addMapLayer: function(layerId) { diff --git a/public/javascript/app/details/views/ContactDetailsView.js b/client-app/src/oldapp/details/views/ContactDetailsView.js similarity index 95% rename from public/javascript/app/details/views/ContactDetailsView.js rename to client-app/src/oldapp/details/views/ContactDetailsView.js index 361c4da14fd23618f9eb2ea7efc2de7a770a3d73..6fc59f63fbf1a0f6973db1e4ca847f9630629f7e 100644 --- a/public/javascript/app/details/views/ContactDetailsView.js +++ b/client-app/src/oldapp/details/views/ContactDetailsView.js @@ -1,6 +1,6 @@ define([ "app/designs/details/main/Contact" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" ], function( @@ -28,4 +28,4 @@ define([ this.pathParent = redmicConfig.viewPaths.contact; } }); -}); \ No newline at end of file +}); diff --git a/public/javascript/app/details/views/_ActivityTimeSeriesDataManagement.js b/client-app/src/oldapp/details/views/_ActivityTimeSeriesDataManagement.js similarity index 100% rename from public/javascript/app/details/views/_ActivityTimeSeriesDataManagement.js rename to client-app/src/oldapp/details/views/_ActivityTimeSeriesDataManagement.js diff --git a/client-app/src/oldapp/edition/views/ActivityEditionView.js b/client-app/src/oldapp/edition/views/ActivityEditionView.js new file mode 100644 index 0000000000000000000000000000000000000000..a5e87f33b529ceaaa82ab2e34af91eee06a597e8 --- /dev/null +++ b/client-app/src/oldapp/edition/views/ActivityEditionView.js @@ -0,0 +1,9 @@ +define([ + 'src/edition/activity/ActivityEditionView' +], function( + ActivityEditionView +) { + + // TODO placeholder hasta que se referencien las vistas a partir de src/ + return ActivityEditionView; +}); diff --git a/public/javascript/app/edition/views/AnimalEditionView.js b/client-app/src/oldapp/edition/views/AnimalEditionView.js similarity index 98% rename from public/javascript/app/edition/views/AnimalEditionView.js rename to client-app/src/oldapp/edition/views/AnimalEditionView.js index 893a8c995e74d4db839eda19cccee3165a3a6f9a..a3450a0b0aa447768e430a8e4730184eda27db60 100644 --- a/public/javascript/app/edition/views/AnimalEditionView.js +++ b/client-app/src/oldapp/edition/views/AnimalEditionView.js @@ -4,7 +4,7 @@ define([ , "app/components/steps/SpecimenTagSetStep" , "app/designs/edition/Controller" , "app/designs/edition/Layout" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" ], function( @@ -67,4 +67,4 @@ define([ }, this.editorConfig || {}]); } }); -}); \ No newline at end of file +}); diff --git a/public/javascript/app/edition/views/ConditionEditionView.js b/client-app/src/oldapp/edition/views/ConditionEditionView.js similarity index 90% rename from public/javascript/app/edition/views/ConditionEditionView.js rename to client-app/src/oldapp/edition/views/ConditionEditionView.js index 486739b68da48f308dc741c21f56d0b877932eea..1b5ecd8cb452e4dbac8130806e3c28a7fb07ed2c 100644 --- a/public/javascript/app/edition/views/ConditionEditionView.js +++ b/client-app/src/oldapp/edition/views/ConditionEditionView.js @@ -1,12 +1,12 @@ define([ - "app/maintenance/domains/observations/views/AttributeTypesView" + "src/maintenance/domain/definition/AttributeTypes" , "app/components/steps/MainDataStep" , "app/designs/edition/Controller" , "app/designs/edition/Layout" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/layout/wizard/_CompleteBySelection" + , "src/component/layout/wizard/_CompleteBySelection" ], function( AttributeType , MainDataStep diff --git a/public/javascript/app/edition/views/ContactEditionView.js b/client-app/src/oldapp/edition/views/ContactEditionView.js similarity index 97% rename from public/javascript/app/edition/views/ContactEditionView.js rename to client-app/src/oldapp/edition/views/ContactEditionView.js index 91248856ad03ee1a1ab3fea7de970659e761f72a..efdd8e7d0af8b848a7836c51498667eeb9bc46f3 100644 --- a/public/javascript/app/edition/views/ContactEditionView.js +++ b/client-app/src/oldapp/edition/views/ContactEditionView.js @@ -2,7 +2,7 @@ define([ "app/components/steps/MainDataStep" , "app/designs/edition/Controller" , "app/designs/edition/Layout" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" ], function( diff --git a/public/javascript/app/edition/views/DeviceEditionView.js b/client-app/src/oldapp/edition/views/DeviceEditionView.js similarity index 92% rename from public/javascript/app/edition/views/DeviceEditionView.js rename to client-app/src/oldapp/edition/views/DeviceEditionView.js index 68a87b782b2bc0509c569c32acccbf090d0b3db0..5994acdf68849a7f477a012725768b2cb50c4880 100644 --- a/public/javascript/app/edition/views/DeviceEditionView.js +++ b/client-app/src/oldapp/edition/views/DeviceEditionView.js @@ -1,13 +1,13 @@ define([ - "app/maintenance/domains/admin/views/DeviceTypesView" + "src/maintenance/domain/definition/DeviceTypes" , "app/components/steps/CalibrationSetStep" , "app/components/steps/MainDataStep" , "app/designs/edition/Controller" , "app/designs/edition/Layout" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/layout/wizard/_CompleteBySelection" + , "src/component/layout/wizard/_CompleteBySelection" ], function( DeviceType , CalibrationSetStep diff --git a/public/javascript/app/edition/views/DocumentEditionView.js b/client-app/src/oldapp/edition/views/DocumentEditionView.js similarity index 98% rename from public/javascript/app/edition/views/DocumentEditionView.js rename to client-app/src/oldapp/edition/views/DocumentEditionView.js index 93565172144920bd71897e5ad676365cecbbcea5..3676e5fa3f3f7d771890b8efa785dfd5651adc17 100644 --- a/public/javascript/app/edition/views/DocumentEditionView.js +++ b/client-app/src/oldapp/edition/views/DocumentEditionView.js @@ -2,7 +2,7 @@ define([ "app/components/steps/MainDataStep" , "app/designs/edition/Controller" , "app/designs/edition/Layout" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" ], function( diff --git a/public/javascript/app/edition/views/LoadDataDocumentEditionView.js b/client-app/src/oldapp/edition/views/LoadDataDocumentEditionView.js similarity index 100% rename from public/javascript/app/edition/views/LoadDataDocumentEditionView.js rename to client-app/src/oldapp/edition/views/LoadDataDocumentEditionView.js diff --git a/public/javascript/app/edition/views/LoadDataToActivityEditionView.js b/client-app/src/oldapp/edition/views/LoadDataToActivityEditionView.js similarity index 98% rename from public/javascript/app/edition/views/LoadDataToActivityEditionView.js rename to client-app/src/oldapp/edition/views/LoadDataToActivityEditionView.js index a8f53be47d7b3cbf036c71daa3e224cb9b050534..9d8cdde249dcb4532130bfaf1480865d25cad5bd 100644 --- a/public/javascript/app/edition/views/LoadDataToActivityEditionView.js +++ b/client-app/src/oldapp/edition/views/LoadDataToActivityEditionView.js @@ -10,11 +10,11 @@ define([ , "app/edition/views/dataLoader/LoadDataFT" , "app/edition/views/dataLoader/LoadDataOC" , "app/edition/views/dataLoader/LoadDataTR" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/Deferred" - , "redmic/modules/layout/templateDisplayer/TemplateDisplayer" + , "src/component/layout/templateDisplayer/TemplateDisplayer" , "templates/ActivityCategoriesNoExist" ], function( SelectActivityCategoryStep diff --git a/public/javascript/app/edition/views/MetricsDefinitionEditionView.js b/client-app/src/oldapp/edition/views/MetricsDefinitionEditionView.js similarity index 91% rename from public/javascript/app/edition/views/MetricsDefinitionEditionView.js rename to client-app/src/oldapp/edition/views/MetricsDefinitionEditionView.js index 0f8cde78756da15cb7504bec9168233f63364203..93664a5677eff7e78f8da4e3073daf087baefe1a 100644 --- a/public/javascript/app/edition/views/MetricsDefinitionEditionView.js +++ b/client-app/src/oldapp/edition/views/MetricsDefinitionEditionView.js @@ -1,13 +1,13 @@ define([ - "app/maintenance/domains/observations/views/MetricGroupsView" + "src/maintenance/domain/definition/MetricGroups" , "app/administrative/views/DeviceView" , "app/components/steps/MainDataStep" , "app/designs/edition/Controller" , "app/designs/edition/Layout" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/layout/wizard/_CompleteBySelection" + , "src/component/layout/wizard/_CompleteBySelection" ], function( MetricGroup , DeviceView @@ -71,4 +71,4 @@ define([ } }); -}); \ No newline at end of file +}); diff --git a/public/javascript/app/edition/views/MisIdentificationEditionView.js b/client-app/src/oldapp/edition/views/MisIdentificationEditionView.js similarity index 92% rename from public/javascript/app/edition/views/MisIdentificationEditionView.js rename to client-app/src/oldapp/edition/views/MisIdentificationEditionView.js index c74706cd0b012b8f1d1cccd5f17382516b7d4607..13e004d3ce521bd2fe9f385f88c10ffbbb8c7479 100644 --- a/public/javascript/app/edition/views/MisIdentificationEditionView.js +++ b/client-app/src/oldapp/edition/views/MisIdentificationEditionView.js @@ -1,15 +1,15 @@ define([ - "app/viewers/views/BibliographyView" - , "app/catalog/views/SpeciesCatalogView" + "src/catalog/bibliography/BibliographyCatalogView" + , "src/catalog/species/SpeciesCatalogView" , "app/components/steps/CitationStep" , "app/components/steps/MainDataStep" , "app/components/steps/DocumentStepFiltered" , "app/designs/edition/Controller" , "app/designs/edition/Layout" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/layout/wizard/_CompleteBySelection" + , "src/component/layout/wizard/_CompleteBySelection" ], function( DocumentView , SpeciesView diff --git a/public/javascript/app/edition/views/OrganisationEditionView.js b/client-app/src/oldapp/edition/views/OrganisationEditionView.js similarity index 97% rename from public/javascript/app/edition/views/OrganisationEditionView.js rename to client-app/src/oldapp/edition/views/OrganisationEditionView.js index 06c0b9364f5a4c456f776325a3ea0f108493d74e..ddbbf154593e35c1f863669c59984c64dc3e49ad 100644 --- a/public/javascript/app/edition/views/OrganisationEditionView.js +++ b/client-app/src/oldapp/edition/views/OrganisationEditionView.js @@ -2,7 +2,7 @@ define([ "app/components/steps/MainDataStep" , "app/designs/edition/Controller" , "app/designs/edition/Layout" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" ], function( diff --git a/public/javascript/app/edition/views/ParameterEditionView.js b/client-app/src/oldapp/edition/views/ParameterEditionView.js similarity index 91% rename from public/javascript/app/edition/views/ParameterEditionView.js rename to client-app/src/oldapp/edition/views/ParameterEditionView.js index 0c13197a0bbec7f3b771feaefd832c6126944e34..131c0791a85e28801daf6bf1474a951d1fa189e6 100644 --- a/public/javascript/app/edition/views/ParameterEditionView.js +++ b/client-app/src/oldapp/edition/views/ParameterEditionView.js @@ -1,13 +1,13 @@ define([ - "app/maintenance/domains/observations/views/ParameterTypesView" + "src/maintenance/domain/definition/ParameterTypes" , "app/components/steps/MainDataStep" , "app/components/steps/UnitSetStep" , "app/designs/edition/Controller" , "app/designs/edition/Layout" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/layout/wizard/_CompleteBySelection" + , "src/component/layout/wizard/_CompleteBySelection" ], function( ParameterType , ParameterMainDataStep diff --git a/public/javascript/app/edition/views/PermissionsEditionView.js b/client-app/src/oldapp/edition/views/PermissionsEditionView.js similarity index 98% rename from public/javascript/app/edition/views/PermissionsEditionView.js rename to client-app/src/oldapp/edition/views/PermissionsEditionView.js index 9b57eb035da30d7b1c63b6e33ce6c0ffc204af6e..27ce8a4fe5f7b9b559fe10304e0bed89a3d6097f 100644 --- a/public/javascript/app/edition/views/PermissionsEditionView.js +++ b/client-app/src/oldapp/edition/views/PermissionsEditionView.js @@ -4,7 +4,7 @@ define([ , "app/designs/edition/Controller" , "app/designs/edition/Layout" , "app/maintenance/models/PermissionsModel" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" ], function( diff --git a/client-app/src/oldapp/edition/views/PlatformEditionView.js b/client-app/src/oldapp/edition/views/PlatformEditionView.js new file mode 100644 index 0000000000000000000000000000000000000000..b5d229b845e463e9b32fe38c233622f34a6156d2 --- /dev/null +++ b/client-app/src/oldapp/edition/views/PlatformEditionView.js @@ -0,0 +1,9 @@ +define([ + 'src/edition/platform/PlatformEditionView' +], function( + PlatformEditionView +) { + + // TODO placeholder hasta que se referencien las vistas a partir de src/ + return PlatformEditionView; +}); diff --git a/client-app/src/oldapp/edition/views/ProgramEditionView.js b/client-app/src/oldapp/edition/views/ProgramEditionView.js new file mode 100644 index 0000000000000000000000000000000000000000..4978258ed2229fd61a3fdb0aa6b93996a73afa9e --- /dev/null +++ b/client-app/src/oldapp/edition/views/ProgramEditionView.js @@ -0,0 +1,9 @@ +define([ + 'src/edition/program/ProgramEditionView' +], function( + ProgramEditionView +) { + + // TODO placeholder hasta que se referencien las vistas a partir de src/ + return ProgramEditionView; +}); diff --git a/client-app/src/oldapp/edition/views/ProjectEditionView.js b/client-app/src/oldapp/edition/views/ProjectEditionView.js new file mode 100644 index 0000000000000000000000000000000000000000..91bd56f6c7c5846ba614a5cb403e811b856b50d5 --- /dev/null +++ b/client-app/src/oldapp/edition/views/ProjectEditionView.js @@ -0,0 +1,9 @@ +define([ + 'src/edition/project/ProjectEditionView' +], function( + ProjectEditionView +) { + + // TODO placeholder hasta que se referencien las vistas a partir de src/ + return ProjectEditionView; +}); diff --git a/public/javascript/app/edition/views/ServiceOGCEditionView.js b/client-app/src/oldapp/edition/views/ServiceOGCEditionView.js similarity index 95% rename from public/javascript/app/edition/views/ServiceOGCEditionView.js rename to client-app/src/oldapp/edition/views/ServiceOGCEditionView.js index d0309a226ade07b362d52a0298c04a4a41e1bc3a..196520462c0cbc37384305054275e64e3ebcea51 100644 --- a/public/javascript/app/edition/views/ServiceOGCEditionView.js +++ b/client-app/src/oldapp/edition/views/ServiceOGCEditionView.js @@ -8,7 +8,7 @@ define([ , "app/components/steps/SelectLayerStep" , "app/designs/edition/Controller" , "app/designs/edition/Layout" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" ], function( @@ -48,9 +48,9 @@ define([ _setConfigurations: function() { this.editorConfig = this._merge([{ - title: this.i18n.newServiceOGC, + title: this.i18n.newOgcService, editionTitle: { - primary: this.i18n.editServiceOGC, + primary: this.i18n.editOgcService, secondary: "{title}" }, modelTarget: this.editionTarget, diff --git a/public/javascript/app/edition/views/SpeciesEditionView.js b/client-app/src/oldapp/edition/views/SpeciesEditionView.js similarity index 98% rename from public/javascript/app/edition/views/SpeciesEditionView.js rename to client-app/src/oldapp/edition/views/SpeciesEditionView.js index 60329c53ec19c689ed6582549445b6a77d0875dd..f4183e0fe10467c028ad236c873e78c2199b80f5 100644 --- a/public/javascript/app/edition/views/SpeciesEditionView.js +++ b/client-app/src/oldapp/edition/views/SpeciesEditionView.js @@ -3,7 +3,7 @@ define([ , "app/components/steps/SpeciesMainDataStep" , "app/designs/edition/Controller" , "app/designs/edition/Layout" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" ], function( diff --git a/public/javascript/app/edition/views/UnitEditionView.js b/client-app/src/oldapp/edition/views/UnitEditionView.js similarity index 90% rename from public/javascript/app/edition/views/UnitEditionView.js rename to client-app/src/oldapp/edition/views/UnitEditionView.js index cfee36ca12ba619a3c302eb51fbc77e4d026552b..f5adc41b900c7bb6810f187a0919afaa5d2ee9f6 100644 --- a/public/javascript/app/edition/views/UnitEditionView.js +++ b/client-app/src/oldapp/edition/views/UnitEditionView.js @@ -1,12 +1,12 @@ define([ "app/components/steps/MainDataStep" - , "app/maintenance/domains/observations/views/UnitTypesView" + , "src/maintenance/domain/definition/UnitTypes" , "app/designs/edition/Controller" , "app/designs/edition/Layout" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/layout/wizard/_CompleteBySelection" + , "src/component/layout/wizard/_CompleteBySelection" ], function( MainDataStep , UnitType diff --git a/public/javascript/app/edition/views/dataLoader/AddDataFT.js b/client-app/src/oldapp/edition/views/dataLoader/AddDataFT.js similarity index 99% rename from public/javascript/app/edition/views/dataLoader/AddDataFT.js rename to client-app/src/oldapp/edition/views/dataLoader/AddDataFT.js index 0b57ed487ab2396e1d2fbb072b4e21b7f9d70114..6febf05a30e77de9450ba4a1a36860341799790c 100644 --- a/public/javascript/app/edition/views/dataLoader/AddDataFT.js +++ b/client-app/src/oldapp/edition/views/dataLoader/AddDataFT.js @@ -5,7 +5,7 @@ define([ , "app/components/viewCustomization/addGeomSite/views/Point" , "app/designs/edition/Controller" , "app/designs/edition/Layout" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" ], function( diff --git a/public/javascript/app/edition/views/dataLoader/AddDataIF.js b/client-app/src/oldapp/edition/views/dataLoader/AddDataIF.js similarity index 98% rename from public/javascript/app/edition/views/dataLoader/AddDataIF.js rename to client-app/src/oldapp/edition/views/dataLoader/AddDataIF.js index 9179cd97f46c43a85fd5fbec4bd30f11f88a83c9..f048a0076bcef7382ca956a04af05d07675914b5 100644 --- a/public/javascript/app/edition/views/dataLoader/AddDataIF.js +++ b/client-app/src/oldapp/edition/views/dataLoader/AddDataIF.js @@ -4,7 +4,7 @@ define([ , "app/components/viewCustomization/addGeomSite/views/Point" , "app/designs/edition/Controller" , "app/designs/edition/Layout" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" ], function( @@ -61,4 +61,4 @@ define([ }, this.editorConfig || {}]); } }); -}); \ No newline at end of file +}); diff --git a/public/javascript/app/edition/views/dataLoader/AddDataOC.js b/client-app/src/oldapp/edition/views/dataLoader/AddDataOC.js similarity index 99% rename from public/javascript/app/edition/views/dataLoader/AddDataOC.js rename to client-app/src/oldapp/edition/views/dataLoader/AddDataOC.js index 66f15a7f2593426081745af8a9c7a5b5e4e4cfa6..23dff4a98b82be396d2504593dc2dfdfe88798f7 100644 --- a/public/javascript/app/edition/views/dataLoader/AddDataOC.js +++ b/client-app/src/oldapp/edition/views/dataLoader/AddDataOC.js @@ -5,7 +5,7 @@ define([ , "app/components/viewCustomization/addGeomSite/views/Line" , "app/designs/edition/Controller" , "app/designs/edition/Layout" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" ], function( diff --git a/public/javascript/app/edition/views/dataLoader/EditDataAR.js b/client-app/src/oldapp/edition/views/dataLoader/EditDataAR.js similarity index 98% rename from public/javascript/app/edition/views/dataLoader/EditDataAR.js rename to client-app/src/oldapp/edition/views/dataLoader/EditDataAR.js index 2518c565e0fd398a1fcb14fe1e11891f6b23580a..8f1457e81e2e2800ac7fb1155898b31401348fba 100644 --- a/public/javascript/app/edition/views/dataLoader/EditDataAR.js +++ b/client-app/src/oldapp/edition/views/dataLoader/EditDataAR.js @@ -3,7 +3,7 @@ define([ , "app/components/steps/MainDataStep" , "app/designs/edition/Controller" , "app/designs/edition/Layout" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" ], function( diff --git a/public/javascript/app/edition/views/dataLoader/LoadDataAR.js b/client-app/src/oldapp/edition/views/dataLoader/LoadDataAR.js similarity index 100% rename from public/javascript/app/edition/views/dataLoader/LoadDataAR.js rename to client-app/src/oldapp/edition/views/dataLoader/LoadDataAR.js diff --git a/public/javascript/app/edition/views/dataLoader/LoadDataFT.js b/client-app/src/oldapp/edition/views/dataLoader/LoadDataFT.js similarity index 100% rename from public/javascript/app/edition/views/dataLoader/LoadDataFT.js rename to client-app/src/oldapp/edition/views/dataLoader/LoadDataFT.js diff --git a/public/javascript/app/edition/views/dataLoader/LoadDataOC.js b/client-app/src/oldapp/edition/views/dataLoader/LoadDataOC.js similarity index 96% rename from public/javascript/app/edition/views/dataLoader/LoadDataOC.js rename to client-app/src/oldapp/edition/views/dataLoader/LoadDataOC.js index eaf06a201406b053fb50215602afc1e75e3386f5..e6c22338fcc091f5c5251a729aade499a1b84d84 100644 --- a/public/javascript/app/edition/views/dataLoader/LoadDataOC.js +++ b/client-app/src/oldapp/edition/views/dataLoader/LoadDataOC.js @@ -11,11 +11,11 @@ define([ , "app/designs/list/Controller" , "app/designs/list/layout/Layout" , "app/edition/views/dataLoader/_BaseLoadDataToActivityEdition" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/browser/_Select" - , "redmic/modules/layout/wizard/_CompleteBySelection" + , "src/component/browser/_Select" + , "src/component/layout/wizard/_CompleteBySelection" , "templates/DomainList" ], function( _LocalSelectionView diff --git a/public/javascript/app/edition/views/dataLoader/LoadDataTR.js b/client-app/src/oldapp/edition/views/dataLoader/LoadDataTR.js similarity index 95% rename from public/javascript/app/edition/views/dataLoader/LoadDataTR.js rename to client-app/src/oldapp/edition/views/dataLoader/LoadDataTR.js index 7348a8db90eb0775313f1da35d167b3c8d589e83..24ec1e260e10e7c5405f9dc84b505593dd211573 100644 --- a/public/javascript/app/edition/views/dataLoader/LoadDataTR.js +++ b/client-app/src/oldapp/edition/views/dataLoader/LoadDataTR.js @@ -7,12 +7,12 @@ define([ , "app/designs/list/Controller" , "app/designs/list/layout/Layout" , "app/edition/views/dataLoader/_BaseLoadDataToActivityEdition" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/browser/_Select" - , "redmic/modules/browser/bars/Pagination" - , "redmic/modules/layout/wizard/_CompleteBySelection" + , "src/component/browser/_Select" + , "src/component/browser/bars/Pagination" + , "src/component/layout/wizard/_CompleteBySelection" , "templates/AnimalList" , "templates/PlatformList" ], function( diff --git a/public/javascript/app/edition/views/dataLoader/_BaseDataToActivityEdition.js b/client-app/src/oldapp/edition/views/dataLoader/_BaseDataToActivityEdition.js similarity index 99% rename from public/javascript/app/edition/views/dataLoader/_BaseDataToActivityEdition.js rename to client-app/src/oldapp/edition/views/dataLoader/_BaseDataToActivityEdition.js index 3f06d8ab99a28f9ced54289c818d1f9edd520076..705c581b8ad0cbc05b1156cfd5433a0406f39034 100644 --- a/public/javascript/app/edition/views/dataLoader/_BaseDataToActivityEdition.js +++ b/client-app/src/oldapp/edition/views/dataLoader/_BaseDataToActivityEdition.js @@ -1,7 +1,7 @@ define([ "app/designs/edition/Controller" , "app/designs/edition/Layout" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" @@ -162,4 +162,4 @@ define([ }); } }); -}); \ No newline at end of file +}); diff --git a/public/javascript/app/edition/views/dataLoader/_BaseDataToActivityEditionItfc.js b/client-app/src/oldapp/edition/views/dataLoader/_BaseDataToActivityEditionItfc.js similarity index 93% rename from public/javascript/app/edition/views/dataLoader/_BaseDataToActivityEditionItfc.js rename to client-app/src/oldapp/edition/views/dataLoader/_BaseDataToActivityEditionItfc.js index 76a88f1b215a798cc14fbdc322abe4debfd3491b..0975648a1497c18ea57a7126287c9ca0cbd79585 100644 --- a/public/javascript/app/edition/views/dataLoader/_BaseDataToActivityEditionItfc.js +++ b/client-app/src/oldapp/edition/views/dataLoader/_BaseDataToActivityEditionItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/public/javascript/app/edition/views/dataLoader/_BaseLoadDataToActivityEdition.js b/client-app/src/oldapp/edition/views/dataLoader/_BaseLoadDataToActivityEdition.js similarity index 100% rename from public/javascript/app/edition/views/dataLoader/_BaseLoadDataToActivityEdition.js rename to client-app/src/oldapp/edition/views/dataLoader/_BaseLoadDataToActivityEdition.js diff --git a/public/javascript/app/edition/views/dataLoader/_BaseLoadDataToActivityEditionItfc.js b/client-app/src/oldapp/edition/views/dataLoader/_BaseLoadDataToActivityEditionItfc.js similarity index 92% rename from public/javascript/app/edition/views/dataLoader/_BaseLoadDataToActivityEditionItfc.js rename to client-app/src/oldapp/edition/views/dataLoader/_BaseLoadDataToActivityEditionItfc.js index 9c15cb189d30764bf69a360acd1bcbaa43d249ca..2d25d9289d6c542f8e7cffea413dd013c51ef010 100644 --- a/public/javascript/app/edition/views/dataLoader/_BaseLoadDataToActivityEditionItfc.js +++ b/client-app/src/oldapp/edition/views/dataLoader/_BaseLoadDataToActivityEditionItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/public/javascript/app/maintenance/models/AccessModel.js b/client-app/src/oldapp/maintenance/models/AccessModel.js similarity index 94% rename from public/javascript/app/maintenance/models/AccessModel.js rename to client-app/src/oldapp/maintenance/models/AccessModel.js index b00b619bca65dcfe4a8964ca84dad9c47fad1536..0ce0d86c982576e2bc805efe9ce9d715af4999ab 100644 --- a/public/javascript/app/maintenance/models/AccessModel.js +++ b/client-app/src/oldapp/maintenance/models/AccessModel.js @@ -1,5 +1,5 @@ define([ - "app/redmicConfig" + 'src/redmicConfig' ], function ( redmicConfig ){ @@ -22,4 +22,4 @@ define([ } } }; -}); \ No newline at end of file +}); diff --git a/public/javascript/app/maintenance/models/PermissionsModel.js b/client-app/src/oldapp/maintenance/models/PermissionsModel.js similarity index 97% rename from public/javascript/app/maintenance/models/PermissionsModel.js rename to client-app/src/oldapp/maintenance/models/PermissionsModel.js index f6d063ee0373bb84733c8119866f059c6bc43dc5..5d0d4dfa6fef34feba21e65a4deee397c7df7e01 100644 --- a/public/javascript/app/maintenance/models/PermissionsModel.js +++ b/client-app/src/oldapp/maintenance/models/PermissionsModel.js @@ -1,5 +1,5 @@ define([ - "app/redmicConfig" + 'src/redmicConfig' ], function ( redmicConfig ){ @@ -49,4 +49,4 @@ define([ } } }; -}); \ No newline at end of file +}); diff --git a/public/javascript/app/maintenance/views/DomainView.js b/client-app/src/oldapp/maintenance/views/DomainView.js similarity index 89% rename from public/javascript/app/maintenance/views/DomainView.js rename to client-app/src/oldapp/maintenance/views/DomainView.js index 06530d19b68e66892de78cc88b62145f69491cdc..6ebf497ea7fc58ac72cca5d324f535ca4327d23d 100644 --- a/public/javascript/app/maintenance/views/DomainView.js +++ b/client-app/src/oldapp/maintenance/views/DomainView.js @@ -1,7 +1,7 @@ define([ "app/designs/details/Controller" , "app/designs/details/Layout" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "app/base/views/_ViewListBase" @@ -32,7 +32,7 @@ define([ height: 3, type: _ViewListBase, props: { - title: this.i18n.administrative, + title: 'administrative', "class": "containerDetails", items: { catergoryId: 109, @@ -46,7 +46,7 @@ define([ height: 3, type: _ViewListBase, props: { - title: this.i18n.speciesAndTaxonomy, + title: 'speciesAndTaxonomy', "class": "containerDetails", items: { catergoryId: 110, @@ -59,7 +59,7 @@ define([ height: 3, type: _ViewListBase, props: { - title: this.i18n.dataAndObservations, + title: 'dataAndObservations', "class": "containerDetails", items: { catergoryId: 111, @@ -73,7 +73,7 @@ define([ height: 3, type: _ViewListBase, props: { - title: this.i18n.geometryAndClassifications, + title: 'geometryAndClassifications', "class": "containerDetails", items: { catergoryId: 112, @@ -108,4 +108,4 @@ define([ } }); -}); \ No newline at end of file +}); diff --git a/public/javascript/app/maintenance/views/PermissionsView.js b/client-app/src/oldapp/maintenance/views/PermissionsView.js similarity index 88% rename from public/javascript/app/maintenance/views/PermissionsView.js rename to client-app/src/oldapp/maintenance/views/PermissionsView.js index bc40a64acfecc9d40ebf6a2e9b6208580091f77a..e9704a8f4e23a2e9115373caf16d74a178872939 100644 --- a/public/javascript/app/maintenance/views/PermissionsView.js +++ b/client-app/src/oldapp/maintenance/views/PermissionsView.js @@ -2,13 +2,13 @@ define([ "app/base/views/extensions/_EditionWizardView" , "app/designs/list/Controller" , "app/designs/list/layout/Layout" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Store" - , "redmic/modules/browser/_Select" - //, "redmic/modules/browser/bars/Pagination" - , "redmic/modules/browser/bars/Total" + , "src/component/base/_Store" + , "src/component/browser/_Select" + //, "src/component/browser/bars/Pagination" + , "src/component/browser/bars/Total" , "templates/PermissionsList" ], function( _EditionWizardView @@ -38,7 +38,6 @@ define([ target: redmicConfig.services.users, browserExts: [_Select], itemLabel: null, - perms: null, listButtonsEdition: [] }; diff --git a/public/javascript/app/maintenance/views/templates/forms/AccessForm.html b/client-app/src/oldapp/maintenance/views/templates/forms/AccessForm.html similarity index 100% rename from public/javascript/app/maintenance/views/templates/forms/AccessForm.html rename to client-app/src/oldapp/maintenance/views/templates/forms/AccessForm.html diff --git a/public/javascript/app/maintenance/views/templates/forms/CategoryLayerForm.html b/client-app/src/oldapp/maintenance/views/templates/forms/CategoryLayerForm.html similarity index 100% rename from public/javascript/app/maintenance/views/templates/forms/CategoryLayerForm.html rename to client-app/src/oldapp/maintenance/views/templates/forms/CategoryLayerForm.html diff --git a/public/javascript/app/maintenance/views/templates/forms/DownloadsForm.html b/client-app/src/oldapp/maintenance/views/templates/forms/DownloadsForm.html similarity index 100% rename from public/javascript/app/maintenance/views/templates/forms/DownloadsForm.html rename to client-app/src/oldapp/maintenance/views/templates/forms/DownloadsForm.html diff --git a/public/javascript/app/maintenance/views/templates/forms/PermissionsForm.html b/client-app/src/oldapp/maintenance/views/templates/forms/PermissionsForm.html similarity index 100% rename from public/javascript/app/maintenance/views/templates/forms/PermissionsForm.html rename to client-app/src/oldapp/maintenance/views/templates/forms/PermissionsForm.html diff --git a/public/javascript/app/maintenance/views/templates/forms/ProtocolsForm.html b/client-app/src/oldapp/maintenance/views/templates/forms/ProtocolsForm.html similarity index 100% rename from public/javascript/app/maintenance/views/templates/forms/ProtocolsForm.html rename to client-app/src/oldapp/maintenance/views/templates/forms/ProtocolsForm.html diff --git a/public/javascript/app/maintenance/views/templates/forms/ServiceOGCForm.html b/client-app/src/oldapp/maintenance/views/templates/forms/ServiceOGCForm.html similarity index 100% rename from public/javascript/app/maintenance/views/templates/forms/ServiceOGCForm.html rename to client-app/src/oldapp/maintenance/views/templates/forms/ServiceOGCForm.html diff --git a/public/javascript/app/maintenance/views/templates/forms/ServiceOGCLayerSearchForm.html b/client-app/src/oldapp/maintenance/views/templates/forms/ServiceOGCLayerSearchForm.html similarity index 100% rename from public/javascript/app/maintenance/views/templates/forms/ServiceOGCLayerSearchForm.html rename to client-app/src/oldapp/maintenance/views/templates/forms/ServiceOGCLayerSearchForm.html diff --git a/public/javascript/app/nls/es/translation.js b/client-app/src/oldapp/nls/es/translation.js similarity index 92% rename from public/javascript/app/nls/es/translation.js rename to client-app/src/oldapp/nls/es/translation.js index d518e3271c4c68a388af547cd67b939d4ef0f262..978be9efca785826f42587fa0c946e8b55ba54d4 100644 --- a/public/javascript/app/nls/es/translation.js +++ b/client-app/src/oldapp/nls/es/translation.js @@ -1,5 +1,14 @@ define({ "ok": "Aceptar" + , "contents": "Contenidos" + , "providedByAtlas": "Contenido provisto por atlas" + , "providedByView": "Contenido provisto por este producto" + , "toggleLayerVisibility": "Alternar visibilidad de capa" + , "showLegend": "Mostrar leyenda de la capa" + , "showElevation": "Mostrar valores de elevación de la capa" + , "addLayerFirst": "Añade la capa al mapa primero" + , "navigateToLayerInfo": "Navegar a la vista de detalles de la capa" + , "userData": "Datos de usuario" , "cancel": "Cancelar" , "nextStep": "Siguiente" , "prevStep": "Anterior" @@ -11,7 +20,6 @@ define({ , "closeActivityConfirmationTitle": "Confirmación de cierre de actividad" , "closeActivityConfirmationMessage": "¿Desea establecer como cerrada esta actividad?" , "viewDocument": "Ver documento" - , "underConstruction": "En construcción" , "notFound": "Cero coincidencias" , "layers": "Capas" , "services": "Servicios" @@ -24,6 +32,7 @@ define({ , "parentalTaxon": "Taxón parental" , "legend": "Leyenda" , "noAssociatedDocuments": "Sin documentos asociados" + , "noSupport": "Por favor, actualice su navegador a una versión más reciente" , "registeredTask1": "Su tarea " , "registeredTask2": " se ha registrado." @@ -102,6 +111,7 @@ define({ , "loseSelectionConfirmationMessage": "Perderá su selección actual. ¿Desea continuar?" , "clearSelection": "Limpiar selección" , "selectAll": "Seleccionar todo" + , "select": "Seleccionar" , "data": "Datos" , "method": "Método" , "trophic-regime": "Régimen trófico" @@ -120,7 +130,8 @@ define({ , "unitsAssociated": "Unidades asociadas" , "unitsSelected": "Unidades seleccionadas" , "speciesCatalogView": "Catálogo de especies" - , "activitiesCatalogView": "Catálogo de actividades" + , "activityCatalogView": "Catálogo de actividades" + , "animalCatalogView": "Catálogo de animales" , "projectCatalogView": "Catálogo de proyectos" , "programCatalogView": "Catálogo de programas" , "platformCatalogView": "Catálogo de plataformas" @@ -136,7 +147,7 @@ define({ , "selectDocument": "Seleccione un documento" , "noAssociatedCitations": "Sin citas asociadas" , "speciesItem": "Especie" - , "serviceOGCCatalogView": "Catálogo de servicios OGC" + , "ogcServiceCatalogView": "Catálogo de servicios OGC" , "service-ogc-catalog": "Servicios" , "service-ogc": "Servicios OGC" , "srs": "SRS" @@ -152,8 +163,8 @@ define({ , "geograficFrame": "Marco geográfico" , "activateQueryOnMap": "Activar consulta en mapa" , "queryOnMapActivated": "Ahora puede hacer click en el mapa para mostrar datos sobre ese punto" - , "newServiceOGC": "Nuevo servicio OGC" - , "editServiceOGC": "Editando servicio OGC" + , "newOgcService": "Nuevo servicio OGC" + , "editOgcService": "Editando servicio OGC" , "layerImage": "Imagen de la capa" , "noLayerInfo": "La localización pulsada no contiene ninguna información" , "formats": "Formatos" @@ -299,11 +310,11 @@ define({ , "photo": "Foto" , "recovery": "Recuperación" - , "specimenTag": "Etiqueta de muestras" + , "specimenTag": "Etiqueta" , "recoveries": "Recuperaciones" - , "specimenTags": "Etiquetas de muestras" + , "specimenTags": "Etiquetas" , "recoveriesAssociated": "Recuperaciones asociadas" - , "specimenTagsAssociated": "Etiquetas de muestras asociadas" + , "specimenTagsAssociated": "Etiquetas asociadas" , "convalescence": "Convalecencia" , "admissionDate": "Fecha de admisión" , "releasePlace": "Lugar de liberación" @@ -406,11 +417,6 @@ define({ , "alertRestartAction": "Pulse aquí para deshacer la acción" - , "browserPartiallySupported": "Navegador soportado parcialmente" - , "browserPartiallySupportedMsg1": "Su navegador no soporta todas las características presentes en este módulo" - , "browserPartiallySupportedMsg2": "Puede continuar a pesar de ello, o usar un navegador diferente" - , "recommendBrowser": "Le recomendamos utilizar 'Google Chrome' o 'Mozilla Firefox' para tener un soporte completo" - , "categorizeLayer": "Categorizar capa" , "addLayersCategory": "Añadir categoría de capas" , "editLayersCategory": "Editando categoría de capas" @@ -547,6 +553,9 @@ define({ , "seeMap": "Ver mapa" , "map": "Mapa" , "atlas": "Atlas" + , "atlasViewerView": "Atlas" + , "marineMonitoringViewerView": "Monitorización marina" + , "marineMonitoringLayers": "Capas de monitorización marina" , "activity": "Actividad" , "activities": "Actividades" , "info": "Información" @@ -748,11 +757,13 @@ define({ , "service": "Servicios" , "charts": "Series temporales" , "species-catalog": "Especies" - , "activities-catalog": "Actividades" + , "activity-catalog": "Actividades" , "project-catalog": "Proyectos" , "program-catalog": "Programas" , "platform-catalog": "Plataformas" , "organisation-catalog": "Organizaciones" + , "animal-catalog": "Animales" + , "raster-catalog": "Recursos ráster" , "confidence": "Fiabilidad" , "sightings": "Avistamientos" , "logout": "Cerrar sesión" @@ -842,7 +853,6 @@ define({ , "modeLabel": "Contenido de la cuadrícula" , "pressHere": "Pulse aquí" , "successResetting": "Recuperación de contraseña realizada con éxito" - , "stac-browser": "Teledetección (STAC)" , "monday": "lunes" , "mondayShort": "lun" @@ -886,6 +896,7 @@ define({ , "items": "elementos" + , "marine-monitoring": "Monitorización marina" , "real-time": "Datos en tiempo real" , "goToDashboard": "Visualizar datos" , "dashboard": "Dashboard" @@ -1154,9 +1165,6 @@ define({ , "loadDocument": "Cargar documentos" , "isAphia": "Sin aphia" - , "updateAllSpecies": "Actualizar todas las especies" - , "updateAllSpeciesConfirmationTitle": "Confirmación" - , "updateAllSpeciesConfirmationMessage": "¿Actualizar todas las especies?" , "noteForAttributeType": "Si ya existen otros atributos del mismo tipo, estos deben de tener las fechas establecidas y no deben solaparse entre si" , "noteForContact": "Solo incluir datos de contacto profesional" @@ -1238,6 +1246,7 @@ define({ , "activityStatusFirstValue": "Sin iniciar" , "activityStatusSecondValue": "En curso" , "activityStatusThirdValue": "Concluida" + , "starred": "Destacada" , "starredActivity": "Destacada" , "activityHasResource": "Con recursos" , "accessibilityFilterInfo": "La accesibilidad de una actividad determina si los datos que contiene son públicos o tienen algún tipo de restricción para su visualización y descarga. Utiliza este filtro para diferenciar actividades con datos libres o con algún tipo de restricción." @@ -1262,7 +1271,7 @@ define({ , "speciesCatalogProductName": "Catálogo de especies" , "atlasProductName": "Atlas" - , "serviceOgcProductName": "Servicios OGC" + , "ogcServiceProductName": "Servicios OGC" , "trackingProductName": "Seguimiento" , "speciesDistributionProductName": "Distribución de especies" , "timeSeriesProductName": "Series temporales" @@ -1271,7 +1280,7 @@ define({ , "bibliographyProductName": "Bibliografía" , "speciesCatalogProductDescription": "Listado de especies sincronizado con WoRMS, pero centrado en la región de la Macaronesia. Incluye aquellas especies que se encuentran referenciadas en los datos recogidos en la plataforma." , "atlasProductDescription": "Mapa interactivo con una selección de información relevante para los interesados en el mar y la costa, organizada por capas combinables: demarcaciones jurídicas, zonas de baño, áreas protegidas, pesquerías, batimetrías, etc." - , "serviceOgcProductDescription": "Listado de servicios contenidos en REDMIC que se ofrecen a terceros, siguiendo los protocolos del Open Geospatial Consortium." + , "ogcServiceProductDescription": "Listado de servicios que se ofrecen a terceros, siguiendo los protocolos del Open Geospatial Consortium." , "trackingProductDescription": "Visor interactivo de datos de seguimiento. Consiste en un mapa acompañado de una barra de reproducción, que permite moverse en la dimensión temporal para ver su evolución." , "speciesDistributionProductDescription": "Visor interactivo sobre la distribución de las especies, representada en mallas o retículas de 0,5 - 10 km². Permite calcular el número total de especies presentes en cada cuadrícula, dato muy útil en estudios de biodiversidad y planificación territorial." , "timeSeriesProductDescription": "Visor interactivo para series temporales de parámetros oceanográficos, recogidos en las diferentes actividades registradas en la plataforma. Los datos están asociados a una estación, fija o eventual, donde se recogen una serie de parámetros para su estudio." @@ -1329,36 +1338,50 @@ define({ , "selectFeatureOnMap": "Pulse sobre algún elemento del mapa para obtener información" + , "leafletZoomInButton": "Acercar" + , "leafletZoomOutButton": "Alejar" + , "leafletHomeButton": "Ir a la localización inicial" + , "leafletForwardButton": "Avanzar en el historial de localizaciones" + , "leafletBackButton": "Retroceder en el historial de localizaciones" + + , "noFixedContent": "Sin contenido fijado" + // Meta-tags , "metaDefaultTitle": "Repositorio de Datos Marinos Integrados de Canarias" , "metaDefaultDescription": "REDMIC es una infraestructura de datos marinos de caracter público, que ofrece información sobre el medio biofísico marino de Canarias" , "metaDefaultImageAlt": "Logo de REDMIC, compuesto por un tridente blanco a modo de pupila de un ojo con fondo azul y borde dorado" , "metaHomeTitle": "Inicio" , "metaHomeDescription": "Página de bienvenida a la plataforma REDMIC, repositorio de datos marinos integrados de Canarias" - , "metaCatalogActivitiesCatalogTitle": "Catálogo de actividades" - , "metaCatalogActivitiesCatalogDescription": "Listado de actividades registradas en las que se generan datos relacionados con el medio marino" - , "metaCatalogActivityInfoIdTitle": "Actividad" - , "metaCatalogActivityInfoIdDescription": "Información sobre la actividad" - , "metaCatalogProjectCatalogTitle": "Catálogo de proyectos" - , "metaCatalogProjectCatalogDescription": "Listado de proyectos en los que se recogen las actividades registradas" - , "metaCatalogProjectInfoIdTitle": "Proyecto" - , "metaCatalogProjectInfoIdDescription": "Información sobre el proyecto" - , "metaCatalogProgramCatalogTitle": "Catálogo de programas" - , "metaCatalogProgramCatalogDescription": "Listado de programas en los que se agrupan los proyectos registrados" - , "metaCatalogProgramInfoIdTitle": "Programa" - , "metaCatalogProgramInfoIdDescription": "Información sobre el programa" - , "metaCatalogOrganizationCatalogTitle": "Catálogo de organizaciones" - , "metaCatalogOrganizationCatalogDescription": "Listado de organizaciones que han participado en alguna actividad registrada" - , "metaCatalogOrganizationInfoIdTitle": "Organización" - , "metaCatalogOrganizationInfoIdDescription": "Información sobre la organización" - , "metaCatalogPlatformCatalogTitle": "Catálogo de plataformas" - , "metaCatalogPlatformCatalogDescription": "Listado de plataformas que están relacionadas con alguna actividad registrada" - , "metaCatalogPlatformInfoIdTitle": "Plataforma" - , "metaCatalogPlatformInfoIdDescription": "Información sobre la plataforma" - , "metaCatalogSpeciesCatalogTitle": "Catálogo de especies" - , "metaCatalogSpeciesCatalogDescription": "Listado de especies marinas registradas dentro del ámbito geográfico de la Macaronesia" - , "metaCatalogSpeciesInfoIdTitle": "Especie" - , "metaCatalogSpeciesInfoIdDescription": "Información sobre la especie" + , "metaActivityCatalogTitle": "Catálogo de actividades" + , "metaActivityCatalogDescription": "Listado de actividades registradas en las que se generan datos relacionados con el medio marino" + , "metaActivityInfoTitle": "Actividad" + , "metaActivityInfoDescription": "Información sobre la actividad" + , "metaAnimalCatalogTitle": "Catálogo de animales" + , "metaAnimalCatalogDescription": "Listado de animales registrados" + , "metaAnimalInfoTitle": "Animal" + , "metaAnimalInfoDescription": "Información sobre el animal" + , "metaProjectCatalogTitle": "Catálogo de proyectos" + , "metaProjectCatalogDescription": "Listado de proyectos en los que se recogen las actividades registradas" + , "metaProjectInfoTitle": "Proyecto" + , "metaProjectInfoDescription": "Información sobre el proyecto" + , "metaProgramCatalogTitle": "Catálogo de programas" + , "metaProgramCatalogDescription": "Listado de programas en los que se agrupan los proyectos registrados" + , "metaProgramInfoTitle": "Programa" + , "metaProgramInfoDescription": "Información sobre el programa" + , "metaOrganizationCatalogTitle": "Catálogo de organizaciones" + , "metaOrganizationCatalogDescription": "Listado de organizaciones que han participado en alguna actividad registrada" + , "metaOrganizationInfoTitle": "Organización" + , "metaOrganizationInfoDescription": "Información sobre la organización" + , "metaPlatformCatalogTitle": "Catálogo de plataformas" + , "metaPlatformCatalogDescription": "Listado de plataformas que están relacionadas con alguna actividad registrada" + , "metaPlatformInfoTitle": "Plataforma" + , "metaPlatformInfoDescription": "Información sobre la plataforma" + , "metaSpeciesCatalogTitle": "Catálogo de especies" + , "metaSpeciesCatalogDescription": "Listado de especies marinas registradas dentro del ámbito geográfico de la Macaronesia" + , "metaSpeciesInfoTitle": "Especie" + , "metaSpeciesInfoDescription": "Información sobre la especie" + , "metaRasterCatalogTitle": "Catálogo de recursos ráster" + , "metaRasterCatalogDescription": "Catálogo de recursos espacio-temporales distribuidos bajo la especificación STAC, integrando la herramienta STAC Browser para ofrecer y describir contenido geoespacial, generado mayormente por teledetección desde satélites" , "metaViewerSpeciesDistributionTitle": "Distribución de especies marinas" , "metaViewerSpeciesDistributionDescription": "Visor de análisis de la distribución geográfica de las especies marinas que se encuentran en Canarias. Cuenta con diferentes modos de visualizar y filtrar los datos" , "metaViewerTrackingTitle": "Seguimiento de posición de animales y objetos marinos" @@ -1371,20 +1394,20 @@ define({ , "metaViewerRealTimeDescription": "Visor de estaciones que proveen datos en tiempo real sobre el entorno marino" , "metaViewerRealTimeDashboardIdTitle": "Datos en tiempo real de la estación" , "metaViewerRealTimeDashboardIdDescription": "Visor de los datos producidos por la estación" - , "metaViewerStacBrowserTitle": "Catálogo de teledetección (STAC)" - , "metaViewerStacBrowserDescription": "Visor de catálogo de recursos espacio-temporales (STAC), integrando la herramienta STAC browser para ofrecer contenido generado mayormente por teledetección desde satélites" + , "metaViewerMarineMonitoringTitle": "Visor de monitorización marina" + , "metaViewerMarineMonitoringDescription": "Visor de variables ambientales que afectan al medio marino" , "metaAtlasTitle": "Atlas" , "metaAtlasDescription": "Atlas marino de Canarias, con una selección de capas de datos marinos georeferenciados de interés público, agrupadas por temáticas" - , "metaServiceOgcCatalogTitle": "Catálogo de servicios OGC" - , "metaServiceOgcCatalogDescription": "Listado de servicios de mapas, siguiendo los estándares OGC. Contempla protocolos como WMS, WMTS o TMS" - , "metaServiceOgcCatalogServiceOgcInfoIdTitle": "Servicio OGC" - , "metaServiceOgcCatalogServiceOgcInfoIdDescription": "Información sobre el servicio OGC" - , "metaBibliographyTitle": "Biblioteca marina de Canarias" - , "metaBibliographyDescription": "Recopilación de documentos relacionados con el medio marino de Canarias de cualquier tipo: informes, revistas, libros, manuales, estudios..." - , "metaBibliographyDocumentInfoIdTitle": "Documento" - , "metaBibliographyDocumentInfoIdDescription1": "Información sobre el documento" - , "metaBibliographyDocumentInfoIdDescription2": "por" - , "metaBibliographyDocumentInfoIdDescription3": "en" + , "metaOgcServiceCatalogTitle": "Catálogo de servicios OGC" + , "metaOgcServiceCatalogDescription": "Listado de servicios de mapas, siguiendo los estándares OGC. Contempla protocolos como WMS, WMTS o TMS" + , "metaOgcServiceInfoTitle": "Servicio OGC" + , "metaOgcServiceInfoDescription": "Información sobre el servicio OGC" + , "metaBibliographyCatalogTitle": "Biblioteca marina de Canarias" + , "metaBibliographyCatalogDescription": "Recopilación de documentos relacionados con el medio marino de Canarias de cualquier tipo: informes, revistas, libros, manuales, estudios..." + , "metaBibliographyInfoTitle": "Documento" + , "metaBibliographyInfoDescription1": "Información sobre el documento" + , "metaBibliographyInfoDescription2": "por" + , "metaBibliographyInfoDescription3": "en" , "metaLoginTitle": "Identificación de usuarios" , "metaLoginDescription": "Permite el acceso a usuarios registrados en REDMIC" , "metaRegisterTitle": "Registro de usuarios" diff --git a/public/javascript/app/nls/translation.js b/client-app/src/oldapp/nls/translation.js similarity index 91% rename from public/javascript/app/nls/translation.js rename to client-app/src/oldapp/nls/translation.js index 301adfbe168bf887f63bc56794ba75d1cb20ff4f..6b7c9c206c1e454ba930b2915049529de7044f6f 100644 --- a/public/javascript/app/nls/translation.js +++ b/client-app/src/oldapp/nls/translation.js @@ -1,6 +1,15 @@ define({ root: { "ok": "Agree" + , "contents": "Contents" + , "providedByAtlas": "Content provided by atlas" + , "providedByView": "Content provided by this product" + , "toggleLayerVisibility": "Toggle layer visibility" + , "showLegend": "Show layer legend" + , "showElevation": "Show layer elevation values" + , "addLayerFirst": "Add layer to map first" + , "navigateToLayerInfo": "Navigate to layer details view" + , "userData": "User data" , "cancel": "Cancel" , "nextStep": "Next" , "prevStep": "Previous" @@ -12,7 +21,6 @@ define({ , "closeActivityConfirmationTitle": "Activity closing confirmation" , "closeActivityConfirmationMessage": "Do you want to set this activity as closed?" , "viewDocument": "View document" - , "underConstruction": "Under construction" , "notFound": "No matches" , "layers": "Layers" , "services": "Services" @@ -25,6 +33,7 @@ define({ , "parentalTaxon": "Parental taxon" , "legend": "Legend" , "noAssociatedDocuments": "No associated documents" + , "noSupport": "Please, update your browser to a newer version" , "registeredTask1": "Your task " , "registeredTask2": " has been recorded." @@ -103,6 +112,7 @@ define({ , "loseSelectionConfirmationMessage": "You will lose your current selection. Do you wish to continue?" , "clearSelection": "Clear selection" , "selectAll": "Select all" + , "select": "Select" , "data": "Data" , "method": "Method" , "trophic-regime": "Trophic regimen" @@ -120,15 +130,16 @@ define({ , "unitsAssociated": "Associated units" , "unitsSelected": "Selected units" , "speciesCatalogView": "Species catalog" - , "activitiesCatalogView": "Activities catalog" - , "projectCatalogView": "Project catalog" - , "programCatalogView": "Program catalog" - , "platformCatalogView": "Platform catalog" - , "organisationCatalogView": "Organisation catalog" + , "activityCatalogView": "Activities catalog" + , "animalCatalogView": "Animals catalog" + , "projectCatalogView": "Projects catalog" + , "programCatalogView": "Programs catalog" + , "platformCatalogView": "Platforms catalog" + , "organisationCatalogView": "Organisations catalog" , "printToPdf": "Print content to PDF" , "remove": "Remove" , "module": "Module" - , "perms": "Perms" + , "perms": "Permissions" , "selectSpecies": "Select species" , "selectActivity": "Select activity" , "associatedSurveyStation": "Associated survey stations" @@ -136,7 +147,7 @@ define({ , "selectDocument": "Select document" , "noAssociatedCitations": "No associated citations" , "speciesItem": "Species" - , "serviceOGCCatalogView": "OGC services catalog" + , "ogcServiceCatalogView": "OGC services catalog" , "service-ogc-catalog": "Services" , "service-ogc": "OGC services" , "srs": "SRS" @@ -152,8 +163,8 @@ define({ , "geograficFrame": "Geografic frame" , "activateQueryOnMap": "Activate query on map" , "queryOnMapActivated": "Now you can click the map to show data on that point" - , "newServiceOGC": "New OGC service" - , "editServiceOGC": "Edit OGC service" + , "newOgcService": "New OGC service" + , "editOgcService": "Edit OGC service" , "layerImage": "Layer image" , "noLayerInfo": "The clicked location does not contain any information" , "formats": "Formats" @@ -299,11 +310,11 @@ define({ , "photo": "Photo" , "recovery": "Recovery" - , "specimenTag": "Specimen tag" + , "specimenTag": "Tag" , "recoveries": "Recoveries" - , "specimenTags": "Specimen tags" + , "specimenTags": "Tags" , "recoveriesAssociated": "Associated recoveries" - , "specimenTagsAssociated": "Associated specimen tags" + , "specimenTagsAssociated": "Associated tags" , "convalescence": "Convalescence" , "admissionDate": "Admission date" , "releasePlace": "Release place" @@ -406,11 +417,6 @@ define({ , "alertRestartAction": "Click here to undo the action" - , "browserPartiallySupported": "Browser partially supported" - , "browserPartiallySupportedMsg1": "Your browser does not support all the features present in this module" - , "browserPartiallySupportedMsg2": "You can continue despite this, or use a different browser" - , "recommendBrowser": "We recommend using 'Google Chrome' or 'Mozilla Firefox' to get full support" - , "categorizeLayer": "Categorize layer" , "addLayersCategory": "Add layers category" , "editLayersCategory": "Edit layers category" @@ -548,6 +554,9 @@ define({ , "map": "Map" , "seeMap": "See map" , "atlas": "Atlas" + , "atlasViewerView": "Atlas" + , "marineMonitoringViewerView": "Marine monitoring" + , "marineMonitoringLayers": "Marine monitoring layers" , "activity": "Activity" , "activities": "Activities" , "info": "Information" @@ -749,11 +758,13 @@ define({ , "service": "Services" , "charts": "Timeseries" , "species-catalog": "Species" - , "activities-catalog": "Activities" + , "activity-catalog": "Activities" , "project-catalog": "Projects" , "program-catalog": "Programs" , "platform-catalog": "Platforms" , "organisation-catalog": "Organisations" + , "animal-catalog": "Animals" + , "raster-catalog": "Raster assets" , "confidence": "Confidence" , "sightings": "Sightings" , "logout": "Logout" @@ -847,7 +858,6 @@ define({ , "noCita": "No citations for this grid size" , "pressHere": "Press here" , "successResetting": "Password recovery completed successfully" - , "stac-browser": "Remote sensing (STAC)" , "monday": "Monday" , "mondayShort": "Mon" @@ -891,6 +901,7 @@ define({ , "items": "items" + , "marine-monitoring": "Marine monitoring" , "real-time": "Realtime data" , "goToDashboard": "Visualize data" , "dashboard": "Dashboard" @@ -1156,11 +1167,8 @@ define({ , "selectFilter": "Select filter" , "noAssociatedData": "No associated data" - , "loadDocument": "Load document" + , "loadDocument": "Load documents" , "isAphia": "Not aphia" - , "updateAllSpecies": "Update all species" - , "updateAllSpeciesConfirmationTitle": "Confirmation" - , "updateAllSpeciesConfirmationMessage": "Update all species?" , "noteForAttributeType": "Note: If other attributes of the same type already exist, they must have the established dates and must not only be between" , "noteForContact": "Only include professional contact information" @@ -1242,6 +1250,7 @@ define({ , "activityStatusFirstValue": "Not started" , "activityStatusSecondValue": "In progress" , "activityStatusThirdValue": "Concluded" + , "starred": "Starred" , "starredActivity": "Starred" , "activityHasResource": "Has resources" , "accessibilityFilterInfo": "The accessibility of an activity determines if the contained data is public or has some kind of restriction for viewing and downloading it. Use this filter to differentiate activities with open data or with some kind of restriction." @@ -1266,7 +1275,7 @@ define({ , "speciesCatalogProductName": "Species catalog" , "atlasProductName": "Atlas" - , "serviceOgcProductName": "OGC services" + , "ogcServiceProductName": "OGC services" , "trackingProductName": "Tracking" , "speciesDistributionProductName": "Species distribution" , "timeSeriesProductName": "Timeseries" @@ -1275,7 +1284,7 @@ define({ , "bibliographyProductName": "Bibliography" , "speciesCatalogProductDescription": "Species list synchronized with WoRMS, but focused on the Macaronesia region. It includes those species that are referenced in the data collected on the platform." , "atlasProductDescription": "Interactive map with a selection of relevant information for those interested in the sea and the coast, organized by combinable layers: legal demarcations, bathing areas, protected areas, fisheries, bathymetries, etc." - , "serviceOgcProductDescription": "List of services contained in REDMIC that are offered to third parties, following the protocols of the Open Geospatial Consortium." + , "ogcServiceProductDescription": "List of services that are offered to third parties, following the protocols of the Open Geospatial Consortium." , "trackingProductDescription": "Interactive viewer for tracking data. It consists of a map accompanied by a playback bar, which allows you to move in the temporal dimension to see its evolution." , "speciesDistributionProductDescription": "Interactive viewer on the distribution of the species, represented in meshes or grids of 0.5 - 10 km². It allows calculating the total number of species present in each cell, a very useful data in biodiversity studies and territorial planning." , "timeSeriesProductDescription": "Interactive viewer for timeseries of oceanographic parameters, collected in the different activities recorded on the platform. The data are associated with a station, fixed or eventual, where a series of parameters are collected for study." @@ -1333,36 +1342,50 @@ define({ , "selectFeatureOnMap": "Click on any element of the map to get information" + , "leafletZoomInButton": "Zoom in" + , "leafletZoomOutButton": "Zoom out" + , "leafletHomeButton": "Go to initial location" + , "leafletForwardButton": "Go forward in location history" + , "leafletBackButton": "Go back in location history" + + , "noFixedContent": "No fixed content" + // Meta-tags , "metaDefaultTitle": "Repositorio de Datos Marinos Integrados de Canarias" , "metaDefaultDescription": "REDMIC is a public marine data infrastructure that offers information on the marine biophysical environment of the Canary Islands" , "metaDefaultImageAlt": "REDMIC logo, composed of a white trident as the pupil of an eye with a blue background and golden border" , "metaHomeTitle": "Home" , "metaHomeDescription": "Welcome page to the REDMIC platform, integrated marine data repository of the Canary Islands" - , "metaCatalogActivitiesCatalogTitle": "Activities catalog" - , "metaCatalogActivitiesCatalogDescription": "List of registered activities in which data related to the marine environment is generated" - , "metaCatalogActivityInfoIdTitle": "Activity" - , "metaCatalogActivityInfoIdDescription": "Information about the activity" - , "metaCatalogProjectCatalogTitle": "Project catalog" - , "metaCatalogProjectCatalogDescription": "List of projects in which the registered activities are collected" - , "metaCatalogProjectInfoIdTitle": "Project" - , "metaCatalogProjectInfoIdDescription": "Information about the project" - , "metaCatalogProgramCatalogTitle": "Program catalog" - , "metaCatalogProgramCatalogDescription": "List of programs in which registered projects are grouped" - , "metaCatalogProgramInfoIdTitle": "Program" - , "metaCatalogProgramInfoIdDescription": "Information about the program" - , "metaCatalogOrganizationCatalogTitle": "Catalog of organisations" - , "metaCatalogOrganizationCatalogDescription": "List of organisations that have participated in some registered activity" - , "metaCatalogOrganizationInfoIdTitle": "Organisation" - , "metaCatalogOrganizationInfoIdDescription": "Information about the organisation" - , "metaCatalogPlatformCatalogTitle": "Platform catalog" - , "metaCatalogPlatformCatalogDescription": "List of platforms that are related to some registered activity" - , "metaCatalogPlatformInfoIdTitle": "Platform" - , "metaCatalogPlatformInfoIdDescription": "Information about the platform" - , "metaCatalogSpeciesCatalogTitle": "Species catalog" - , "metaCatalogSpeciesCatalogDescription": "List of marine species registered within the geographical scope of Macaronesia" - , "metaCatalogSpeciesInfoIdTitle": "Species" - , "metaCatalogSpeciesInfoIdDescription": "Species information" + , "metaActivityCatalogTitle": "Activities catalog" + , "metaActivityCatalogDescription": "List of registered activities in which data related to the marine environment is generated" + , "metaActivityInfoTitle": "Activity" + , "metaActivityInfoDescription": "Information about the activity" + , "metaAnimalCatalogTitle": "Animals catalog" + , "metaAnimalCatalogDescription": "List of registered animals" + , "metaAnimalInfoTitle": "Animal" + , "metaAnimalInfoDescription": "Information about the animal" + , "metaProjectCatalogTitle": "Projects catalog" + , "metaProjectCatalogDescription": "List of projects in which the registered activities are collected" + , "metaProjectInfoTitle": "Project" + , "metaProjectInfoDescription": "Information about the project" + , "metaProgramCatalogTitle": "Programs catalog" + , "metaProgramCatalogDescription": "List of programs in which registered projects are grouped" + , "metaProgramInfoTitle": "Program" + , "metaProgramInfoDescription": "Information about the program" + , "metaOrganizationCatalogTitle": "Organisations catalog" + , "metaOrganizationCatalogDescription": "List of organisations that have participated in some registered activity" + , "metaOrganizationInfoTitle": "Organisation" + , "metaOrganizationInfoDescription": "Information about the organisation" + , "metaPlatformCatalogTitle": "Platforms catalog" + , "metaPlatformCatalogDescription": "List of platforms that are related to some registered activity" + , "metaPlatformInfoTitle": "Platform" + , "metaPlatformInfoDescription": "Information about the platform" + , "metaSpeciesCatalogTitle": "Species catalog" + , "metaSpeciesCatalogDescription": "List of marine species registered within the geographical scope of Macaronesia" + , "metaSpeciesInfoTitle": "Species" + , "metaSpeciesInfoDescription": "Species information" + , "metaRasterCatalogTitle": "Raster assets catalog" + , "metaRasterCatalogDescription": "Catalog for spatio-temporal assets distributed under the STAC specification, integrating the STAC Browser tool to offer and describe geospatial content, generated mostly by remote sensing from satellites" , "metaViewerSpeciesDistributionTitle": "Distribution of marine species" , "metaViewerSpeciesDistributionDescription": "Analysis viewer of the geographical distribution of marine species found in the Canary Islands. It has different ways to visualize and filter the data" , "metaViewerTrackingTitle": "Position tracking of animals and marine objects" @@ -1375,20 +1398,20 @@ define({ , "metaViewerRealTimeDescription": "Station viewer that provides realtime data on the marine environment" , "metaViewerRealTimeDashboardIdTitle": "Realtime data from the station" , "metaViewerRealTimeDashboardIdDescription": "Viewer of the data produced by the station" - , "metaViewerStacBrowserTitle": "Remote sensing catalog (STAC)" - , "metaViewerStacBrowserDescription": "Viewer for spatio-temporal assets catalog (STAC), integrating STAC browser tool to serve mostly remote sensing content obtained from satellites" + , "metaViewerMarineMonitoringTitle": "Marine monitoring viewer" + , "metaViewerMarineMonitoringDescription": "Viewer of environmental variables that affect the marine environment" , "metaAtlasTitle": "Atlas" , "metaAtlasDescription": "Marine Atlas of the Canary Islands, with a selection of georeferenced marine data layers of public interest, grouped by theme" - , "metaServiceOgcCatalogTitle": "OGC service catalog" - , "metaServiceOgcCatalogDescription": "List of map services, following OGC standards. Includes protocols such as WMS, WMTS or TMS" - , "metaServiceOgcCatalogServiceOgcInfoIdTitle": "OGC service" - , "metaServiceOgcCatalogServiceOgcInfoIdDescription": "Information about the OGC service" - , "metaBibliographyTitle": "Canary Islands marine library" - , "metaBibliographyDescription": "Compilation of documents related to the marine environment of the Canary Islands of any kind: reports, magazines, books, manuals, studies..." - , "metaBibliographyDocumentInfoIdTitle": "Document" - , "metaBibliographyDocumentInfoIdDescription1": "Information about the document" - , "metaBibliographyDocumentInfoIdDescription2": "by" - , "metaBibliographyDocumentInfoIdDescription3": "at" + , "metaOgcServiceCatalogTitle": "OGC service catalog" + , "metaOgcServiceCatalogDescription": "List of map services, following OGC standards. Includes protocols such as WMS, WMTS or TMS" + , "metaOgcServiceInfoTitle": "OGC service" + , "metaOgcServiceInfoDescription": "Information about the OGC service" + , "metaBibliographyCatalogTitle": "Canary Islands marine library" + , "metaBibliographyCatalogDescription": "Compilation of documents related to the marine environment of the Canary Islands of any kind: reports, magazines, books, manuals, studies..." + , "metaBibliographyInfoTitle": "Document" + , "metaBibliographyInfoDescription1": "Information about the document" + , "metaBibliographyInfoDescription2": "by" + , "metaBibliographyInfoDescription3": "at" , "metaLoginTitle": "User identification" , "metaLoginDescription": "Allows access to users registered in REDMIC" , "metaRegisterTitle": "User registration" diff --git a/public/javascript/app/user/models/FeedbackModel.js b/client-app/src/oldapp/user/models/FeedbackModel.js similarity index 95% rename from public/javascript/app/user/models/FeedbackModel.js rename to client-app/src/oldapp/user/models/FeedbackModel.js index 2e2cb9852d53b791a48eb66290c4a34a98be0466..fd1a96c11f2b16ad9eff1f27e8167aa0fda08ee4 100644 --- a/public/javascript/app/user/models/FeedbackModel.js +++ b/client-app/src/oldapp/user/models/FeedbackModel.js @@ -1,5 +1,5 @@ define([ - "app/redmicConfig" + 'src/redmicConfig' ], function ( redmicConfig ){ @@ -34,4 +34,4 @@ define([ } } }; -}); \ No newline at end of file +}); diff --git a/public/javascript/app/user/models/PasswordModel.js b/client-app/src/oldapp/user/models/PasswordModel.js similarity index 94% rename from public/javascript/app/user/models/PasswordModel.js rename to client-app/src/oldapp/user/models/PasswordModel.js index 73bb44c429c2d3d9bda31147403ab313645f5286..5f825eb58efcc0f70a47ef476b8f1bafc9b0f146 100644 --- a/public/javascript/app/user/models/PasswordModel.js +++ b/client-app/src/oldapp/user/models/PasswordModel.js @@ -1,5 +1,5 @@ define([ - "app/redmicConfig" + 'src/redmicConfig' ], function ( redmicConfig ){ @@ -25,4 +25,4 @@ define([ } } }; -}); \ No newline at end of file +}); diff --git a/public/javascript/app/user/models/RegisterModel.js b/client-app/src/oldapp/user/models/RegisterModel.js similarity index 96% rename from public/javascript/app/user/models/RegisterModel.js rename to client-app/src/oldapp/user/models/RegisterModel.js index 85bdc00aa62d99838c4557e2053995d4a47d1f51..385b361428d4fcc2f48098d7060dfbe7a166ef8b 100644 --- a/public/javascript/app/user/models/RegisterModel.js +++ b/client-app/src/oldapp/user/models/RegisterModel.js @@ -1,5 +1,5 @@ define([ - "app/redmicConfig" + 'src/redmicConfig' ], function ( redmicConfig ){ @@ -39,4 +39,4 @@ define([ } } }; -}); \ No newline at end of file +}); diff --git a/public/javascript/app/user/models/UserEmailModel.js b/client-app/src/oldapp/user/models/UserEmailModel.js similarity index 93% rename from public/javascript/app/user/models/UserEmailModel.js rename to client-app/src/oldapp/user/models/UserEmailModel.js index fd8c0a8465e151ba25d5ea7da4b0e77c3523133d..c35ae7fc71e1cec0a1861285abc78aaff377be00 100644 --- a/public/javascript/app/user/models/UserEmailModel.js +++ b/client-app/src/oldapp/user/models/UserEmailModel.js @@ -1,5 +1,5 @@ define([ - "app/redmicConfig" + 'src/redmicConfig' ], function ( redmicConfig ){ @@ -19,4 +19,4 @@ define([ } } }; -}); \ No newline at end of file +}); diff --git a/public/javascript/app/user/models/UserImageModel.js b/client-app/src/oldapp/user/models/UserImageModel.js similarity index 93% rename from public/javascript/app/user/models/UserImageModel.js rename to client-app/src/oldapp/user/models/UserImageModel.js index 8f6d9cbd84578d4c574a3d850db0eefe8ee5ea37..7f1b6c6aebfa7feb320ec1bdcb8844ce4e858dd4 100644 --- a/public/javascript/app/user/models/UserImageModel.js +++ b/client-app/src/oldapp/user/models/UserImageModel.js @@ -1,5 +1,5 @@ define([ - "app/redmicConfig" + 'src/redmicConfig' ], function ( redmicConfig ){ @@ -19,4 +19,4 @@ define([ } } }; -}); \ No newline at end of file +}); diff --git a/public/javascript/app/user/models/UserNameModel.js b/client-app/src/oldapp/user/models/UserNameModel.js similarity index 94% rename from public/javascript/app/user/models/UserNameModel.js rename to client-app/src/oldapp/user/models/UserNameModel.js index f53714528961f2765e1be3cec2055aa6247a9d76..6cbf05bad730508cfaa3015df9ba44c1cccbe26e 100644 --- a/public/javascript/app/user/models/UserNameModel.js +++ b/client-app/src/oldapp/user/models/UserNameModel.js @@ -1,5 +1,5 @@ define([ - "app/redmicConfig" + 'src/redmicConfig' ], function ( redmicConfig ){ diff --git a/public/javascript/app/user/models/UserSectorModel.js b/client-app/src/oldapp/user/models/UserSectorModel.js similarity index 93% rename from public/javascript/app/user/models/UserSectorModel.js rename to client-app/src/oldapp/user/models/UserSectorModel.js index 25ac2d24f20beb8bbe6fccb000491672a1663d6b..12460e8df87511b0094a5268899daddd33baa3e1 100644 --- a/public/javascript/app/user/models/UserSectorModel.js +++ b/client-app/src/oldapp/user/models/UserSectorModel.js @@ -1,5 +1,5 @@ define([ - "app/redmicConfig" + 'src/redmicConfig' ], function ( redmicConfig ){ @@ -19,4 +19,4 @@ define([ } } }; -}); \ No newline at end of file +}); diff --git a/public/javascript/app/user/views/ConfirmResettingView.js b/client-app/src/oldapp/user/views/ConfirmResettingView.js similarity index 95% rename from public/javascript/app/user/views/ConfirmResettingView.js rename to client-app/src/oldapp/user/views/ConfirmResettingView.js index 2cb168b271fe733669798c8fbe6001fb6284b62f..3acc87a312c2c9855f1d226787c2e46866a22a45 100644 --- a/public/javascript/app/user/views/ConfirmResettingView.js +++ b/client-app/src/oldapp/user/views/ConfirmResettingView.js @@ -1,12 +1,12 @@ define([ - 'alertify/alertify.min' + 'alertify' , "app/user/views/_ExternalUserBaseView" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/text!./templates/ConfirmResetting.html" - , 'redmic/modules/base/_ListenQueryParams' - , 'redmic/modules/base/_Store' + , 'src/component/base/_ListenQueryParams' + , 'src/component/base/_Store' ], function( alertify , _ExternalUserBaseView @@ -163,7 +163,7 @@ define([ _goBack: function() { - window.location.href = '/'; + globalThis.location.href = '/'; }, _onGetTokenError: function() { @@ -177,7 +177,7 @@ define([ } }); - window.location.href = '/404'; + globalThis.location.href = '/404'; }, _confirmValidator: function() { diff --git a/public/javascript/app/user/views/FeedbackView.js b/client-app/src/oldapp/user/views/FeedbackView.js similarity index 94% rename from public/javascript/app/user/views/FeedbackView.js rename to client-app/src/oldapp/user/views/FeedbackView.js index f18ba3bfd97ba200bb56a09196fbb43ed20740cf..36305895b8d3b64a937b809fe6e7f9d6ae5750de 100644 --- a/public/javascript/app/user/views/FeedbackView.js +++ b/client-app/src/oldapp/user/views/FeedbackView.js @@ -1,17 +1,17 @@ define([ - 'alertify/alertify.min' - , 'app/components/ReCaptcha' + 'alertify' + , 'src/util/ReCaptcha' , "app/user/models/FeedbackModel" , "app/user/views/_ExternalUserBaseView" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/query" , "dojo/text!./templates/Feedback.html" - , "redmic/base/Credentials" - , "redmic/modules/form/FormContainerImpl" - , "redmic/modules/form/_ListenModelHasChanged" - , "redmic/modules/model/ModelImpl" + , "src/util/Credentials" + , "src/component/form/FormContainerImpl" + , "src/component/form/_ListenModelHasChanged" + , "src/component/model/ModelImpl" ], function( alertify , ReCaptcha @@ -108,7 +108,7 @@ define([ this._createReCaptcha(); - if (Credentials.get("userRole") !== "ROLE_GUEST") { + if (!Credentials.userIsGuest()) { if (Credentials.get("userEmail")) { this._emitEvt('SET_VALUE', { email: Credentials.get("userEmail") @@ -219,7 +219,7 @@ define([ this.i18n.sendFeedback, lang.hitch(this, function() { this._resetForm(); - window.location.href = "/"; + globalThis.location.href = "/"; }) ); }, diff --git a/public/javascript/app/user/views/InnerWhatIsRedmicView.js b/client-app/src/oldapp/user/views/InnerWhatIsRedmicView.js similarity index 94% rename from public/javascript/app/user/views/InnerWhatIsRedmicView.js rename to client-app/src/oldapp/user/views/InnerWhatIsRedmicView.js index 63e6e869fc452c0818d2768e8838f3f0f64aed81..1dc215d9da0274010642e11ecf11a2c24faaa6ba 100644 --- a/public/javascript/app/user/views/InnerWhatIsRedmicView.js +++ b/client-app/src/oldapp/user/views/InnerWhatIsRedmicView.js @@ -4,9 +4,9 @@ define([ , 'app/designs/details/_AddBasicTitle' , 'dojo/_base/declare' , 'dojo/_base/lang' - , 'redmic/modules/components/PDFViewer/PDFViewer' - , 'redmic/modules/layout/TabsDisplayer' - , 'redmic/modules/layout/templateDisplayer/TemplateDisplayer' + , 'src/component/components/PDFViewer/PDFViewer' + , 'src/component/layout/TabsDisplayer' + , 'src/component/layout/templateDisplayer/TemplateDisplayer' , 'templates/WhatIsRedmicLongTermChallenge' , 'templates/WhatIsRedmicInfoType' , 'templates/WhatIsRedmicUserType' @@ -55,7 +55,7 @@ define([ title: this.i18n.logicalDataModel, type: PDFViewer, props: { - urlPdf: '/resources/documents/ModeloLogico.pdf', + urlPdf: '/res/documents/ModeloLogico.pdf', roleGuestActive: true } },{ diff --git a/public/javascript/app/user/views/LoginView.js b/client-app/src/oldapp/user/views/LoginView.js similarity index 95% rename from public/javascript/app/user/views/LoginView.js rename to client-app/src/oldapp/user/views/LoginView.js index 5401b62fb6ea04cf52c67cf1508fed2d57c25203..b5b102b6f7db3476d34be8b249bb43cefefa7538 100644 --- a/public/javascript/app/user/views/LoginView.js +++ b/client-app/src/oldapp/user/views/LoginView.js @@ -1,12 +1,12 @@ define([ - 'alertify/alertify.min' + 'alertify' , "app/user/views/_ExternalUserBaseView" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/text!./templates/Login.html" - , "redmic/base/Credentials" - , 'redmic/modules/base/_Store' + , "src/util/Credentials" + , 'src/component/base/_Store' ], function( alertify , _ExternalUserBaseView @@ -48,7 +48,7 @@ define([ this.inherited(arguments); // Si hemos entrado anteriormente, pone el correo usado por última vez - if (Credentials.get("userRole") !== "ROLE_GUEST") { + if (!Credentials.userIsGuest("userRole")) { this.template.emailInputForm.set("value", Credentials.get("userEmail")); } // Si hemos activado la cuenta anteriormente, informa al usuario diff --git a/public/javascript/app/user/views/RegisterView.js b/client-app/src/oldapp/user/views/RegisterView.js similarity index 94% rename from public/javascript/app/user/views/RegisterView.js rename to client-app/src/oldapp/user/views/RegisterView.js index 2f46ac8fa7c9717eafcfc147fb7f1e560f4bfd74..21fe5507ec1150b8d4a7fa274a9ec7a62a1bedd2 100644 --- a/public/javascript/app/user/views/RegisterView.js +++ b/client-app/src/oldapp/user/views/RegisterView.js @@ -1,17 +1,17 @@ define([ - 'alertify/alertify.min' - , 'app/components/ReCaptcha' + 'alertify' + , 'src/util/ReCaptcha' , "app/user/models/RegisterModel" , "app/user/views/_ExternalUserBaseView" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/query" , "dojo/text!./templates/Register.html" - , "redmic/modules/form/FormContainerImpl" - , "redmic/modules/form/_ListenModelHasChanged" - , "redmic/modules/form/_PublicateChanges" - , "redmic/modules/model/ModelImpl" + , "src/component/form/FormContainerImpl" + , "src/component/form/_ListenModelHasChanged" + , "src/component/form/_PublicateChanges" + , "src/component/model/ModelImpl" ], function( alertify , ReCaptcha @@ -179,7 +179,7 @@ define([ // this._resetForm(); - window.location.href = "/"; + globalThis.location.href = "/"; }, _resetForm: function() { @@ -240,7 +240,7 @@ define([ alertify.alert(this.i18n.success, this.i18n.activateAccount, lang.hitch(this, function() { this._resetForm(); - window.location.href = "/"; + globalThis.location.href = "/"; })); }, @@ -279,7 +279,7 @@ define([ } }); - window.location.href = "terms-and-conditions"; + globalThis.location.href = "terms-and-conditions"; } }); }); diff --git a/public/javascript/app/user/views/ResettingView.js b/client-app/src/oldapp/user/views/ResettingView.js similarity index 96% rename from public/javascript/app/user/views/ResettingView.js rename to client-app/src/oldapp/user/views/ResettingView.js index d28fc39e4bd9917c3131ba3a816e089d2b841b97..918c476cccde758c101365ab0670767e36756dab 100644 --- a/public/javascript/app/user/views/ResettingView.js +++ b/client-app/src/oldapp/user/views/ResettingView.js @@ -1,11 +1,11 @@ define([ - 'alertify/alertify.min' + 'alertify' , "app/user/views/_ExternalUserBaseView" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/text!./templates/Resetting.html" - , 'redmic/modules/base/_Store' + , 'src/component/base/_Store' ], function( alertify , _ExternalUserBaseView @@ -65,7 +65,7 @@ define([ _goBack: function() { - window.location.href = '/'; + globalThis.location.href = '/'; }, _onSubmitResettingPassword: function(/*Event*/ evt) { diff --git a/public/javascript/app/user/views/TermsAndConditionsView.js b/client-app/src/oldapp/user/views/TermsAndConditionsView.js similarity index 96% rename from public/javascript/app/user/views/TermsAndConditionsView.js rename to client-app/src/oldapp/user/views/TermsAndConditionsView.js index 474a482af996a27f424119c69c4add0170ce9725..736615e025b470fa5eb630d880429a4302e77f4b 100644 --- a/public/javascript/app/user/views/TermsAndConditionsView.js +++ b/client-app/src/oldapp/user/views/TermsAndConditionsView.js @@ -38,7 +38,7 @@ define([ // callback private // - window.history.go(-1); + globalThis.history.go(-1); } }); }); diff --git a/public/javascript/app/user/views/UserProfileView.js b/client-app/src/oldapp/user/views/UserProfileView.js similarity index 95% rename from public/javascript/app/user/views/UserProfileView.js rename to client-app/src/oldapp/user/views/UserProfileView.js index aeb62ac3e31a4278dfda3b21ebbaefe4b235efad..5d6ff73e72ce2158d010c8017ca73efa7b6d1687 100644 --- a/public/javascript/app/user/views/UserProfileView.js +++ b/client-app/src/oldapp/user/views/UserProfileView.js @@ -1,7 +1,7 @@ define([ "app/designs/details/Controller" , "app/designs/details/Layout" - , "app/redmicConfig" + , 'src/redmicConfig' , "app/user/models/PasswordModel" , "app/user/models/UserImageModel" , "app/user/models/UserNameModel" @@ -9,23 +9,23 @@ define([ , "app/user/models/UserSectorModel" , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/base/Credentials" - , "redmic/modules/base/_Window" - , "redmic/modules/base/_Persistence" - , "redmic/modules/browser/_ButtonsInRow" - , "redmic/modules/browser/_MultiTemplate" - , "redmic/modules/browser/ListImpl" - , "redmic/modules/layout/templateDisplayer/TemplateDisplayer" - , "redmic/modules/form/_CreateKeypad" - , "redmic/modules/form/FormContainerImpl" - , "redmic/modules/form/_ListenModelHasChanged" + , "src/util/Credentials" + , "src/component/base/_Window" + , "src/component/base/_Persistence" + , "src/component/browser/_ButtonsInRow" + , "src/component/browser/_MultiTemplate" + , "src/component/browser/ListImpl" + , "src/component/layout/templateDisplayer/TemplateDisplayer" + , "src/component/form/_CreateKeypad" + , "src/component/form/FormContainerImpl" + , "src/component/form/_ListenModelHasChanged" , "templates/UserImage" , "templates/UserTitle" , "templates/UserEmail" , "templates/UserName" , "templates/UserSector" , "templates/UserPassword" - , "redmic/modules/notification/TaskNotification" + , "src/component/notification/TaskNotification" ], function( Controller , Layout @@ -100,7 +100,7 @@ define([ height: 3, type: TemplateDisplayer, props: { - title: this.i18n.image, + title: 'image', template: TemplateImage, "class": "imageContainer.imageContainerEdit", target: this.target, @@ -112,7 +112,7 @@ define([ height: 3, type: declare([ListImpl, _ButtonsInRow, _MultiTemplate]), props: { - title: "Datos de usuario", + title: "userData", target: this.target, idProperty: "dataType", rowConfig: { diff --git a/public/javascript/app/user/views/WhatIsRedmicView.js b/client-app/src/oldapp/user/views/WhatIsRedmicView.js similarity index 71% rename from public/javascript/app/user/views/WhatIsRedmicView.js rename to client-app/src/oldapp/user/views/WhatIsRedmicView.js index 29637dd38c65673a560a2d32fde2f63885cd7c0c..787652100e3b466c587aa2b0c0d953d3db04f02b 100644 --- a/public/javascript/app/user/views/WhatIsRedmicView.js +++ b/client-app/src/oldapp/user/views/WhatIsRedmicView.js @@ -36,6 +36,17 @@ define([ this.inherited(arguments); on(this.domNode, "click", lang.hitch(this, this._onCloseWhatIsRedmic)); + }, + + _onCloseWhatIsRedmic: function(/*event*/ evt) { + // summary: + // Función que cierra la vista que muestra información de redmic. + // tags: + // callback private + + if (globalThis.location.pathname.includes(this.whatIsRedmicPath)) { + globalThis.location.href = this.loginPath; + } } }); }); diff --git a/public/javascript/app/user/views/_ExternalUserBaseView.js b/client-app/src/oldapp/user/views/_ExternalUserBaseView.js similarity index 67% rename from public/javascript/app/user/views/_ExternalUserBaseView.js rename to client-app/src/oldapp/user/views/_ExternalUserBaseView.js index f72a357bfa25647691b67ebfa7be3a62d5e9d084..ccc14525f3efa820421ee686cc6d32d12625f0b2 100644 --- a/public/javascript/app/user/views/_ExternalUserBaseView.js +++ b/client-app/src/oldapp/user/views/_ExternalUserBaseView.js @@ -1,5 +1,5 @@ define([ - 'app/redmicConfig' + 'src/redmicConfig' , 'dijit/_TemplatedMixin' , 'dijit/_WidgetBase' , 'dijit/_WidgetsInTemplateMixin' @@ -8,8 +8,8 @@ define([ , 'dojo/_base/declare' , 'dojo/_base/lang' , 'dojo/_base/kernel' - , 'redmic/modules/base/_Module' - , 'redmic/modules/base/_Show' + , 'src/component/base/_Module' + , 'src/component/base/_Show' , 'dijit/form/Form' , 'dijit/form/ValidationTextBox' @@ -45,14 +45,14 @@ define([ this.config = { baseTemplateProps: { - _onShowWhatIsRedmic: this._onShowWhatIsRedmic, - _onCloseWhatIsRedmic: this._onCloseWhatIsRedmic, + _onShowWhatIsRedmic: lang.hitch(this, this._onShowWhatIsRedmic), _getManagerNode: this._getManagerNode, _changeLang: this._changeLang }, baseClass: '', replaceReg: /\%\[([^\]]+)\]/g, - whatIsRedmicPath: 'what-is-redmic' + whatIsRedmicPath: '/what-is-redmic', + loginPath: '/login' }; lang.mixin(this, this.config, args); @@ -85,42 +85,25 @@ define([ _changeLang: function(evt) { - window.location.href = window.location.protocol + '//' + evt.target.dataset.dojoProps + '.' + - window.location.hostname.replace(kernel.locale + '.', ''); + globalThis.location.href = globalThis.location.protocol + '//' + evt.target.dataset.dojoProps + '.' + + globalThis.location.hostname.replace(kernel.locale + '.', ''); }, _onShowWhatIsRedmic: function(event) { // summary: // Función que muestra información de redmic. - // *** Se ejecuta en el ámbito del template - // // tags: // callback private - // event.stopPropagation(); - var path = 'what-is-redmic'; - if (window.location.href.indexOf(path) < 0) { - window.location.href = path; - } else { - window.history.back(); - } - }, - _onCloseWhatIsRedmic: function(/*event*/ evt) { - // summary: - // Función que cierra la vista que muestra información de redmic. - // *** Se ejecuta en el ámbito del template - // - // tags: - // callback private - // + var path = this.whatIsRedmicPath; - setTimeout(lang.hitch(this, function() { - if (window.location.href.indexOf(this.whatIsRedmicPath) >= 0) { - window.history.back(); - } - }), 200); + if (globalThis.location.pathname.includes(path)) { + globalThis.location.href = this.loginPath; + } else { + globalThis.location.href = path; + } } }); }); diff --git a/public/javascript/app/user/views/templates/ConfirmResetting.html b/client-app/src/oldapp/user/views/templates/ConfirmResetting.html similarity index 100% rename from public/javascript/app/user/views/templates/ConfirmResetting.html rename to client-app/src/oldapp/user/views/templates/ConfirmResetting.html diff --git a/public/javascript/app/user/views/templates/ExternalUserBase.html b/client-app/src/oldapp/user/views/templates/ExternalUserBase.html similarity index 78% rename from public/javascript/app/user/views/templates/ExternalUserBase.html rename to client-app/src/oldapp/user/views/templates/ExternalUserBase.html index e2d7f2129b096b1ff9726c2b5da154ff6c365434..3efb32bcc1a0cc6340f7e550dcef75288cac8232 100644 --- a/public/javascript/app/user/views/templates/ExternalUserBase.html +++ b/client-app/src/oldapp/user/views/templates/ExternalUserBase.html @@ -2,9 +2,10 @@ %[template]