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

Calculation recorsively up completed!

Browse Source
This commit is contained in:
Paolo Arena
2019-04-06 21:52:34 +02:00
parent d40297acb3
commit 1856818d3a
5 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/models/project.js
View File

@@ -41,7 +41,7 @@ var ProjectSchema = new mongoose.Schema({
priority: { priority: {
type: Number, type: Number,
}, },
status: { statusproj: {
type: Number, type: Number,
default: 0 default: 0
}, },

2
server/models/todo.js
View File

@@ -32,7 +32,7 @@ var TodoSchema = new mongoose.Schema({
priority: { priority: {
type: Number, type: Number,
}, },
status: { statustodo: {
type: Number, type: Number,
default: 0 default: 0
}, },

8
server/tests/seed/seed.js
View File

@@ -75,7 +75,7 @@ const userjson = JSON.stringify(users[0]);
const todos = [{ const todos = [{
_id: new ObjectID(), _id: new ObjectID(),
category: "personal", category: "personal",
status: 0, statustodo: 0,
completed_at: new Date(), completed_at: new Date(),
created_at: new Date(), created_at: new Date(),
descr: "Primo Task Esempio", descr: "Primo Task Esempio",
@@ -91,7 +91,7 @@ const todos = [{
}, { }, {
_id: new ObjectID(), _id: new ObjectID(),
category: "personal", category: "personal",
status: 0, statustodo: 0,
completed_at: new Date(), completed_at: new Date(),
created_at: new Date(), created_at: new Date(),
descr: "Secondo Task Esempio", descr: "Secondo Task Esempio",
@@ -107,7 +107,7 @@ const todos = [{
}, { }, {
_id: new ObjectID(), _id: new ObjectID(),
category: "personal", category: "personal",
status: 0, statustodo: 0,
completed_at: new Date(), completed_at: new Date(),
created_at: new Date(), created_at: new Date(),
descr: "Terzo Task Esempio", descr: "Terzo Task Esempio",
@@ -123,7 +123,7 @@ const todos = [{
}, { // RECORD CHE VERRA' UTILIZZATO PER AGGIUNGERE UN NUOVO TASK }, { // RECORD CHE VERRA' UTILIZZATO PER AGGIUNGERE UN NUOVO TASK
_id: new ObjectID(), _id: new ObjectID(),
category: "personal", category: "personal",
status: 0, statustodo: 0,
completed_at: new Date(), completed_at: new Date(),
created_at: new Date(), created_at: new Date(),
descr: "Nuovo Quarto Task Esempio da Inserire", descr: "Nuovo Quarto Task Esempio da Inserire",

8
server/tests/server.test.js
View File

@@ -327,7 +327,7 @@ if (testsingolo) {
.set('x-auth', users[0].tokens[0].token) .set('x-auth', users[0].tokens[0].token)
.expect(404) .expect(404)
.expect((res) => { .expect((res) => {
console.log('res', res.status) console.log('res', res.statustodo);
expect(res.body.todos).toBe(undefined); expect(res.body.todos).toBe(undefined);
}) })
.end(done); .end(done);
@@ -393,13 +393,13 @@ if (testsingolo) {
.patch(`/todos/${hexId}`) .patch(`/todos/${hexId}`)
.set('x-auth', users[0].tokens[0].token) .set('x-auth', users[0].tokens[0].token)
.send({ .send({
status: 1, statustodo: 1,
descr descr
}) })
.expect(200) .expect(200)
.expect((res) => { .expect((res) => {
expect(res.body.todo.descr).toBe(descr); expect(res.body.todo.descr).toBe(descr);
expect(res.body.todo.status).toBe(1); expect(res.body.todo.statustodo).toBe(1);
// expect(res.body.todo.completedAt).toBeA('number'); // expect(res.body.todo.completedAt).toBeA('number');
}) })
.end(done); .end(done);
@@ -413,7 +413,7 @@ if (testsingolo) {
.patch(`/todos/${hexId}`) .patch(`/todos/${hexId}`)
.set('x-auth', users[1].tokens[0].token) .set('x-auth', users[1].tokens[0].token)
.send({ .send({
status: 1, statustodo: 1,
descr descr
}) })
.expect(404) .expect(404)

4
server/tools/general.js
View File

@@ -51,7 +51,7 @@ module.exports = {
}, },
allfieldTodo: function () { allfieldTodo: function () {
return ['userId', 'pos', 'category', 'descr', 'priority', 'status', 'created_at', 'modify_at', return ['userId', 'pos', 'category', 'descr', 'priority', 'statustodo', 'created_at', 'modify_at',
'completed_at', 'expiring_at', 'enableExpiring', 'id_prev', 'progress', 'modified', 'phase', 'assigned_to_userId', 'hoursplanned', 'hoursworked', 'start_date'] 'completed_at', 'expiring_at', 'enableExpiring', 'id_prev', 'progress', 'modified', 'phase', 'assigned_to_userId', 'hoursplanned', 'hoursworked', 'start_date']
}, },
@@ -61,7 +61,7 @@ module.exports = {
// #TODO Projects++ Add fields ... // #TODO Projects++ Add fields ...
allfieldProject: function () { allfieldProject: function () {
return ['userId', 'pos', 'id_parent', 'descr', 'longdescr', 'hoursplanned', 'hoursworked', 'priority', 'status', 'created_at', 'modify_at', return ['userId', 'pos', 'id_parent', 'descr', 'longdescr', 'hoursplanned', 'hoursworked', 'priority', 'statusproj', 'created_at', 'modify_at',
'completed_at', 'expiring_at', 'enableExpiring', 'id_prev', 'progressCalc', 'modified', 'live_url', 'test_url', 'begin_development', 'begin_test'] 'completed_at', 'expiring_at', 'enableExpiring', 'id_prev', 'progressCalc', 'modified', 'live_url', 'test_url', 'begin_development', 'begin_test']
}, },