Fix of errors: automatic and some manual

This commit is contained in:
2024-11-04 19:56:03 +01:00
parent 90798b12e5
commit f05c25853c
41 changed files with 101 additions and 148 deletions

View File

@@ -98,7 +98,6 @@
import ToggleFlags from './Banner/ToggleFlags';
import SocialIssue from './Banner/SocialIssue.vue';
import PersonsAssociated from './Banner/PersonsAssociated.vue';
import UserRenderBoxBadge from 'ChillMainAssets/vuejs/_components/Entity/UserRenderBoxBadge.vue';
export default {
name: 'Banner',
@@ -106,7 +105,6 @@ export default {
ToggleFlags,
SocialIssue,
PersonsAssociated,
UserRenderBoxBadge,
},
computed: {
accompanyingCourse() {

View File

@@ -106,7 +106,6 @@
<script>
import OnTheFly from 'ChillMainAssets/vuejs/OnTheFly/components/OnTheFly.vue';
import ButtonLocation from '../ButtonLocation.vue';
import PersonRenderBox from 'ChillPersonAssets/vuejs/_components/Entity/PersonRenderBox.vue';
import ThirdPartyRenderBox from 'ChillThirdPartyAssets/vuejs/_components/Entity/ThirdPartyRenderBox.vue';
import WriteComment from './WriteComment';
@@ -116,7 +115,6 @@ export default {
name: 'ResourceItem',
components: {
OnTheFly,
ButtonLocation,
PersonRenderBox,
ThirdPartyRenderBox,
WriteComment

View File

@@ -520,12 +520,9 @@ import ClassicEditor from 'ChillMainAssets/module/ckeditor5/editor_config';
import AddResult from './components/AddResult.vue';
import AddEvaluation from './components/AddEvaluation.vue';
import AddPersons from 'ChillPersonAssets/vuejs/_components/AddPersons.vue';
import AddressRenderBox from 'ChillMainAssets/vuejs/_components/Entity/AddressRenderBox.vue';
import ThirdPartyRenderBox from 'ChillThirdPartyAssets/vuejs/_components/Entity/ThirdPartyRenderBox.vue';
import PickTemplate from 'ChillDocGeneratorAssets/vuejs/_components/PickTemplate.vue';
import OnTheFly from 'ChillMainAssets/vuejs/OnTheFly/components/OnTheFly.vue';
import ListWorkflowModal from 'ChillMainAssets/vuejs/_components/EntityWorkflow/ListWorkflowModal.vue';
import PickWorkflow from 'ChillMainAssets/vuejs/_components/EntityWorkflow/PickWorkflow.vue';
import PersonText from 'ChillPersonAssets/vuejs/_components/Entity/PersonText.vue';
import {buildLinkCreate} from 'ChillMainAssets/lib/entity-workflow/api.js';
import { makeFetch } from 'ChillMainAssets/lib/api/apiMethods';
@@ -586,12 +583,9 @@ export default {
AddResult,
AddEvaluation,
AddPersons,
AddressRenderBox,
ThirdPartyRenderBox,
PickTemplate,
ListWorkflowModal,
OnTheFly,
PickWorkflow,
PersonText,
},
i18n,

View File

@@ -259,14 +259,13 @@
</template>
<script>
import {dateToISO, ISOToDate, ISOToDatetime} from 'ChillMainAssets/chill/js/date';
import {ISOToDatetime} from 'ChillMainAssets/chill/js/date';
import CKEditor from '@ckeditor/ckeditor5-vue';
import ClassicEditor from 'ChillMainAssets/module/ckeditor5/editor_config';
import { mapGetters, mapState } from 'vuex';
import { mapState } from 'vuex';
import PickTemplate from 'ChillDocGeneratorAssets/vuejs/_components/PickTemplate.vue';
import {buildLink} from 'ChillDocGeneratorAssets/lib/document-generator';
import AddAsyncUpload from 'ChillDocStoreAssets/vuejs/_components/AddAsyncUpload.vue';
import AddAsyncUploadDownloader from 'ChillDocStoreAssets/vuejs/_components/AddAsyncUploadDownloader.vue';
import ListWorkflowModal from 'ChillMainAssets/vuejs/_components/EntityWorkflow/ListWorkflowModal.vue';
import {buildLinkCreate} from 'ChillMainAssets/lib/entity-workflow/api.js';
import {buildLinkCreate as buildLinkCreateNotification} from 'ChillMainAssets/lib/entity-notification/api';
@@ -312,7 +311,6 @@ export default {
ckeditor: CKEditor.component,
PickTemplate,
AddAsyncUpload,
AddAsyncUploadDownloader,
ListWorkflowModal,
DocumentActionButtonsGroup,
},

View File

@@ -1,7 +1,5 @@
import { createStore } from 'vuex';
import { dateToISO, ISOToDate, datetimeToISO, ISOToDatetime, intervalDaysToISO, intervalISOToDays } from 'ChillMainAssets/chill/js/date';
import { findSocialActionsBySocialIssue } from 'ChillPersonAssets/vuejs/_api/SocialWorkSocialAction.js';
import { create } from 'ChillPersonAssets/vuejs/_api/AccompanyingCourseWork.js';
import { dateToISO, ISOToDate, datetimeToISO, intervalDaysToISO, intervalISOToDays } from 'ChillMainAssets/chill/js/date';
import { fetchResults, makeFetch } from 'ChillMainAssets/lib/api/apiMethods.ts';
import { fetchTemplates } from 'ChillDocGeneratorAssets/api/pickTemplate.js';

View File

@@ -269,17 +269,13 @@ export default {
}).catch;
},
/**
* Select/unselect in Result Multiselect
* @param value
*/
selectResult(value) {
// selectResult(value) {
//console.log('----'); console.log('select result', value.id);
},
// },
unselectResult(value) {
// unselectResult(value) {
//console.log('----'); console.log('unselect result', value.id);
},
// },
/**
* Choose parent action will involve retaining the "children" actions.

View File

@@ -65,7 +65,7 @@
<script>
import {mapGetters, mapState} from 'vuex';
import {mapState} from 'vuex';
import Concerned from './components/Concerned.vue';
import Household from './components/Household.vue';
import HouseholdAddress from './components/HouseholdAddress';

View File

@@ -72,14 +72,12 @@
<script>
import { mapState, mapGetters } from 'vuex';
import AddPersons from 'ChillPersonAssets/vuejs/_components/AddPersons.vue';
import PersonRenderBox from 'ChillPersonAssets/vuejs/_components/Entity/PersonRenderBox.vue';
import PersonText from 'ChillPersonAssets/vuejs/_components/Entity/PersonText.vue';
export default {
name: 'Concerned',
components: {
AddPersons,
PersonRenderBox,
PersonText,
},
computed: {

View File

@@ -52,7 +52,6 @@
import MemberDetails from './MemberDetails.vue';
import {mapGetters, mapState} from "vuex";
import CurrentHousehold from "./CurrentHousehold";
import PersonRenderBox from 'ChillPersonAssets/vuejs/_components/Entity/PersonRenderBox.vue';
import PersonComment from './PersonComment';
import PersonText from '../../_components/Entity/PersonText.vue';
@@ -60,7 +59,6 @@ export default {
name: "Positioning",
components: {
CurrentHousehold,
PersonRenderBox,
PersonComment,
PersonText
},

View File

@@ -382,7 +382,7 @@ const store = createStore({
state.household.current_address = address;
state.forceHouseholdNoAddress = false;
},
removeHouseholdAddress(state, address) {
removeHouseholdAddress(state) {
if (null === state.household) {
console.error("no household");
throw new Error("No household");
@@ -455,7 +455,7 @@ const store = createStore({
dispatch('computeWarnings');
dispatch('fetchAddressSuggestions');
},
markPosition({ commit, state, dispatch }, { person_id, position_id }) {
markPosition({ commit, dispatch }, { person_id, position_id }) {
commit('markPosition', { person_id, position_id });
dispatch('computeWarnings');
},
@@ -504,7 +504,7 @@ const store = createStore({
setHouseholdCompositionType({ commit }, payload) {
commit('setHouseholdCompositionType', payload);
},
fetchHouseholdSuggestionForConcerned({ commit, state }, person) {
fetchHouseholdSuggestionForConcerned({ commit }, person) {
fetchHouseholdSuggestionByAccompanyingPeriod(person.id)
.then(households => {
commit('addHouseholdSuggestionByAccompanyingPeriod', households);
@@ -535,8 +535,7 @@ const store = createStore({
});
},
computeWarnings({ commit, state, getters }) {
let warnings = [],
payload;
let warnings = []
if (!getters.hasHousehold && !state.forceLeaveWithoutHousehold) {
warnings.push({ m: 'household_members_editor.add_destination', a: {} });
@@ -553,7 +552,7 @@ const store = createStore({
commit('setWarnings', warnings);
},
confirm({ getters, state, commit }) {
confirm({ getters, commit }) {
let payload = getters.buildPayload,
errors = [],
person_id,

View File

@@ -38,7 +38,7 @@ const patchFetch = (url, body) => {
* @param body
* @returns {Promise<Response>}
*/
const deleteFetch = (url, body) => {
const deleteFetch = (url) => {
return makeFetch('DELETE', url, null)
}

View File

@@ -1,6 +1,6 @@
import { createStore } from 'vuex'
import { getHouseholdByPerson, getCoursesByPerson, getRelationshipsByPerson } from './api'
import { getHouseholdLabel, getHouseholdWidth, getRelationshipLabel, getRelationshipTitle, getRelationshipDirection, splitId, getAge } from './vis-network'
import { getHouseholdWidth, getRelationshipLabel, getRelationshipTitle, getRelationshipDirection, splitId, getAge } from './vis-network'
import {visMessages} from "./i18n";
import { darkBlue, darkBrown, darkGreen, lightBlue, lightBrown, lightGreen } from './colors';
@@ -364,7 +364,6 @@ const store = createStore({
color: lightBrown,
font: { color: darkBrown },
dashes: (getHouseholdWidth(m) === 1)? [0,4] : false, //edge style: [dash, gap, dash, gap]
//label: getHouseholdLabel(m),
width: getHouseholdWidth(m),
})
if (!getters.isPersonLoaded(m.person.id)) {
@@ -378,7 +377,7 @@ const store = createStore({
* @param object
* @param person
*/
fetchCoursesByPerson({ commit, dispatch }, person) {
fetchCoursesByPerson({ dispatch }, person) {
return getCoursesByPerson(person)
.then(courses => new Promise(resolve => {
dispatch('addCourses', courses)
@@ -496,7 +495,7 @@ const store = createStore({
* @param object
* @param array
*/
addMissingPerson({ commit, getters, dispatch }, [person, parent]) {
addMissingPerson({ commit, getters }, [person, parent]) {
//console.log('! add missing Person', person.id)
commit('markPersonLoaded', person.id)
commit('addPerson', [person, { folded: true }])

View File

@@ -227,7 +227,7 @@ export default {
}
this.search.currentSearchQueryController = new AbortController();
searchEntities({ query, options: this.options }, this.search.currentSearchQueryController.signal)
.then(suggested => new Promise((resolve, reject) => {
.then(suggested => new Promise((resolve) => {
this.loadSuggestions(suggested.results);
resolve();
}))

View File

@@ -278,21 +278,18 @@
</template>
<script>
import {dateToISO, ISOToDate} from 'ChillMainAssets/chill/js/date';
import {ISOToDate} from 'ChillMainAssets/chill/js/date';
import AddressRenderBox from 'ChillMainAssets/vuejs/_components/Entity/AddressRenderBox.vue';
import GenderIconRenderBox from 'ChillMainAssets/vuejs/_components/Entity/GenderIconRenderBox.vue'
import Confidential from 'ChillMainAssets/vuejs/_components/Confidential.vue';
import BadgeEntity from 'ChillMainAssets/vuejs/_components/BadgeEntity.vue';
import PersonText from 'ChillPersonAssets/vuejs/_components/Entity/PersonText.vue';
import ThirdPartyText from 'ChillThirdPartyAssets/vuejs/_components/Entity/ThirdPartyText.vue';
import AddressDetailsButton from "ChillMainAssets/vuejs/_components/AddressDetails/AddressDetailsButton.vue";
export default {
name: "PersonRenderBox",
components: {
AddressRenderBox,
GenderIconRenderBox,
Confidential,
BadgeEntity,
PersonText,
ThirdPartyText