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

-student/lecturer mode of dashboard - fixed

Browse source
This commit is contained in:
Matan Bar Yosef 2015-08-02 16:51:18 +03:00
parent ec3dc29024
commit 083c27267c
1 changed files with 115 additions and 152 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

229
templates/views/home.html
View file

@ -25,71 +25,23 @@
<md-content> <md-content>
<h1 style="margin-left:15px;"><i class="fa fa-dashboard"></i> Dash Board</h1> <h1 style="margin-left:15px;"><i class="fa fa-dashboard"></i> Dash Board</h1>
</md-content> </md-content>
<div layout = "column" flex = 90 layout-margin>
<div>
Closest Task-
<md-card layout-margin layout-padding>
<div>
<md-button ng-click="gotoTask(task)">
{{userTasks[0].title}}
</md-button>
</div>
</md-card>
</div>
<div>
Latest Message-
<md-card layout-margin layout-padding>
{{userMessages[0].message}}
</md-card>
</div>
</div>
<!--
<table style="width:100%;" border = "1">
<tr>
<th>Message</th>
<th style = "width:20%;">Date</th>
<th style = "width:10%;">Committer</th>
</tr>
<tr ng-repeat = "commit in project.info.commits" layout-margin align = "center">
<td>
<span ng-repeat = "msg in commit">
<a target = "_blank"ng-href="{{commit.html_url}}"
style="text-decoration:none; color:black;">
{{msg.message}}
</a>
</span>
</td>
<td>
<span ng-repeat = "date in commit.author">
{{date.date}}
</span>
</td>
<td ng-repeat = "member in project.members">
<a ng-href="#/profile/{{member.id}}" style="text-decoration:none; color:black;">
{{member.name}}
</a>
</td>
</tr>
</table>
-->
<div ng-if="user.isLecturer"> <!-- Lecturer Mode --> <div ng-if="user.isLecturer"> <!-- Lecturer Mode -->
<md-card> <md-card>
<div flex = 90> <div flex = "90">
<md-content> <md-content>
<md-tabs md-dynamic-height md-border-bottom> <md-tabs md-dynamic-height md-border-bottom>
<md-tab label="Messages"> <md-tab label="Messages">
<md-content class="tabDesign"> <md-content class="tabDesign">
<md-content class="messagesContent"> <!-- <md-content class="messagesContent"> -->
<md-card ng-repeat = "msg in userMessages"> <md-card ng-repeat = "msg in userMessages">
<div layout = "column" layout-padding> <div layout = "column" layout-padding>
<div flex = 30 class="md-avatar"> <!-- <div> -->
<div flex = "30" class="md-avatar">
<img ng-src="{{msg.user.avatar_url}}" style="width:100%"> <img ng-src="{{msg.user.avatar_url}}" style="width:100%">
</div> </div>
<div flex = 20 layout = "row"> <!-- </div> -->
<!-- <div> -->
<div flex = "20" layout = "row">
<div> <div>
{{msg.user.username}} {{msg.user.username}}
</div> </div>
@ -98,38 +50,20 @@
{{msg.group.projectName}} {{msg.group.projectName}}
</div> </div>
</div> </div>
<div flex = 40> <!-- </div> -->
<!-- <div> -->
<div flex = "40">
{{msg.message}} {{msg.message}}
</div> </div>
<!-- </div> -->
</div> </div>
<!---->
</md-card> </md-card>
</md-content> </md-content>
<!-- </div> --> <!-- </md-content> -->
</md-content>
</md-tab> </md-tab>
<md-tab label="Tasks waiting for review">
<!-- <div flex layout="column">
<div flex = 30 class="md-avatar" layout-padding layout-margin>
<img ng-src="{{msg.user.avatar_url}}" style="width:100%">
</div>
<div layout = "row" flex = 15 layout-padding>
<div>
{{msg.user.username}}
</div>
<div>
{{msg.group.courseName}}
{{msg.group.projectName}}
</div>
</div>
<div flex = 50 layout-padding>
{{msg.message}}
</div>
</div> -->
<md-tab label="Tasks">
<md-content class="md-padding"> <md-content class="md-padding">
<md-card ng-repeat = "task in userTasks" layout-padding> <md-card ng-repeat = "task in userTasks" layout-padding>
<div> <div>
@ -143,12 +77,12 @@
</md-card> </md-card>
</md-content> </md-content>
</md-tab> </md-tab>
<md-tab label="two"> <!-- <md-tab label="two">
<md-content class="md-padding"> <md-content class="md-padding">
<h1 class="md-display-2">Tab Two</h1> <h1 class="md-display-2">Tab Two</h1>
Two Two
</md-content> </md-content>
</md-tab> </md-tab> -->
</md-tabs> </md-tabs>
</md-content> </md-content>
</div> </div>
@ -178,75 +112,104 @@
</div> </div>
</div> </div>
</div> </div>
<!-- </md-content> -->
</div> </div>
<div ng-if="isStudent"> <!-- Student Mode --> <div ng-if="isStudent"> <!-- Student Mode -->
<div layout = "column" flex = 90 layout-margin>
<div>
Closest Task-
<md-card layout-margin layout-padding>
<div>
<md-button ng-click="gotoTask(userTasks[0])">
{{userTasks[0].title}}
</md-button>
</div>
</md-card>
</div>
<div>
Latest Message-
<md-card layout-margin layout-padding>
{{userMessages[0].message}}
</md-card>
</div>
</div>
<md-content> <md-content>
<div layout="row">
<div flex="65">
<md-card> <md-card>
<p class = "messagesFeed">Messages</p> <div flex="100">
</md-card> <md-tabs md-dynamic-height md-border-bottom>
<md-tab label="Messages">
<md-content class="tabDesign">
<md-content class="messagesContent">
<md-card ng-repeat = "msg in userMessages">
<div layout = "column" layout-padding>
<div flex = "30" class="md-avatar">
<img ng-src="{{msg.user.avatar_url}}" style="width:100%">
</div> </div>
<div flex="34"> <div flex = "20" layout = "row">
<md-card>
<p class = "tasksFeed">Tasks</p>
</md-card>
</div>
</div>
<div layout="row">
<div flex="65">
<md-card>
<div class = "messagesContent">
<md-card ng-repeat = "msg in messages">
<div layout="column">
<div layout="row" layout-margin layout-padding>
<div flex="10">
<img ng-src="{{user.avatar_url}}" class="roundUserAvatar" style = "width:70%;">
</div>
<div flex>
<div layout = "column">
<div> <div>
<b>{{user.name}}</b> {{msg.user.username}}
</div> </div>
<div> <div>
class_name {{msg.group.courseName}}
{{msg.group.projectName}}
</div> </div>
</div> </div>
<div flex = "40">
{{msg.message}}
</div> </div>
</div> </div>
</md-card>
</md-content>
<!-- </div> -->
</md-content>
</md-tab>
<md-tab label="Tasks">
<md-content class="md-padding">
<md-card ng-repeat = "task in userTasks" layout-padding>
<div> <div>
<div flex="69" class="msgSent" layout-margin layout-padding> Title:
{{msg.text}} <md-button ng-click="gotoTask(task)">
</div> {{task.title}}
</div> </md-button>
<br></br>
Description: {{task.description}}
</div> </div>
</md-card> </md-card>
</md-content>
</md-tab>
<!-- <md-tab label="two">
<md-content class="md-padding">
<h1 class="md-display-2">Tab Two</h1>
Two
</md-content>
</md-tab> -->
</md-tabs>
</div> </div>
</md-card> </md-card>
</div> <div class ="addMessage" layout="row" layout-margin layout padding>
<div flex="34"> <div>
<md-card> <md-button ng-click="addMessageClicked()" ng class="md-raised md-primary"><i class="fa fa-comments"></i></md-button>
<p class = "tasksContent"> </div>
For Task 3 Press: <a href="http://localhost:8080/home#/tasks">Task #3</a> </div>
<br></br> <div ng-if="addMsg">
For Task 4 Press: <a href="http://localhost:8080/home#/home">Task #4</a> <div layout = "row" layout-margin layout padding layout-align = "left center">
<br></br> <md-button ng-click="postMessageClicked()" ng class="md-raised md-primary">Post</md-button>
For Task 5 Press: <a href="http://localhost:8080/home#/home">Task #5</a> <md-button ng-click="clearAllClicked()" ng class="md-raised md-primary">Clear All</md-button>
<br></br> </div>
For Task 6 Press: <a href="http://localhost:8080/home#/home">Task #6</a> <div class="port_spacer"></div>
<br></br> <div layout-padding layout = "row">
For Task 7 Press: <a href="http://localhost:8080/home#/home">Task #7</a> <div flex = "60">
<br></br> <md-input-container>
For Task 8 Press: <a href="http://localhost:8080/home#/home">Task #8</a> <label> Write Your Desired Message Here And Press Post</label>
</p> <input type="text" minlength="1" ng-model="msg.msgToAdd" required></input>
</md-card> </md-input-container>
</div>
<div flex = "30">
<md-select placeholder="Choose Course" ng-model="courseObj.name" ng-change="chooseCourseClicked()" style="z-index: 300" class="courseDropDown" required>
<md-option ng-repeat="c in courses" value="{{c.courseName}}">{{c.courseName}}</md-option>
</md-select>
</div>
</div> </div>
</div> </div>
<!-- <md-button ng-click="chooseCourseClicked()" ng class="md-raised md-primary">Choose Course</md-button> -->
<!-- <md-select placeholder="Choose Course" ng-model="course" ng-click="chooseCourseClicked()" style="z-index: 300"> -->
<!-- <md-option ng-switch="user.isLecturer" ng-repeat="c in courses" value="{{c.title}}">{{c.title}}</md-option> -->
<!-- </md-select> -->
</md-content> </md-content>
</div> </div>
</div> </div>