arnaucube/openworktime
1
0
Fork 0
mirror of https://github.com/arnaucube/openworktime.git synced 2026-02-07 11:46:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

41
webapp/controllers.js
View File

@@ -54,6 +54,10 @@ angular.module('workApp', ['chart.js'])
$scope.currentInclude="login.html";
console.log("token ended");
}else{
for(var i=0; i<data.length; i++)
{
data[i].chart=translateWorkStrikes2Chart(data[i].workStrikes);
}
console.log(data);
$scope.projects=data;
}
@@ -257,6 +261,11 @@ angular.module('workApp', ['chart.js'])
data: $scope.user
}).then(function(response) {
console.log(response);
for(var i=0; i<response.data.length; i++)
{
response.data[i].chart=translateWorkStrikes2Chart(response.data[i].workStrikes);
}
$scope.projects=response.data;
},
function(response) {// failed
@@ -278,6 +287,19 @@ angular.module('workApp', ['chart.js'])
window.open(urlCode);
}
};
$scope.arrayObjectIndexOf = function(myArray, searchTerm, property) {
if(myArray)
{
for(var i = 0, len = myArray.length; i < len; i++) {
if (myArray[i][property] === searchTerm){
//console.log("i: " + i);
return i;
}
}
}
//console.log("i: -1");
return -1;
}
//chart
/*$scope.chart={
@@ -297,3 +319,22 @@ angular.module('workApp', ['chart.js'])
return new Date(2016, 0, 1).setSeconds(seconds);
};
}]);
function translateWorkStrikes2Chart(workStrikes){
var auxChart={
labels: [],
series: ['working'],
data: []
};
if(workStrikes)
{
for(var i=0; i<workStrikes.length; i++)
{
auxChart.labels.push(workStrikes[i].username);
auxChart.data.push(workStrikes[i].time);
}
}
return(auxChart);
}

10
webapp/dashboard.html
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>