Merge remote-tracking branch 'origin/dev_oracle' into dev_oracle_sherlock

atms-api/pom.xml

@@ -14,8 +14,6 @@
     </parent>
 
     <dependencies>
-
-
         <!-- https://mvnrepository.com/artifact/com.oracle/ojdbc6 -->
         <!--<dependency>-->
             <!--<groupId>com.oracle</groupId>-->
@@ -28,7 +26,6 @@
             <version>12.1.0.1-atlassian-hosted</version>
         </dependency>
 
-
         <dependency>
             <groupId>pwc.taxtech.atms</groupId>
             <artifactId>atms-dao</artifactId>
@@ -54,11 +51,6 @@
             <groupId>org.springframework</groupId>
             <artifactId>spring-jdbc</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-test</artifactId>
-            <version>3.1.1.RELEASE</version>
-        </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-aspects</artifactId>

atms-web/src/main/webapp/app/app.config.js

+(function () {
+    'use strict';
+
+    angular.module('app.config', [])
+        // region of current application
+        .constant('region', 'zh-CN')
+        //.constant('region', 'en-US')
+        // version of current application
+        .constant('version', '1.0.0.0')
+        // Exceptionless Server URL
+        .constant('exceptionlessServerURL', '')
+        .run([
+            'region', function (region) {
+                $.when(
+                    $.getJSON("/Scripts/cldr/main/zh/numbers.json"),
+                    $.getJSON("/Scripts/cldr/main/zh/ca-gregorian.json"),
+                    $.getJSON("/Scripts/cldr/supplemental/likelySubtags.json")
+                ).then(function () {
+                    return [].slice.apply(arguments, [0]).map(function (result) {
+                        return result[0];
+                    });
+                }).then(Globalize.load).then(function () {
+                     Globalize.locale("zh-CN");
+                   // Globalize.locale("en-US");
+                    DevExpress.localization.locale(region);
+                    //DevExpress.localization.locale(navigator.language || navigator.browserLanguage);
+                });
+            }
+        ]);
+}());
\ No newline at end of file

atms-web/src/main/webapp/app/module-part4.js

+
+var noPermissionPageModule = angular.module('app.noPermissionPage', [])
+    .run(['$log', function ($log) {
+        $log.debug('app.noPermissionPage.run()...');
+    }])
+    .config(['$controllerProvider', '$compileProvider', '$filterProvider', '$provide', 'scriptDependencyProvider', '$stateProvider', '$urlRouterProvider',
+        function ($controllerProvider, $compileProvider, $filterProvider, $provide, scriptDependencyProvider, $stateProvider, $urlRouterProvider) {
+            'use strict';
+
+
+            // this is required to add controller/directive/filter/service after angular bootstrap
+            bindModule(noPermissionPageModule, $controllerProvider, $compileProvider, $filterProvider, $provide);
+
+
+            $stateProvider.state({
+                name: 'noPermissionPage',
+                url: '/noPermissionPage',
+                views: {
+                    '@': {
+                        controller: ['$scope', '$stateParams', 'appTranslation',
+                       function ($scope, $stateParams, appTranslation) {
+                           appTranslation.load([appTranslation.noPermissionPage]);
+                       }],
+                        template: '<no-permission-page></no-permission-page>'
+                    }
+                },
+                resolve: scriptDependencyProvider.createDependenciesMap(scriptDependencyProvider.noPermissionPage),
+                deepStateRedirect: true,
+                sticky: true
+            });
+        }]);
\ No newline at end of file