@@ -295,38 +298,39 @@ export default {
}
},
computed: {
- ...mapState([
- 'isPosting'
- ]),
+ ...mapState([
+ 'isPosting'
+ ]),
getTemplatesAvailables() {
- return this.$store.getters.getTemplatesAvailablesForEvaluation(this.evaluation.evaluation);
+ return this.$store.getters.getTemplatesAvailablesForEvaluation(this.evaluation.evaluation);
},
canGenerate() {
- return !this.$store.state.isPosting && this.template !== null;
+ return !this.$store.state.isPosting && this.template !== null;
},
startDate: {
- get() {
- return dateToISO(this.evaluation.startDate);
- },
- set(v) {
- this.$store.commit('setEvaluationStartDate', { key: this.evaluation.key, date: ISOToDate(v) });
- }
+ get() {
+ console.log('evaluation', this.evaluation);
+ return this.evaluation.startDate;
+ },
+ set(v) {
+ this.$store.commit('setEvaluationStartDate', { key: this.evaluation.key, date: v });
+ }
},
endDate: {
- get() {
- return dateToISO(this.evaluation.endDate);
- },
- set(v) {
- this.$store.commit('setEvaluationEndDate', { key: this.evaluation.key, date: ISOToDate(v) });
- }
+ get() {
+ return this.evaluation.endDate;
+ },
+ set(v) {
+ this.$store.commit('setEvaluationEndDate', { key: this.evaluation.key, date: v });
+ }
},
maxDate: {
- get() {
- return dateToISO(this.evaluation.maxDate);
- },
- set(v) {
- this.$store.commit('setEvaluationMaxDate', { key: this.evaluation.key, date: ISOToDate(v) });
- }
+ get() {
+ return this.evaluation.maxDate;
+ },
+ set(v) {
+ this.$store.commit('setEvaluationMaxDate', { key: this.evaluation.key, date: v });
+ }
},
warningInterval: {
get() { return this.evaluation.warningInterval; },
@@ -341,7 +345,7 @@ export default {
ISOToDatetime,
canEditDocument(document) {
return 'storedObject' in document ?
- this.mime.includes(document.storedObject.type) && document.storedObject.keyInfos.length === 0 : false;
+ this.mime.includes(document.storedObject.type) : false;
},
listAllStatus() {
console.log('load all status');
@@ -357,16 +361,16 @@ export default {
},
buildEditLink(storedObject) {
return `/wopi/edit/${storedObject.uuid}?returnPath=` + encodeURIComponent(
- window.location.pathname + window.location.search + window.location.hash);
+ window.location.pathname + window.location.search + window.location.hash);
},
submitBeforeGenerate({template}) {
- const callback = (data) => {
- let evaluationId = data.accompanyingPeriodWorkEvaluations.find(e => e.key === this.evaluation.key).id;
+ const callback = (data) => {
+ let evaluationId = data.accompanyingPeriodWorkEvaluations.find(e => e.key === this.evaluation.key).id;
- window.location.assign(buildLink(template, evaluationId, 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWorkEvaluation'));
- };
+ window.location.assign(buildLink(template, evaluationId, 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWorkEvaluation'));
+ };
- return this.$store.dispatch('submit', callback).catch(e => { console.log(e); throw e; });
+ return this.$store.dispatch('submit', callback).catch(e => { console.log(e); throw e; });
},
onInputDocumentTitle(event) {
const id = Number(event.target.id);
@@ -392,20 +396,20 @@ export default {
},
removeDocument(document) {
if (window.confirm("Êtes-vous sûr·e de vouloir supprimer le document qui a pour titre \"" + document.title +"\" ?")) {
- this.$store.commit('removeDocument', {key: this.evaluation.key, document: document});
+ this.$store.commit('removeDocument', {key: this.evaluation.key, document: document});
}
},
goToGenerateWorkflowEvaluationDocument({event, link, workflowName, payload}) {
- const callback = (data) => {
- let evaluation = data.accompanyingPeriodWorkEvaluations.find(e => e.key === this.evaluation.key);
- let updatedDocument = evaluation.documents.find(d => d.key === payload.doc.key);
- window.location.assign(buildLinkCreate(workflowName,
- 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWorkEvaluationDocument', updatedDocument.id));
- };
+ const callback = (data) => {
+ let evaluation = data.accompanyingPeriodWorkEvaluations.find(e => e.key === this.evaluation.key);
+ let updatedDocument = evaluation.documents.find(d => d.key === payload.doc.key);
+ window.location.assign(buildLinkCreate(workflowName,
+ 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWorkEvaluationDocument', updatedDocument.id));
+ };
- return this.$store.dispatch('submit', callback)
- .catch(e => { console.log(e); throw e; });
- },
+ return this.$store.dispatch('submit', callback)
+ .catch(e => { console.log(e); throw e; });
+ },
},
}
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js
index 4ce0b8ebe..d5437b0a7 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js
@@ -1,5 +1,5 @@
import { createStore } from 'vuex';
-import { datetimeToISO, ISOToDatetime, intervalDaysToISO, intervalISOToDays } from 'ChillMainAssets/chill/js/date.js';
+import { dateToISO, ISOToDate, datetimeToISO, ISOToDatetime, intervalDaysToISO, intervalISOToDays } from 'ChillMainAssets/chill/js/date.js';
import { findSocialActionsBySocialIssue } from 'ChillPersonAssets/vuejs/_api/SocialWorkSocialAction.js';
import { create } from 'ChillPersonAssets/vuejs/_api/AccompanyingCourseWork.js';
import { fetchResults, makeFetch } from 'ChillMainAssets/lib/api/apiMethods.js';
@@ -13,9 +13,9 @@ const store = createStore({
state: {
work: window.accompanyingCourseWork,
startDate: window.accompanyingCourseWork.startDate !== null ?
- ISOToDatetime(window.accompanyingCourseWork.startDate.datetime) : null,
+ dateToISO(new Date(window.accompanyingCourseWork.startDate.datetime)) : null,
endDate: window.accompanyingCourseWork.endDate !== null ?
- ISOToDatetime(window.accompanyingCourseWork.endDate.datetime) : null,
+ dateToISO(new Date(window.accompanyingCourseWork.endDate.datetime)) : null,
note: window.accompanyingCourseWork.note,
goalsPicked: window.accompanyingCourseWork.goals,
goalsForAction: [],
@@ -72,11 +72,11 @@ const store = createStore({
return {
type: 'accompanying_period_work',
id: state.work.id,
- startDate: state.startDate === null ? null : {
- datetime: datetimeToISO(state.startDate)
+ startDate: state.startDate === null || state.startDate === '' ? null : {
+ datetime: datetimeToISO(ISOToDate(state.startDate))
},
- endDate: state.endDate === null ? null : {
- datetime: datetimeToISO(state.endDate)
+ endDate: state.endDate === null || state.endDate === '' ? null : {
+ datetime: datetimeToISO(ISOToDate(state.endDate))
},
note: state.note,
persons: state.personsPicked.map(p => ({id: p.id, type: p.type})),
@@ -110,9 +110,9 @@ const store = createStore({
id: e.evaluation.id,
type: e.evaluation.type
},
- startDate: e.startDate !== null ? { datetime: datetimeToISO(e.startDate) } : null,
- endDate: e.endDate !== null ? { datetime: datetimeToISO(e.endDate) } : null,
- maxDate: e.maxDate !== null ? { datetime: datetimeToISO(e.maxDate) } : null,
+ startDate: e.startDate === null || e.startDate === '' ? null : { datetime: datetimeToISO(ISOToDate(e.startDate)) },
+ endDate: e.endDate === null || e.endDate === '' ? null : { datetime: datetimeToISO(ISOToDate(e.endDate)) },
+ maxDate: e.maxDate === null || e.maxDate === '' ? null : { datetime: datetimeToISO(ISOToDate(e.maxDate)) },
warningInterval: intervalDaysToISO(e.warningInterval),
comment: e.comment,
documents: e.documents
@@ -132,9 +132,9 @@ const store = createStore({
var k = Object.assign(e, {
key: index,
editEvaluation: false,
- startDate: e.startDate !== null ? ISOToDatetime(e.startDate.datetime) : null,
- endDate: e.endDate !== null ? ISOToDatetime(e.endDate.datetime) : null,
- maxDate: e.maxDate !== null ? ISOToDatetime(e.maxDate.datetime) : null,
+ startDate: e.startDate !== null ? dateToISO(new Date(e.startDate.datetime)) : null,
+ endDate: e.endDate !== null ? dateToISO(new Date(e.endDate.datetime)) : null,
+ maxDate: e.maxDate !== null ? dateToISO(new Date(e.maxDate.datetime)) : null,
warningInterval: e.warningInterval !== null ? intervalISOToDays(e.warningInterval) : null,
documents: e.documents.map((d, docIndex) => {
return Object.assign(d, {
@@ -244,7 +244,7 @@ const store = createStore({
type: "accompanying_period_work_evaluation",
key: state.evaluationsPicked.length + 1,
evaluation: evaluation,
- startDate: new Date(),
+ startDate: dateToISO(new Date()),
endDate: null,
maxDate: null,
warningInterval: null,
@@ -264,6 +264,7 @@ const store = createStore({
.startDate = date;
},
setEvaluationEndDate(state, {key, date}) {
+ console.log('commit date', date)
state.evaluationsPicked.find(e => e.key === key)
.endDate = date;
},
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Dates.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Dates.vue
index 94c1a146a..03feb0329 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Dates.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Dates.vue
@@ -53,7 +53,7 @@ export default {
return null;
},
set(value) {
- this.$store.commit('setHouseholdCompositionType', value);
+ this.$store.dispatch('setHouseholdCompositionType', value);
},
},
numberOfChildren: {
@@ -66,18 +66,19 @@ export default {
},
startDate: {
get() {
- return [
- this.$store.state.startDate.getFullYear(),
- (this.$store.state.startDate.getMonth() + 1).toString().padStart(2, '0'),
- this.$store.state.startDate.getDate().toString().padStart(2, '0')
- ].join('-');
+ return this.$store.state.startDate;
+ // return [
+ // this.$store.state.startDate.getFullYear(),
+ // (this.$store.state.startDate.getMonth() + 1).toString().padStart(2, '0'),
+ // this.$store.state.startDate.getDate().toString().padStart(2, '0')
+ // ].join('-');
},
set(value) {
- let
- [year, month, day] = value.split('-'),
- dValue = new Date(year, month-1, day);
+ // let
+ // [year, month, day] = value.split('-'),
+ // dValue = new Date(year, month-1, day);
- this.$store.dispatch('setStartDate', dValue);
+ this.$store.dispatch('setStartDate', value);
}
}
}
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/store/index.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/store/index.js
index cc5ab497c..f3801576d 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/store/index.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/store/index.js
@@ -2,7 +2,7 @@ import { createStore } from 'vuex';
import { householdMove, fetchHouseholdSuggestionByAccompanyingPeriod, fetchAddressSuggestionByPerson} from './../api.js';
import { fetchResults } from 'ChillMainAssets/lib/api/apiMethods.js'
import { fetchHouseholdByAddressReference } from 'ChillPersonAssets/lib/household.js';
-import { datetimeToISO } from 'ChillMainAssets/chill/js/date.js';
+import { datetimeToISO, dateToISO, ISOToDate } from 'ChillMainAssets/chill/js/date.js';
const debug = process.env.NODE_ENV !== 'production';
@@ -30,7 +30,7 @@ const store = createStore({
}
return 0;
}),
- startDate: new Date(),
+ startDate: dateToISO(new Date()),
/**
* Indicates if the destination is:
*
@@ -278,7 +278,7 @@ const store = createStore({
type: conc.person.type
},
start_date: {
- datetime: datetimeToISO(state.startDate)
+ datetime: state.startDate === null || state.startDate === '' ? null : datetimeToISO(ISOToDate(state.startDate))
}
};
@@ -302,7 +302,7 @@ const store = createStore({
},
number_of_children: state.numberOfChildren,
start_date: {
- datetime: datetimeToISO(state.startDate),
+ datetime: datetimeToISO(ISOToDate(state.startDate)),
},
};
}
@@ -430,7 +430,7 @@ const store = createStore({
state.householdCompositionTypes = types;
},
setHouseholdCompositionType(state, id) {
- state.householdCompositionType = state.householdCompositionTypes.find(t => t.id = id);
+ state.householdCompositionType = state.householdCompositionTypes.find(t => t.id === id);
},
setNumberOfChildren(state, number) {
state.numberOfChildren = Number.parseInt(number);
@@ -495,6 +495,12 @@ const store = createStore({
setComment({ commit }, payload) {
commit('setComment', payload);
},
+ setHouseholdCompositionTypes({ commit }, payload) {
+ commit('setHouseholdCompositionTypes', payload);
+ },
+ setHouseholdCompositionType({ commit }, payload) {
+ commit('setHouseholdCompositionType', payload);
+ },
fetchHouseholdSuggestionForConcerned({ commit, state }, person) {
fetchHouseholdSuggestionByAccompanyingPeriod(person.id)
.then(households => {
@@ -597,7 +603,7 @@ if (concerned.length > 0) {
}
fetchResults(`/api/1.0/person/houehold/composition/type.json`).then(types => {
- store.commit('setHouseholdCompositionTypes', types);
+ store.dispatch('setHouseholdCompositionTypes', types);
})
export { store };
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/Comment/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/Comment/index.html.twig
index a8a5d78b8..d5ece68a9 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/Comment/index.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/Comment/index.html.twig
@@ -40,6 +40,7 @@
{% endif %}
{{ form_start(form) }}
{{ form_errors(form) }}
+ {{ form_errors(form.content) }}
{{ form_widget(form.content) }}
-
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_item.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_item.html.twig
index 8ff8a0617..3d4f46425 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_item.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_item.html.twig
@@ -25,22 +25,6 @@
- {% if w.createdBy %}
-
-
-
{{ 'Referrers'|trans }}
-
-
-
- {% for u in w.referrers %}
- {{ u|chill_entity_render_box }}
- {% if not loop.last %}, {% endif %}
- {% endfor %}
-
-
-
- {% endif %}
-
{%- if w.persons -%}
@@ -78,6 +62,22 @@
{% endif %}
+ {%- if w.referrers -%}
+
+
+
{{ 'Referrers'|trans }}
+
+
+ {% for u in w.referrers %}
+
+ {{ u|chill_entity_render_box }}
+ {% if not loop.last %}, {% endif %}
+
+ {% endfor %}
+
+
+ {% endif %}
+
{%- if w.socialAction.issue -%}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/list_recent_by_accompanying_period.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/list_recent_by_accompanying_period.html.twig
index 7f2fb0177..4621cb97a 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/list_recent_by_accompanying_period.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/list_recent_by_accompanying_period.html.twig
@@ -28,6 +28,15 @@
{{ w.handlingThierParty|chill_entity_render_box }}
{% endif %}
+ {% if w.referrers %}
+
-
+ {{ 'Referrers'|trans ~ ' : ' }}
+ {% for u in w.referrers %}
+ {{ u|chill_entity_render_box }}
+ {% if not loop.last %}, {% endif %}
+ {% endfor %}
+
+ {% endif %}
-
{{ 'Participants'|trans ~ ' : ' }}
{% for p in w.persons %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list_item.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list_item.html.twig
index 65e514b14..cfa616988 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list_item.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list_item.html.twig
@@ -20,7 +20,7 @@
{% elseif period.step == 'CONFIRMED' %}
{{- 'Confirmed'|trans|upper -}}
{% else %}
- {{- 'Closed'|trans|upper -}}
+ {{- 'Closed'|trans|upper -}}
{% endif %}
@@ -116,14 +116,40 @@
{% endif %}
-
- {% set notif_counter = chill_count_notifications('Chill\\PersonBundle\\Entity\\AccompanyingPeriod', period.id) %}
- {% if notif_counter.total > 0 %}
-