work and stopwork system done, project time data structure runs ok

This commit is contained in:
nau
2016-09-09 19:24:13 +02:00
parent a0f6d4abba
commit 0eeb2cab2f
5 changed files with 68 additions and 9 deletions

View File

@@ -79,7 +79,7 @@
<p class="grey-text">{{project.description}}</p>
<p class="grey-text">{{project.totaltime | secondsToDateTime | date:'HH:mm:ss'}}</p>
<p class="grey-text">
<div ng-repeat="user in project.users">{{user}}</div>
<div ng-repeat="user in project.users">{{user.username}}</div>
</p>
</a>
</div>
@@ -122,17 +122,17 @@
<p>
Total time: {{currentproject.totaltime | secondsToDateTime | date:'HH:mm:ss'}}
</p>
<p>
Current strike time: <b>{{currentStrike | secondsToDateTime | date:'HH:mm:ss'}}</b>
<p ng-repeat="user in currentproject.users">
{{user.username}}: <b>{{user.time | secondsToDateTime | date:'HH:mm:ss'}}</b>
</p>
</div>
<div class="card-action">
<div ng-show="currentproject.users.indexOf(user.username)!=-1">
<div ng-show="arrayObjectIndexOf(currentproject.users, user.username, 'username')!=-1">
<a ng-click="btnWork()" ng-show="!working" class="waves-effect waves-light btn green lighten-2">Work!</a>
<a ng-click="btnStop()" ng-show="working" class="waves-effect waves-light btn red lighten-2">Stop!</a>
</div>
<div ng-show="currentproject.users.indexOf(user.username)==-1">
<div ng-show="arrayObjectIndexOf(currentproject.users, user.username, 'username')==-1">
<a ng-click="joinProject()" class="waves-effect waves-light btn blue lighten-2">Join!</a>
</div>