diff --git a/src/components/ConcernementMapItem.vue b/src/components/ConcernementMapItem.vue
index 54d7f28..0e7da86 100644
--- a/src/components/ConcernementMapItem.vue
+++ b/src/components/ConcernementMapItem.vue
@@ -1106,6 +1106,8 @@ export default {
},
setPaperEntites(){
+ console.log(`setPaperEntites ${this.cid}`);
+
let g = new paper.Group({
pivot: new paper.Point(this.pos),
name: 'entites'
@@ -1120,7 +1122,8 @@ export default {
// for (let i = 0; i < this.entites.length; i++) {
for (let i = 0; i < this.concernement.revisions_byid[this.active_revision].entites.length; i++) {
let entite = this.concernement.revisions_byid[this.active_revision].entites[i];
-
+ console.log('entite', entite);
+
if (!entite.active && !this.concernement.can_update) {
continue;
}
@@ -1144,7 +1147,7 @@ export default {
}
}
- // console.log(`item_type: ${item_type}, symbol_name: ${symbol_name}`);
+ console.log(`item_type: ${item_type}, symbol_name: ${symbol_name}`);
let instance = new paper.SymbolItem(this.paper_symbol_definitions[symbol_name]);
instance.name = 'entite';
@@ -1157,7 +1160,8 @@ export default {
instance.is_symbol_instance = true;
g.addChild(instance);
// instance.bringToFront();
-
+ console.log('instance', instance);
+
if (entite.entite && entite.entite.title) {
let pad = 2;
let label_pos = new paper.Point({
@@ -1209,6 +1213,8 @@ export default {
instance.label_item = label;
}
}
+ console.log(`g`, g);
+
return g;
},
setPaperEntitesSuperposees(){
diff --git a/src/components/contents/Doleancer.vue b/src/components/contents/Doleancer.vue
index 2d50a91..d5b26c0 100644
--- a/src/components/contents/Doleancer.vue
+++ b/src/components/contents/Doleancer.vue
@@ -11,6 +11,11 @@ import SvgIcon from '@jamescoyle/vue-icon';
import { mdiArrowLeft } from '@mdi/js';
import { mdiArrowRight } from '@mdi/js';
+import ContentEditable from '@components/editable/ContentEditable.vue';
+// import CheckboxEditable from '@components/editable/CheckboxEditable.vue';
+// import SelectEditable from '@components/editable/SelectEditable.vue';
+
+
export default {
props: ['cid'],
data(){
@@ -31,7 +36,8 @@ export default {
'p_groupes_interets',
'p_reception_et_traitement',
'p_mise_en_oeuvre_decision',
- 'p_reception_application_decision'
+ 'p_reception_application_decision',
+ 'reloadConcernementCerclePol'
]),
...mapState(CommonStore,['hover_elmt'])
},
@@ -44,6 +50,7 @@ export default {
this.doleance_index = index;
}
});
+
},
mounted() {
if (this.doleance_index > 0)
@@ -71,8 +78,9 @@ export default {
this.openDoleance()
},
openDoleance(){
- console.log('openDoleance');
this.doleance = this.concernement.doleances[this.doleance_index];
+ console.log('openDoleance', this.doleance);
+
this.setOpenedDoleance(parseInt(this.cid), this.doleance.id);
setTimeout((function(that){
return function(){
@@ -88,7 +96,10 @@ export default {
},
components: {
CartoucheLayout,
- SvgIcon
+ SvgIcon,
+ ContentEditable
+ // CheckboxEditable,
+ // SelectEditable
}
}
@@ -112,7 +123,19 @@ export default {
v-if="opened_concernement.opened_doleance.field === 'leprobleme' || !opened_concernement.opened_doleance.field">
{{ doleance.date_leprobleme.start }}
{{ ct_cercle_politique.field_le_probleme.label }}
- {{ doleance.leprobleme }}
+
+
{
entite.cid = tmp_conc.id;
- // if(entite.entite){
+ if(entite.entite){
if (this.allEntitesById[entite.entite.id]) {
_assign(this.allEntitesById[entite.entite.id], entite);
}else{
@@ -400,7 +400,7 @@ export const ConcernementsStore = defineStore({
}else{
tmp_conc.entites_byid[entite.entite.id] = entite;
}
- // }
+ }
});
// add and/or merge revisions
tmp_conc.active_revision = concernement.revision_id;
@@ -546,6 +546,106 @@ export const ConcernementsStore = defineStore({
})
});
},
+ reloadConcernementCerclePol(nid){
+ // let tmp_conc = this.concernementsByID[nid];
+ // console.log(`reloadConcernementCerclePol nid: ${nid} ${Math.random()*10000}`);
+ return new Promise((resolve, reject) => {
+ const ast = gql`{
+ concernement(id:${nid}) {
+ id
+ doleances {
+ id
+ author
+ bundle
+ path
+ title
+ uuid
+ #1
+ date_leprobleme {
+ start
+ }
+ leprobleme
+ lenquete
+ groupesinterets {
+ date {
+ end
+ start
+ }
+ groupe_interets
+ accorder_interets
+ formuler
+ }
+ #2
+ date_adresse {
+ start
+ }
+ entite_addresse_doleance
+ comment_ennonce_doleance
+ aqui_addresse_doleance
+ reception_traitement {
+ date {
+ end
+ start
+ }
+ entite_adressee
+ doleance_formulee
+ traite_doleance
+ entite_recoit_doleance
+ }
+ #3
+ date_decision {
+ start
+ }
+ entites_decisionnaires
+ decision_formule
+ mise_en_oeuvre_decision {
+ date {
+ end
+ start
+ }
+ entite_adresse_decision
+ formule_decision
+ entite_metenoeuvre_decisio
+ }
+ #4
+ date_application {
+ start
+ }
+ entite_adresse_application
+ aqui_adresse_decision
+ comment_formule_decision
+ receptions_et_applications {
+ date {
+ end
+ start
+ }
+ applique_decision
+ formule_decision_applic
+ entite_recoit_decision
+ }
+ probleme_initial_resolu
+ oui_nouvelle_situation
+ non_adresse_doleance
+ }
+ }
+ }
+ `
+ // console.log('ast', ast);
+ GQL.post('', { query: print(ast) })
+ .then(({ data : { data : { concernement } } }) => {
+ console.log(`reloadConcernementCerclePol loaded len: ${concernement.doleances.length} revision: ${concernement.revision_id}`, concernement)
+ let tmp_conc = this.concernementsByID[concernement.id];
+ // merge old concernement entites with new once
+ _assign(tmp_conc.doleances, concernement.doleances);
+ resolve(concernement);
+ })
+ .catch(error => {
+ console.warn('Issue with reloadConcernementCerclePol', error)
+ reject(error);
+ Promise.reject(error)
+ })
+ });
+ },
loadContentTypeDefinition () {
const body = {
query: `
@@ -706,7 +806,7 @@ export const ConcernementsStore = defineStore({
// })
},
setOpenedDoleance(cid, did){
- console.log(`setOpenedDoleance(${cid}, ${did})`, cid, did);
+ console.log(`setOpenedDoleance cid:${cid}, did:${did})`, cid, did);
this.concernementsByID[cid].opened_doleance = {id: did};
// console.log('this.opened_concernement.opened_doleance', this.opened_concernement.opened_doleance);
},