Changeset 12516 for branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/services

Timestamp:

06/25/15 18:34:40 (9 years ago)

Author:

dglaser

Message:

#2388:

HeuristicLab.Services.Hive.DataAccess-3.3:

• updated daos
• changed statistics database schema
• updated HiveStatisticsGenerator

HeuristicLab.Services.WebApp.Statistics-3.3:

• added jobs, client and user page

Location:

branches/HiveStatistics/sources

Files:

• . (modified) (1 prop)
• HeuristicLab.Services.WebApp.Statistics/3.3 (modified) (2 props)
• HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/services/clientService.js (added)
• HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/services/jobService.js (added)
• HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/services/statisticsService.js (modified) (1 diff)
• HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/services/taskService.js (added)
• HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/services/userService.js (added)

branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/services/statisticsService.js

@@ -4 +4 @@
     module.factory('app.statistics.data.service',
         ['$resource', function ($resource) {
-            return $resource(apiUrl + ':action', { id: '@id' }, {
+            return $resource(apiUrl + ':action', { id: '@id', page: '@page', size: '@size', states: '@states', expired: '@expired'}, {
+                getJob: { method: 'GET', params: { action: 'GetJob' } },
                 getJobs: { method: 'GET', params: { action: 'GetJobs' }, isArray: true },
+                getCompletedJobs: { method: 'GET', params: { action: 'GetCompletedJobs' }, isArray: true },
+                getCompletedJobsByUserId: { method: 'GET', params: { action: 'GetCompletedJobsByUserId' }, isArray: true },
+                getCompletedJobsCount: { method: 'GET', params: { action: 'GetCompletedJobsCount' } },
+                getCompletedJobsCountByUserId: { method: 'GET', params: { action: 'GetCompletedJobsCountByUserId' } },
                 getJobsByUserId: { method: 'GET', params: { action: 'GetJobsByUserId' }, isArray: true },
-                getTasksByJobId: { method: 'GET', params: { action: 'GetTasksByJobId' }, isArray: true }
+                getTaskCountByJobId: { method: 'GET', params: { action: 'GetTaskCountByJobId' } },
+                getTasksByJobId: { method: 'GET', params: { action: 'GetTasksByJobId' }, isArray: true },
+                getJobTasksStatesByJobId: { method: 'GET', params: { action: 'GetJobTasksStatesByJobId' }, isArray: true },
+                getClient: { method: 'GET', params: { action: 'GetClient' } },
+                getClientCount: { method: 'GET', params: { action: 'GetClientCount' } },
+                getClients: { method: 'GET', params: { action: 'GetClients' }, isArray: true },
+                getTaskCountByClientId: { method: 'GET', params: { action: 'GetTaskCountByClientId' } },
+                getTasksByClientId: { method: 'GET', params: { action: 'GetTasksByClientId' }, isArray: true },
+                getJobTasksStatesByClientId: { method: 'GET', params: { action: 'GetJobTasksStatesByClientId' }, isArray: true },
+                getClientHistory: { method: 'GET', params: { action: 'GetClientHistory' }, isArray: true },
+                getUsers: { method: 'GET', params: { action: 'GetUsers' }, isArray: true },
+                getUser: { method: 'GET', params: { action: 'GetUser' } }
             });
         }]