Skip to content
This repository has been archived by the owner on Oct 1, 2020. It is now read-only.

Commit

Permalink
Merge branch 'develop' into filters
Browse files Browse the repository at this point in the history
  • Loading branch information
@dmorina
dmorina committed Oct 16, 2017
2 parents 552cc36 + 4d89f43 commit 1f48f61
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 6 deletions.
2 changes: 1 addition & 1 deletion static/js/layout/controllers/home.controller.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
$scope.isLoggedIn = Authentication.isAuthenticated();
$scope.account = Authentication.getAuthenticatedAccount();

$scope.randomImg = 1+Math.floor(Math.random() * 6);
$scope.randomImg = 1+Math.floor(Math.random() * 5);

$scope.data = {
'reddit': [{
Expand Down
26 changes: 21 additions & 5 deletions static/templates/project/submission-review-tabular.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -197,15 +197,24 @@
<md-icon md-font-set="material-icons" style="outline: none"
ng-class="{'_clickable': task.status != review.status.ACCEPTED}"
ng-click="review.updateStatus(review.status.ACCEPTED, task)">
{{ task.status == review.status.ACCEPTED ? 'check_circle':'check_box_outline_blank' }}</md-icon>
{{ task.status == review.status.ACCEPTED ? 'check_circle':'done' }}
<md-tooltip>
{{ task.status == review.status.ACCEPTED? 'Approved': 'Approve task' }}</md-tooltip>
</md-icon>

</td>
<td>
<md-icon md-font-set="material-icons"
ng-if="task.status == review.status.RETURNED || task.status == review.status.SUBMITTED"
ng-class="{'_clickable': task.status != review.status.RETURNED, '_disabled-text': task.status === review.status.ACCEPTED}"
ng-click="review.returnTask(task, worker.worker_alias, $event); cancel();">
{{ task.status == review.status.RETURNED ? 'check_circle':'check_box_outline_blank' }}</md-icon>
<div ng-if="task.status == review.status.ACCEPTED">&mdash;</div>
{{ task.status == review.status.RETURNED ? 'check_circle':'reply' }}
<md-tooltip>
{{ task.status == review.status.RETURNED? 'Returned': 'Return task for revision' }}</md-tooltip>
</md-icon>
<div ng-if="task.status == review.status.ACCEPTED" style="padding-left: 8px">
&mdash;
</div>
</td>
<td>{{ task.task }}</td>
<td ng-repeat="item in taskColumns">
Expand Down Expand Up @@ -313,15 +322,22 @@
<md-icon md-font-set="material-icons" style="outline: none"
ng-class="{'_clickable': task.status != review.status.ACCEPTED}"
ng-click="review.updateStatus(review.status.ACCEPTED, task)">
{{ task.status == review.status.ACCEPTED ? 'check_circle':'check_box_outline_blank' }}</md-icon>
{{ task.status == review.status.ACCEPTED ? 'check_circle':'done' }}
<md-tooltip>
{{ task.status == review.status.ACCEPTED? 'Approved': 'Approve task' }}</md-tooltip>
</md-icon>

</td>
<td>
<md-icon md-font-set="material-icons"
ng-if="task.status == review.status.RETURNED || task.status == review.status.SUBMITTED"
ng-class="{'_clickable': task.status != review.status.RETURNED,
'_disabled-text': task.status === review.status.ACCEPTED}"
ng-click="review.returnTask(task, task.worker_alias, $event); cancel();">
{{ task.status == review.status.RETURNED ? 'check_circle':'check_box_outline_blank' }}</md-icon>
{{ task.status == review.status.RETURNED ? 'check_circle':'reply' }}
<md-tooltip>
{{ task.status == review.status.RETURNED? 'Returned': 'Return task for revision' }}</md-tooltip>
</md-icon>
<div ng-if="task.status == review.status.ACCEPTED">&mdash;</div>
</td>
<td>{{ task.task }}</td>
Expand Down

0 comments on commit 1f48f61

Please sign in to comment.