surya/freeplanet_serverside
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cut/Paste project and todos

Browse Source
This commit is contained in:
Paolo Arena
2019-04-29 01:01:40 +02:00
parent d44c0f3769
commit 4ed5a3d350
4 changed files with 31 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/models/project.js
View File

@@ -81,6 +81,10 @@ var ProjectSchema = new mongoose.Schema({
type: Number,
default: 0
},
hoursleft: {
type: Number,
default: 0
},
hoursworked: {
type: Number,
default: 0

6
server/models/todo.js
View File

@@ -266,6 +266,7 @@ class CalcTodo {
}
clean() {
this.mydata.hoursleft = 0;
this.mydata.hoursplanned = 0;
this.mydata.hoursworked = 0;
this.mydata.progressCalc = 0;
@@ -291,6 +292,10 @@ class CalcTodo {
// console.log('addFields', recin);
recout.hoursworked += recin.hoursworked;
recout.hoursplanned += recin.hoursplanned;
let hoursleft = (recin.hoursplanned - recin.hoursworked);
if (hoursleft < 0)
hoursleft = 0;
recout.hoursleft += hoursleft;
if (recin.progress === undefined) {
recout.progressCalc += recin.progressCalc;
} else {
@@ -303,6 +308,7 @@ class CalcTodo {
static copyFields(recout, recin) {
recout.hoursworked = recin.hoursworked;
recout.hoursplanned = recin.hoursplanned;
recout.hoursleft = recin.hoursleft;
if (recin.progress === undefined)
recout.progressCalc = recin.progressCalc;
else {