Compare commits
No commits in common. "bee362342c65ff8d20478c2bee2d5ca63030dc00" and "3345eb156030c6d62e5d2cbc55fff0efaa0a10a8" have entirely different histories.
bee362342c
...
3345eb1560
13
config.yaml
13
config.yaml
|
|
@ -92,12 +92,6 @@ views:
|
||||||
files:
|
files:
|
||||||
- web/layouts/_partials/address_autocomplete.html
|
- web/layouts/_partials/address_autocomplete.html
|
||||||
- web/layouts/agenda/create-event.html
|
- web/layouts/agenda/create-event.html
|
||||||
delete_subscriber:
|
|
||||||
files:
|
|
||||||
- web/layouts/agenda/delete-subscriber.html
|
|
||||||
history_event:
|
|
||||||
files:
|
|
||||||
- web/layouts/agenda/history-event.html
|
|
||||||
directory:
|
directory:
|
||||||
home:
|
home:
|
||||||
files:
|
files:
|
||||||
|
|
@ -252,9 +246,4 @@ emails:
|
||||||
files:
|
files:
|
||||||
- emails/layout.html
|
- emails/layout.html
|
||||||
- emails/onboarding/support_emailing.html
|
- emails/onboarding/support_emailing.html
|
||||||
delete_subscriber:
|
|
||||||
request:
|
|
||||||
subject: PARCOURSMOB - Un bénéficiaire a été retiré d'un dispositif
|
|
||||||
files:
|
|
||||||
- emails/layout.html
|
|
||||||
- emails/onboarding/delete-subscriber.html
|
|
||||||
|
|
|
||||||
|
|
@ -1,5 +0,0 @@
|
||||||
{{define "content"}}
|
|
||||||
<p>Un bénéficiare a été retiré d'un événement sur PARCOURSMOB par <b>{{.user}}</b></p>
|
|
||||||
<p>Pour le motif suivant : "{{.key}}"</p>
|
|
||||||
<p>Voir l'événement {{.link}}</p>
|
|
||||||
{{end}}
|
|
||||||
|
|
@ -17,7 +17,6 @@
|
||||||
</th>
|
</th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
{{$evid := .ViewState.event.ID}}
|
|
||||||
<tbody class="divide-y divide-gray-200 bg-white">
|
<tbody class="divide-y divide-gray-200 bg-white">
|
||||||
{{range .ViewState.event.Subscriptions}}
|
{{range .ViewState.event.Subscriptions}}
|
||||||
<tr>
|
<tr>
|
||||||
|
|
@ -37,13 +36,6 @@
|
||||||
<!-- <a href=""
|
<!-- <a href=""
|
||||||
class="text-co-blue hover:text-co-blue">Voir</a> -->
|
class="text-co-blue hover:text-co-blue">Voir</a> -->
|
||||||
</td>
|
</td>
|
||||||
|
|
||||||
<!-- ajout du bouton supprimer -->
|
|
||||||
<td>
|
|
||||||
<a href="/app/agenda/{{$evid}}/{{.Subscriber}}/delete" class="inline-flex"><button type="button"
|
|
||||||
class="w-full px-4 py-2 border border-transparent text-sm font-medium rounded-2xl shadow-sm text-white bg-co-red hover:bg-co-red focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-co-red">Retirer</button></a>
|
|
||||||
</td>
|
|
||||||
<!-- fin -->
|
|
||||||
</tr>
|
</tr>
|
||||||
{{end}}
|
{{end}}
|
||||||
</tbody>
|
</tbody>
|
||||||
|
|
|
||||||
|
|
@ -1,39 +0,0 @@
|
||||||
{{define "content"}}
|
|
||||||
<div>
|
|
||||||
<form method="POST" >
|
|
||||||
|
|
||||||
<div class="fixed inset-0 bg-gray-500 bg-opacity-75 transition-opacity"></div>
|
|
||||||
|
|
||||||
<div class="fixed inset-0 z-10 overflow-y-auto">
|
|
||||||
<div class="flex min-h-full items-end justify-center p-4 text-center sm:items-center sm:p-0">
|
|
||||||
|
|
||||||
<div class="relative transform overflow-hidden rounded-lg bg-white px-4 pt-5 pb-4 text-left shadow-xl transition-all sm:my-8 sm:w-full max-w-lg sm:p-6">
|
|
||||||
<div>
|
|
||||||
<div class="mx-auto flex h-12 w-12 items-center justify-center rounded-co bg-co-blue text-white">
|
|
||||||
{{.IconSet.Icon "hero:outline/information-circle" "h-6 w-6"}}
|
|
||||||
</div>
|
|
||||||
<div class="mt-3 text-center sm:mt-5">
|
|
||||||
<h3 class="text-lg font-medium leading-6 text-gray-900" id="modal-title">Confirmation de retrait</h3>
|
|
||||||
<div class="mt-2">
|
|
||||||
<p class="text-sm text-gray-500">Voulez-vous vraiment retirer ce bénéficiaire ?</p>
|
|
||||||
</div>
|
|
||||||
<div class="col-span-6">
|
|
||||||
<label for="motif" class="block text-sm font-medium text-gray-700">Motif</label>
|
|
||||||
<div class="mt-1">
|
|
||||||
<textarea rows="4" name="motif" id="motif"
|
|
||||||
class="shadow-sm focus:ring-co-blue focus:border-co-blue block w-full sm:text-sm border-gray-300 rounded-2xl"></textarea>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="mt-5 sm:mt-6 sm:grid sm:grid-flow-row-dense sm:grid-cols-2">
|
|
||||||
<a href="/app/agenda/{{.ViewState.eventid}}" class="mt-3 inline-flex w-full justify-center rounded-l-2xl border border-gray-300 bg-white px-4 py-2 text-base font-medium text-gray-700 shadow-sm hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 sm:col-start-1 sm:mt-0 sm:text-sm">Annuler</a>
|
|
||||||
<button type="submit" class="inline-flex w-full justify-center rounded-r-2xl border border-transparent bg-co-blue px-4 py-2 text-base font-medium text-white shadow-sm hover:bg-co-blue focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 sm:col-start-2 sm:text-sm">Confirmation</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</form>
|
|
||||||
|
|
||||||
</div>
|
|
||||||
{{end}}
|
|
||||||
|
|
@ -68,13 +68,8 @@
|
||||||
{{ if eq (index .ViewState.event.Owners 0) .Group.ID }}
|
{{ if eq (index .ViewState.event.Owners 0) .Group.ID }}
|
||||||
<section aria-labelledby="subscribers-table"></section>
|
<section aria-labelledby="subscribers-table"></section>
|
||||||
<div class="bg-white shadow sm:rounded-lg">
|
<div class="bg-white shadow sm:rounded-lg">
|
||||||
<div class="flex justify-between px-4 py-5 sm:px-6">
|
<div class="px-4 py-5 sm:px-6">
|
||||||
<h2 id="event-information-title" class="text-lg leading-6 font-medium text-gray-900">Tous les inscrits</h2>
|
<h2 id="event-information-title" class="text-lg leading-6 font-medium text-gray-900">Tous les inscrits</h2>
|
||||||
<a href="/app/agenda/{{.ViewState.event.ID}}/history">
|
|
||||||
<button type="submit"class="rounded-2xl border border-transparent bg-co-blue px-4 py-2 w-full text-sm font-medium text-white shadow-sm focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 sm:w-auto">
|
|
||||||
Bénéficiaires désinscrits
|
|
||||||
</button>
|
|
||||||
</a>
|
|
||||||
</div>
|
</div>
|
||||||
{{template "subscribers_table" .}}
|
{{template "subscribers_table" .}}
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -150,22 +145,11 @@
|
||||||
<h2 id="subscribers-title" class="text-lg font-medium text-gray-900 mt-10">Bénéficiaires {{.Group.Data.name}} inscrits</h2>
|
<h2 id="subscribers-title" class="text-lg font-medium text-gray-900 mt-10">Bénéficiaires {{.Group.Data.name}} inscrits</h2>
|
||||||
<div class="mt-2">
|
<div class="mt-2">
|
||||||
<ul class="p-1">
|
<ul class="p-1">
|
||||||
{{$evid := .ViewState.event.ID}}
|
|
||||||
{{range .ViewState.event.Subscriptions}}
|
{{range .ViewState.event.Subscriptions}}
|
||||||
{{if eq $.Group.ID .Data.subscribed_by.group.id}}
|
{{if eq $.Group.ID .Data.subscribed_by.group.id}}
|
||||||
<div class="flex justify-between border">
|
<a href="/app/beneficiaries/{{.Subscriber}}">
|
||||||
<div>
|
<li class="inline-flex text-sm p-2"><img class="h-6 w-6 rounded-co mr-2" src="/app/beneficiaries/{{.Subscriber}}/picture"> {{ (index $.ViewState.subscribers .Subscriber).Data.first_name }} {{ (index $.ViewState.subscribers .Subscriber).Data.last_name }}</li>
|
||||||
<a href="/app/beneficiaries/{{.Subscriber}}">
|
</a>
|
||||||
<li class="inline-flex text-sm p-2"><img class="h-6 w-6 rounded-co mr-2" src="/app/beneficiaries/{{.Subscriber}}/picture"> {{ (index $.ViewState.subscribers .Subscriber).Data.first_name }} {{ (index $.ViewState.subscribers .Subscriber).Data.last_name }}
|
|
||||||
</a>
|
|
||||||
</div>
|
|
||||||
<div class="flex items-center">
|
|
||||||
<a href="/app/agenda/{{$evid}}/{{.Subscriber}}/delete" class="inline-flex">
|
|
||||||
<button type="button" class="w-full mr-2 py-1 px-2 border border-transparent text-sm font-medium rounded-2xl shadow-sm text-white bg-co-red hover:bg-co-red focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-co-red">Retirer</button></a>
|
|
||||||
<!-- <a href="/app/agenda/{{$evid}}/{{.Subscriber}}/delete" class="inline-flex font-bold text-co-red">x</a> -->
|
|
||||||
</li>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{{end}}
|
{{end}}
|
||||||
{{end}}
|
{{end}}
|
||||||
</ul>
|
</ul>
|
||||||
|
|
|
||||||
|
|
@ -1,102 +0,0 @@
|
||||||
{{define "content"}}
|
|
||||||
{{ if eq (index .ViewState.event.Owners 0) .Group.ID }}
|
|
||||||
<main class="py-10">
|
|
||||||
<div class="max-w-3xl mx-auto px-4 sm:px-6 md:flex md:items-center md:justify-between md:space-x-5 lg:max-w-7xl lg:px-8">
|
|
||||||
<div class="flex items-center space-x-5">
|
|
||||||
<div>
|
|
||||||
<h1 class="text-2xl font-bold text-gray-900">Bénéficiaires désinscrits de l'évènement {{.ViewState.event.Name}}</h1>
|
|
||||||
<p class="text-m font-medium text-gray-500">
|
|
||||||
{{if eq .ViewState.event.Startdate .ViewState.event.Enddate}}
|
|
||||||
Le {{(timeFrom .ViewState.event.Startdate).Format "02/01/2006"}}
|
|
||||||
{{else}}
|
|
||||||
Du {{(timeFrom .ViewState.event.Startdate).Format "02/01/2006"}} au {{(timeFrom
|
|
||||||
.ViewState.event.Enddate).Format "02/01/2006"}}
|
|
||||||
{{end}}
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="mt-6 flex flex-col-reverse justify-stretch space-y-4 space-y-reverse sm:flex-row-reverse sm:justify-end sm:space-x-reverse sm:space-y-0 sm:space-x-3 md:mt-0 md:flex-row md:space-x-3">
|
|
||||||
<a href="/app/agenda/{{.ViewState.event.ID}}" class="inline-flex"><button type="button"
|
|
||||||
class="w-full px-4 py-2 border border-transparent text-sm font-medium rounded-2xl shadow-sm text-white bg-co-blue hover:bg-co-blue focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-co-blue">Retour</button></a>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<table class="mt-4 min-w-full divide-y divide-gray-300 border-t border-gray-200">
|
|
||||||
<thead class="bg-gray-50">
|
|
||||||
<tr>
|
|
||||||
<th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6 ">
|
|
||||||
Bénéficiaire
|
|
||||||
</th>
|
|
||||||
<th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 sm:pl-6">
|
|
||||||
Prescripteur
|
|
||||||
</th>
|
|
||||||
<th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 sm:pl-6">
|
|
||||||
Désinscrit par
|
|
||||||
</th>
|
|
||||||
<th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 sm:pl-6">
|
|
||||||
Date de suppression
|
|
||||||
</th>
|
|
||||||
<th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 sm:pl-6">
|
|
||||||
Motif
|
|
||||||
</th>
|
|
||||||
</tr>
|
|
||||||
</thead>
|
|
||||||
<tbody class="divide-y divide-gray-200 bg-white">
|
|
||||||
{{range .ViewState.event.DeletedSubscription}}
|
|
||||||
<tr>
|
|
||||||
<td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6 text-center">
|
|
||||||
<a href="/app/beneficiaries/{{.Subscriber}}" class="flex">
|
|
||||||
<img class="h-6 w-6 rounded-co mr-2" src="/app/beneficiaries/{{.Subscriber}}/picture" alt=" ">
|
|
||||||
{{ (index $.ViewState.subscribers .Subscriber).Data.first_name }} {{ (index
|
|
||||||
$.ViewState.subscribers .Subscriber).Data.last_name }}
|
|
||||||
</a>
|
|
||||||
</td>
|
|
||||||
<td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
|
|
||||||
<div class="flex"><img class="h-6 w-6 rounded-co mr-2"
|
|
||||||
src="/app/beneficiaries/{{.Data.subscribed_by.user.id}}/picture" alt=" ">
|
|
||||||
{{.Data.subscribed_by.user.display_name}}</div>
|
|
||||||
{{.Data.subscribed_by.group.name}}
|
|
||||||
</td>
|
|
||||||
<td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
|
|
||||||
<div class="flex"><img class="h-6 w-6 rounded-co mr-2"
|
|
||||||
src="/app/beneficiaries/{{.Data.unsubscribed_by.user.id}}/picture" alt=" ">
|
|
||||||
{{.Data.unsubscribed_by.user.display_name}}</div>
|
|
||||||
{{.Data.unsubscribed_by.group.name}}
|
|
||||||
</td>
|
|
||||||
<td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
|
|
||||||
{{(timeFormat .CreatedAt "02/01/2006")}}
|
|
||||||
</td>
|
|
||||||
<td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
|
|
||||||
<div class="flex">{{.Data.motif}}</div>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
{{end}}
|
|
||||||
</tbody>
|
|
||||||
</table>
|
|
||||||
</main>
|
|
||||||
{{else}}
|
|
||||||
<div class="fixed inset-0 bg-gray-500 bg-opacity-75 transition-opacity"></div>
|
|
||||||
|
|
||||||
<div class="fixed inset-0 z-10 overflow-y-auto">
|
|
||||||
<div class="flex min-h-full items-end justify-center p-4 text-center sm:items-center sm:p-0">
|
|
||||||
|
|
||||||
<div
|
|
||||||
class="relative transform overflow-hidden rounded-lg bg-white px-4 pt-5 pb-4 text-left shadow-xl transition-all sm:my-8 sm:w-full max-w-lg sm:p-6">
|
|
||||||
<div>
|
|
||||||
<div class="mx-auto flex h-12 w-12 items-center justify-center rounded-co bg-co-blue text-white">
|
|
||||||
{{.IconSet.Icon "hero:outline/information-circle" "h-6 w-6"}}
|
|
||||||
</div>
|
|
||||||
<div class="mt-3 text-center sm:mt-5">
|
|
||||||
<h3 class="text-lg font-medium leading-6 text-gray-900" id="modal-title">Vous n'avez pas accès à
|
|
||||||
cette page</h3>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="mt-5 sm:mt-6 sm:grid sm:grid-flow-row-dense sm:grid-cols-1">
|
|
||||||
<a href="/app/agenda/{{.ViewState.event.ID}}"
|
|
||||||
class="mt-3 inline-flex w-full justify-center rounded-2xl border border-gray-300 bg-white px-4 py-2 text-base font-medium text-gray-700 shadow-sm hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 sm:col-start-1 sm:mt-0 sm:text-sm">Annuler</a>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{{end}}
|
|
||||||
{{end}}
|
|
||||||
Loading…
Reference in New Issue