diff --git a/.classpath b/.classpath new file mode 100644 index 0000000..0371133 --- /dev/null +++ b/.classpath @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.project b/.project new file mode 100644 index 0000000..25ea1ed --- /dev/null +++ b/.project @@ -0,0 +1,34 @@ + + + aren + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature + + + + 1631056289277 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + + diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..abdea9a --- /dev/null +++ b/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,4 @@ +eclipse.preferences.version=1 +encoding//src/main/java=UTF-8 +encoding//src/main/resources=UTF-8 +encoding/=UTF-8 diff --git a/.settings/org.eclipse.jdt.apt.core.prefs b/.settings/org.eclipse.jdt.apt.core.prefs new file mode 100644 index 0000000..d4313d4 --- /dev/null +++ b/.settings/org.eclipse.jdt.apt.core.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.apt.aptEnabled=false diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000..1b6e1ef --- /dev/null +++ b/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,9 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore +org.eclipse.jdt.core.compiler.processAnnotations=disabled +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 0000000..f897a7f --- /dev/null +++ b/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/src/main/webapp/assets/img/mapimg.png b/src/main/webapp/assets/img/mapimg.png new file mode 100644 index 0000000..5942730 Binary files /dev/null and b/src/main/webapp/assets/img/mapimg.png differ diff --git a/src/main/webapp/assets/js/components/grids/debatesSurCarteGrid.vue b/src/main/webapp/assets/js/components/grids/debatesSurCarteGrid.vue new file mode 100644 index 0000000..84a31ad --- /dev/null +++ b/src/main/webapp/assets/js/components/grids/debatesSurCarteGrid.vue @@ -0,0 +1,74 @@ + + + + + + + + + + {{ category.name }} + + + + + + + + + + + + + + + + + {{ debate.commentsCount }} + + + + {{ debate.lastCommentDate !== 0 ? $d(debate.lastCommentDate, 'short') : $t('no_post') }} + + + + {{ debate.document.name }} + + + + + {{ team.name }} + + + + + + {{ guest.fullName() }} + + + + + Aller au débat + + + + + + + + + + \ No newline at end of file diff --git a/src/main/webapp/assets/js/components/grids/documentsDebateSurCarte.vue b/src/main/webapp/assets/js/components/grids/documentsDebateSurCarte.vue new file mode 100644 index 0000000..299850b --- /dev/null +++ b/src/main/webapp/assets/js/components/grids/documentsDebateSurCarte.vue @@ -0,0 +1,51 @@ + + + + + + + + + + {{ category.name }} + + + + + + + + + + + + + {{ document.name }} + + + + {{ document.author }} + + + + Aller au document + + + + + + \ No newline at end of file diff --git a/src/main/webapp/assets/js/components/widgets/comment.vue b/src/main/webapp/assets/js/components/widgets/comment.vue index 021e830..7d0c2da 100644 --- a/src/main/webapp/assets/js/components/widgets/comment.vue +++ b/src/main/webapp/assets/js/components/widgets/comment.vue @@ -38,11 +38,9 @@ @@ -267,13 +265,20 @@ module.exports = { .replace(/"/g, """) .replace(/'/g, "'"); }, - copyToClipBoard(text) { + copyToClipBoard(text, f=null) { navigator.clipboard.writeText(`${baseUrl}${text}`).then( function () { - alert("lien copié dans le presse-papier"); + if(f){ + if (window.confirm('Lien copié dans le presse-papier \n Aller vers l\'influent?')) + { + f(); + } + } else { + alert("lien copié dans le presse-papier"); + } }, - function () { - console.error("Erreur du copie de lien"); + function (e) { + console.error("Erreur du copie de lien------"+e); } ); }, @@ -302,9 +307,15 @@ module.exports = { console.log(error); } }, - shareComment() { + shareComment(text) { try { - alert("share comment functionnality"); + const openInfluentInNewTab = () => { + // setTimeout(function(){ + + // },1500) + window.open(`https://app.linfluent.com/#/Editeur`, '_blank').focus(); + } + this.copyToClipBoard(text, openInfluentInNewTab) } catch (error) { alert(error); } diff --git a/src/main/webapp/assets/js/router.js b/src/main/webapp/assets/js/router.js index cd1609e..32bca47 100644 --- a/src/main/webapp/assets/js/router.js +++ b/src/main/webapp/assets/js/router.js @@ -21,6 +21,11 @@ const router = new VueRouter({ {path: '/votemajoritaire', component: vueLoader('views/votemajoritaire')}, {path: '/createVoteMajoritaire', component: vueLoader('views/createVoteMajoritaire')}, {path: '/votemajoritairedetails', component: vueLoader('views/votemajoritairedetails')}, + {path: '/carto', component: vueLoader('views/cartoTest')}, + {path: '/creation-debats-sur-cartes', component: vueLoader('views/createDebateSurCarte')}, + {path: '/documents-debats-sur-cartes', component: vueLoader('views/documentsDebatesSurCarte')}, + {path: '/documents-debats-sur-cartes/:id', component: vueLoader('views/documentDebatesSurCarte')}, + {path: '/debats-sur-cartes', component: vueLoader('views/debatesSurCarte')}, {path: '*', component: vueLoader('views/404')}, ] }); \ No newline at end of file diff --git a/src/main/webapp/assets/js/service/i18n.js b/src/main/webapp/assets/js/service/i18n.js index 21ac9de..44089ae 100644 --- a/src/main/webapp/assets/js/service/i18n.js +++ b/src/main/webapp/assets/js/service/i18n.js @@ -102,6 +102,7 @@ const messages = { guests: "Invité⋅e⋅s", debates: "Débats", new_debate: "Nouveau débat", + new_map_debate: "Nouveau débat sur caarte", invite_in_debate: "Inviter au débat", SUPERADMIN: "Super administrateur⋅rice", SUPERADMIN: "Root", @@ -232,6 +233,8 @@ const messages = { teams: "Groupes", documents: "Documents", my_debates: "Mes débats", + my_map_debates: "Mes débats sur cartes", + public_map_debates: "Débats publics sur cartes", public_debates: "Débats publics", logout: "Déconnection", login: "Se connecter", diff --git a/src/main/webapp/assets/js/views/cartoTest.vue b/src/main/webapp/assets/js/views/cartoTest.vue new file mode 100644 index 0000000..083b423 --- /dev/null +++ b/src/main/webapp/assets/js/views/cartoTest.vue @@ -0,0 +1,242 @@ + + + + + Debat sur carte + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{ $t("argue").toLowerCase() }} + + + + + + + + + + + + + + + diff --git a/src/main/webapp/assets/js/views/createDebateSurCarte.vue b/src/main/webapp/assets/js/views/createDebateSurCarte.vue new file mode 100644 index 0000000..24cd605 --- /dev/null +++ b/src/main/webapp/assets/js/views/createDebateSurCarte.vue @@ -0,0 +1,283 @@ + + + + Ouvrir un débat + + + + + + + + + + + + + + {{ $t('with_dots') }} + + + + + + + + + {{ $t('on_the_doc') }} + + + + + + + + {{ $t('recapitulative') }} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + group{{ $t('teams') }} + + + + {{ team.institution.type }} {{ team.institution.name }} - {{ team.name }} + + delete_forever + + + + + + + + person{{ $t('guests') }} + + + + {{ user.fullName() }} - {{ user.atuthority }} + + delete_forever + + + + + + + + + group{{ $t('public_debate') }}person + + + {{ $t('helper.public_debate') }} + + + + + + + + + description{{ $t('document') }} + + + {{ debate.document.category.name }} - {{ debate.document.name }} + + + + + + + + + + + settings_applications{{ $t('advanced_options') }} + + + + + + + + + + {{ $t('reformulation_assist') }} + + + + + + + + {{ $t('idefix_link') }} + + + + + + + + {{ $t('with_hypostases') }} + + + + + + + + + + + Lancer le débat + + + + + + + + + + + + diff --git a/src/main/webapp/assets/js/views/debatesSurCarte.vue b/src/main/webapp/assets/js/views/debatesSurCarte.vue new file mode 100644 index 0000000..1fd87df --- /dev/null +++ b/src/main/webapp/assets/js/views/debatesSurCarte.vue @@ -0,0 +1,91 @@ + + + + {{ $root.user.is('USER') ? $t('menu.my_map_debates') : $t('menu.public_map_debates') }} + + + + + {{ $t('new_map_debate') }} + + + + + + + + + + + + {{ $t('invite_in_debate') }} + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/webapp/assets/js/views/documentDebatesSurCarte.vue b/src/main/webapp/assets/js/views/documentDebatesSurCarte.vue new file mode 100644 index 0000000..4d07eda --- /dev/null +++ b/src/main/webapp/assets/js/views/documentDebatesSurCarte.vue @@ -0,0 +1,208 @@ + + + + {{ $t("document") }} - + + + + {{ $t("by").toLowerCase() }} + + + + + + {{ $t("save") }} + + + {{ $t("cancel") }} + + + + {{ $t("modify") }} + + + + + Charger la carte + + + + + Nombre de ligne + + + + Nombre de colonne + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/webapp/assets/js/views/documentsDebatesSurCarte.vue b/src/main/webapp/assets/js/views/documentsDebatesSurCarte.vue new file mode 100644 index 0000000..4ab7434 --- /dev/null +++ b/src/main/webapp/assets/js/views/documentsDebatesSurCarte.vue @@ -0,0 +1,140 @@ + + + + Documents + + + + + Nouvelle catégorie + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index 1e19386..7850e00 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -111,8 +111,16 @@ Votes majoritaires + + Ouvrir un débat sur carte + + + Mes documents de débat sur carte + + + Mes débats sur carte + -