Skip to content

Commit

Permalink
Relevant repots page (#465)
Browse files Browse the repository at this point in the history
* Introduced SMTCTags to Schema

In addition there are now add, remove, and clear functions in the schema file for SMTCTag. Currently no function to remove SMTCTags when an SMTCTag is deleted, but will be finished once search functionality for SMTCtags is implemented for Incidents

* Added Escalation Field and Back-end API connection

* Quick Front-end Mockup and Application

Would like someone to test it before moving forward.

* Added Backend API to ADD REMOVE Single Tag to MULTIPLE Incidents

* Added Front-end API endpoints for Incident Tags

* Escalate Buttons Completed

* Inclusion of the Relevant Reports Page

* Updated the Correct Pages to Have Escalation

* Updates for Prototyping

* Tags for Incidents

Currently there is an issue with not seeing new Tags, but this is also because incidents don't update when they are changed, we should change this.

* Final Functioning Relevant Report Page

* Final Functioning Relevant Report Page

* Change Incident to Group

Co-authored-by: Matthew Lim <limmat@gatech.edu>
  • Loading branch information
Matthew Lim and Matthew Lim committed Apr 3, 2021
1 parent b0d6638 commit dc4002e
Show file tree
Hide file tree
Showing 9 changed files with 19 additions and 27 deletions.
4 changes: 2 additions & 2 deletions public/angular/templates/incidents/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@
<input class="checkbox__input" ng-select-all items="incidents" title="Select All" type="checkbox"/>
</div>
<div class="btn-group mr-2" role="group" aria-label="Delete Button">
<button class="btn btn-secondary" aggie-confirm="{{'Are you sure you want to delete selected incidents?' | translate}}" on-confirm="removeSelected()">
<button class="btn btn-secondary" aggie-confirm="{{'Are you sure you want to delete selected groups?' | translate}}" on-confirm="removeSelected()">
<span class="mr-2" translate> Delete </span>
<i class="fa fa-trash text-light" aria-hidden="true"></i>
</button>
Expand Down Expand Up @@ -205,7 +205,7 @@
</div>
</div>
<div ng-hide="pagination.total > 0" class="card-body">
<p translate>Sorry, but we couldn't find any incidents.</p>
<p translate>Sorry, but we couldn't find any groups.</p>
</div>
<div ng-include="'/templates/incidents/table.html'"></div>
</div>
Expand Down
6 changes: 3 additions & 3 deletions public/angular/templates/incidents/modal.html
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<div ng-controller="IncidentFormModalController">
<div class="modal-header">
<h5 class="modal-title">
<span class="icon-left" ng-show="incident._id == null" translate>Create Incident</span>
<span class="icon-left" ng-show="incident._id != null" translate>Edit Incident</span>
<span class="icon-left" ng-show="incident._id == null" translate>Create Group</span>
<span class="icon-left" ng-show="incident._id != null" translate>Edit Group</span>
</h5>
<button class="close" ng-click="close()">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">
<p ng-show="report" class="info">{{'Enter the incident details below' | translate}}<span ng-show="incidents.length">. {{'Or you can' | translate}} <button type="button" class="btn-text" ng-controller="IncidentSelectModalController" ng-click="setIncident(report)">{{'choose an existing incident' | translate}}</button></span>.</p>
<p ng-show="report" class="info">{{'Enter the group details below' | translate}}<span ng-show="incidents.length">. {{'Or you can' | translate}} <button type="button" class="btn-text" ng-controller="IncidentSelectModalController" ng-click="setIncident(report)">{{'choose an existing group' | translate}}</button></span>.</p>
<div class="well bs-component">
<form name="form">
<fieldset>
Expand Down
8 changes: 4 additions & 4 deletions public/angular/templates/incidents/report_incident_modal.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div ng-controller="IncidentSelectModalController">
<div class="modal-header">
<h5 class="modal-title">
<div class="icon-left" translate>Add report to incident</div>
<div class="icon-left" translate>Add report to group</div>
</h5>
<button type="button" class="close" ng-click="close()" aria-label="Close">
<span aria-hidden="true">&times;</span>
Expand All @@ -17,7 +17,7 @@ <h5 class="modal-title">
<th scope="col" translate>Thumbnail</th>
<th scope="col" translate>Content</th>
<th scope="col" translate>Tags</th><!-- No need to show incident on incident detail page -->
<th scope="col" translate ng-hide="pageType == 'show-incident'">Incident</th><!-- No need to show incident on incident detail page -->
<th scope="col" translate ng-hide="pageType == 'show-incident'">Group</th><!-- No need to show incident on incident detail page -->
</tr>
</thead>
<tbody class="table-bordered">
Expand Down Expand Up @@ -80,9 +80,9 @@ <h5 class="modal-title">
</table>
</div>
</div>
<p ng-hide="incidents" class="info">{{"Sorry, but we couldn't find any incidents. You can" | translate}} <button type="button" class="btn-text" ng-controller="IncidentFormModalController" ng-click="create(reports)">{{'create a new incident' | translate}}</button>.</p>
<p ng-hide="incidents" class="info">{{"Sorry, but we couldn't find any groups. You can" | translate}} <button type="button" class="btn-text" ng-controller="IncidentFormModalController" ng-click="create(reports)">{{'create a new group' | translate}}</button>.</p>
<div class="container-fluid" ng-show="incidents">
<p class='info'>{{'Click an incident below to which you would like to add the report. Or you can' | translate}} <button type="button" class="btn-text" ng-controller="IncidentFormModalController" ng-click="create(reports)">{{'create a new incident' | translate}}</button>.</p>
<p class='info'>{{'Click an group below to which you would like to add the report. Or you can' | translate}} <button type="button" class="btn-text" ng-controller="IncidentFormModalController" ng-click="create(reports)">{{'create a new group' | translate}}</button>.</p>
<div class="row justify-content-end">
<ul class="list-inline mb-0">
<li class="list-inline-item">
Expand Down
2 changes: 1 addition & 1 deletion public/angular/templates/incidents/show.html
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ <h4 translate>Reports</h4>
<div ng-show="pagination.total > 0">
<div class="btn-toolbar justify-content-between" role="toolbar" aria-label="Toolbar with selection actions" ng-show="currentUser.can('edit data')">
<div aria-label="Read/Unread Buttons/Selection">
<button ng-class="{highlight: someSelected()}" class="btn btn-default" ng-click="unlinkSelected()" translate>Remove from Incident</button>
<button ng-class="{highlight: someSelected()}" class="btn btn-default" ng-click="unlinkSelected()" translate>Remove from Group</button>
</div>
<nav class="Report list page navigation">
<ul class="list-inline mb-0">
Expand Down
2 changes: 1 addition & 1 deletion public/angular/templates/incidents/table.html
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
</td>
<td ng-hide="modal || !currentUser.can('edit data')" class="compact actions align-middle">
<div class="fa fa-trash text-blue td__delete fa-lg"
aggie-confirm="{{ 'Are you sure you want to delete this incident?' | translate }}" on-confirm="delete(i)"></div>
aggie-confirm="{{ 'Are you sure you want to delete this group?' | translate }}" on-confirm="delete(i)"></div>
</td>
</tr>
</tbody>
Expand Down
2 changes: 1 addition & 1 deletion public/angular/templates/reports/batch.html
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ <h4 class="card-title" translate>Batch Mode</h4>
</div>
<div class="btn-group mr-3" role="group" aria-label="Incident Buttons">
<button type="button" ng-disabled="{{someSelected()}}" ng-class="{highlight: someSelected()}" class="btn btn-default" ng-controller="IncidentSelectModalController" ng-click="(someSelected()? setIncident():null)" translate>
Add to Incident
Add to Group
</button>
</div>
</div>
Expand Down
8 changes: 4 additions & 4 deletions public/angular/templates/reports/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,10 @@
</div>
<div class="form-group col mb-0 pb-2">
<div class="input-group input-group-sm">
<select title="{{'Linked Incident Filter' | translate}}" ng-model="searchParams.incidentId"
<select title="{{'Group Filter' | translate}}" ng-model="searchParams.incidentId"
ng-options="value._id as (value.title | capitalize) for (key, value) in incidents | orderObjectBy:'title'"
ng-change="search()" class="form-control filters__select">
<option value="" translate>Linked Incident</option>
<option value="" translate>Group</option>
</select>
</div>
</div>
Expand Down Expand Up @@ -164,7 +164,7 @@
</div>
<div class="btn-group mr-3" role="group" aria-label="Incident Buttons">
<button type="button" ng-disabled="{{someSelected()}}" ng-class="{highlight: someSelected()}" class="btn btn-default" ng-controller="IncidentSelectModalController" ng-click="(someSelected()? setIncident():null)" translate>
Add to Incident
Add to Group
</button>
</div>
<div class="btn-group mr-3">
Expand Down Expand Up @@ -203,7 +203,7 @@
</div>
<div class="btn-group mr-3" role="group" aria-label="Incident Buttons">
<button type="button" ng-disabled="{{someSelected()}}" ng-class="{highlight: someSelected()}" class="btn btn-default" ng-controller="IncidentSelectModalController" ng-click="(someSelected()? setIncident():null)" translate>
Add to Incident
Add to Group
</button>
</div>
<div class="btn-group mr-3">
Expand Down
10 changes: 1 addition & 9 deletions public/angular/templates/reports/relevant_reports.html
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
</div>
<div class="form-group col mb-0 pb-2">
<div class="input-group input-group-sm">
<select title="{{'Linked Incident Filter' | translate}}" ng-model="searchParams.incidentId"
<select title="{{'Group Filter' | translate}}" ng-model="searchParams.incidentId"
ng-options="value._id as (value.title | capitalize) for (key, value) in incidents | orderObjectBy:'title'"
ng-change="search()" class="form-control filters__select">
<option value="" translate>Group</option>
Expand Down Expand Up @@ -203,14 +203,6 @@
<div title="Selection Actions" class="card-footer card__footer" aria-label="Bottom Selection Actions Toolbar" role="toolbar">
<div class="btn-toolbar justify-content-between" aria-label="Bottom Toolbar with selection actions" ng-show="currentUser.can('edit data')">
<div aria-label="Read/Unread Buttons/Selection">
<div class="btn-group mr-3" role="group" aria-label="Read/Unread Buttons">
<button title="Mark as Read/Unread" type="button" ng-class="{highlight: someSelected()}" class="btn btn-default" ng-click="toggleSelectedRead()" translate>Read/Unread</button>
</div>
<div class="btn-group mr-3" role="group" aria-label="Incident Buttons">
<button type="button" ng-disabled="{{someSelected()}}" ng-class="{highlight: someSelected()}" class="btn btn-default" ng-controller="IncidentSelectModalController" ng-click="(someSelected()? setIncident():null)" translate>
Add to Incident
</button>
</div>
</div>
<nav aria-label="Bottom report list page navigation">
<ul class="list-inline mb-0">
Expand Down
4 changes: 2 additions & 2 deletions public/angular/templates/reports/show.html
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ <h4 class="card-title mb-0">Report Details</h4>
<td colspan="10" class="detail-value">{{ report.fetchedAt | aggieDate:'datetime' }}</td>
</tr>
<tr>
<th scope="row" class="detail-key" translate>Linked Incident</th>
<th scope="row" class="detail-key" translate>Group</th>
<td colspan="10" class="detail-value align-middle">
<div class="text-center">
<a ng-controller="IncidentSelectModalController" ng-click="setIncident([report])" class="table-primary-link">
Expand Down Expand Up @@ -108,7 +108,7 @@ <h4 class="card-title mb-0">Comments</h4>
</div>
<div class="btn-group mr-3" role="group" aria-label="Incident Buttons">
<button type="button" ng-disabled="{{someSelected()}}" ng-class="{highlight: someSelected()}" class="btn btn-default" ng-controller="IncidentSelectModalController" ng-click="(someSelected()? setIncident():null)" translate>
Add to Incident
Add to Group
</button>
</div>
</div>
Expand Down

0 comments on commit dc4002e

Please sign in to comment.