Commit d7f0daff authored by thomas craipeau's avatar thomas craipeau
Browse files

update

parent c5a120d0
......@@ -62,39 +62,7 @@ if (Meteor.isClient) {
},
});
}
/*
aapStep1 : proposition > ajout ligne de depense
aapStep2 : evaluation
aapStep3 : financement
aapStep4 : suivies
// etape 1
"estimates": {
"5e26e2c0681c3338068b456b": {
"price": "100000",
"days": "200",
"name": "anatole",
"date": "23/4/2021"
}
},
// maitre d'ouvre - suivies -quand projet etape 4
"worker": {
"id": "605ee65359ed2401b52b68b3",
"name": "Jirama",
"workType": "",
"user": "5e26e2c0681c3338068b456b",
"date": "1/4/2021"
},
// chaque ligne de depense - etape 4
"validFinal": {
"valid": "reserved", // avce reserved / sans reserved / non valider
"user": "5e26e2c0681c3338068b456b",
"date": "23/4/2021"
},
*/
Answers.helpers({
isCreator() {
return this.user === Meteor.userId();
......
......@@ -1187,4 +1187,4 @@ export const isValidObjectId = (id) => {
return false;
}
return false;
};
\ No newline at end of file
};
......@@ -54,7 +54,9 @@ import { SchemasRoomsRest } from '../schema/rooms.js';
import { Proposals } from '../collection/proposals.js';
import { SchemasProposalsRest, BlockProposalsRest } from '../schema/proposals.js';
import { SchemasAnswersRest, SchemasAnswersDepenseRest, SchemasAnswersDepenseEstimateRest, SchemasAnswersDepenseFinanceRest, SchemasAnswersDepenseWorkerRest, SchemasAnswersDepensePayementRest } from '../schema/answers.js';
import {
SchemasAnswersRest, SchemasAnswersDepenseRest, SchemasAnswersDepenseEstimateRest, SchemasAnswersDepenseFinanceRest, SchemasAnswersDepenseWorkerRest, SchemasAnswersDepensePayementRest,
} from '../schema/answers.js';
import { LogUserPomo } from '../collection/logpomodoro.js';
......
......@@ -38,7 +38,9 @@ import { SchemasProposalsRest, BlockProposalsRest } from '../../api/schema/propo
import { SchemasActionsRest } from '../../api/schema/actions.js';
import { SchemasLogUserActionsRest, SchemasValidateUserActionsRest, SchemasTibilletRest } from '../../api/schema/loguseractions.js';
import { SchemasMessagesRest } from '../../api/schema/logemailsend.js';
import { SchemasAnswersRest, SchemasAnswersDepenseRest, SchemasAnswersDepenseEstimateRest, SchemasAnswersDepenseFinanceRest, SchemasAnswersDepenseWorkerRest, SchemasAnswersDepensePayementRest } from '../../api/schema/answers.js';
import {
SchemasAnswersRest, SchemasAnswersDepenseRest, SchemasAnswersDepenseEstimateRest, SchemasAnswersDepenseFinanceRest, SchemasAnswersDepenseWorkerRest, SchemasAnswersDepensePayementRest,
} from '../../api/schema/answers.js';
import { SchemasShareRest, SchemasRolesRest } from '../../api/schema/schema.js';
......
......@@ -81,7 +81,7 @@ Template.detailViewAnswers.events({
});
} else {
Router.go('answersListOrga', {
orgaCibleId: answer.orgaCibleId, _id: answer._id, scope: answer.scope
orgaCibleId: answer.orgaCibleId, _id: answer._id, scope: answer.scope,
});
}
});
......@@ -395,10 +395,7 @@ Template.detailViewAnswers.events({
cancelText: i18n.__('cancel'),
cancel() {
},
buttonClicked(index) {
if (index === 0) {
}
buttonClicked() {
return true;
},
});
......@@ -1010,7 +1007,7 @@ Template.answersDepenseFinanceEdit.onCreated(function () {
});
Template.answersDepenseFinanceFields.events({
'keyup input[name="amount"]'(event, instance) {
'keyup input[name="amount"]'(event) {
const amount = parseInt(event.currentTarget.value);
const max = parseInt(event.currentTarget.max);
if (amount > max) {
......@@ -1413,9 +1410,8 @@ Template.answersDepensePayementFields.helpers({
},
});
Template.answersDepensePayementFields.events({
'keyup input[name="amount"]'(event, instance) {
'keyup input[name="amount"]'(event) {
const amount = parseInt(event.currentTarget.value);
const max = parseInt(event.currentTarget.max);
if (amount > max) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment