asd

Author: abainczyk

frontend/src/main/javascript/src/html/components/views/settings-view.html renamed to frontend/src/main/javascript/src/html/components/views/admin-settings-view.html

@@ -84,9 +84,9 @@ class Sidebar {
                     {
                         title: 'App Settings',
                         icon: 'fa-gears',
-                        active: () => this.isState('settings'),
+                        active: () => this.isState('adminSettings'),
                         display: () => true,
-                        click: () => $state.go('settings')
+                        click: () => $state.go('adminSettings')
                     },
                     {
                         title: 'User Management',

frontend/src/main/javascript/src/js/components/sidebar.js

@@ -19,7 +19,7 @@ import {webBrowser} from "../../constants";
 /**
  * The component for the about page.
  */
-class SettingsView {
+class AdminSettingsView {
 
     /**
      * Constructor.
@@ -54,8 +54,8 @@ class SettingsView {
     }
 }
 
-export const settingsView = {
-    controller: SettingsView,
+export const adminSettingsView = {
+    controller: AdminSettingsView,
     controllerAs: 'vm',
-    templateUrl: 'html/components/views/settings-view.html'
+    templateUrl: 'html/components/views/admin-settings-view.html'
 };

frontend/src/main/javascript/src/js/components/views/settingsView.js renamed to frontend/src/main/javascript/src/js/components/views/adminSettingsView.js

@@ -113,8 +113,8 @@ class ResultsView {
      */
     openSelectedResults() {
         if (this.selectedResults.length > 0) {
-            const testNos = this.selectedResults.map(r => r.testNo);
-            this.$state.go('resultsCompare', {testNos: testNos.join(',')});
+            const testNos = this.selectedResults.map(r => r.testNo).join(',');
+            this.$state.go('resultsCompare', {testNos});
         }
     }
 

frontend/src/main/javascript/src/js/components/views/resultsView.js

@@ -96,7 +96,7 @@ import {projectsView} from "./components/views/projectsView";
 import {projectsDashboardView} from "./components/views/projectsDashboardView";
 import {resultsCompareView} from "./components/views/resultsCompareView";
 import {resultsView} from "./components/views/resultsView";
-import {settingsView} from "./components/views/settingsView";
+import {adminSettingsView} from "./components/views/adminSettingsView";
 import {statisticsCompareView} from "./components/views/statisticsCompareView";
 import {symbolsActionsView} from "./components/views/symbolsActionsView";
 import {symbolsView} from "./components/views/symbolsView";
@@ -301,6 +301,7 @@ angular
 
     // view components
     .component('aboutView', aboutView)
+    .component('adminSettingsView', adminSettingsView)
     .component('adminUsersView', adminUsersView)
     .component('countersView', countersView)
     .component('errorView', errorView)
@@ -312,7 +313,6 @@ angular
     .component('projectsDashboardView', projectsDashboardView)
     .component('resultsCompareView', resultsCompareView)
     .component('resultsView', resultsView)
-    .component('settingsView', settingsView)
     .component('statisticsCompareView', statisticsCompareView)
     .component('symbolsActionsView', symbolsActionsView)
     .component('symbolsView', symbolsView)

frontend/src/main/javascript/src/js/index.js

@@ -34,9 +34,14 @@ export function config($stateProvider, $urlRouterProvider) {
             template: '<users-settings-view></users-settings-view>',
             data: {requiresProject: false, roles: ['REGISTERED', 'ADMIN'], title: 'Settings'}
         })
-        .state('settings', {
-            url: '/settings',
-            template: '<settings-view></settings-view>',
+        .state('adminUsers', {
+            url: '/admin/users',
+            template: '<admin-users-view></admin-users-view>',
+            data: {requiresProject: false, roles: ['ADMIN'], title: 'Admin > Users'}
+        })
+        .state('adminSettings', {
+            url: '/admin/settings',
+            template: '<admin-settings-view></admin-settings-view>',
             data: {requiresProject: false, roles: ['ADMIN'], title: 'Application Settings'}
         })
         .state('projects', {
@@ -75,7 +80,7 @@ export function config($stateProvider, $urlRouterProvider) {
             data: {requiresProject: true, roles: ['REGISTERED', 'ADMIN'], title: 'Learner > Setup'}
         })
         .state('learnerStart', {
-            url: '/learner/start',
+            url: '/learner/learn',
             template: '<learner-view></learner-view>',
             data: {requiresProject: true, roles: ['REGISTERED', 'ADMIN'], title: 'Learning'},
             params: {result: null}
@@ -86,7 +91,7 @@ export function config($stateProvider, $urlRouterProvider) {
             data: {requiresProject: true, roles: ['REGISTERED', 'ADMIN'], title: 'Results'}
         })
         .state('resultsCompare', {
-            url: '/results/:testNos/compare',
+            url: '/results/{testNos:string}',
             template: '<results-compare-view></results-compare-view>',
             data: {requiresProject: true, roles: ['REGISTERED', 'ADMIN'], title: 'Results > Compare'}
         })
@@ -95,11 +100,6 @@ export function config($stateProvider, $urlRouterProvider) {
             template: '<statistics-compare-view></statistics-compare-view>',
             data: {requiresProject: true, roles: ['REGISTERED', 'ADMIN'], title: 'Statistics > Compare'}
         })
-        .state('adminUsers', {
-            url: '/admin/users',
-            template: '<admin-users-view></admin-users-view>',
-            data: {requiresProject: false, roles: ['ADMIN'], title: 'Admin > Users'}
-        })
         .state('tests', {
             url: '/tests/{testId:int}',
             template: '<tests-view></tests-view>',