diff --git a/config.yaml b/config.yaml index e7449ef..3f4b4e1 100644 --- a/config.yaml +++ b/config.yaml @@ -27,6 +27,7 @@ views: - web/layouts/beneficiaries/_partials/beneficiary-journeys.html - web/layouts/beneficiaries/_partials/beneficiary-events.html - web/layouts/beneficiaries/_partials/beneficiary-files.html + - web/layouts/beneficiaries/_partials/beneficiary-organizations.html - web/layouts/beneficiaries/display.html update: files: @@ -79,6 +80,7 @@ views: - web/layouts/agenda/home.html display_event: files: + - web/layouts/agenda/_partials/subscribers-table.html - web/layouts/agenda/display-event.html create_event: files: diff --git a/web/layouts/administration/home.html b/web/layouts/administration/home.html index 372307d..723af8a 100644 --- a/web/layouts/administration/home.html +++ b/web/layouts/administration/home.html @@ -43,7 +43,7 @@ class="flex-1 flex items-center justify-between border-t border-r border-b border-gray-200 bg-white rounded-r-3xl truncate">
diff --git a/web/layouts/agenda/_partials/subscribers-table.html b/web/layouts/agenda/_partials/subscribers-table.html new file mode 100644 index 0000000..9eb12ed --- /dev/null +++ b/web/layouts/agenda/_partials/subscribers-table.html @@ -0,0 +1,43 @@ +{{define "subscribers_table"}} ++ Bénéficiaire + | ++ Prescripteur + | ++ Date d'inscription + | ++ Actions + | +
---|---|---|---|
+ + {{ (index $.ViewState.subscribers .Subscriber).Data.first_name }} {{ (index $.ViewState.subscribers .Subscriber).Data.last_name }} + + | +
+ {{.Data.subscribed_by.user.display_name}}
+ {{.Data.subscribed_by.group.name}}
+ |
+ + {{(timeFormat .CreatedAt "02/01/2006")}} + | ++ + | +
Type | ++ Véhicule + | Beneficiaire | @@ -33,21 +36,50 @@ {{range .ViewState.bookings}}|||
---|---|---|---|---|---|
+ {{if .Data.administrator_unavailability}} + + Retiré + + {{else}} + {{if eq .Status 1 }} + + A venir + + {{end}} + {{if eq .Status 0 }} + + En cours + + {{end}} + {{if eq .Status -1 }} + + Terminé + + {{end}} + {{end}} + |
Voiture
|
+ {{.Vehicle.Data.name}}
+ |
+ + {{if not .Data.administrator_unavailability}} + {{end}} |
+ {{if not .Data.administrator_unavailability}}
Du {{(timeFrom .Startdate).Format "02/01/2006"}} au {{(timeFrom .Enddate).Format "02/01/2006"}}
+ {{else}}
+ Du {{(timeFrom .Unavailablefrom).Format "02/01/2006"}} au {{(timeFrom .Unavailableto).Format "02/01/2006"}}
+ {{end}}
|
-
+ -->
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Changer de véhicule+
+
+
+
+
+
+
diff --git a/web/public/css/main.css b/web/public/css/main.css
index dcdf68f..109e22f 100644
--- a/web/public/css/main.css
+++ b/web/public/css/main.css
@@ -834,14 +834,14 @@ html {
grid-column: span 5 / span 5;
}
-.m-2 {
- margin: 0.5rem;
-}
-
.m-4 {
margin: 1rem;
}
+.m-2 {
+ margin: 0.5rem;
+}
+
.-mx-4 {
margin-left: -1rem;
margin-right: -1rem;
@@ -977,6 +977,10 @@ html {
margin-bottom: 2.5rem;
}
+.ml-8 {
+ margin-left: 2rem;
+}
+
.-mt-2 {
margin-top: -0.5rem;
}
@@ -1224,16 +1228,6 @@ html {
transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));
}
-.translate-y-4 {
- --tw-translate-y: 1rem;
- transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));
-}
-
-.translate-y-0 {
- --tw-translate-y: 0px;
- transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));
-}
-
.scale-95 {
--tw-scale-x: .95;
--tw-scale-y: .95;
@@ -1675,16 +1669,16 @@ html {
background-color: rgb(17 24 39 / var(--tw-bg-opacity));
}
-.bg-gray-500 {
- --tw-bg-opacity: 1;
- background-color: rgb(107 114 128 / var(--tw-bg-opacity));
-}
-
.bg-black {
--tw-bg-opacity: 1;
background-color: rgb(0 0 0 / var(--tw-bg-opacity));
}
+.bg-gray-500 {
+ --tw-bg-opacity: 1;
+ background-color: rgb(107 114 128 / var(--tw-bg-opacity));
+}
+
.bg-opacity-75 {
--tw-bg-opacity: 0.75;
}
@@ -2047,11 +2041,6 @@ html {
color: rgb(0 0 0 / var(--tw-text-opacity));
}
-.text-green-600 {
- --tw-text-opacity: 1;
- color: rgb(22 163 74 / var(--tw-text-opacity));
-}
-
.placeholder-gray-500::-moz-placeholder {
--tw-placeholder-opacity: 1;
color: rgb(107 114 128 / var(--tw-placeholder-opacity));
@@ -2306,11 +2295,6 @@ html {
background-color: rgb(29 78 216 / var(--tw-bg-opacity));
}
-.hover\:bg-indigo-700:hover {
- --tw-bg-opacity: 1;
- background-color: rgb(67 56 202 / var(--tw-bg-opacity));
-}
-
.hover\:bg-opacity-5:hover {
--tw-bg-opacity: 0.05;
}
@@ -2494,14 +2478,14 @@ html {
grid-column: span 4 / span 4;
}
- .sm\:col-start-2 {
- grid-column-start: 2;
- }
-
.sm\:col-start-1 {
grid-column-start: 1;
}
+ .sm\:col-start-2 {
+ grid-column-start: 2;
+ }
+
.sm\:-mx-6 {
margin-left: -1.5rem;
margin-right: -1.5rem;
@@ -2573,10 +2557,6 @@ html {
max-width: 24rem;
}
- .sm\:max-w-lg {
- max-width: 32rem;
- }
-
.sm\:flex-auto {
flex: 1 1 auto;
}
@@ -2589,23 +2569,6 @@ html {
flex: 1 1 0%;
}
- .sm\:translate-y-0 {
- --tw-translate-y: 0px;
- transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));
- }
-
- .sm\:scale-95 {
- --tw-scale-x: .95;
- --tw-scale-y: .95;
- transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));
- }
-
- .sm\:scale-100 {
- --tw-scale-x: 1;
- --tw-scale-y: 1;
- transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));
- }
-
.sm\:grid-flow-row-dense {
grid-auto-flow: row dense;
}
@@ -2646,10 +2609,6 @@ html {
gap: 1rem;
}
- .sm\:gap-3 {
- gap: 0.75rem;
- }
-
.sm\:space-y-0 > :not([hidden]) ~ :not([hidden]) {
--tw-space-y-reverse: 0;
margin-top: calc(0px * calc(1 - var(--tw-space-y-reverse)));
|