Merge pull request #246 from marklise/master

NOBUG: Activities tweaks.
bcgov · Sep 5, 2017 · 3a4f85b · 3a4f85b
2 parents c6bdc4c + 8b59b34
commit 3a4f85b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 43 deletions.
diff --git a/modules/recent-activity/client/config/recent-activity.routes.js b/modules/recent-activity/client/config/recent-activity.routes.js
@@ -48,23 +48,6 @@ angular.module('recent-activity').config(['$stateProvider', function ($stateProv
 							item.code = proj ? proj.code : '';
 							item.projectName = proj ? proj.name : '';
 						}
-						switch(item.priority) {
-							case 0:
-								item.priorityDesc = 'Critical';
-								break;
-							case 1:
-								item.priorityDesc = 'Top';
-								break;
-							case 2:
-								item.priorityDesc = 'Normal';
-								break;
-							case 4:
-								item.priorityDesc = 'Low';
-								break;
-							default:
-								item.priorityDesc = '';
-								break;
-						}
 						item.activeDesc = item.active ? 'Active' : 'Inactive';
 					});
 					return data;
@@ -76,17 +59,13 @@ angular.module('recent-activity').config(['$stateProvider', function ($stateProv
 
 			var s = this;
 			s.typeArray = [];
-			s.priorityDescArray = [];
 			s.activeDescArray = [];
 			s.busy = false;
 
 			var items = _(angular.copy(recentActivity)).chain().flatten();
 			items.pluck('type').unique().value().map( function(item) {
 				s.typeArray.push({id: item, title: item});
 			});
-			items.pluck('priorityDesc').unique().value().map( function (item) {
-				s.priorityDescArray.push({id: item, title: item});
-			});
 			items.pluck('activeDesc').unique().value().map( function(item) {
 				var id = 'Active' === item ? true : false;
 				s.activeDescArray.push({id: id, title: item});
@@ -166,23 +145,6 @@ angular.module('recent-activity').config(['$stateProvider', function ($stateProv
 							item.code = proj ? proj.code : '';
 							item.projectName = proj ? proj.name : '';
 						}
-						switch(item.priority) {
-							case 0:
-								item.priorityDesc = 'Critical';
-								break;
-							case 1:
-								item.priorityDesc = 'Top';
-								break;
-							case 2:
-								item.priorityDesc = 'Normal';
-								break;
-							case 4:
-								item.priorityDesc = 'Low';
-								break;
-							default:
-								item.priorityDesc = '';
-								break;
-						}
 						item.activeDesc = item.active ? 'Active' : 'Inactive';
 					});
 					return data;

diff --git a/modules/recent-activity/client/views/recent-activity-edit.html b/modules/recent-activity/client/views/recent-activity-edit.html
@@ -102,8 +102,9 @@ <h1>Create/Edit Activity & Update</h1>
 							name="priority"
 							ng-model="recentActivity.priority"
 							ng-init="recentActivity.priority = recentActivity.priority" convert-to-number>
-							<option value="1">Top</option>
-							<option value="2">Normal</option>
+							<option value="1">1</option>
+							<option value="2">2</option>
+							<option value="3">3</option>
 						</select>
 					</div>
 				</div>

diff --git a/modules/recent-activity/client/views/recent-activity-list.html b/modules/recent-activity/client/views/recent-activity-list.html
@@ -54,9 +54,7 @@ <h1>Activities & Updates</h1>
 					<td class="priority-col"
 						header-class="'priority-col'"
 						data-title="'Priority'"
-						filter="{priorityDesc:'select'}"
-						filter-data="s.priorityDescArray"
-						sortable="'priorityDesc'" >{{o.priorityDesc}}</td>
+						sortable="'priority'" >{{o.priority}}</td>
 					<td class="status-col"
 						header-class="'status-col'"
 						data-title="'Status'"
@@ -81,6 +79,11 @@ <h1>Activities & Updates</h1>
 							x-ok-args="o">
 							<span class="glyphicon glyphicon-trash"></span>
 						</button>
+						<button class="btn icon-btn disabled"
+							title="Activity/Update must be inactive before you can delete."
+							ng-if="application.userCan.createNews && o.active">
+							<span class="glyphicon glyphicon-trash"></span>
+						</button>
 					</td>
 				</tr><!-- / NEWS ROW ITEM TEMPLATE -->