sagi/se-hub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Tasks Should Work... Maybe

Browse source
This commit is contained in:
Sagi Dayan 2015-08-03 00:22:10 +03:00
parent 35ecdd1f60
commit b1f8a6f4f3
3 changed files with 41 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
templates/css/theme.css
View file

@ -92,17 +92,11 @@ body.noscroll
box-shadow: 2px 2px 5px 0px rgba(0,0,0,0.75);
}
/* Added BY devMatan */
/*.disabledSubmitButton:
{
/*background: #f7f7f7;*/
/*border-radius: 10000px;*/
/*text-align: center;*/
/*position: relative !important;*
}*/
.md-toolbar-tools h1 {
font-size: inherit;
font-weight: inherit;
margin: inherit;
}
.campusAvatar img
{
@ -298,6 +292,16 @@ body.noscroll
cursor: pointer;
}
.hoverable{
cursor: pointer;
}
.hoverable:hover{
cursor: pointer;
background-color: #E2E2E2;
}
.se-menu li:active{
background-color: #B2B2B2;
text-shadow:#e0e0e0 1px 1px 0;

13
templates/js/controllers/tasksController.js
View file

@ -19,7 +19,7 @@ angular.module('SeHub')
///Need to show the List
$mdDialog.show({
controller: DialogController,
templateUrl: 'templates/views/UserStateList.html?v=1',
templateUrl: 'templates/views/UserStateList.html?v=1122231',
parent: $scope,
targetEvent: ev,
locals: {
@ -43,9 +43,9 @@ angular.module('SeHub')
}
apiService.isTaskSubmitted(token, task.id, ownerId).success(function(data) {
if (data.submitted)
$location.path('/tasks/overview/' + task.id + '/' + ownerId + '/' + ownerId)
$location.path('/tasks/overview/' + task.id + '/' + ownerId + '/' + ownerId);
else
$location.path('/tasks/fill/' + task.id + '/' + ownerId)
$location.path('/tasks/fill/' + task.id + '/' + ownerId);
})
}).error(function(err) {
console.error('Error: ', err);
@ -56,8 +56,6 @@ angular.module('SeHub')
function DialogController($scope, $mdDialog, data, apiService) {
console.log(apiService);
$scope.task = data.task;
$scope.isPersonal = data.isPersonal;
var token = data.token;
@ -71,6 +69,11 @@ angular.module('SeHub')
$scope.hide();
})
$scope.goToTask = function(obj){
$mdDialog.hide();
$location.path('/tasks/overview/' + $scope.task.id + '/' + obj.id + '/' + obj.id);
}
$scope.hide = function() {
$mdDialog.hide();

25
templates/views/UserStateList.html
View file

@ -1,4 +1,4 @@
<md-dialog aria-label="Class Status" style='width: 80%'>
<md-dialog aria-label="Class Status" style='width: 60%'>
<form>
<md-toolbar>
<div class="md-toolbar-tools">
@ -10,14 +10,14 @@
</div>
</md-toolbar>
<md-dialog-conten layout-padding>
<div ng-if='loading'>
<!-- <div ng-if='loading'>
</div>
<div ng-if='!loading'>
<div ng-repeat="obj in classList">
<div layout='row' width='100%' >
<div layout='row' width='100%' max-height="20px">
<div>
<img ng-src="{{obj.avatar_url || obj.logo_url}}" alt="" class='campusAvatar' style='max-height:auto'>
<img ng-src="{{obj.avatar_url || obj.logo_url}}" alt="" class='campusAvatar' style='max-height=15px'>
</div>
<div class='spacer'></div>
<div>{{obj.name || obj.projectName}}</div>
@ -28,9 +28,20 @@
</div>
<md-divider ng-if="!$last"></md-divider>
</div>
</div>
</div> -->
<md-list>
<md-list-item class="md-3-line hoverable" ng-repeat="obj in classList" layout="row" ng-click='goToTask(obj)'>
<img ng-src="{{obj.avatar_url || obj.logo_url}}?{{$index}}" class="md-avatar" alt="{{obj.id}}" />
<div class="md-list-item-text">
<h4>{{obj.name || obj.projectName}}</h3>
<p>Grade: {{obj.grade.grade || "Not Yet Reviewed"}}</p>
<!-- <p>{{ item.notes }}</p> -->
</div>
</md-list-item>
</md-list>
</md-dialog-content>
<div class="md-actions" layout="row">
<!-- <div class="md-actions" layout="row">
<md-button href="http://en.wikipedia.org/wiki/Mango" target="_blank" hide show-md>
More on Wikipedia
</md-button>
@ -41,6 +52,6 @@
<md-button ng-click="answer('useful')" class="md-primary">
Useful
</md-button>
</div>
</div> -->
</form>
</md-dialog>