From 32216eee1c4101b399a745e1827ec9087e647734 Mon Sep 17 00:00:00 2001
From: Carrie Arnold <cmarnold@tacc.utexas.edu>
Date: Thu, 29 Jun 2017 14:17:34 -0500
Subject: [PATCH] Finished fixing allocations display in admin project view

---
 .../templates/allocations/user-projects.html  |  4 +++
 allocations/views.py                          | 27 ++++++++++---------
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/allocations/templates/allocations/user-projects.html b/allocations/templates/allocations/user-projects.html
index a60b1c0f..389dd55f 100644
--- a/allocations/templates/allocations/user-projects.html
+++ b/allocations/templates/allocations/user-projects.html
@@ -69,6 +69,10 @@ <h3>Projects and Allocations for user: [[selections.username]] ([[projects.lengt
                                         <label>
                                             <input type="checkbox" ng-model="filter.active" ng-change="updateSelected()"> Active</label>
                                     </div>
+                                    <div class="checkbox">
+                                        <label>
+                                        <input type="checkbox" ng-model="filter.approved" ng-change="updateSelected()"> Approved</label>
+                                    </div>
                                     <div class="checkbox">
                                         <label>
                                             <input type="checkbox" ng-model="filter.inactive" ng-change="updateSelected()"> Inactive</label>
diff --git a/allocations/views.py b/allocations/views.py
index dfd31e08..3bad7ba2 100644
--- a/allocations/views.py
+++ b/allocations/views.py
@@ -79,22 +79,25 @@ def user_projects( request, username ):
             try:
                 userProjects = tas.projects_for_user( username=username )
                 #logger.debug(userProjects)
-                #if (len(userProjects) > 0):
-                 #   logger.info('User Projects: %s',  len(userProjects))
+
+                temp = {}
+                # run through and make sure all the allocations are associated with one project
                 for p in userProjects:
                      if p['source'] == 'Chameleon':
-                        resp['status'] = 'success'
-                        resp['result'].append(p)
+                        if p['chargeCode'] not in temp:
+                            logger.debug('Project ' + p['chargeCode'] + ' is not in the temp yet, adding')
+                            temp[p['chargeCode']] = p
+                        else:
+                            logger.debug('Project ' + p['chargeCode'] + ' is in temp...appending allocations')
+                            tempProj = temp[p['chargeCode']]
+                            tempProj['allocations'].extend(p['allocations'])
+                            temp[p['chargeCode']] = tempProj
+                for code, proj in temp.items():
+                    resp['status'] = 'success'
+                    resp['result'].append(proj)
                 logger.info('Total chameleon projects for user %s: %s', username, len(resp))
-                    # @TODO verify that all projects will have a source of Chameleon
-                    #if (chameleonProjects and userProjects):
-                    #    for project in userProjects:
-                    #        if project in chameleonProjects:
-                    #            resp['status'] = 'success'
-                    #            resp['result'].append(project)
-                    #            logger.info( 'Total chameleon projects for user %s: %s', username, len( resp ) )
             except Exception as e:
-                logger.debug('Error loading projects for user: %s', username)
+                logger.debug('Error loading projects for user: %s with error %s', username, e)
                 resp['msg'] = 'Error loading projects for user: %s' %username
         except Exception as e:
             logger.debug('User not found with username: %s', username)