Task #8887: merged feature branch back into trunk

SAS/ResourceAssignment/ResourceAssignmentDatabase/sql/create_database.sql

@@ -9,12 +9,17 @@
 --       CONNECTION LIMIT = -1;
 
 -- psql resourceassignment -U resourceassignment -f create_database.sql -W
+
+BEGIN;
+
+DROP SCHEMA IF EXISTS virtual_instrument CASCADE;
+DROP SCHEMA IF EXISTS resource_monitoring CASCADE;
+DROP SCHEMA IF EXISTS resource_allocation CASCADE;
+
 CREATE SCHEMA virtual_instrument;
 CREATE SCHEMA resource_monitoring;
 CREATE SCHEMA resource_allocation;
 
-BEGIN;
-
 -- This is insanity, but works, order needs to be the reverse of the CREATE TABLE statements
 DROP VIEW IF EXISTS virtual_instrument.resource_view CASCADE;
 DROP VIEW IF EXISTS resource_allocation.task_view CASCADE;
@@ -166,6 +171,9 @@ CREATE TABLE resource_allocation.claim_session (
 ALTER TABLE resource_allocation.claim_session
   OWNER TO resourceassignment;
 
+--until we use user management, insert one default session_id
+INSERT INTO resource_allocation.claim_session(id, username, user_id, starttime, token) VALUES (1, 'anonymous', -1, '2015-04-14', 'foo');
+
 CREATE TABLE resource_allocation.resource_claim_status (
   id serial NOT NULL,
   name text NOT NULL,

SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/controllers/gridcontroller.js

@@ -142,6 +142,8 @@ gridControllerMod.controller('GridController', ['$scope', 'dataService', 'uiGrid
             $scope.gridOptions.data = $scope.dataService.tasks;
         else
             $scope.gridOptions.data = []
+
+        fillProjectsColumFilterSelectOptions();
     }, true);
 
     $scope.$watch('dataService.taskstatustypes', function() {
@@ -155,12 +157,17 @@ gridControllerMod.controller('GridController', ['$scope', 'dataService', 'uiGrid
         fillColumFilterSelectOptions(tasktypenames, $scope.columns[7]);
     });
 
-    $scope.$watch('dataService.momProjectsDict', function() {
+    function fillProjectsColumFilterSelectOptions() {
         var projectNames = [];
         var momProjectsDict = $scope.dataService.momProjectsDict;
-        for(var key in momProjectsDict) {
-            if(momProjectsDict.hasOwnProperty(key)) {
-                var projectName = momProjectsDict[key].name;
+        var tasks = $scope.dataService.tasks;
+        //get unique projectIds from tasks
+        var task_project_ids = tasks.map(function(t) { return t.project_mom_id; });
+        task_project_ids = task_project_ids.filter(function(value, index, arr) { return arr.indexOf(value) == index;})
+
+        for(var project_id of task_project_ids) {
+            if(momProjectsDict.hasOwnProperty(project_id)) {
+                var projectName = momProjectsDict[project_id].name;
                 if(!(projectName in projectNames)) {
                     projectNames.push(projectName);
                 }
@@ -168,7 +175,9 @@ gridControllerMod.controller('GridController', ['$scope', 'dataService', 'uiGrid
         }
         projectNames.sort();
         fillColumFilterSelectOptions(projectNames, $scope.columns[1]);
-    });
+    };
+
+    $scope.$watch('dataService.momProjectsDict', fillProjectsColumFilterSelectOptions);
 
     $scope.$watch('dataService.selected_task_id', function() {
         var taskIdx = $scope.gridOptions.data.findIndex(function(row) {return row.id == dataService.selected_task_id});

SAS/ResourceAssignment/ResourceAssignmentEditor/lib/webservice.py

@@ -82,7 +82,7 @@ class CustomJSONEncoder(JSONEncoder):
 __root_path = os.path.dirname(os.path.realpath(__file__))
 
 '''The flask webservice app'''
-app = Flask('ResourceAssignmentEditor',
+app = Flask('Scheduler',
             instance_path=__root_path,
             template_folder=os.path.join(__root_path, 'templates'),
             static_folder=os.path.join(__root_path, 'static'),
@@ -101,7 +101,7 @@ radbchangeshandler = None
 @app.route('/index.html')
 def index():
     '''Serves the ResourceAssignmentEditor's index page'''
-    return render_template('index.html', title='Resource Assignment Editor')
+    return render_template('index.html', title='Scheduler')
 
 @app.route('/rest/resources')
 @gzipped
@@ -248,8 +248,6 @@ def getMoMProjects():
     except Exception as e:
         logger.error(e)
         projects.append({'name':'<unknown>', 'mom_id':-99, 'description': 'Container project for tasks for which we could not find a MoM project'})
-        for i in range(5):
-            projects.append({'name':'<unknown>', 'mom_id':1234+i, 'description': 'Container project for tasks for which we could not find a MoM project'})
 
     projects.append({'name':'OTDB Only', 'mom_id':-98, 'description': 'Container project for tasks which exists only in OTDB'})
     return jsonify({'momprojects': projects})
@@ -303,7 +301,7 @@ def main():
     global rarpc
     rarpc = RARPC(busname=DEFAULT_RADB_BUSNAME, servicename=DEFAULT_RADB_SERVICENAME, broker=options.broker)
     global momrpc
-    momrpc = MoMRPC(busname=DEFAULT_MOM_BUSNAME, servicename=DEFAULT_MOM_SERVICENAME, timeout=0.05, broker=options.broker)
+    momrpc = MoMRPC(busname=DEFAULT_MOM_BUSNAME, servicename=DEFAULT_MOM_SERVICENAME, timeout=2.5, broker=options.broker)
     global radbchangeshandler
     radbchangeshandler = RADBChangesHandler(DEFAULT_RADB_CHANGES_BUSNAME, broker=options.broker, momrpc=momrpc)