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

added themecolor and themebgcolor to todos and projects

Browse Source
This commit is contained in:
Paolo Arena
2019-04-29 23:47:48 +02:00
parent 4ed5a3d350
commit 1f9f5b44bd
3 changed files with 55 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/models/project.js
View File

@@ -89,6 +89,14 @@ var ProjectSchema = new mongoose.Schema({
type: Number,
default: 0
},
themecolor: {
type: String,
default: ''
},
themebgcolor: {
type: String,
default: ''
},
progressCalc: {
type: Number,
default: 0

75
server/models/todo.js
View File

@@ -71,6 +71,13 @@ var TodoSchema = new mongoose.Schema({
hoursworked: {
type: Number,
},
themecolor: {
type: String,
},
themebgcolor: {
type: String,
default: '',
},
modified: {
type: Boolean,
},
@@ -375,47 +382,55 @@ TodoSchema.statics.calculateTreeTodo = async function (actualphase, userId, idpr
.then(() => {
// console.log('objdata', objdata);
// 2) Calculate the Todos of this project
return Todo.calculateTodoHoursAndProgress(userId, idproj, myrecproj.actualphase);
if (!!myrecproj)
return Todo.calculateTodoHoursAndProgress(userId, idproj, myrecproj.actualphase);
else
return null
})
.then((objdatatodos) => {
if (myrecproj.actualphase === actualphase) {
// console.log('objdatatodos', objdatatodos);
objdata.addDataTodo(objdatatodos);
if (!!objdatatodos) {
if (!!myrecproj) {
if (myrecproj.actualphase === actualphase) {
// console.log('objdatatodos', objdatatodos);
objdata.addDataTodo(objdatatodos);
// End Calculate
objdata.endDataCalc();
// End Calculate
objdata.endDataCalc();
// Update into the DB:
return Project.updateCalc(userId, idproj, objdata, null)
.then((ris) => {
if (ris)
return objdata.getData();
else
return null;
});
} else {
return null;
// Update into the DB:
return Project.updateCalc(userId, idproj, objdata, null)
.then((ris) => {
if (ris)
return objdata.getData();
else
return null;
});
}
}
}
return null;
})
.then((ris) => {
if (calcalsoUpper) {
if (!!myrecproj.id_parent) {
// Calculate also the upper Projects !
return new Promise((resolve, reject) => {
Todo.calculateTreeTodo(actualphase, userId, myrecproj.id_parent, true, masterproj, false);
resolve(ris)
});
} else {
return new Promise((resolve, reject) => {
resolve()
});
if (!!myrecproj) {
if (!!myrecproj.id_parent) {
// Calculate also the upper Projects !
return new Promise((resolve, reject) => {
Todo.calculateTreeTodo(actualphase, userId, myrecproj.id_parent, true, masterproj, false);
resolve(ris)
});
} else {
return new Promise((resolve, reject) => {
resolve()
});
}
}
} else {
return new Promise((resolve, reject) => {
resolve()
});
}
return new Promise((resolve, reject) => {
resolve()
});
})
};