fix err

LICENSE.md

@@ -0,0 +1,660 @@
+# GNU AFFERO GENERAL PUBLIC LICENSE
+
+Version 3, 19 November 2007
+
+Copyright (C) 2007 Free Software Foundation, Inc.
+<https://fsf.org/>
+
+Everyone is permitted to copy and distribute verbatim copies of this
+license document, but changing it is not allowed.
+
+## Preamble
+
+The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains
+free software for all its users.
+
+When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate. Many developers of free software are heartened and
+encouraged by the resulting cooperation. However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community. It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server. Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals. This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing
+under this license.
+
+The precise terms and conditions for copying, distribution and
+modification follow.
+
+## TERMS AND CONDITIONS
+
+### 0. Definitions.
+
+"This License" refers to version 3 of the GNU Affero General Public
+License.
+
+"Copyright" also means copyright-like laws that apply to other kinds
+of works, such as semiconductor masks.
+
+"The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of
+an exact copy. The resulting work is called a "modified version" of
+the earlier work or a work "based on" the earlier work.
+
+A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user
+through a computer network, with no transfer of a copy, is not
+conveying.
+
+An interactive user interface displays "Appropriate Legal Notices" to
+the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+### 1. Source Code.
+
+The "source code" for a work means the preferred form of the work for
+making modifications to it. "Object code" means any non-source form of
+a work.
+
+A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+The Corresponding Source need not include anything that users can
+regenerate automatically from other parts of the Corresponding Source.
+
+The Corresponding Source for a work in source code form is that same
+work.
+
+### 2. Basic Permissions.
+
+All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+You may make, run and propagate covered works that you do not convey,
+without conditions so long as your license otherwise remains in force.
+You may convey covered works to others for the sole purpose of having
+them make modifications exclusively for you, or provide you with
+facilities for running those works, provided that you comply with the
+terms of this License in conveying all material for which you do not
+control copyright. Those thus making or running the covered works for
+you must do so exclusively on your behalf, under your direction and
+control, on terms that prohibit them from making any copies of your
+copyrighted material outside their relationship with you.
+
+Conveying under any other circumstances is permitted solely under the
+conditions stated below. Sublicensing is not allowed; section 10 makes
+it unnecessary.
+
+### 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such
+circumvention is effected by exercising rights under this License with
+respect to the covered work, and you disclaim any intention to limit
+operation or modification of the work as a means of enforcing, against
+the work's users, your or third parties' legal rights to forbid
+circumvention of technological measures.
+
+### 4. Conveying Verbatim Copies.
+
+You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+### 5. Conveying Modified Source Versions.
+
+You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these
+conditions:
+
+-   a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+-   b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under
+    section 7. This requirement modifies the requirement in section 4
+    to "keep intact all notices".
+-   c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy. This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged. This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+-   d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+### 6. Conveying Non-Source Forms.
+
+You may convey a covered work in object code form under the terms of
+sections 4 and 5, provided that you also convey the machine-readable
+Corresponding Source under the terms of this License, in one of these
+ways:
+
+-   a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+-   b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the Corresponding
+    Source from a network server at no charge.
+-   c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source. This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+-   d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge. You need not require recipients to copy the
+    Corresponding Source along with the object code. If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source. Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+-   e) Convey the object code using peer-to-peer transmission,
+    provided you inform other peers where the object code and
+    Corresponding Source of the work are being offered to the general
+    public at no charge under subsection 6d.
+
+A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal,
+family, or household purposes, or (2) anything designed or sold for
+incorporation into a dwelling. In determining whether a product is a
+consumer product, doubtful cases shall be resolved in favor of
+coverage. For a particular product received by a particular user,
+"normally used" refers to a typical or common use of that class of
+product, regardless of the status of the particular user or of the way
+in which the particular user actually uses, or expects or is expected
+to use, the product. A product is a consumer product regardless of
+whether the product has substantial commercial, industrial or
+non-consumer uses, unless such uses represent the only significant
+mode of use of the product.
+
+"Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to
+install and execute modified versions of a covered work in that User
+Product from a modified version of its Corresponding Source. The
+information must suffice to ensure that the continued functioning of
+the modified object code is in no case prevented or interfered with
+solely because modification has been made.
+
+If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or
+updates for a work that has been modified or installed by the
+recipient, or for the User Product in which it has been modified or
+installed. Access to a network may be denied when the modification
+itself materially and adversely affects the operation of the network
+or violates the rules and protocols for communication across the
+network.
+
+Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+### 7. Additional Terms.
+
+"Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders
+of that material) supplement the terms of this License with terms:
+
+-   a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+-   b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+-   c) Prohibiting misrepresentation of the origin of that material,
+    or requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+-   d) Limiting the use for publicity purposes of names of licensors
+    or authors of the material; or
+-   e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+-   f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions
+    of it) with contractual assumptions of liability to the recipient,
+    for any liability that these contractual assumptions directly
+    impose on those licensors and authors.
+
+All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions; the
+above requirements apply either way.
+
+### 8. Termination.
+
+You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+However, if you cease all violation of this License, then your license
+from a particular copyright holder is reinstated (a) provisionally,
+unless and until the copyright holder explicitly and finally
+terminates your license, and (b) permanently, if the copyright holder
+fails to notify you of the violation by some reasonable means prior to
+60 days after the cessation.
+
+Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+### 9. Acceptance Not Required for Having Copies.
+
+You are not required to accept this License in order to receive or run
+a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+### 10. Automatic Licensing of Downstream Recipients.
+
+Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+### 11. Patents.
+
+A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+A contributor's "essential patent claims" are all patent claims owned
+or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+A patent license is "discriminatory" if it does not include within the
+scope of its coverage, prohibits the exercise of, or is conditioned on
+the non-exercise of one or more of the rights that are specifically
+granted under this License. You may not convey a covered work if you
+are a party to an arrangement with a third party that is in the
+business of distributing software, under which you make payment to the
+third party based on the extent of your activity of conveying the
+work, and under which the third party grants, to any of the parties
+who would receive the covered work from you, a discriminatory patent
+license (a) in connection with copies of the covered work conveyed by
+you (or copies made from those copies), or (b) primarily for and in
+connection with specific products or compilations that contain the
+covered work, unless you entered into that arrangement, or that patent
+license was granted, prior to 28 March 2007.
+
+Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+### 12. No Surrender of Others' Freedom.
+
+If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under
+this License and any other pertinent obligations, then as a
+consequence you may not convey it at all. For example, if you agree to
+terms that obligate you to collect a royalty for further conveying
+from those to whom you convey the Program, the only way you could
+satisfy both those terms and this License would be to refrain entirely
+from conveying the Program.
+
+### 13. Remote Network Interaction; Use with the GNU General Public License.
+
+Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your
+version supports such interaction) an opportunity to receive the
+Corresponding Source of your version by providing access to the
+Corresponding Source from a network server at no charge, through some
+standard or customary means of facilitating copying of software. This
+Corresponding Source shall include the Corresponding Source for any
+work covered by version 3 of the GNU General Public License that is
+incorporated pursuant to the following paragraph.
+
+Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+### 14. Revised Versions of this License.
+
+The Free Software Foundation may publish revised and/or new versions
+of the GNU Affero General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation. If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever
+published by the Free Software Foundation.
+
+If the Program specifies that a proxy can decide which future versions
+of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+### 15. Disclaimer of Warranty.
+
+THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT
+WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND
+PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE
+DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR
+CORRECTION.
+
+### 16. Limitation of Liability.
+
+IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR
+CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT
+NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR
+LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM
+TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER
+PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+### 17. Interpretation of Sections 15 and 16.
+
+If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+END OF TERMS AND CONDITIONS
+
+## How to Apply These Terms to Your New Programs
+
+If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these
+terms.
+
+To do so, attach the following notices to the program. It is safest to
+attach them to the start of each source file to most effectively state
+the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+        <one line to give the program's name and a brief idea of what it does.>
+        Copyright (C) <year>  <name of author>
+
+        This program is free software: you can redistribute it and/or modify
+        it under the terms of the GNU Affero General Public License as
+        published by the Free Software Foundation, either version 3 of the
+        License, or (at your option) any later version.
+
+        This program is distributed in the hope that it will be useful,
+        but WITHOUT ANY WARRANTY; without even the implied warranty of
+        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+        GNU Affero General Public License for more details.
+
+        You should have received a copy of the GNU Affero General Public License
+        along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper
+mail.
+
+If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source. For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code. There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for
+the specific requirements.
+
+You should also get your employer (if you work as a programmer) or
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. For more information on this, and how to apply and follow
+the GNU AGPL, see <https://www.gnu.org/licenses/>.

config.yaml

@@ -27,18 +27,31 @@ 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:
         - web/layouts/_partials/address_autocomplete.html
+        - web/layouts/agenda/_partials/address.html
         - web/layouts/beneficiaries/update.html
-  conseillers:
+  members:
     display:
       files:
-        - web/layouts/conseillers/display.html
+        - web/layouts/members/display.html
     update:
       files:
-        - web/layouts/conseillers/update.html
+        - web/layouts/members/update.html
+    list:
+      files:
+        - web/layouts/members/membersList.html
+  group:
+    settings:
+      files:
+        - web/layouts/administration/_partials/groups_admins.html
+        - web/layouts/administration/_partials/group_members.html
+        - web/layouts/group/settings.html
+    
+        
   vehicles:
     search: 
       files: 
@@ -74,22 +87,44 @@ views:
     fleet_update:
       files:
         - web/layouts/_partials/address_autocomplete.html
+        - web/layouts/agenda/_partials/address.html
         - web/layouts/vehicles_management/_partials/vehicle-type-select.html
         - web/layouts/vehicles_management/fleet-update.html
     booking_display: 
       files: 
         - web/layouts/vehicles_management/booking-display.html
+    delete_booking: 
+      files: 
+        - web/layouts/vehicles_management/delete-booking.html
   agenda: 
     list: 
       files: 
         - web/layouts/agenda/home.html
+    history: 
+      files: 
+        - web/layouts/agenda/history.html
     display_event: 
       files: 
+        - web/layouts/agenda/_partials/subscribers-table.html
         - web/layouts/agenda/display-event.html
     create_event: 
       files: 
         - web/layouts/_partials/address_autocomplete.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
+    update:
+      files:
+        - web/layouts/agenda/_partials/address.html
+        - web/layouts/_partials/address_autocomplete.html
+        - web/layouts/agenda/updateEvent.html
+    delete:
+      files:
+        - web/layouts/agenda/delete-event.html
   directory: 
     home: 
       files: 
@@ -112,8 +147,12 @@ views:
         - web/layouts/_partials/address_autocomplete.html
     display:
       files:
+        - web/layouts/_partials/address_autocomplete.html
         - web/layouts/journeys/display_groups.html
         - web/layouts/journeys/_partials/map.html
+    update:
+      files:
+        - web/layouts/journeys/update_groups.html
   support:
     request:
       files:
@@ -143,7 +182,19 @@ views:
         - web/layouts/administration/_partials/groups_admins.html
         - web/layouts/administration/_partials/group_members.html
         - web/layouts/administration/display_group.html
-  group:
+    beneficaires_list:
+      files:
+        - web/layouts/administration/beneficaires_stats.html
+    events_list:
+      files:
+        - web/layouts/administration/events_stats.html
+    vehicles_list:
+      files:
+        - web/layouts/administration/vehicles_stats.html
+    bookings_list:
+      files:
+        - web/layouts/administration/_partials/bookings_list.html
+        - web/layouts/administration/bookings_stats.html
     settings: 
       files:
         - web/layouts/administration/_partials/groups_admins.html
@@ -244,4 +295,9 @@ emails:
       files:
         - emails/layout.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

emails/onboarding/delete-subscriber.html

@@ -0,0 +1,7 @@
+{{define "content"}}
+<p></p>
+<p>Un bénéficiaire a été retiré d'un événement sur PARCOURSMOB par <b>{{.user}}</b></p>
+<p>Pour le motif suivant : <b>{{.motif}}</b></p>
+<p>Pour voir le bénéficiaire, cliquez sur : <a href={{.subscriber}}>{{.subscriber}}</a></p>
+<p>Pour voir l'événement, cliquez sur : <a href={{.link}}>{{.link}}</a></p>
+{{end}}

web/layouts/administration/_partials/bookings_list.html

@@ -0,0 +1,115 @@
+{{define "bookings_list"}}
+<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8">
+    <div class="mt-8 flex flex-col">
+        <div class="-my-2 -mx-4 overflow-x-auto sm:-mx-6 lg:-mx-8">
+            <div class="inline-block min-w-full py-2 align-middle md:px-6 lg:px-8">
+                <div class="overflow-hidden shadow ring-1 ring-black ring-opacity-5 md:rounded-lg">
+                    <table class="min-w-full divide-y divide-gray-300">
+                        <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 text-center">
+                                    Statut
+                                </th>
+                                <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 sm:pl-6">
+                                    Type
+                                </th>
+                                <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 sm:pl-6">
+                                    Numéro
+                                </th>
+                                <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 sm:pl-6">
+                                    Gestionnaire véhicule
+                                </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">
+                                    Beneficiaire
+                                </th>
+                                <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 sm:pl-6">
+                                    Dates
+                                </th>
+                                <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 sm:pl-6">
+                                    Commentaire
+                                </th>
+                                <th scope="col" class="relative py-3.5 pl-3 pr-4 sm:pr-6">
+                                    <span class="sr-only">Actions</span>
+                                </th>
+                            </tr>
+                        </thead>
+                        <tbody class="divide-y divide-gray-200 bg-white">
+                            {{range .ViewState.bookings}}
+                            <tr>
+                                <td class="flex-col py-4 pl-4 pr-3 text-sm sm:pl-6 text-center">
+                                    {{if .Data.administrator_unavailability}}
+                                    <span class="p-1 bg-black text-white text-xs font-bold rounded-xl" >
+                                        Retiré
+                                    </span>
+                                    {{else}}
+                                        {{if eq .Status 1 }}
+                                        <span class="p-1 bg-co-blue text-white text-xs font-bold rounded-xl" >
+                                            A&nbsp;venir
+                                        </span>
+                                        {{end}}
+                                        {{if eq .Status 0 }}
+                                        <span class="p-1 bg-co-green text-white text-xs font-bold rounded-xl" >
+                                            En&nbsp;cours
+                                        </span>
+                                        {{end}}
+                                        {{if eq .Status -1 }}
+                                        <span class="p-1 bg-co-red text-white text-xs font-bold rounded-xl" >
+                                            Terminé
+                                        </span>
+                                        {{end}}
+                                    {{end}}
+                                </td>
+                                <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+                                    <div class="text-gray-900" >{{ (index $.ViewState.vehicles_map .Vehicleid).Type }}</div>
+                                </td>
+                                <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+                                    <div class="text-gray-900" >{{ (index $.ViewState.vehicles_map .Vehicleid).Data.licence_plate }}</div>
+                                </td>
+                                <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+                                    <div class="text-gray-900" >{{ (index $.ViewState.admingroups (index (index $.ViewState.vehicles_map .Vehicleid).Administrators 0)).Data.name }}</div>
+                                </td>
+                                <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+                                    <div class="text-gray-900" >{{ .Data.booked_by.group.name }}<br />({{ .Data.booked_by.user.display_name }})</div>
+                                </td>
+                                <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+                                    {{if .Data.administrator_unavailability}}
+                                    <div class="text-gray-900" ></div>
+                                    {{else}}
+                                    <div class="text-gray-900" >
+                                        <!-- <img class="h-6 w-6 rounded-co" src="/app/beneficiaries/{{.Driver}}/picture" alt=""> -->
+                                        {{$b := (index $.ViewState.beneficiaries_map .Driver)}}
+                                        {{$b.Data.first_name}} {{$b.Data.last_name}} <br />
+                                        {{$b.Data.file_number}}
+                                    </div>
+                                    {{end}}
+                                </td>
+                                <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+                                    {{if .Data.administrator_unavailability}}
+                                    <div class="text-gray-900" >Retiré du {{(timeFrom .Unavailablefrom).Format "02/01/2006"}} <br />
+                                        au {{(timeFrom .Unavailableto).Format "02/01/2006"}}</div>
+                                    {{else}}
+                                    <div class="text-gray-900" >Du {{(timeFrom .Startdate).Format "02/01/2006"}} <br />
+                                        au {{(timeFrom .Enddate).Format "02/01/2006"}}</div>
+                                    {{end}}
+                                </td>
+                                <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+                                    <div class="text-gray-900" >{{ .Data.comment }}</div>
+                                </td>
+                                <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+                                    <a href="/app/vehicles-management/bookings/{{.ID}}"
+                                            class="text-co-blue hover:text-co-blue">Voir</a>
+                                </td>
+                            </tr>
+                            {{end}}
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+{{end}}

web/layouts/administration/_partials/groups_admins.html

@@ -11,7 +11,7 @@
         <img class="h-10 w-10 rounded-co" src="/app/beneficiaries/{{.ID}}/picture" alt="">
       </div>
       <div class="flex-1 min-w-0">
-        <a href="/app/profile/{{.ID}}" class="focus:outline-none">
+        <a href="/app/members/{{.ID}}" class="focus:outline-none">
           <span class="absolute inset-0" aria-hidden="true"></span>
           <p class="text-sm font-medium text-gray-900">{{.Data.first_name}} {{.Data.last_name}}</p>
           <p class="text-sm text-gray-500 truncate">{{.Data.email}}</p>

web/layouts/administration/beneficaires_stats.html

@@ -0,0 +1,156 @@
+{{define "content"}}
+<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8">
+    <div class="sm:flex sm:items-center">
+        <div class="sm:flex-auto">
+            <h1 class="text-2xl font-semibold text-gray-900">La liste des bénéficaires</h1>
+        </div>
+        <div class="mt-4 sm:mt-0 sm:ml-16 sm:flex-none">
+            <a href="/app/administration/">
+                <button type="button"
+                    class="inline-flex items-center justify-center rounded-2xl border border-transparent bg-co-blue px-4 py-2 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">
+                   Retour
+                </button>
+            </a>
+        </div>
+    </div>
+</div>
+<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8" x-data="{
+            state: {{.ViewState.JSONWithLimits 0 10}},
+            current: 0,
+            nb_pages() {
+                let nbEl = this.state.count 
+                return Math.ceil(nbEl/10)
+            },
+            async paginate(page) {
+                let start = (page-1)*10
+                if(start < 0|| start > this.state.count) {
+                    return
+                }
+                let resp = await fetch('/api/cache/' + this.state.cache_id + '?limits.min=' + start + '&limits.max=' + (start+10))
+                let data = await resp.json()
+                this.state.beneficiaries = data
+                this.current=page-1
+            }
+        }">
+    <div class="mt-8 flex flex-col">
+        <div class="-my-2 -mx-4 overflow-x-auto sm:-mx-6 lg:-mx-8">
+            <div class="inline-block min-w-full py-2 align-middle md:px-6 lg:px-8">
+                <div class="overflow-hidden shadow ring-1 ring-black ring-opacity-5 md:rounded-lg">
+                    <table class="min-w-full divide-y divide-gray-300">
+                        <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">
+                                    Nom
+                                </th>
+                                <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900">
+                                    Téléphone
+                                </th>
+                                <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900">
+                                    Adresse
+                                </th>
+                                <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900">
+                                    Labels
+                                </th>
+                                <th scope="col" class="relative py-3.5 pl-3 pr-4 sm:pr-6">
+                                    <span class="sr-only">Modifier</span>
+                                </th>
+                            </tr>
+                        </thead>
+                        <tbody class="divide-y divide-gray-200 bg-white">
+                            <template x-for="beneficiary in state.beneficiaries">
+                                <tr>
+                                    <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+                                        <div class="flex items-center">
+                                            <div class="h-10 w-10 flex-shrink-0">
+                                                <img class="h-10 w-10 rounded-co"
+                                                    :src="'/app/beneficiaries/' + beneficiary.id + '/picture'" alt="">
+                                            </div>
+                                            <div class="ml-4">
+                                                <div class="font-medium text-gray-900"><span
+                                                        x-text="beneficiary.data.first_name"></span> <span
+                                                        x-text="beneficiary.data.last_name"></span></div>
+                                                <div class="text-gray-500" x-text="beneficiary.data.email"></div>
+                                            </div>
+                                        </div>
+                                    </td>
+                                    <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
+                                        <div class="text-gray-900" x-text="beneficiary.data.phone_number"></div>
+                                    </td>
+                                    <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500"
+                                        x-text="beneficiary.data.address ? beneficiary.data.address.properties.label : ''">
+                                    </td>
+                                    <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
+                                        <template x-for="tag in beneficiary.data.tags">
+                                            <span
+                                                class="inline-flex rounded-full bg-green-100 px-2 text-xs font-semibold leading-5 text-green-800"
+                                                x-text="tag"></span>
+                                        </template>
+                                    </td>
+                                    <td
+                                        class="relative whitespace-nowrap py-4 pl-3 pr-4 text-right text-sm font-medium sm:pr-6">
+                                        <a :href="'/app/beneficiaries/' + beneficiary.id"
+                                            class="text-co-blue hover:text-co-blue">Voir<span class="sr-only">, <span
+                                                    x-text="beneficiary.data.first_name"></span> <span
+                                                    x-text="beneficiary.data.last_name"></span></a>
+                                    </td>
+                                </tr>
+                            </template>
+
+                            <!-- More people... -->
+                        </tbody>
+                    </table>
+                    <div class="bg-white px-4 py-3 flex items-center justify-between border-t border-gray-200 sm:px-6">
+                        <div class="flex-1 flex justify-between sm:hidden">
+                          <a href="#" class="relative inline-flex items-center px-4 py-2 border border-gray-300 text-sm font-medium rounded-md text-gray-700 bg-white hover:bg-gray-50"
+                          @click="paginate(current)"> Previous </a>
+                          <a href="#" class="ml-3 relative inline-flex items-center px-4 py-2 border border-gray-300 text-sm font-medium rounded-md text-gray-700 bg-white hover:bg-gray-50"
+                          @click="paginate(current+2)"> Next </a>
+                        </div>
+                        <div class="hidden sm:flex-1 sm:flex sm:items-center sm:justify-between">
+                          <div>
+                            <p class="text-sm text-gray-700">
+                              Résultats
+                              <span class="font-medium" x-text="Math.min((current * 10)+1, state.count)"></span>
+                              à
+                              <span class="font-medium" x-text="Math.min((current * 10)+10, state.count)"></span>
+                              sur
+                              <span class="font-medium" x-text="state.count"></span>
+                            </p>
+                          </div>
+                          <div>
+                            <nav class="relative z-0 inline-flex rounded-md shadow-sm -space-x-px" aria-label="Pagination">
+                              <a href="#" class="relative inline-flex items-center px-2 py-2 rounded-l-md border border-gray-300 bg-white text-sm font-medium text-gray-500 hover:bg-gray-50"
+                                @click="paginate(current)">
+                                <span class="sr-only">Previous</span>
+                                <!-- Heroicon name: solid/chevron-left -->
+                                <svg class="h-5 w-5" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
+                                  <path fill-rule="evenodd" d="M12.707 5.293a1 1 0 010 1.414L9.414 10l3.293 3.293a1 1 0 01-1.414 1.414l-4-4a1 1 0 010-1.414l4-4a1 1 0 011.414 0z" clip-rule="evenodd" />
+                                </svg>
+                              </a>
+                              <template x-for="i in nb_pages">
+                                <a href="#" @click="paginate(i)"
+                                 class="relative inline-flex items-center px-4 py-2 border text-sm font-medium"
+                                 :class="i == current+1 ? 'z-10 bg-indigo-50 border-co-blue text-co-blue' : 'bg-white border-gray-300 text-gray-500 hover:bg-gray-50'"
+                                 x-text="i"></a>
+                              </template>
+                              <!-- Current: "z-10 bg-indigo-50 border-indigo-500 text-indigo-600", Default: "bg-white border-gray-300 text-gray-500 hover:bg-gray-50" -->
+                            <a href="#" class="relative inline-flex items-center px-2 py-2 rounded-r-md border border-gray-300 bg-white text-sm font-medium text-gray-500 hover:bg-gray-50"
+                                @click="paginate(current+2)">
+                                <span class="sr-only">Next</span>
+                                <!-- Heroicon name: solid/chevron-right -->
+                                <svg class="h-5 w-5" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
+                                  <path fill-rule="evenodd" d="M7.293 14.707a1 1 0 010-1.414L10.586 10 7.293 6.707a1 1 0 011.414-1.414l4 4a1 1 0 010 1.414l-4 4a1 1 0 01-1.414 0z" clip-rule="evenodd" />
+                                </svg>
+                              </a>
+                            </nav>
+                          </div>
+                        </div>
+                      </div>
+                </div>
+            </div>
+
+        </div>
+    </div>
+</div>
+{{end}}

web/layouts/administration/bookings_stats.html

@@ -0,0 +1,37 @@
+{{define "content"}}
+<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8">
+    <h1 class="text-2xl font-semibold text-gray-900">Historique des réservations de véhicules</h1>
+
+
+    <div class="sm:flex sm:items-center">
+        <div class="sm:flex-auto">
+            
+        </div>
+        <div class="mt-4 sm:mt-0 sm:ml-16 sm:flex-none">
+            <a href="/app/administration/stats/bookings/export">
+                <button type="button"
+                    class="inline-flex items-center justify-center bg-white hover:bg-gray-50 border-gray-300 border px-4 py-2 text-gray-700 flex items-center text-sm rounded-2xl focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">
+                    Export
+                </button>
+            </a>
+            <a href="/app/administration/stats/vehicles">
+                <button type="button"
+                    class="inline-flex items-center justify-center bg-white hover:bg-gray-50 border-gray-300 border px-4 py-2 text-gray-700 flex items-center text-sm rounded-2xl focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">
+                    {{$.IconSet.Icon "hero:outline/document-arrow-left" "h-5 w-5 mr-3"}}
+                    Liste des véhicules
+                </button>
+            </a>
+            <!-- <a href="/api/cache/{{.ViewState.cacheid}}/export">
+                <button type="button"
+                    class="inline-flex items-center justify-center bg-white hover:bg-gray-50 border-gray-300 border px-4 py-2 text-gray-700 flex items-center text-sm rounded-2xl focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">
+                    {{$.IconSet.Icon "hero:outline/document-arrow-down" "h-5 w-5 mr-3"}}
+                    Exporter
+                </button>
+            </a> -->
+        </div>
+    </div>
+</div>
+
+{{template "bookings_list" .}}
+
+{{end}}

web/layouts/administration/events_stats.html

@@ -0,0 +1,111 @@
+{{define "content"}}
+
+<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8">
+    <div class="sm:flex sm:items-center">
+        <div class="sm:flex-auto">
+            <h1 class="text-2xl font-semibold text-gray-900">La liste des événements</h1>
+        </div>
+        <div class="mt-4 sm:mt-0 sm:ml-16 sm:flex-none">
+            <a href="/exports/agenda/subscriptions">
+                <button type="button"
+                    class="inline-flex items-center justify-center bg-white hover:bg-gray-50 border-gray-300 border px-4 py-2 text-gray-700 flex items-center text-sm rounded-2xl focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">
+                    Export
+                </button>
+            </a>
+            <a href="/app/administration/">
+                <button type="button"
+                    class="inline-flex items-center justify-center rounded-2xl border border-transparent bg-co-blue px-4 py-2 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">
+                   Retour
+                </button>
+            </a>
+        </div>
+    </div>
+</div>
+<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8">
+    <div class="mt-8 flex flex-col">
+        <div class="-my-2 -mx-4 overflow-x-auto sm:-mx-6 lg:-mx-8">
+            <div class="inline-block min-w-full py-2 align-middle md:px-6 lg:px-8">
+                <div class="overflow-hidden shadow ring-1 ring-black ring-opacity-5 md:rounded-lg">
+                    <table class="min-w-full divide-y divide-gray-300">
+                        <thead class="bg-gray-50">
+                            <tr>
+                                <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 sm:pl-6">
+                                    Dispositif
+                                </th>
+                                <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 sm:pl-6">
+                                    Structure
+                                </th>
+                                <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 sm:pl-6">
+                                    Lieu
+                                </th>
+                                <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 sm:pl-6">
+                                    Dates
+                                </th>
+                                <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 sm:pl-6">
+                                    Places disponibles
+                                </th>
+                                <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 sm:pl-6">
+                                    Bénéficiaires positionnés
+                                </th>
+                                <th scope="col" class="relative py-3.5 pl-3 pr-4 sm:pr-6">
+                                    <span class="sr-only">Actions</span>
+                                </th>
+                            </tr>
+                            <tbody class="divide-y divide-gray-200 bg-white">
+                                {{range .ViewState.events}}
+                                <a href="/app/agenda/{{.ID}}">
+                                <tr>
+                                    <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+
+                                        <div class="font-medium text-gray-900">{{.Name}}</div>
+                                        <div class="text-gray-500">{{.Type}}</div>
+                                    </td>
+                                    <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+                
+                                        <div class="text-gray-900" >
+                                            {{range .Owners}}
+                                            {{if (index $.ViewState.groups .)}}
+                                                {{(index $.ViewState.groups .).Data.name}}
+                                            {{end}}
+                                            {{end}}
+                                        </div>
+                                    </td>
+                                    <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+                                        <div class="text-gray-900" >{{if .Data.address}}{{.Data.address.properties.label}}{{end}}</div>
+                                    </td>
+                                    <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+                                        <div class="text-gray-900" >
+                                            {{if eq .Startdate .Enddate}}
+                                            Le {{(timeFrom .Startdate).Format "02/01/2006"}}
+                                            {{else}}
+                                            Du {{(timeFrom .Startdate).Format "02/01/2006"}} <br />Au {{(timeFrom .Enddate).Format "02/01/2006"}}
+                                            {{end}}
+                                        </div>
+                                    </td>
+                                    <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+                                        {{if ne .RemainingSubscriptions 999}}
+                                        <div class="text-gray-900" >{{.RemainingSubscriptions}}</div>
+                                        {{end}}
+                                    </td>
+                                    <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+                                        <div class="flex -space-x-1 overflow-hidden" >
+                                            {{range .Subscriptions}}
+                                            <img class="inline-block h-6 w-6 rounded-co ring-2 ring-white" src="/app/beneficiaries/{{.Subscriber}}/picture" >
+                                            {{end}}
+                                        </div>
+                                    </td>
+                                    <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+                                        <a href="/app/agenda/{{.ID}}" class="text-co-blue hover:text-co-blue">Voir</a>
+                                    </td>
+                                </tr>
+                                </a>
+                                {{end}}
+                            </tbody>
+                        </thead>
+                    </table>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+{{end}}

web/layouts/administration/home.html

@@ -14,8 +14,8 @@
       <div
         class="flex-1 flex items-center justify-between border-t border-r border-b border-gray-200 bg-white rounded-r-3xl truncate">
         <div class="flex-1 px-4 py-2 text-sm truncate">
-          <a href="#" class="text-gray-900 font-medium hover:text-gray-600">Bénéficiaires</a>
-          <p class="text-gray-500">{{len (index .ViewState.groups 0).Members}} bénéficiaires</p>
+          <a href="/app/administration/stats/beneficaires" class="text-gray-900 font-medium hover:text-gray-600">Bénéficiaires</a>
+          <p class="text-gray-500">{{len .ViewState.beneficiaries }} bénéficiaires</p>
         </div>
       </div>
     </li>
@@ -23,13 +23,13 @@
     <li class="col-span-1 flex shadow-sm rounded-3xl">
       <div
         class="flex-shrink-0 flex items-center justify-center w-16 bg-co-green text-white text-sm font-medium rounded-l-3xl">
-        {{.IconSet.Icon "hero:outline/office-building" "h-6 w-6"}}
+        {{.IconSet.Icon "hero:outline/calendar" "h-6 w-6"}}
       </div>
       <div
         class="flex-1 flex items-center justify-between border-t border-r border-b border-gray-200 bg-white rounded-r-3xl truncate">
         <div class="flex-1 px-4 py-2 text-sm truncate">
-          <a href="#" class="text-gray-900 font-medium hover:text-gray-600">Organisations</a>
-          <p class="text-gray-500">{{len .ViewState.groups}} organisations</p>
+          <a href="/app/administration/stats/events" class="text-gray-900 font-medium hover:text-gray-600">Évenements</a>
+          <p class="text-gray-500">{{len .ViewState.events}} évenements</p>
         </div>
       </div>
     </li>
@@ -42,8 +42,8 @@
       <div
         class="flex-1 flex items-center justify-between border-t border-r border-b border-gray-200 bg-white rounded-r-3xl truncate">
         <div class="flex-1 px-4 py-2 text-sm truncate">
-          <a href="#" class="text-gray-900 font-medium hover:text-gray-600">Référents</a>
-          <p class="text-gray-500">1 membres</p>
+          <a href="/app/members/" class="text-gray-900 font-medium hover:text-gray-600">Référents</a>
+          <p class="text-gray-500">{{len .ViewState.accounts}} membres</p>
         </div>
       </div>
     </li>
@@ -51,13 +51,13 @@
     <li class="col-span-1 flex shadow-sm rounded-3xl">
       <div
         class="flex-shrink-0 flex items-center justify-center w-16 bg-co-yellow text-white text-sm font-medium rounded-l-3xl">
-        {{.IconSet.Icon "hero:outline/shield-check" "h-6 w-6"}}
+        {{.IconSet.Icon "tabler-icons:car" "h-6 w-6"}}
       </div>
       <div
         class="flex-1 flex items-center justify-between border-t border-r border-b border-gray-200 bg-white rounded-r-3xl truncate">
         <div class="flex-1 px-4 py-2 text-sm truncate">
-          <a href="#" class="text-gray-900 font-medium hover:text-gray-600">Accompagnement</a>
-          <p class="text-gray-500">0 actions réalisées</p>
+          <a href="/app/administration/stats/vehicles" class="text-gray-900 font-medium hover:text-gray-600">Véhicules</a>
+          <p class="text-gray-500">{{len .ViewState.bookings}} réservations de véhicules</p>
         </div>
       </div>
     </li>
@@ -65,8 +65,11 @@
 </div>
 
 <div class="max-w-7xl mt-10 mx-auto px-4 sm:px-6 md:px-8">
-  <h2 class="text-xl font-semibold text-gray-500">Gestion des organisations</h2>
-
+  <!-- <h2 class="text-xl font-semibold text-gray-500">Gestion des organisations</h2> -->
+  <div class="flex-1 px-4 py-2 text-sm truncate">
+    <h2 class="text-xl font-semibold text-gray-500">Gestion des organisations</h2>
+    <p class="text-gray-500">( {{len .ViewState.groups}} organisations )</p>
+  </div>
   <div class="sm:flex sm:items-center">
     <div class="sm:flex-auto">
       <p class="mt-2 text-sm text-gray-700"></p>

web/layouts/administration/vehicles_stats.html

@@ -0,0 +1,155 @@
+{{define "content"}}
+<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8">
+    <div class="sm:flex sm:items-center">
+        <div class="sm:flex-auto">
+            <h1 class="text-2xl font-semibold text-gray-900">Liste des véhicules</h1>
+        </div>
+        <div class="mt-4 sm:mt-0 sm:ml-16 sm:flex-none">
+            <a href="/app/administration/">
+                <a href="/app/administration/stats/bookings">
+                    <button type="button"
+                        class="inline-flex items-center justify-center bg-white hover:bg-gray-50 border-gray-300 border px-4 py-2 text-gray-700 flex items-center text-sm rounded-2xl focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">
+                        {{$.IconSet.Icon "hero:outline/document-arrow-left" "h-5 w-5 mr-3"}}
+                        Liste des réservations
+                    </button>
+                </a>
+                
+            </a>
+        </div>
+    </div>
+</div>
+
+<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8">
+    <div class="mt-8 flex flex-col">
+        <div class="-my-2 -mx-4 overflow-x-auto sm:-mx-6 lg:-mx-8">
+            <div class="inline-block min-w-full py-2 align-middle md:px-6 lg:px-8">
+                <div class="overflow-hidden shadow ring-1 ring-black ring-opacity-5 md:rounded-lg">
+                    <table class="min-w-full divide-y divide-gray-300">
+                        <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">
+                                    Statut Réservation
+                                </th>
+                                <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 sm:pl-6">
+                                    Organisation
+                                </th>
+                                <th scope="col"
+                                    class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
+                                    Numéro (Immat / Bicycode)
+                                </th>
+                                <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 sm:pl-6">
+                                    Type
+                                </th>
+                                <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 sm:pl-6">
+                                    Modèle
+                                </th>
+                                <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 sm:pl-6">
+                                    Lieu
+                                </th>
+                              
+                                <th scope="col" class="relative py-3.5 pl-3 pr-4 sm:pr-6">
+                                    <span class="sr-only">Actions</span>
+                                </th>
+                            </tr>
+                        </thead>
+                        <tbody class="divide-y divide-gray-200 bg-white">
+                            {{range .ViewState.vehicles}}
+
+                            <tr>
+                                <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6 text-center">
+                                    <div class="flex flex-col px-6">
+                                    {{if not .Bookings}}
+                                    <span class="mt-1 p-1 bg-gray-500 text-white text-xs font-bold rounded-xl" >
+                                        Disponible
+                                    </span>
+                                    {{else if len .Bookings | eq 1}}
+                                        {{range .Bookings}}
+                                            {{if  .Data.administrator_unavailability}}
+                                                <span class="mt-1 p-1 bg-black text-white text-xs font-bold rounded-xl" >
+                                                    Retiré
+                                                </span>
+                                            {{else if eq .Status -1 }}
+                                                <span class="mt-1 p-1 bg-gray-500 text-white text-xs font-bold rounded-xl" >
+                                                    Disponible
+                                                </span>
+                                                {{else if eq .Status 1 }}
+                                                <span class="mt-1 p-1 bg-co-blue text-white text-xs font-bold rounded-xl" >
+                                                    A venir
+                                                </span>
+                                                {{else if eq .Status 0 }}
+                                                <span class="mt-1 p-1 bg-co-green text-white text-xs font-bold rounded-xl" >
+                                                    En cours
+                                                </span>
+                                            {{end}}
+                                        {{end}}
+                                    {{else if gt (len .Bookings) 1}} 
+                                        {{range .Bookings}}
+                                            {{if .Data.administrator_unavailability}}
+                                            <span class="mt-1 p-1 bg-black text-white text-xs font-bold rounded-xl" >
+                                                Retiré
+                                            </span>
+                                            {{else}}
+                                                {{if eq .Status 1 }}
+                                                <span class="mt-1 p-1 bg-co-blue text-white text-xs font-bold rounded-xl" >
+                                                    A venir
+                                                </span>
+                                                {{else if eq .Status 0 }}
+                                                <span class="mt-1 p-1 bg-co-green text-white text-xs font-bold rounded-xl" >
+                                                    En cours
+                                                </span>
+                                                {{end}}
+                                            {{end}}
+                                        {{end}}
+                                        {{$allAvailable := true}}
+                                            {{range .Bookings}}
+                                                {{if ne .Status -1}}
+                                                    {{ $allAvailable = false }}
+                                                    {{break}}
+                                                {{end}}
+                                            {{end}}
+                                            {{if $allAvailable}}
+                                                    <span class="mt-1 p-1 bg-gray-500 text-white text-xs font-bold rounded-xl" >
+                                                        Disponible
+                                                    </span>
+                                            {{end}}                                      
+                                    {{end}}
+                                    </div>
+                                </td>
+                                <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+                                    <div class="text-gray-900" >{{(index $.ViewState.admingroups (index .Administrators 0)).Data.name}}</div>
+                                </td>
+                                <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+                                    <div class="text-gray-900" >{{.Data.licence_plate}}</div>
+                                </td>
+                                <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+                                    <div class="text-gray-900" >
+                                        {{.Type}}
+                                        {{if eq .Type "Voiture"}}
+                                        {{ if .Data.automatic}} (boite auto){{ end }}
+                                        {{end}}
+                                    </div>
+                                </td>
+                                <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+                                    <div class="text-gray-900" >{{.Data.name}}</div>
+                                </td>
+                                <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+                                    <div class="text-gray-900" >{{if .Data.address}}{{.Data.address.properties.label}}{{end}}</div>
+                                </td>
+                               
+                                <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+                                    <a href="/app/vehicles-management/fleet/{{.ID}}"
+                                            class="text-co-blue hover:text-co-blue">Voir</a>
+                                </td>
+                            </tr>
+                            {{end}}
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+
+{{end}}

web/layouts/agenda/_partials/address.html

@@ -0,0 +1,67 @@
+{{ define "address" }}
+
+
+<div class="col-span-6 relative" x-data="{
+    input: {{if .Adress}}'{{.Address.Properties.label}}'{{else}}`{{ .Default.properties.label}}`{{end}},
+    def: `{{ .Default}}`,
+    address: {{if .Address}}JSON.stringify({{printf "%s" .Address.MarshalJSON}}){{else}}null{{end}},
+    addressObject: {{if .Address}}{{printf "%s" .Address.MarshalJSON}}{{else}}null{{end}},
+    responselength: 0,
+    async autocomplete() {
+        if(this.input == null || this.input == '') {
+            this.responselength = 0
+            return []
+        }
+        if(this.addressObject != null && this.input == this.addressObject.properties.label) {
+            this.responselength = 0
+           
+            return []
+        }
+
+        if(this.input == `{{ .Default.properties.label}}`) {
+            this.responselength = 0
+            this.address = this.def
+            this.input = `{{ .Default.properties.label}}`
+            result = await fetch('https://geocode.ridygo.fr/v1/autocomplete/\?text=' + this.input)
+            json = await result.json()
+
+            bb = json['features'][0]
+            console.log(bb)
+            this.address = JSON.stringify(bb)
+            this.addressObject = bb
+            this.input = bb.properties.label
+                return [bb]
+        }
+        
+            result = await fetch('https://geocode.ridygo.fr/v1/autocomplete/\?text=' + this.input)
+            json = await result.json()
+
+        this.responselength = json['features'].length
+        return json['features']
+    },
+    select(a) {
+        this.address = JSON.stringify(a)
+        this.addressObject = a
+        this.input = a.properties.label
+        
+    }
+}">
+    <input type="hidden" name="{{ .FieldName }}" x-model="address" >
+    <label for="address" class="block text-sm font-medium text-gray-700">{{ if .FieldLabel }}{{.FieldLabel}}{{else}}Adresse{{end}}</label>
+    <input type="text"  
+        class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm border-gray-300 rounded-2xl"
+      x-model="input">
+
+    <ul x-show="responselength > 0"
+    class="absolute z-10 mt-1 w-full bg-white shadow-lg max-h-60 rounded-xl py-1 text-base ring-1 ring-black ring-opacity-5 overflow-auto focus:outline-none sm:text-sm" tabindex="-1" role="listbox" aria-labelledby="listbox-label" aria-activedescendant="listbox-option-3">
+        <template x-for="item in autocomplete">
+            <a href="#">
+                <li class="text-gray-900 hover:bg-gray-200 cursor-default select-none relative py-2 pl-3 pr-9" 
+                    @click="select(item)">
+                    <span class="font-normal block truncate" x-text="item.properties.label" ></span>
+                </li>
+            </a>
+        </template>
+    </ul>
+</div>
+{{ end }}

web/layouts/agenda/_partials/subscribers-table.html

@@ -0,0 +1,53 @@
+{{define "subscribers_table"}}
+<table class="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">
+                Date d'inscription
+            </th>
+            <th scope="col" class="relative py-3.5 pl-3 pr-4 sm:pr-6">
+                <span class="sr-only">Actions</span>
+            </th>
+        </tr>
+    </thead>
+    {{$evid := .ViewState.event.ID}}
+    <tbody class="divide-y divide-gray-200 bg-white">
+        {{range .ViewState.event.Subscriptions}}
+        
+        <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">
+                <!-- add the member page and not the beneficiare page -->
+                <a href="/app/members/{{.Data.subscribed_by.user.id}}" 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}}</a>
+                {{.Data.subscribed_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">
+                <!-- <a href=""
+                        class="text-co-blue hover:text-co-blue">Voir</a> -->
+            </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>
+        {{end}}
+    </tbody>
+</table>
+{{end}}

web/layouts/agenda/delete-event.html

@@ -0,0 +1,58 @@
+{{define "content"}}
+{{ if eq (index .ViewState.event.Owners 0) .Group.ID }}
+
+<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">Vous etes sur de retirer cet événement</p>
+                        </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.event.ID}}" 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>
+ {{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 le droit de supprimer cet événement</h3>
+         </div>
+     </div>
+     <div class="flex justify-center  items-center mt-5 sm:mt-6 sm:grid sm:grid-flow-row-dense ">
+        <!-- class="flex justify-center items-center py-2 px-3 border-t dark:border-gray-600 -->
+         <a href="/app/agenda/{{.ViewState.event.ID}}" class="rounded-2xl 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>
+ {{end}}
+{{end}}

web/layouts/agenda/delete-subscriber.html

@@ -0,0 +1,39 @@
+{{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}}

web/layouts/agenda/display-event.html

@@ -12,7 +12,27 @@
                     {{end}}
                 </p>
             </div>
+            {{$gr := .Group.ID}}
+            {{$event := .ViewState.event.ID}}
         </div>
+        {{range .ViewState.event.Owners}}
+        {{$id := .}}
+        {{if eq $gr $id}}
+        <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/{{$event}}/update" 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">Modifier</button></a>
+             
+        
+            <a href="/app/agenda/{{$event}}/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-blue">Retirer</button></a>
+
+
+        </div>
+            {{end}}
+    {{end}}
+   
     </div>
 
     <div class="mt-8 max-w-3xl mx-auto grid grid-cols-1 gap-6 sm:px-6 lg:max-w-7xl lg:grid-flow-col-dense lg:grid-cols-3">
@@ -65,30 +85,63 @@
                     </div>
                 </div>
             </section>
+            {{ if eq (index .ViewState.event.Owners 0) .Group.ID }}
+            <section aria-labelledby="subscribers-table"></section>
+                <div class="bg-white shadow sm:rounded-lg">
+                    <div class="flex justify-between 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>
+                        <a href="/exports/agenda/{{$event}}">
+                            <button type="button"
+                                    class="inline-flex items-center justify-center bg-white hover:bg-gray-50 border-gray-300 border px-4 py-2 text-gray-700 flex items-center text-sm rounded-2xl focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">
+                                {{$.IconSet.Icon "hero:outline/document-arrow-down" "h-5 w-5 mr-3"}}
+                                Exporter
+                            </button>
+                        </a>
+                        <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>
+
+
+                        {{template "subscribers_table" .}}
+                </div>
+            </section>
+            {{end}}
         </div>
         <section aria-labelledby="subscribers-title" class="lg:col-start-3 lg:col-span-1">
-            <div class="bg-white px-4 py-5 shadow sm:rounded-lg sm:px-6">
+            <div class="bg-white px-4 py-5 shadow sm:rounded-lg sm:px-6"  x-data="{
+                text: '',
+                error: false,
+                beneficiariesListOpen: false,
+                beneficiaries: {{json .ViewState.beneficiaries}},
+                filteredBeneficiaries: (text) => {
+                    if(text=='') return beneficiaries
+                    return this.beneficiaries.filter(b => b['data']['first_name'].includes(text) || b['data']['last_name'].includes(text))
+                },
+                fields: {
+                    beneficiaryid: {{if .ViewState.search}}'{{.ViewState.search.beneficiary.ID}}'{{else}}null{{end}},
+                },
+                selectbeneficiary(beneficiary) {
+                    console.log(beneficiary)
+                    this.fields.beneficiaryid = beneficiary.id 
+                    this.text = beneficiary.data.first_name + ' ' + beneficiary.data.last_name
+                    this.beneficiariesListOpen = false
+                },
+                submit(event) {
+                    if(!this.fields.beneficiaryid) {
+                        this.error = true
+                        event.preventDefault()
+                    }
+                    return this.formValidation.valid
+                }
+            }">
                 <h2 id="subscribers-title" class="text-lg font-medium text-gray-900">Inscrire un bénéficiaire</h2>
                 {{if gt .ViewState.event.RemainingSubscriptions 0}}
-                <form class="mt-4" action="/app/agenda/{{.ViewState.event.ID}}/subscribe" method="POST">
-                    <div class="relative mt-1 mb-4"  x-data="{
-                        text: '',
-                        beneficiariesListOpen: false,
-                        beneficiaries: {{json .ViewState.beneficiaries}},
-                        filteredBeneficiaries: (text) => {
-                            if(text=='') return beneficiaries
-                            return this.beneficiaries.filter(b => b['data']['first_name'].includes(text) || b['data']['last_name'].includes(text))
-                        },
-                        fields: {
-                            beneficiaryid: {{if .ViewState.search}}'{{.ViewState.search.beneficiary.ID}}'{{else}}null{{end}},
-                        },
-                        selectbeneficiary(beneficiary) {
-                            console.log(beneficiary)
-                            this.fields.beneficiaryid = beneficiary.id 
-                            this.text = beneficiary.data.first_name + ' ' + beneficiary.data.last_name
-                            this.beneficiariesListOpen = false
-                        }
-                    }">
+                <form class="mt-4" action="/app/agenda/{{.ViewState.event.ID}}/subscribe" method="POST"  @submit="submit">
+                    <div class="relative mt-1 mb-4">
                         <input @focus="beneficiariesListOpen = true" x-model="text" id="combobox" type="text" class="w-full rounded-2xl border border-gray-300 bg-white py-2 pl-3 pr-12 shadow-sm focus:border-co-blue focus:outline-none focus:ring-1 focus:ring-co-blue sm:text-sm" role="combobox" aria-controls="options" aria-expanded="false">
                         
                         <button @click="beneficiariesListOpen = ! beneficiariesListOpen" type="button" class="absolute inset-y-0 right-0 flex items-center rounded-r-2xl px-2 focus:outline-none">
@@ -113,6 +166,7 @@
                         </ul>
                         <input type="hidden" name="subscriber" x-model="fields.beneficiaryid">
                       </div>
+                      <p class="text-co-red text-xs mb-4" x-show="error">Vous devez sélectionner un bénéficiaire</p>
                       <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">
                             Inscrire le bénéficiaire
@@ -122,17 +176,32 @@
                 <p class="p-12 text-gray-500 text-center text-md">Il n'y a plus de place disponible</p>
                 {{end}}
                 {{if .ViewState.subscribers}}
-                <h2 id="subscribers-title" class="text-lg font-medium text-gray-900 mt-10">Inscrits</h2>
+                {{if ne (index .ViewState.event.Owners 0) .Group.ID}}
+                <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">
-                    {{range .ViewState.subscribers}}
                     <ul class="p-1">
-                        <a href="/app/beneficiaries/{{.ID}}">
-                        <li class="inline-flex text-sm p-2"><img class="h-6 w-6 rounded-co mr-2" src="/app/beneficiaries/{{.ID}}/picture"> {{.Data.first_name}} {{.Data.last_name}}</li>
-                        </a>
+                        {{$evid := .ViewState.event.ID}}
+                        {{range .ViewState.event.Subscriptions}}
+                        {{if eq $.Group.ID .Data.subscribed_by.group.id}}
+                        <div class="flex justify-between border">
+                            <div>
+                                <a href="/app/beneficiaries/{{.Subscriber}}">
+                                <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}}
                     </ul>
-                    {{end}}
                 </div>
                 {{end}}
+                {{end}}
             </div>
         </section>
     </div>

web/layouts/agenda/history-event.html

@@ -0,0 +1,102 @@
+{{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}}

web/layouts/agenda/history.html

@@ -0,0 +1,105 @@
+{{define "content"}}
+<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8">
+    <h1 class="text-2xl font-semibold text-gray-900">Anciens dispositifs</h1>
+
+    <div class="sm:flex sm:items-center">
+        <div class="sm:flex-auto">
+            <p class="mt-2 text-sm text-gray-700"></p>
+        </div>
+        <div class="mt-4 sm:mt-0 sm:ml-16 sm:flex-none">
+        </div>
+    </div>
+</div>
+
+<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8">
+    <div class="mt-8 flex flex-col">
+        <div class="-my-2 -mx-4 overflow-x-auto sm:-mx-6 lg:-mx-8">
+            <div class="inline-block min-w-full py-2 align-middle md:px-6 lg:px-8">
+                <div class="overflow-hidden shadow ring-1 ring-black ring-opacity-5 md:rounded-lg">
+                    <table class="min-w-full divide-y divide-gray-300">
+                        <thead class="bg-gray-50">
+                            <tr>
+                                <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 sm:pl-6">
+                                    Dispositif
+                                </th>
+                                <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 sm:pl-6">
+                                    Structure
+                                </th>
+                                <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 sm:pl-6">
+                                    Lieu
+                                </th>
+                                <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 sm:pl-6">
+                                    Dates
+                                </th>
+                                <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 sm:pl-6">
+                                    Places disponibles
+                                </th>
+                                <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 sm:pl-6">
+                                    Bénéficiaires positionnés
+                                </th>
+                                <th scope="col" class="relative py-3.5 pl-3 pr-4 sm:pr-6">
+                                    <span class="sr-only">Actions</span>
+                                </th>
+                            </tr>
+                            <tbody class="divide-y divide-gray-200 bg-white">
+                                {{range .ViewState.events}}
+                                {{if eq .Deleted false}}
+                                <a href="/app/agenda/{{.ID}}">
+                                <tr>
+                                    <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+
+                                        <div class="font-medium text-gray-900">{{.Name}}</div>
+                                        <div class="text-gray-500">{{.Type}}</div>
+                                    </td>
+                                    <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+                
+                                        <div class="text-gray-900" >
+                                            {{range .Owners}}
+                                            {{if (index $.ViewState.groups .)}}
+                                                {{(index $.ViewState.groups .).Data.name}}
+                                            {{end}}
+                                            {{end}}
+                                        </div>
+                                    </td>
+                                    <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+                                        <div class="text-gray-900" >{{if .Data.address}}{{.Data.address.properties.label}}{{end}}</div>
+                                    </td>
+                                    <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+                                        <div class="text-gray-900" >
+                                            {{if eq .Startdate .Enddate}}
+                                            Le {{(timeFrom .Startdate).Format "02/01/2006"}}
+                                            {{else}}
+                                            Du {{(timeFrom .Startdate).Format "02/01/2006"}} <br />Au {{(timeFrom .Enddate).Format "02/01/2006"}}
+                                            {{end}}
+                                        </div>
+                                    </td>
+                                    <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+                                        {{if ne .RemainingSubscriptions 999}}
+                                        <div class="text-gray-900" >{{.RemainingSubscriptions}}</div>
+                                        {{end}}
+                                    </td>
+                                    <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+                                        <div class="flex -space-x-1 overflow-hidden" >
+                                            {{range .Subscriptions}}
+                                            <img class="inline-block h-6 w-6 rounded-co ring-2 ring-white" src="/app/beneficiaries/{{.Subscriber}}/picture" >
+                                            {{end}}
+                                        </div>
+                                    </td>
+
+
+                                    <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+                                        <a href="/app/agenda/{{.ID}}" class="text-co-blue hover:text-co-blue">Voir</a>
+                                    </td>
+                                </tr>
+                                </a>
+                                {{end}}
+                                {{end}}
+                            </tbody>
+                        </thead>
+                    </table>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+{{end}}

web/layouts/agenda/home.html

@@ -7,6 +7,13 @@
             <p class="mt-2 text-sm text-gray-700"></p>
         </div>
         <div class="mt-4 sm:mt-0 sm:ml-16 sm:flex-none">
+            <a href="/app/agenda/history">
+                <button type="button"
+                    class="inline-flex items-center justify-center mr-3 bg-white hover:bg-gray-50 border-gray-300 border px-4 py-2 text-gray-700 flex items-center text-sm rounded-2xl focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">
+                    {{$.IconSet.Icon "hero:outline/calendar" "h-5 w-5 mr-3"}}
+                    Historique
+                </button>
+            </a>
             <a href="/app/agenda/create-event">
                 <button type="button"
                     class="inline-flex items-center justify-center rounded-2xl border border-transparent bg-co-blue px-4 py-2 text-sm font-medium text-white shadow-sm focus:outline-none focus:ring-2 focus:ring-ci-blue focus:ring-offset-2 sm:w-auto">
@@ -50,6 +57,7 @@
                             </tr>
                             <tbody class="divide-y divide-gray-200 bg-white">
                                 {{range .ViewState.events}}
+                                {{if eq .Deleted false}}
                                 <a href="/app/agenda/{{.ID}}">
                                 <tr>
                                     <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
@@ -99,6 +107,7 @@
                                 </tr>
                                 </a>
                                 {{end}}
+                                {{end}}
                             </tbody>
                         </thead>
                     </table>

web/layouts/agenda/updateEvent.html

@@ -0,0 +1,255 @@
+{{ define "content" }}
+{{ if eq (index .ViewState.event.Owners 0) .Group.ID }}
+
+<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8">
+    <h1 class="text-2xl font-semibold text-gray-900">Modifier votre agenda</h1>
+</div>
+{{$sdate := (timeFrom .ViewState.event.Startdate).Format ("2006-01-02")}}
+{{$edate := (timeFrom .ViewState.event.Enddate).Format ("2006-01-02")}}
+<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8 mt-8"
+    x-data="{
+        fields: {
+            name: '{{.ViewState.event.Name}}',
+            type:'{{.ViewState.event.Type}}',
+            description: '{{.ViewState.event.Description}}',
+            allday: {{.ViewState.event.Allday}},
+            startdate:'{{$sdate}}',
+            enddate: '{{$edate}}',
+            starttime: '{{.ViewState.event.Starttime}}',
+            endtime: '{{.ViewState.event.Endtime}}',
+            max_subscribers: '{{.ViewState.event.MaxSubscribers}}',
+        },
+        rules: {
+            name: ['required'],
+            type: ['required'],
+            startdate: ['required'],
+            enddate: ['required'],
+            starttime: ['optional'],
+            endtime: ['optional'],
+            description: ['optional'],
+            max_subscribers: ['required', 'min:0']
+        },
+        formValidation: {
+            valid: false,
+            fields: {
+                name: {valid: null},
+                type: {valid: null},
+                description: {valid: null},
+                startdate: {valid: null},
+                enddate: {valid: null},
+                starttime: {valid: null},
+                endtime: {valid: null},
+                allday: {valid: null},
+                max_subscribers: {valid: null},
+            }
+        },
+        isFormValid: true,
+        validate() {
+            this.formValidation = Iodine.assert(this.fields, this.rules)
+
+            if(!Iodine.assertAfterOrEqual(new Date(this.fields.enddate), new Date(this.fields.startdate))) {
+                this.formValidation.fields.enddate.valid = false
+                this.formValidation.valid = false
+            }
+        },
+        validateField(field) {
+            this.formValidation.fields[field] = Iodine.assert(this.fields[field], this.rules[field])
+        },
+        submit(event) {
+            this.validate()
+            if(!this.formValidation.valid) {
+                this.isFormValid = false
+                event.preventDefault()
+            }
+            return this.formValidation.valid
+        }
+    }">
+    <form class="space-y-6" method="POST" @submit="submit">
+        <div class="bg-white shadow px-4 py-5 sm:rounded-lg sm:p-6">
+            <div class="md:grid md:grid-cols-3 md:gap-6">
+                <div class="md:col-span-1">
+                    <h3 class="text-lg font-medium leading-6 text-gray-900">Informations sur le dispositif</h3>
+                    <p class="mt-1 text-sm text-gray-500">Informations générales sur le dispositif d'accompagnement à ajouter à l'agenda</p>
+                </div>
+                <div class="mt-5 md:mt-0 md:col-span-2">
+                    <div class="grid grid-cols-6 gap-6">
+                        <div class="col-span-6 sm:col-span-3">
+                            <label for="name" class="block text-sm font-medium text-gray-700">Nom</label>
+                            <input type="text" name="name" id="name" value="{{.ViewState.event.Name}}"
+                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-2xl"
+                                x-model="fields.name" @blur="validateField('name')"
+                                :class="formValidation.fields.name.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
+                        </div>
+                        <div class="sm:col-span-3">
+                            <label for="type" class="block text-sm font-medium text-gray-700">Type de dispositif</label>
+                          
+                            <select id="type" name="type" value="{{.ViewState.event.Type}}"
+                                x-model="fields.type" @blur="validateField('type')"
+                                class="max-w-lg mt-1 block focus:ring-co-blue focus:border-co-blue w-full shadow-sm sm:max-w-xs sm:text-sm rounded-2xl"
+                                :class="formValidation.fields.type.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
+                                <option></option>
+                                <option value="Permis accéléré">Permis accéléré</option>
+                                <option value="Auto-école sociale (classique)">Auto-école sociale (classique)</option>
+                                <option value="Information collective">Information collective</option>
+                                <option value="Autres">Autres</option>
+                            </select>
+                            
+                        </div>
+                        <div class="col-span-6">
+                            <label for="description" class="block text-sm font-medium text-gray-700">Description</label>
+                            <div class="mt-1">
+                                
+                                <textarea rows="4" name="description" id="descrpition" value="{{.ViewState.event.Description}}"
+                                    x-model="fields.description" @blur="validateField('description')"
+                                    :class="formValidation.fields.description.valid == false ? 'border-co-red border-2' : 'border-gray-300'"
+                                    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>
+                    
+                        {{ $fieldName := "address" }} 
+                        {{if .ViewState.event.Data.address}}
+                        {{$default := .ViewState.event.Data.address}}
+                        {{ template "address" dict "FieldName" $fieldName  "Default" $default}}
+                        {{else}}
+                        {{ template "address_autocomplete" dict "FieldName" $fieldName}}
+                        
+                        
+                    {{end}}
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        <div class="bg-white shadow px-4 py-5 sm:rounded-lg sm:p-6">
+            <div class="md:grid md:grid-cols-3 md:gap-6">
+                <div class="md:col-span-1">
+                    <h3 class="text-lg font-medium leading-6 text-
+                    ray-900">Planification</h3>
+                    <p class="mt-1 text-sm text-gray-500">Dates et horaires de l'événement</p>
+                </div>
+                <div class="mt-5 space-y-6 md:mt-0 md:col-span-2 align-middle">
+                    <div class="grid grid-cols-6 gap-6">
+
+                        <div class="col-span-6">
+
+                            <button type="button" class="relative inline-flex h-6 w-11 flex-shrink-0 cursor-pointer rounded-full border-2 border-transparent transition-colors duration-200 ease-in-out focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2" role="switch" aria-checked="false"
+                                :class="fields.allday ? 'bg-co-blue' : 'bg-gray-200'"
+                                @click="fields.allday = ! fields.allday">
+                                <span class="sr-only">Use setting</span>
+                                <!-- Enabled: "translate-x-5", Not Enabled: "translate-x-0" -->
+                                <span aria-hidden="true" class="pointer-events-none inline-block h-5 w-5 transform rounded-full bg-white shadow ring-0 transition duration-200 ease-in-out"
+                                    :class="fields.allday ? 'translate-x-5' : 'translate-x-0'"></span>
+                            </button> <span class="text-md font-medium text-gray-700 ml-2">Toute la journée</span>
+                            <input type="hidden" name="allday" x-model="fields.allday">
+
+                        </div>
+
+                        <div class="sm:col-span-6">
+                            <div class="inline-flex w-full">
+                                <div class="flex-1">
+                                    
+                                    <label for="startdate" class="block text-sm font-medium text-gray-700">Date de début</label>
+                                    <input  name="startdate" id="startdate" type="date" value="{{$sdate}}"
+                                            class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-l-2xl"
+                                            x-model="fields.startdate" @blur="validateField('startdate')"
+                                            :class="formValidation.fields.startdate.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
+                                </div>
+                                <div class="flex-1">
+                                    <label for="enddate" class="block text-sm font-medium text-gray-700">Date de fin</label>
+                                    <input  name="enddate" id="enddate" type="date" value="{{$edate}}"
+                                            class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-r-2xl"
+                                            x-model="fields.enddate" @blur="validateField('enddate')"
+                                            :class="formValidation.fields.enddate.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
+                                </div>
+
+
+                            </div>
+                        </div>
+
+                        <div class="sm:col-span-6" x-show="!fields.allday">
+                            <div class="inline-flex w-full">
+                                <div class="flex-1">
+                                    <label for="startdate" class="block text-sm font-medium text-gray-700">Horaire de début</label>
+                                    <input type="time" name="starttime" id="starttime" placeholder="00:00" 
+                                            class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-l-2xl"
+                                            x-model="fields.starttime" @blur="validateField('starttime')"
+                                            :class="formValidation.fields.starttime.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
+                                </div>
+                                <div class="flex-1">
+                                    <label for="endtime" class="block text-sm font-medium text-gray-700">Horaire de fin</label>
+                                    <input type="time" name="endtime" id="endtime" placeholder="00:00" 
+                                            class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-r-2xl"
+                                            x-model="fields.endtime" @blur="validateField('endtime')"
+                                            :class="formValidation.fields.endtime.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
+                                </div>
+                                
+                                
+                            </div>
+                        </div>
+
+
+                    </div>
+
+                </div>
+            </div>
+        </div>
+
+        <div class="bg-white shadow px-4 py-5 sm:rounded-lg sm:p-6">
+            <div class="md:grid md:grid-cols-3 md:gap-6">
+                <div class="md:col-span-1">
+                    <h3 class="text-lg font-medium leading-6 text-gray-900">Paramètres</h3>
+                    <p class="mt-1 text-sm text-gray-500">Paramètres du dispositift (nombre de places disponibles, etc...)</p>
+                </div>
+                <div class="mt-5 space-y-6 md:mt-0 md:col-span-2 align-middle">
+                    <div class="grid grid-cols-6 gap-6">
+                        <div class="col-span-6 sm:col-span-3">
+                            <label for="max_subscribers" class="block text-sm font-medium text-gray-700">Places disponibles (0 = illimité)</label>
+                            <input type="number" value="{{.ViewState.event.MaxSubscribers}}" name="max_subscribers" id="max_subscribers"
+                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-2xl"
+                                x-model="fields.max_subscribers" @blur="validateField('max_subscribers')"
+                                :class="formValidation.fields.max_subscribers.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+
+
+        <div class="flex justify-end">
+            <p x-show="! isFormValid" class="px-4 py-2 text-sm text-co-red">Certains champs de sont pas valides.</p>
+            <a href="/app/agenda/{{.ViewState.event.ID}}">
+                <button type="button"
+                    class="bg-white py-2 px-4 border border-gray-300 rounded-2xl shadow-sm text-sm font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">Annuler</button>
+            </a>
+            <button type="submit"
+                class="ml-3 inline-flex justify-center py-2 px-4 border border-transparent shadow-sm text-sm font-medium rounded-2xl text-white bg-co-blue hover:bg-co-blue focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">Modifier</button>
+        </div>
+    </form>
+</div>
+{{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 le droit de modifier cet événement</h3>
+         </div>
+     </div>
+     <div class="flex justify-center  items-center mt-5 sm:mt-6 sm:grid sm:grid-flow-row-dense ">
+        <!-- class="flex justify-center items-center py-2 px-3 border-t dark:border-gray-600 -->
+         <a href="/app/agenda/{{.ViewState.event.ID}}" class="rounded-2xl 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>
+{{end}}
+{{end}}

web/layouts/beneficiaries/_partials/beneficiary-events.html

@@ -1,4 +1,63 @@
 {{define "beneficiary_events"}}
-<div class="px-4 py-6 sm:px-6">
+{{ $calendarIcon := .IconSet.Icon "hero:outline/calendar" "h-6 w-6" }}
+{{ $carIcon := .IconSet.Icon "tabler-icons:car" "h-6 w-6"}}
+<div class="bg-white shadow sm:rounded-lg">
+    <div class="px-4 py-5 sm:px-6">
+        <h2 id="timeline-title" class="text-lg font-medium text-gray-900">Actions réalisées</h2>
+    </div>
+    <div class="border-t border-gray-200">
+        {{ $eventCount := len .ViewState.event }}
+        <ul role="list" class="divide-y divide-gray-200 flex-1">
+            {{if eq $eventCount 0}}
+                <li class="py-2 px-4">
+                    <p class="py-5 mt-1 max-w-2xl text-sm text-gray-500">Aucun dispositif n'est prévu pour le moment.</p>
+                </li>
+            {{else}}
+                {{range .ViewState.event}}
+                {{if eq .Deleted false}}
+                    <li class="py-5 px-4 flex">
+                        <a href="{{.Db}}{{.ID}}" class="flex w-full">
+                            <div class="flex-1 ml-3">
+                                <div class="flex items-center">
+
+                                    {{if eq .Status 2}}
+                                        {{if eq .Icons "vehicle"}}
+                                            <span class="bg-co-green text-white rounded-full h-8 w-10 flex items-center justify-center">{{$carIcon}}</span>
+                                        {{else}}
+                                            <span class="bg-co-green text-white rounded-full h-8 w-10 flex items-center justify-center">{{$calendarIcon}}</span>
+                                        {{end}}
+                                    {{end}}
+
+                                    {{if eq .Status 1}}
+                                        {{if eq .Icons "vehicle"}}
+                                            <span class="bg-co-blue text-white rounded-full h-8 w-10 flex items-center justify-center">{{$carIcon}}</span>
+                                        {{else}}
+                                            <span class="bg-co-blue text-white rounded-full h-8 w-10 flex items-center justify-center">{{$calendarIcon}}</span>
+                                        {{end}}
+                                    {{end}}
+
+                                    {{if eq .Status 3}}
+                                        {{if eq .Icons "vehicle"}}
+                                            <span class="bg-gray-500 text-white rounded-full h-8 w-10 flex items-center justify-center">{{$carIcon}}</span>
+                                        {{else}}
+                                            <span class="bg-gray-500 text-white rounded-full h-8 w-10 flex items-center justify-center">{{$calendarIcon}}</span>
+                                        {{end}}
+                                    {{end}} 
+
+                                    {{if eq .Date .DateEnd}}
+                                        <p class="text-sm font-medium text-gray-500"> &ensp;le {{(timeFrom .Date).Format "02/01/2006"}}</p>
+                                    {{else}}
+                                        <p class="text-sm font-medium text-gray-500">&ensp;du {{(timeFrom .Date).Format "02/01/2006"}} au {{(timeFrom .DateEnd).Format "02/01/2006"}}</p>
+                                    {{end}}
+                                </div>
+                                <p class="mt-1 text-sm text-gray-900">{{.Type}} - {{.Name}}</p>
+                            </div>
+                        </a>
+                    </li>
+                {{end}}
+                {{end}}
+            {{end}}
+        </ul>
+    </div>
 </div>
 {{end}}

web/layouts/beneficiaries/_partials/beneficiary-files.html

@@ -81,7 +81,7 @@ x-data="{
     {{end}}
 
     <h3 class="text-lg">Ajouter un document</h3>
-    <form method="POST" action="/app/beneficiaries/e7616eac-4a87-4396-a505-23e0421b9c4c/documents"  @submit="submit"  enctype="multipart/form-data">
+    <form method="POST" action="/app/beneficiaries/{{.ViewState.beneficiary.ID}}/documents"  @submit="submit"  enctype="multipart/form-data">
         <div class="md:grid md:grid-cols-6 p-2">
             <div class="sm:col-span-2">
                 <label for="type" class="block text-sm font-medium text-gray-700">Type</label>

web/layouts/beneficiaries/_partials/beneficiary-organizations.html

@@ -0,0 +1,10 @@
+{{define "beneficiary_organizations"}}
+<div class="px-4 py-6 sm:px-6">
+    <h3 class="text-lg">Organisations gestionnaires du bénéficiaire</h3>
+    <ul class="my-8">
+        {{range .ViewState.organizations}}
+        <li class="text-sm ml-8">{{.Data.name}}</li>
+        {{end}}
+    </ul>
+</div>
+{{end}}

web/layouts/beneficiaries/create.html

@@ -20,7 +20,7 @@
             email: ['required', 'email'],
             phone_number: ['required', 'regexMatch:^((\\+)33|0)[1-9](\\d{2}){4}$'],
             birthdate: ['required'],
-            file_number: ['optional'],
+            file_number: ['required'],
         },
         formValidation: {
             valid: false,
@@ -100,6 +100,13 @@
                                 x-model="fields.birthdate" @blur="validateField('birthdate')"
                                 :class="formValidation.fields.birthdate.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
                         </div>
+                        <div class="col-span-6 sm:col-span-3">
+                            <label for="file_number" class="block text-sm font-medium text-gray-700">Numéro de dossier (CAF / Pole Emploi ...)</label>
+                            <input type="text" name="file_number" id="file_number" placeholder=""
+                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-2xl"
+                                x-model="fields.file_number" @blur="validateField('file_number')"
+                                :class="formValidation.fields.file_number.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
+                        </div>
                     </div>
                 </div>
             </div>
@@ -114,14 +121,6 @@
                 <div class="mt-5 space-y-6 md:mt-0 md:col-span-2">
                     <div class="grid grid-cols-6 gap-6">
 
-                        <div class="col-span-6 sm:col-span-3">
-                            <label for="file_number" class="block text-sm font-medium text-gray-700">Numéro de dossier (allocataire, ...)</label>
-                            <input type="text" name="file_number" id="file_number" placeholder=""
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-2xl"
-                                x-model="fields.file_number" @blur="validateField('file_number')"
-                                :class="formValidation.fields.file_number.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
-                        </div>
-
                         <div class="col-span-6 sm:col-span-3">
                             <label for="gender" class="block text-sm font-medium text-gray-700">Genre</label>
                             <div class="sm:mt-0 sm:col-span-2">

web/layouts/beneficiaries/display.html

@@ -69,6 +69,12 @@
                                 <dd class="mt-1 text-sm text-gray-900">{{.ViewState.beneficiary.Data.address.properties.label}}</dd>
                             </div>
                             {{end}}
+                            {{if .ViewState.beneficiary.Data.file_number}}
+                            <div class="sm:col-span-1">
+                                <dt class="text-sm font-medium text-gray-500">Numéro de dossier (CAF / Pole emploi)</dt>
+                                <dd class="mt-1 text-sm text-gray-900">{{.ViewState.beneficiary.Data.file_number}}</dd>
+                            </div>
+                            {{end}}
                         </dl>
                     </div>
                 </div>
@@ -89,11 +95,11 @@
                                     class="block w-full pl-3 pr-10 py-2 text-base border-gray-300 focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm rounded-md">
                                     <!-- <option value="notes">Notes</option> -->
 
-                                    <option value="journeys">Déplacements</option>
+                                    <!-- <option value="journeys">Déplacements</option>
 
                                     <option value="vehicles">Véhicules</option>
 
-                                    <option value="events">Dispositifs</option>
+                                    <option value="events">Dispositifs</option> -->
 
                                     <option value="documents">Documents</option>
                                 </select>
@@ -107,7 +113,7 @@
                                             :class="tab == 'notes' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
                                             Notes </a> -->
 
-                                        <a href="#" @click="tab = 'journeys'"
+                                        <!-- <a href="#" @click="tab = 'journeys'"
                                             class="whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm"
                                             :class="tab == 'journeys' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
                                             Déplacements </a>
@@ -120,32 +126,32 @@
                                         <a href="#" @click="tab = 'events'"
                                             class="whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm"
                                             :class="tab == 'events' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
-                                            Dispositifs </a>
+                                            Dispositifs </a> -->
 
                                         <a href="#" @click="tab = 'documents'"
+                                        class="whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm"
+                                        :class="tab == 'documents' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
+                                        Documents </a>
+
+                                        <a href="#" @click="tab = 'organizations'"
                                             class="whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm"
-                                            :class="tab == 'documents' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
-                                            Documents </a>
+                                            :class="tab == 'organizations' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
+                                            Gestionnaires </a>
                                     </nav>
                                 </div>
                             </div>
                         </div>
 
-                        <div x-show="tab == 'journeys'">{{template "beneficiary_journeys" .}}</div>
-                        <div x-show="tab == 'vehicles'">{{template "beneficiary_vehicles" .}}</div>
-                        <div x-show="tab == 'events'">{{template "beneficiary_events" .}}</div>
                         <div x-show="tab == 'documents'">{{template "beneficiary_files" .}}</div>
                         <div x-show="tab == 'notes'">{{template "beneficiary_notes" .}}</div>
+                        <div x-show="tab == 'organizations'">{{template "beneficiary_organizations" .}}</div>
                     </div>
                 </div>
             </section>
         </div>
 
         <section aria-labelledby="timeline-title" class="lg:col-start-3 lg:col-span-1">
-            <div class="bg-white px-4 py-5 shadow sm:rounded-lg sm:px-6">
-                <h2 id="timeline-title" class="text-lg font-medium text-gray-900">Actions réalisées</h2>
-                <p class="p-12 text-gray-500 text-center text-md">Aucune action réalisée pour le moment</p>
-            </div>
+        {{template "beneficiary_events" .}}
         </section>
     </div>
 </main>

web/layouts/beneficiaries/update.html

@@ -21,7 +21,7 @@
             email: ['required', 'email'],
             phone_number: ['required', 'regexMatch:^((\\+)33|0)[1-9](\\d{2}){4}$'],
             birthdate: ['required'],
-            file_number: ['optional'],
+            file_number: ['required'],
         },
         formValidation: {
             valid: false,
@@ -101,6 +101,15 @@
                                 x-model="fields.birthdate" @blur="validateField('birthdate')"
                                 :class="formValidation.fields.birthdate.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
                         </div>
+
+                        <div class="col-span-6 sm:col-span-3">
+                            <label for="file_number" class="block text-sm font-medium text-gray-700">Numéro de dossier (CAF / Pole Emploi ...)</label>
+                            <input type="text" name="file_number" id="file_number"
+                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-2xl"
+                                x-model="fields.file_number" @blur="validateField('file_number')"
+                                :class="formValidation.fields.file_number.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
+                        </div>
+
                     </div>
                 </div>
             </div>
@@ -114,15 +123,6 @@
                 </div>
                 <div class="mt-5 space-y-6 md:mt-0 md:col-span-2">
                     <div class="grid grid-cols-6 gap-6">
-
-                        <div class="col-span-6 sm:col-span-3">
-                            <label for="file_number" class="block text-sm font-medium text-gray-700">Numéro de dossier (allocataire, ...)</label>
-                            <input type="text" name="file_number" id="file_number"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-2xl"
-                                x-model="fields.file_number" @blur="validateField('file_number')"
-                                :class="formValidation.fields.file_number.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
-                        </div>
-
                         <div class="col-span-6 sm:col-span-3">
                             <label for="gender" class="block text-sm font-medium text-gray-700">Genre</label>
                             <div class="sm:mt-0 sm:col-span-2">
@@ -163,7 +163,12 @@
                 <div class="mt-5 space-y-6 md:mt-0 md:col-span-2">
 
                     {{ $fieldName := "address" }}
-                    {{ template "address_autocomplete" (dict "FieldName" $fieldName "Address" .ViewState.Data.address) }}
+                    {{if .ViewState.Data.address}}
+                    {{$default := .ViewState.Data.address}}
+                    {{ template "address" dict "FieldName" $fieldName  "Default" $default}}
+                    {{else}}
+                    {{ template "address_autocomplete" dict "FieldName" $fieldName}}
+                    {{end}}
                     <!-- will dolater : tags, groups, ... -->
 
                 </div>

web/layouts/dashboard/_partials/agenda-widget.html

@@ -10,6 +10,7 @@
     </div>
     <ul role="list" class="divide-y divide-gray-200 flex-1">
         {{range .}}
+        {{if eq .Deleted false}}
             <li class="py-2 px-4 flex">
                 <a href="/app/agenda/{{.ID}}" class="flex w-full">
                 <div class="ml-3">
@@ -18,6 +19,7 @@
             </a>
             </li>
         {{end}}
+        {{end}}
     </ul>
 
     <a href="/app/agenda/">

web/layouts/dashboard/_partials/beneficiaries-widget.html

@@ -1,5 +1,5 @@
 {{define "beneficiaries_widget"}}
-<div class="col-span-1 bg-white rounded-2xl shadow divide-y divide-gray-200">
+<div class="col-span-1 bg-white rounded-2xl shadow divide-y divide-gray-200 flex flex-col">
     <div class="-ml-4 -mt-2 px-4 py-2 flex items-center justify-between flex-wrap sm:flex-nowrap">
         <div class="ml-4 mt-2">
             <h3 class="text-lg leading-6 font-medium text-gray-900">Bénéficiaires</h3>
@@ -9,7 +9,7 @@
           <button type="button" class="relative inline-flex items-center px-4 py-2 border border-transparent shadow-sm text-sm font-medium rounded-md text-white bg-co-blue hover:bg-co-blue focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">Voir</button>
         </div> -->
     </div>
-    <ul role="list" class="divide-y divide-gray-200">
+    <ul role="list" class="divide-y divide-gray-200 flex-1">
         {{range .latest}}
             <li class="py-2 px-4 flex">
                 <a href="/app/beneficiaries/{{.ID}}" class="flex w-full">

web/layouts/journeys/_partials/map.html

@@ -25,6 +25,11 @@
 	<input id="ar" type="hidden" value="{{.ViewState.group.Data.arrive.geometry.coordinates}}">
 	<input id="des" type="hidden" value="{{.ViewState.group.Data.depart.geometry.coordinates}}">
 	<input id="arri" type="hidden" value="{{.ViewState.group.Data.arrive.geometry.coordinates}}">
+    {{range .ViewState.beneficiaries}}                   
+    {{if (index $.ViewState.groups .ID) }}
+    <input id="passager"  type="hidden"value="{{(index $.ViewState.groups .ID).Data.depart.geometry.coordinates}}">
+    {{end}}
+    {{end}}
 
 <div>
         <span id="polyline-info-content"></span>
@@ -100,7 +105,7 @@ function errorRoute() {
 		 var br = (wwr[0])
          destCoord = [r, br]
         map.setZoom(9);
-        //console.log("Ici : " [depCoord[0],depCoord[1]],[destCoord[0],destCoord[1]])
+       
         map.fitBounds([[depCoord[0],depCoord[1]],[destCoord[0],destCoord[1]]],{padding: 40});   
 }
 
@@ -115,10 +120,8 @@ function errorRoute() {
         if (rideDuration != null && rideDistance != null) {
             document.getElementById("polyline-info-content").innerHTML = "Durée : " + (Math.round(((rideDuration / 60) + Number.EPSILON) * 100) / 100) + " min<br/>Distance : " + rideDistance + " km";
         }
-        // $("#polyline-str").val(polylineString);
-        // $("#ride-duration").val(rideDuration);
-        // $("#ride-distance").val(rideDistance);
-        console.log("rideDuration :", rideDuration, ", rideDistance ",rideDistance)
+       
+        // console.log("rideDuration :", rideDuration, ", rideDistance ",rideDistance)
         if(polylineCoord != null && polylineCoord.length > 0 ){
         
             drawPolylineOnMap(polylineCoord)
@@ -130,10 +133,9 @@ function createPolyline() {
 
     destination = [r, br]
 
-    console.log("origin : ", origin)
 
     if(origin != null && destination != null && origin != "" && destination != ""){
-        console.log("Get polyline infos")
+       
         var hash_locs = [];
         hash_locs.push({
             'lat' : (origin[1]),
@@ -156,17 +158,15 @@ function createPolyline() {
             success : retrievePolylineInfo,
             error: routeNotOptimized(body),
         });
-        console.log("JSON.stringify(body)",JSON.stringify(body))
+      
     }
 }
             var depCoord = []
             var destCoord = []
+            var other = []
             var a, b
             depCoord = [a, b]
-            console.log("yeeesss: ", a)
-            //////////////////////////////
            
-        //mapboxgl.accessToken = 'pk.eyJ1Ijoic291a2FpbmFsYWZkaWxpIiwiYSI6ImNsYjB1djUxNjAwaWQzdm82dnJ5OXJrZzcifQ.0i8xkskwRps3W1PFwApL_Q';
         const map = new maplibregl.Map({
             container: 'map', 
             style: 'https://api.maptiler.com/maps/streets/style.json?key=get_your_own_OpIi9ZULNHzrESv6T2vL', 
@@ -175,9 +175,24 @@ function createPolyline() {
         });
         map.addControl(new maplibregl.NavigationControl(), 'bottom-right');
         var markers = []
+        var pass = []
 
+        //////////////////Code to add position in the map///////////////
+        var ii = document.querySelectorAll("#passager")
+        for (var i = 0; i < ii.length; i++){
+            var v = ii[i].value
+            var val = ii[i].value.split(' ')
+            const wl = val[0].split('[')
+            const wwl = val[1].split(']')
+            al = (wl[1]);
+            bl = (wwl[0])
+            other = [al, bl]
+            {var marker = new maplibregl.Marker()
+            .setLngLat([al, bl])//position of passager
+            .addTo(map);
+            pass.push(marker)}
+        }
 
-		//destination
 		 var i = document.getElementById('de').value
 		var words = i.split(' ');
 		 const w = words[0].split('[')
@@ -185,8 +200,6 @@ function createPolyline() {
 		 a = (w[1]);
 		 b = (ww[0])
          depCoord = [a, b]
-         console.log("yeeesss: ", depCoord[0])
-		 console.log(b)
 		//arrive
 		var ar = document.getElementById('ar').value
 		var wordsr = ar.split(' ');
@@ -195,7 +208,7 @@ function createPolyline() {
 		 var r = (wr[1]);
 		 var br = (wwr[0])
          destCoord = [r, br]
-		 console.log(br)
+		
 		 /////
 		{var marker = new maplibregl.Marker();
 		marker.setLngLat([a, b])//starting position
@@ -205,7 +218,7 @@ function createPolyline() {
         center: [a, b]
        
     });
-    console.log("again: ", a , b)
+   
     markers.push(marker)
   createPolyline()
 }

web/layouts/journeys/create_groups.html

@@ -63,7 +63,7 @@
                         </div>
                         <div class="col-span-5">
                             <label for="name" class="block text-sm font-medium text-gray-700">Nombre maximum de personne</label>
-                            <input type="text" name="number" id="number"
+                            <input type="number" name="number" id="number"
                                 class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-2xl"
                                 x-model="fields.number" @blur="validateField('number')"
                                 :class="formValidation.fields.number.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
@@ -157,53 +157,31 @@
                     <p class="mt-1 text-sm text-gray-500">Informations liés a la planification de groupe, veuillez cocher la solution qui vous convient </p>
                 </div>
             
-        <div class="mt-5 md:mt-0 md:col-span-2">
-            <!-- <div class="flex items-start">
-                <div class="flex items-center h-5">
-                    <input id="ponctuelleuelle" name="ponctuelleuelle" type="checkbox"
-                        class="focus:ring-co-blue h-4 w-4 text-co-blue border-gray-300 rounded">
-                </div>
-                <div class="ml-3 text-sm">
-                    <label for="ponctuelleuelle" class=" text-lg font-medium leading-6 text-gray-900">ponctuelleuelle</label>
-                   
-                </div>
-            </div> -->
-            <!-- $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$ -->
+    <div class="mt-5 md:mt-0 md:col-span-2">
             <div x-data="{selectedListID: ''}" x-init="$watch('selectedListID', value => console.log(value))">
             <input type="radio" value="recurrent" x-model="selectedListID">&nbsp Recurrent &nbsp&nbsp
             <input type="radio"  value="ponctuelle" x-model="selectedListID">&nbsp Ponctuelle
-            <!-- <p>value: <span x-text="selectedListID" name="selectedListID"></span></p> -->
    
+        <input id="t" :name="selectedListID" type="hidden" :value="selectedListID">
 
-<!-- <div x-data="{lists: [{id: 'ponctuelle', name: 'ponctuelle'}, {id: 'recurrent', name: 'recurrent'}], selectedListID: ''}">
-    <template x-for="list in lists" :key="list.id">
-      <div>
-        <input x-model="selectedListID" type="radio" :value="list.id.toString()" :id="list.name" >
-        <label :for="list.name" x-text="list.name"></label>
-      </div>
-    </template> -->
-    <input id="t" :name="selectedListID" type="hidden" :value="selectedListID">
+        <div class="sm:col-span-6"  x-show="selectedListID == 'ponctuelle'" >
+            <div class="py-4 grid grid-cols-2">
+                <div class="lg:col-span-1">
+                    <label for="departdate" class="block text-sm font-medium text-gray-700">le</label>
+                    <div class="mt-1">
+                        <input type="date" id="departdate" name="departdate"
+                            class="shadow-sm focus:ring-co-blue focus:border-co-blue block w-full sm:text-sm border-gray-300 rounded-l-2xl border-r-1" class="sr-only">
+                    </div>
 
-    <!-- <p name="selectedListID">Selected value: <code x-text="selectedListID" ></code></p> -->
-    <!-- ******************************* -->
-    <div class="sm:col-span-6"  x-show="selectedListID == 'ponctuelle'" >
-        <div class="py-4 grid grid-cols-2">
-            <div class="lg:col-span-1">
-                <label for="departdate" class="block text-sm font-medium text-gray-700">le</label>
-                <div class="mt-1">
-                    <input type="date" id="departdate" name="departdate"
-                        class="shadow-sm focus:ring-co-blue focus:border-co-blue block w-full sm:text-sm border-gray-300 rounded-l-2xl border-r-1" class="sr-only">
                 </div>
-
-            </div>
-            <div class="lg:col-span-1">
-                <label for="departtime" class="block text-sm font-medium text-gray-700">A</label>
-                <div class="mt-1">
-                    <input type="time" id="departtime" name="departtime"
-                        class="shadow-sm focus:ring-co-blue focus:border-co-blue block w-full sm:text-sm border-gray-300 rounded-r-2xl border-l-0">
+                <div class="lg:col-span-1">
+                    <label for="departtime" class="block text-sm font-medium text-gray-700">A</label>
+                    <div class="mt-1">
+                        <input type="time" id="departtime" name="departtime"
+                            class="shadow-sm focus:ring-co-blue focus:border-co-blue block w-full sm:text-sm border-gray-300 rounded-r-2xl border-l-0">
+                    </div>
                 </div>
             </div>
-         </div>
     </div>
     <!-- $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$ -->
     <div x-show="selectedListID == 'recurrent'">

web/layouts/journeys/display_groups.html

@@ -1,5 +1,6 @@
 {{define "content"}}
-<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8">
+<div x-data="{dialog: false, id: ''}">
+    <div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8">
     <h1 class="text-2xl font-semibold text-gray-900">Gestion du groupe</h1>
     <div class="sm:flex sm:items-center">
         <div class="sm:flex-auto">
@@ -122,6 +123,94 @@
                        
                     </div>
                 </div>
+                
+            </div>
+            
+            <div class="mt-8 max-w-3xl mx-auto grid grid-cols-1 gap-6 lg:max-w-7xl lg:grid-flow-col-dense lg:grid-cols-1">
+                <div class="space-y-6 lg:col-start-1 lg:col-span-1">
+                  
+                    <div class="bg-white shadow sm:rounded-2xl">
+                        <h2 id="timeline-title" class="text-lg font-medium text-gray-900 p-4 sm:px-6">Ajouter un passager</h2>
+                      
+                        <div class="border-t border-gray-200 px-4 py-5 sm:px-6">
+                            {{if gt .ViewState.group.Data.number .ViewState.number}}
+                            <form method="GET" >
+                            <div x-data="{
+                                text: '{{if .ViewState.search}}{{.ViewState.search.beneficiary.Data.first_name}} {{.ViewState.search.beneficiary.Data.last_name}}{{end}}',
+                                beneficiariesListOpen: false,
+                                beneficiaries: {{json .ViewState.beneficiaries}},
+                                filteredBeneficiaries: (text) => {
+                                    if(text=='') return beneficiaries
+                                    return this.beneficiaries.filter(b => b['data']['first_name'].includes(text) || b['data']['last_name'].includes(text))
+                                },
+                                fields: {
+                                    beneficiaryid: {{if .ViewState.search}}'{{.ViewState.search.beneficiary.ID}}'{{else}}null{{end}},
+                                },
+                                selectbeneficiary(beneficiary) {
+                                    console.log(beneficiary)
+                                    this.fields.beneficiaryid = beneficiary.id 
+                                    this.text = beneficiary.data.first_name + ' ' + beneficiary.data.last_name
+                                    this.beneficiariesListOpen = false
+                                }
+                            }">
+                                <input type="hidden" name="beneficiaryid" x-model="fields.beneficiaryid">
+                                <label for="combobox" class="block text-sm font-medium text-gray-700">Passager</label>
+                                <div class="relative mt-1 mb-4">
+                                  <input @focus="beneficiariesListOpen = true" x-model="text" id="combobox" type="text" class="w-full rounded-2xl border border-gray-300 bg-white py-2 pl-3 pr-12 shadow-sm focus:border-co-blue focus:outline-none focus:ring-1 focus:ring-co-blue sm:text-sm" role="combobox" aria-controls="options" aria-expanded="false">
+                                  
+                                  <button @click="beneficiariesListOpen = ! beneficiariesListOpen" type="button" class="absolute inset-y-0 right-0 flex items-center rounded-r-2xl px-2 focus:outline-none">
+                                 
+                                    <svg class="h-5 w-5 text-gray-400" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
+                                      <path fill-rule="evenodd" d="M10 3a1 1 0 01.707.293l3 3a1 1 0 01-1.414 1.414L10 5.414 7.707 7.707a1 1 0 01-1.414-1.414l3-3A1 1 0 0110 3zm-3.707 9.293a1 1 0 011.414 0L10 14.586l2.293-2.293a1 1 0 011.414 1.414l-3 3a1 1 0 01-1.414 0l-3-3a1 1 0 010-1.414z" clip-rule="evenodd" />
+                                    </svg>
+                                  </button>
+                              
+                                  <ul x-show="beneficiariesListOpen" class="absolute z-10 mt-1 max-h-60 w-full overflow-auto rounded-xl bg-white py-1 text-base shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none sm:text-sm" id="options" role="listbox">
+                                  
+                                    <template x-for="beneficiary in beneficiaries">
+                                        <li @click="selectbeneficiary(beneficiary)" class="relative cursor-default hover:bg-gray-100 select-none py-2 pl-3 pr-9 text-gray-900" id="option-0" role="option" tabindex="-1">
+                                      
+                                        <span class="truncate" x-text="beneficiary.data.first_name"></span> <span class="truncate" x-text="beneficiary.data.last_name"></span>
+                                
+                                        <span class="absolute inset-y-0 right-0 flex items-center pr-4 text-co-blue">
+                                        
+                                        </span>
+                                        </li>
+                                    </template>
+                              
+                                 
+                                  </ul>
+                                </div>
+                                <div class="space-y-6 lg:col-start-1 lg:col-span-1 ">
+            
+                                    {{ $departureField := "departure" }}
+                                    {{ $departureLabel := "Départ" }}
+                                    {{ $departure := .ViewState.departure }}
+                                    {{ template "address_autocomplete" dict "FieldName" $departureField "FieldLabel" $departureLabel "Address" $departure }}
+                
+                                    {{ $destinationField := "destination" }}
+                                    {{ $destinationLabel := "Destination" }}
+                                    {{ $destination := .ViewState.destination }}
+                                    {{ template "address_autocomplete" dict "FieldName" $destinationField "FieldLabel" $destinationLabel "Address" $destination }}
+                                   
+                
+                                </div>
+                              </div>
+                            
+                                <button type="submit"
+                                    class="rounded-2xl border border-transparent bg-co-blue px-4 py-2 my-4 mt-8 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">
+                                    Ajouter
+                                </button>
+                                {{else}}
+                                <p>Vous avez atteint le nombre maximum de passagers</p>
+                                {{end}}
+                            </form>
+                        </div>
+                     
+                    </div>
+                    
+                </div>
+                
             </div>
             
         </div>
@@ -129,26 +218,7 @@
    
     <!-- *********************************** -->
   
-   
-    <div class="lg:col-start-2 lg:col-span-2" x-data="{
-        state: {{.ViewState.list.JSONWithLimits 0 10}},
-        current: 0,
-        nb_pages() {
-            let nbEl = this.state.count 
-            return Math.ceil(nbEl/10)
-        },
-        async paginate(page) {
-            let start = (page-1)*10
-            if(start < 0|| start > this.state.count) {
-                return
-            }
-            let resp = await fetch('/api/cache/' + this.state.cache_id + '?limits.min=' + start + '&limits.max=' + (start+10))
-            let data = await resp.json()
-            this.state.beneficiaries = data
-            this.current=page-1
-            this.state.group = data
-        }
-    }">
+    <div class="lg:col-start-2 lg:col-span-2">
     <div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8 mt-2 mb-4">
         <div class="sm:flex sm:items-center">
             <div class="sm:flex-auto">
@@ -156,7 +226,6 @@
             </div>
         </div>
     </div>
-    <!-- $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$ -->
     
     <div class="-my-2 -mx-4 overflow-x-auto sm:-mx-6 lg:-mx-8 mt-2">
     <!--  -->
@@ -172,172 +241,83 @@
                                 Nom du bénéficiaire
                             </th>
                             <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900">
-                                Téléphone
+                                Départ
                             </th>
                             <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900">
-                                Email
+                                Déstination
+                            </th>
+                            <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900">
+                            
                             </th>
                         </tr>
                     </thead>
                     <tbody class="divide-y divide-gray-200 bg-white">
-                        <template x-for="beneficiary in state.beneficiaries">
+                        {{range .ViewState.beneficiaries}}
+                        
+                        {{if (index $.ViewState.groups .ID) }}
                             <tr>
                                 <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
                                     <div class="flex items-center">
-                                        <div class="ml-4">
-                                            <div class="font-medium text-gray-900"><span
-                                                    x-text="beneficiary.data.first_name"></span> <span
-                                                    x-text="beneficiary.data.last_name"></span></div>
+                                        <div class="h-10 w-10 flex-shrink-0">
+                                            <img class="h-10 w-10 rounded-co"
+                                                :src="'/app/beneficiaries/' + `{{.ID}}`+ '/picture'" alt="">
                                         </div>
-                                    </div>
+                                        <a :href="'/app/beneficiaries/' + `{{.ID}}`">
+                                            <div class="flex items-center">
+                                                
+                                                <div class="ml-4">
+                                                    <div class="text-co-blue hover:text-co-blue"><span
+                                                            >{{.Data.first_name}}</span> <span
+                                                            >{{.Data.last_name}}</span></div>
+                                                </div>
+                                            </div></a>
+                                </td>
+                               
+                                <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
+                                  
+                                    {{if (index $.ViewState.groups .ID).Data.depart}}
+                                    <div class="text-gray-900" >{{(index $.ViewState.groups .ID).Data.depart.properties.label}}</div>
+                                    {{else}}
+                                    <div class="text-gray-900" >...</div>
+                                    {{end}}
+                                    
                                 </td>
                                 <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
-                                    <div class="text-gray-900" x-text="beneficiary.data.phone_number"></div>
-                                </td>
-                                <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500"
-                                    x-text="beneficiary.data.email">
+                                    {{if (index $.ViewState.groups .ID).Data.arrive}}
+                                    <div class="text-gray-900" >{{(index $.ViewState.groups .ID).Data.arrive.properties.label}}</div>
+                                    {{else}}
+                                    <div class="text-gray-900" >...</div>
+                                    {{end}}
+                                  
                                 </td>
+                                
                                 <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
-                                    <template x-for="tag in beneficiary.data.tags">
-                                        <span
-                                            class="inline-flex rounded-full bg-green-100 px-2 text-xs font-semibold leading-5 text-green-800"
-                                            x-text="tag"></span>
-                                    </template>
-                                </td>
-                                <td
-                                    class="relative whitespace-nowrap py-4 pl-3 pr-4 text-right text-sm font-medium sm:pr-6">
-                                    <a :href="'/app/beneficiaries/' + beneficiary.id"
-                                        class="text-co-blue hover:text-co-blue">Voir<span class="sr-only">, <span
-                                                x-text="beneficiary.data.first_name"></span> <span
-                                                x-text="beneficiary.data.last_name"></span></a>
+                             
+                                   <a  :href="'/app/journeys/groups_covoiturage/create/{{(index $.ViewState.groups .ID).ID}}/{{(index $.ViewState.groups .ID).Groupid}}/{{(index $.ViewState.groups .ID).Memberid}}'">
+                                    <div class="flex items-center">
+                                                
+                                        <div class="ml-4">
+                                            <div class="text-co-blue hover:text-co-blue"><span
+                                                    >retirer</span> </div>
+                                        </div>
+                                   </a>
                                 </td>
                             </tr>
-                        </template>
+                     {{end}}
                      
-                    </tbody>
-                </table>
-                
-                <div class="bg-white px-4 py-3 flex items-center justify-between border-t border-gray-200 sm:px-6">
-                    <div class="flex-1 flex justify-between sm:hidden">
-                    <a href="#" class="relative inline-flex items-center px-4 py-2 border border-gray-300 text-sm font-medium rounded-md text-gray-700 bg-white hover:bg-gray-50"
-                    @click="paginate(current)"> Previous </a>
-                    <a href="#" class="ml-3 relative inline-flex items-center px-4 py-2 border border-gray-300 text-sm font-medium rounded-md text-gray-700 bg-white hover:bg-gray-50"
-                    @click="paginate(current+2)"> Next </a>
-                    </div>
-                    <div class="hidden sm:flex-1 sm:flex sm:items-center sm:justify-between">
-                    <div>
-                        <p class="text-sm text-gray-700">
-                        Résultats
-                        <span class="font-medium" x-text="Math.min((current * 10)+1, state.count)"></span>
-                        à
-                        <span class="font-medium" x-text="Math.min((current * 10)+10, state.count)"></span>
-                        sur
-                        <span class="font-medium" x-text="state.count"></span>
-                        </p>
-                    </div>
-                    <div>
-                        <nav class="relative z-0 inline-flex rounded-md shadow-sm -space-x-px" aria-label="Pagination">
-                        <a href="#" class="relative inline-flex items-center px-2 py-2 rounded-l-md border border-gray-300 bg-white text-sm font-medium text-gray-500 hover:bg-gray-50"
-                            @click="paginate(current)">
-                            <span class="sr-only">Previous</span>
-                            <!-- Heroicon name: solid/chevron-left -->
-                            <svg class="h-5 w-5" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
-                            <path fill-rule="evenodd" d="M12.707 5.293a1 1 0 010 1.414L9.414 10l3.293 3.293a1 1 0 01-1.414 1.414l-4-4a1 1 0 010-1.414l4-4a1 1 0 011.414 0z" clip-rule="evenodd" />
-                            </svg>
-                        </a>
-                        <template x-for="i in nb_pages">
-                            <a href="#" @click="paginate(i)"
-                            class="relative inline-flex items-center px-4 py-2 border text-sm font-medium"
-                            :class="i == current+1 ? 'z-10 bg-indigo-50 border-co-blue text-co-blue' : 'bg-white border-gray-300 text-gray-500 hover:bg-gray-50'"
-                            x-text="i"></a>
-                        </template>
-                        <!-- Current: "z-10 bg-indigo-50 border-indigo-500 text-indigo-600", Default: "bg-white border-gray-300 text-gray-500 hover:bg-gray-50" -->
-                        <a href="#" class="relative inline-flex items-center px-2 py-2 rounded-r-md border border-gray-300 bg-white text-sm font-medium text-gray-500 hover:bg-gray-50"
-                            @click="paginate(current+2)">
-                            <span class="sr-only">Next</span>
-                            <!-- Heroicon name: solid/chevron-right -->
-                            <svg class="h-5 w-5" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
-                            <path fill-rule="evenodd" d="M7.293 14.707a1 1 0 010-1.414L10.586 10 7.293 6.707a1 1 0 011.414-1.414l4 4a1 1 0 010 1.414l-4 4a1 1 0 01-1.414 0z" clip-rule="evenodd" />
-                            </svg>
-                        </a>
-                        </nav>
-                    </div>
-                    </div>
+                     {{end}}
+                        </tbody>
+                    </table>
                 </div>
             </div>
+        
+        </div>
+        </div>
         </div>
 
     </div>
-    </div>
-    </div>
-
-</div>
-<div class="mt-8 max-w-3xl mx-auto grid grid-cols-1 gap-6 lg:max-w-7xl lg:grid-flow-col-dense lg:grid-cols-3">
-    <div class="space-y-6 lg:col-start-1 lg:col-span-1">
-      
-        <div class="bg-white shadow sm:rounded-2xl">
-            <h2 id="timeline-title" class="text-lg font-medium text-gray-900 p-4 sm:px-6">Ajouter un passager</h2>
-            <div class="border-t border-gray-200 px-4 py-5 sm:px-6">
-                <form method="GET" >
-                <div x-data="{
-                    text: '{{if .ViewState.search}}{{.ViewState.search.beneficiary.Data.first_name}} {{.ViewState.search.beneficiary.Data.last_name}}{{end}}',
-                    beneficiariesListOpen: false,
-                    beneficiaries: {{json .ViewState.beneficiaries}},
-                    filteredBeneficiaries: (text) => {
-                        if(text=='') return beneficiaries
-                        return this.beneficiaries.filter(b => b['data']['first_name'].includes(text) || b['data']['last_name'].includes(text))
-                    },
-                    fields: {
-                        beneficiaryid: {{if .ViewState.search}}'{{.ViewState.search.beneficiary.ID}}'{{else}}null{{end}},
-                    },
-                    selectbeneficiary(beneficiary) {
-                        console.log(beneficiary)
-                        this.fields.beneficiaryid = beneficiary.id 
-                        this.text = beneficiary.data.first_name + ' ' + beneficiary.data.last_name
-                        this.beneficiariesListOpen = false
-                    }
-                }">
-                    <input type="hidden" name="beneficiaryid" x-model="fields.beneficiaryid">
-                    <label for="combobox" class="block text-sm font-medium text-gray-700">Passager</label>
-                    <div class="relative mt-1 mb-4">
-                      <input @focus="beneficiariesListOpen = true" x-model="text" id="combobox" type="text" class="w-full rounded-2xl border border-gray-300 bg-white py-2 pl-3 pr-12 shadow-sm focus:border-co-blue focus:outline-none focus:ring-1 focus:ring-co-blue sm:text-sm" role="combobox" aria-controls="options" aria-expanded="false">
-                      
-                      <button @click="beneficiariesListOpen = ! beneficiariesListOpen" type="button" class="absolute inset-y-0 right-0 flex items-center rounded-r-2xl px-2 focus:outline-none">
-                     
-                        <svg class="h-5 w-5 text-gray-400" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
-                          <path fill-rule="evenodd" d="M10 3a1 1 0 01.707.293l3 3a1 1 0 01-1.414 1.414L10 5.414 7.707 7.707a1 1 0 01-1.414-1.414l3-3A1 1 0 0110 3zm-3.707 9.293a1 1 0 011.414 0L10 14.586l2.293-2.293a1 1 0 011.414 1.414l-3 3a1 1 0 01-1.414 0l-3-3a1 1 0 010-1.414z" clip-rule="evenodd" />
-                        </svg>
-                      </button>
-                  
-                      <ul x-show="beneficiariesListOpen" class="absolute z-10 mt-1 max-h-60 w-full overflow-auto rounded-xl bg-white py-1 text-base shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none sm:text-sm" id="options" role="listbox">
-                      
-                        <template x-for="beneficiary in beneficiaries">
-                            <li @click="selectbeneficiary(beneficiary)" class="relative cursor-default hover:bg-gray-100 select-none py-2 pl-3 pr-9 text-gray-900" id="option-0" role="option" tabindex="-1">
-                          
-                            <span class="truncate" x-text="beneficiary.data.first_name"></span> <span class="truncate" x-text="beneficiary.data.last_name"></span>
-                    
-                            <span class="absolute inset-y-0 right-0 flex items-center pr-4 text-co-blue">
-                            
-                            </span>
-                            </li>
-                        </template>
-                  
-                     
-                      </ul>
-                    </div>
-                  </div>
-                
-                    <button type="submit"
-                        class="rounded-2xl border border-transparent bg-co-blue px-4 py-2 my-4 mt-8 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">
-                        Ajouter
-                    </button>
-               
-                </form>
-            </div>
-        </div>
 
     </div>
-</div>
 
 </div>
 

web/layouts/journeys/group_management.html

@@ -63,15 +63,6 @@
                                     </div>
                                     <div class="ml-4">
                                   
-                                        <!-- <div class="font-medium text-gray-900"> <span
-                                                x-text="beneficiary.data.name"></span> </div> -->
-                                                <!-- <div class="flex items-center font-medium text-gray-700 text-xl">
-                                                  {{$.IconSet.Icon "hero:outline/user-group" "flex-shrink-0 mr-1.5 h-5 w-5"}}
-                                                  <p>
-                                                    <span
-                                                x-text="beneficiary.data.name"></span>
-                                                  </p>
-                                                </div> -->
                                                 <div class="truncate">
                                                   <div class="flex text-sm">
                                                     <p class="font-medium text-lg text-co-blue truncate" x-text="beneficiary.data.name"></p>
@@ -99,7 +90,6 @@
                         </tr>
                     </template>
 
-                    <!-- More people... -->
                 </tbody>
             </table>
             <div class="bg-white px-4 py-3 flex items-center justify-between border-t border-gray-200 sm:px-6">

web/layouts/journeys/update_groups.html

@@ -0,0 +1,32 @@
+{{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">Vous etes sur de retirer ce passager </p>
+                        </div>
+                    </div>
+                </div>
+                <div class="mt-5 sm:mt-6 sm:grid sm:grid-flow-row-dense sm:grid-cols-2">
+                    <a href="/app/journeys/groups_covoiturage/create/{{.ViewState.groupid}}" 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}}

web/layouts/layout.html

@@ -151,14 +151,14 @@
               x-transition:leave-start="transform opacity-100 scale-100"
               x-transition:leave-end="transform opacity-0 scale-95">
               <!-- Active: "bg-gray-100", Not Active: "" -->
-              <a href="/app/profile/{{.UserID}}" class="block px-4 py-2 text-sm text-gray-700" role="menuitem" tabindex="-1"
+              <a href="/app/members/{{.UserID}}" class="block px-4 py-2 text-sm text-gray-700" role="menuitem" tabindex="-1"
                 id="user-menu-item-0">Votre profil</a>
 
-              <a href="/app/profile/{{.UserID}}/update" class="block px-4 py-2 text-sm text-gray-700" role="menuitem" tabindex="-1"
+              <a href="/app/members/{{.UserID}}/update" class="block px-4 py-2 text-sm text-gray-700" role="menuitem" tabindex="-1"
                 id="user-menu-item-1">Paramètres</a>
 
-              <!-- <a href="/app/disconnect" class="block px-4 py-2 text-sm text-gray-700" role="menuitem" tabindex="-1"
-                id="user-menu-item-2">Se déconnecter</a> -->
+              <a href="/auth/disconnect" class="block px-4 py-2 text-sm text-gray-700" role="menuitem" tabindex="-1"
+                id="user-menu-item-2">Se déconnecter</a>
             </div>
           </div>
         </div>

web/layouts/members/display.html

@@ -16,10 +16,10 @@
         </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">
-        <!-- <button type="button"
-            class="inline-flex items-center justify-center px-4 py-2 border border-gray-300 shadow-sm text-sm font-medium rounded-2xl text-gray-700 bg-white hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-co-blue">Supprimer</button> -->
-        <a href="/app/profile/{{.ViewState.admins.ID}}/update" class="inline-flex"><button type="button"
+            {{if eq .UserID .ViewState.admins.ID}}
+            <a href="/app/members/{{.ViewState.admins.ID}}/update" 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">Modifier</button></a>
+            {{end}}
     </div>
     </div>
 
@@ -58,6 +58,13 @@
                                 <dd class="mt-1 text-sm text-gray-900">{{.ViewState.admins.Data.last_name}}
                                </dd>
                             </div>
+                            <div class="sm:col-span-1">
+                                <dt class="text-sm font-medium text-gray-500">Organisations</dt>
+                                {{range .ViewState.groups}}
+                                <dd class="mt-1 text-sm text-gray-900">{{.}} 
+                               </dd>
+                               {{end}}
+                            </div>
                             
                         </dl>
                     </div>

web/layouts/members/membersList.html

@@ -0,0 +1,154 @@
+{{define "content"}}
+<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8">
+    <div class="sm:flex sm:items-center">
+        <div class="sm:flex-auto">
+            <h1 class="text-2xl font-semibold text-gray-900">La listes des référents</h1>
+        </div>
+        <div class="mt-4 sm:mt-0 sm:ml-16 sm:flex-none">
+            <a href="/app/administration/">
+                <button type="button"
+                    class="inline-flex items-center justify-center rounded-2xl border border-transparent bg-co-blue px-4 py-2 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">
+                   Retour
+                </button>
+            </a>
+        </div>
+    </div>
+</div>
+
+<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8" x-data="{
+            state: {{.ViewState.list.JSONWithLimits 0 10}},
+            current: 0,
+            nb_pages() {
+                let nbEl = this.state.count 
+                return Math.ceil(nbEl/10)
+            },
+            async paginate(page) {
+                let start = (page-1)*10
+                if(start < 0|| start > this.state.count) {
+                    return
+                }
+                let resp = await fetch('/api/cache/' + this.state.cache_id + '?limits.min=' + start + '&limits.max=' + (start+10))
+                let data = await resp.json()
+                this.state.members = data
+                this.current=page-1
+            }
+        }">
+    <div class="mt-8 flex flex-col">
+        <div class="-my-2 -mx-4 overflow-x-auto sm:-mx-6 lg:-mx-8">
+            <div class="inline-block min-w-full py-2 align-middle md:px-6 lg:px-8">
+                <div class="overflow-hidden shadow ring-1 ring-black ring-opacity-5 md:rounded-lg">
+                    <table class="min-w-full divide-y divide-gray-300">
+                        <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">
+                                    Nom
+                                </th>
+                                <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900">
+                                    Téléphone
+                                </th>
+                                <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900">
+                                    Email
+                                </th>
+                                <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900">
+                                    Organisations
+                                </th>
+                                <th scope="col" class="relative py-3.5 pl-3 pr-4 sm:pr-6">
+                                    <span class="sr-only"></span>
+                                </th>
+                            </tr>
+                        </thead>
+                       
+                        <tbody class="divide-y divide-gray-200 bg-white"> 
+                            <template x-for="(member, i) in state.members"  > 
+                                <tr>
+                                    <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+                                        <div class="flex items-center">
+                                            <div class="h-10 w-10 flex-shrink-0">
+                                                <img class="h-10 w-10 rounded-co"
+                                                    :src="'/app/members/' + member.id + '/picture'" alt="">
+                                            </div>
+                                            <div class="ml-4">
+                                                <div class="font-medium text-gray-900"><span
+                                                        x-text="member.data.first_name"></span> <span
+                                                        x-text="member.data.last_name"></span></div>
+                                            </div>
+                                        </div>
+                                    </td>
+                                    <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
+                                        <div class="text-gray-900" x-text="member.data.phone_number"></div>
+                                    </td>
+                                    <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500"
+                                        x-text="member.data.email">
+                                    </td>
+                                    <template x-for="(group, index) in state.groups" > 
+                                    <template  x-if="i === index">
+                                        <td  class="whitespace-nowrap px-3 py-4 text-sm text-gray-500"
+                                    x-text="group"   >
+                                </td>
+                                    </template></template>
+                                    
+                                    <td
+                                        class="relative whitespace-nowrap py-4 pl-3 pr-4 text-right text-sm font-medium sm:pr-6">
+                                        <a :href="'/app/members/' + member.id"
+                                            class="text-co-blue hover:text-co-blue">Voir<span class="sr-only">, <span
+                                                    x-text="member.data.first_name"></span> <span
+                                                    x-text="member.data.last_name"></span></a>
+                                    </td>
+                                </tr>
+                        </template>
+                        </tbody>
+                   
+                    </table>
+                    <div class="bg-white px-4 py-3 flex items-center justify-between border-t border-gray-200 sm:px-6">
+                        <div class="flex-1 flex justify-between sm:hidden">
+                          <a href="#" class="relative inline-flex items-center px-4 py-2 border border-gray-300 text-sm font-medium rounded-md text-gray-700 bg-white hover:bg-gray-50"
+                          @click="paginate(current)"> Previous </a>
+                          <a href="#" class="ml-3 relative inline-flex items-center px-4 py-2 border border-gray-300 text-sm font-medium rounded-md text-gray-700 bg-white hover:bg-gray-50"
+                          @click="paginate(current+2)"> Next </a>
+                        </div>
+                        <div class="hidden sm:flex-1 sm:flex sm:items-center sm:justify-between">
+                          <div>
+                            <p class="text-sm text-gray-700">
+                              Résultats
+                              <span class="font-medium" x-text="Math.min((current * 10)+1, state.count)"></span>
+                              à
+                              <span class="font-medium" x-text="Math.min((current * 10)+10, state.count)"></span>
+                              sur
+                              <span class="font-medium" x-text="state.count"></span>
+                            </p>
+                          </div>
+                          <div>
+                            <nav class="relative z-0 inline-flex rounded-md shadow-sm -space-x-px" aria-label="Pagination">
+                              <a href="#" class="relative inline-flex items-center px-2 py-2 rounded-l-md border border-gray-300 bg-white text-sm font-medium text-gray-500 hover:bg-gray-50"
+                                @click="paginate(current)">
+                                <span class="sr-only">Previous</span>
+                                
+                                <svg class="h-5 w-5" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
+                                  <path fill-rule="evenodd" d="M12.707 5.293a1 1 0 010 1.414L9.414 10l3.293 3.293a1 1 0 01-1.414 1.414l-4-4a1 1 0 010-1.414l4-4a1 1 0 011.414 0z" clip-rule="evenodd" />
+                                </svg>
+                              </a>
+                              <template x-for="i in nb_pages">
+                                <a href="#" @click="paginate(i)"
+                                 class="relative inline-flex items-center px-4 py-2 border text-sm font-medium"
+                                 :class="i == current+1 ? 'z-10 bg-indigo-50 border-co-blue text-co-blue' : 'bg-white border-gray-300 text-gray-500 hover:bg-gray-50'"
+                                 x-text="i"></a>
+                              </template>
+                            <a href="#" class="relative inline-flex items-center px-2 py-2 rounded-r-md border border-gray-300 bg-white text-sm font-medium text-gray-500 hover:bg-gray-50"
+                                @click="paginate(current+2)">
+                                <span class="sr-only">Next</span>
+                                <svg class="h-5 w-5" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
+                                  <path fill-rule="evenodd" d="M7.293 14.707a1 1 0 010-1.414L10.586 10 7.293 6.707a1 1 0 011.414-1.414l4 4a1 1 0 010 1.414l-4 4a1 1 0 01-1.414 0z" clip-rule="evenodd" />
+                                </svg>
+                              </a>
+                            </nav>
+                          </div>
+                        </div>
+                      </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+{{end}}

web/layouts/members/update.html

@@ -1,4 +1,5 @@
 {{define "content"}}
+{{if eq .UserID .ViewState.ID}}
 
 <div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8">
     <h1 class="text-2xl font-semibold text-gray-900">Modifier vos informations</h1>
@@ -17,8 +18,9 @@
             first_name: ['required'],
             last_name: ['required'],
             email: ['required', 'email'],
-            phone_number: ['required', 'regexMatch:^((\\+)33|0)[1-9](\\d{2}){4}$'],
+            phone_number: ['regexMatch:^((\\+)33|0)[1-9](\\d{2}){4}$'],
         },
+       
         formValidation: {
             valid: false,
             fields: {
@@ -119,7 +121,7 @@
 
         <div class="flex justify-end">
             <p x-show="! isFormValid" class="px-4 py-2 text-sm text-co-red">Certains champs de sont pas valides.</p>
-            <a href="/app/profile/{{.ViewState.ID}}">
+            <a href="/app/members/{{.ViewState.ID}}">
                 <button type="button"
                     class="bg-white py-2 px-4 border border-gray-300 rounded-2xl shadow-sm text-sm font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">Annuler</button>
             </a>
@@ -128,4 +130,26 @@
         </div>
     </form>
 </div>
+{{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 le droit de modifier ce profil</h3>
+         </div>
+     </div>
+     <div class="flex justify-center  items-center mt-5 sm:mt-6 sm:grid sm:grid-flow-row-dense ">
+         <a href="/app/members/{{.ViewState.ID}}"class="rounded-2xl 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>
+     </div>
+     </div>
+ </div>
+ </div>
+{{end}}
 {{end}}

web/layouts/vehicles/bookings-list.html

@@ -1,6 +1,18 @@
 {{define "content"}}
 <div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8">
-    <h1 class="text-2xl font-semibold text-gray-900">Réservations</h1>
+    <div class="sm:flex sm:items-center">
+        <div class="sm:flex-auto">
+            <h1 class="text-2xl font-semibold text-gray-900">Réservations</h1>
+        </div>
+        <div class="mt-4 sm:mt-0 sm:ml-16 sm:flex-none">
+            <!-- <a href="/app/administration/stats/vehicles/available">
+                <button type="button"
+                    class="inline-flex items-center justify-center rounded-2xl border border-transparent bg-co-blue px-4 py-2 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">
+                    Voitures disponibles
+                </button>
+            </a> -->
+        </div>
+    </div>
 </div>
 
 <div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8">
@@ -11,13 +23,22 @@
                     <table class="min-w-full divide-y divide-gray-300">
                         <thead class="bg-gray-50">
                             <tr>
-                                <!-- <th scope="col"
+                                <th scope="col"
                                     class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
                                     Statut
-                                </th> -->
+                                </th>
                                 <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 sm:pl-6">
                                     Type
                                 </th>
+                                <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 sm:pl-6">
+                                    Véhicule
+                                </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">
+                                    Gestionnaire
+                                </th>
                                 <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 sm:pl-6">
                                     Beneficiaire
                                 </th>
@@ -33,21 +54,74 @@
                             
                             {{range .ViewState.bookings}}
                             <tr>
-                                <!-- <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-                                    <div class="text-gray-900" >aa</div>
-                                </td> -->
-                                <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-                                    <div class="text-gray-900" >Voiture</div>
+                                <td class="flex-col py-4 pl-4 pr-3 text-sm sm:pl-6 text-center">
+                                    {{if .Data.administrator_unavailability}}
+                                    <span class="p-1 bg-black text-white text-xs font-bold rounded-xl" >
+                                        Retiré
+                                    </span>
+                                    {{else}}
+                                        {{if eq .Status 1 }}
+                                        <span class="p-1 bg-co-blue text-white text-xs font-bold rounded-xl" >
+                                            A venir
+                                        </span>
+                                        {{end}}
+                                        {{if eq .Status 0 }}
+                                        <span class="p-1 bg-co-green text-white text-xs font-bold rounded-xl" >
+                                            En cours
+                                        </span>
+                                        {{end}}
+                                        {{if eq .Status -1 }}
+                                        <span class="p-1 bg-co-red text-white text-xs font-bold rounded-xl" >
+                                            Terminé
+                                        </span>
+                                        {{end}}
+                                    {{end}}
                                 </td>
                                 <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+                                    <div class="text-gray-900" >{{(index $.ViewState.vehicles_map .Vehicleid).Type}}</div>
+                                  </td>
+                                
+                                <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+                                    <div class="text-gray-900" >{{(index $.ViewState.vehicles_map .Vehicleid).Data.licence_plate}}</div>
+                                </td>
+                                
+                                <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+                                {{if .Data.booked_by}}
+                                {{if .Data.booked_by.user}}
+                                <a href="/app/members/{{.Data.booked_by.user.id}}" class="flex inline">
+                                    <img class="h-5 w-5 rounded-co mr-1"
+                                        src="/app/members/{{.Data.booked_by.user.id}}/picture" alt="">
+                                    {{.Data.booked_by.user.display_name}} 
+                                </a>
+                                {{end}}
+                                {{if .Data.booked_by.group}}
+                                ({{.Data.booked_by.group.name}})
+                                {{end}}
+                                {{end}}
+                                </td>
+
+
+                                <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+                                    {{if gt (len (index $.ViewState.vehicles_map .Vehicleid).Administrators) 0}}
+                                    {{ (index $.ViewState.groups_map (index (index $.ViewState.vehicles_map .Vehicleid).Administrators 0)).Data.name }}
+                                    {{end}}
+                                </td>
+
+                                <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+                                    {{if not .Data.administrator_unavailability}}
                                     <div class="text-gray-900" ><img class="h-6 w-6 rounded-co"
                                         src="/app/beneficiaries/{{.Driver}}/picture" alt=""></div>
+                                    {{end}}
                                 </td>
                                 <!-- <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
                                     <div class="text-gray-900" >aa</div>
                                 </td> -->
                                 <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+                                    {{if not .Data.administrator_unavailability}}
                                     <div class="text-gray-900" >Du {{(timeFrom .Startdate).Format "02/01/2006"}} au {{(timeFrom .Enddate).Format "02/01/2006"}}</div>
+                                    {{else}}
+                                    <div class="text-gray-900" >Du {{(timeFrom .Unavailablefrom).Format "02/01/2006"}} au {{(timeFrom .Unavailableto).Format "02/01/2006"}}</div>
+                                    {{end}}
                                 </td>
                                 <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
                                     <a href="/app/vehicles/bookings/{{.ID}}"

web/layouts/vehicles_management/_partials/bookings-list.html

@@ -34,11 +34,15 @@
                         <tbody class="divide-y divide-gray-200 bg-white">
                             {{range .ViewState.bookings}}
                             <tr>
-                                <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6 text-center">
+                                <td class="flex-col py-4 pl-4 pr-3 text-sm sm:pl-6 text-center">
                                     {{if .Data.administrator_unavailability}}
                                     <span class="p-1 bg-black text-white text-xs font-bold rounded-xl" >
                                         Retiré
                                     </span>
+                                    {{else if or .Deleted .Data.Deleted}}
+                                    <span class="p-1 bg-black text-white text-xs font-bold rounded-xl" >
+                                        Annulé
+                                    </span>
                                     {{else}}
                                         {{if eq .Status 1 }}
                                         <span class="p-1 bg-co-blue text-white text-xs font-bold rounded-xl" >

web/layouts/vehicles_management/_partials/vehicles-list.html

@@ -7,6 +7,10 @@
                     <table class="min-w-full divide-y divide-gray-300">
                         <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">
+                                    Statut Réservation
+                                </th>
                                 <th scope="col"
                                     class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
                                     Numéro (Immat / Bicycode)
@@ -28,6 +32,65 @@
                         <tbody class="divide-y divide-gray-200 bg-white">
                             {{range .ViewState.vehicles}}
                             <tr>
+                                <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6 text-center">
+                                    <div class="flex flex-col px-6">
+                                    {{if not .Bookings}}
+                                    <span class="mt-1 p-1 bg-gray-500 text-white text-xs font-bold rounded-xl" >
+                                        Disponible
+                                    </span>
+                                    {{else if len .Bookings | eq 1}}
+                                        {{range .Bookings}}
+                                            {{if  .Data.administrator_unavailability}}
+                                                <span class="mt-1 p-1 bg-black text-white text-xs font-bold rounded-xl" >
+                                                    Retiré
+                                                </span>
+                                            {{else if eq .Status -1 }}
+                                                <span class="mt-1 p-1 bg-gray-500 text-white text-xs font-bold rounded-xl" >
+                                                    Disponible
+                                                </span>
+                                            {{else if eq .Status 1 }}
+                                                <span class="mt-1 p-1 bg-co-blue text-white text-xs font-bold rounded-xl" >
+                                                    A venir
+                                                </span>
+                                            {{else if eq .Status 0 }}
+                                                <span class="mt-1 p-1 bg-co-green text-white text-xs font-bold rounded-xl" >
+                                                    En cours
+                                                </span>
+                                            {{end}}
+                                        {{end}}
+                                    {{else if gt (len .Bookings) 1}} 
+                                        {{range .Bookings}}
+                                            {{if .Data.administrator_unavailability}}
+                                            <span class="mt-1 p-1 bg-black text-white text-xs font-bold rounded-xl" >
+                                                Retiré
+                                            </span>
+                                            {{else}}
+                                                {{if eq .Status 1 }}
+                                                <span class="mt-1 p-1 bg-co-blue text-white text-xs font-bold rounded-xl" >
+                                                    A venir
+                                                </span>
+                                                {{else if eq .Status 0 }}
+                                                <span class="mt-1 p-1 bg-co-green text-white text-xs font-bold rounded-xl" >
+                                                    En cours
+                                                </span>
+                                                {{end}}
+                                            {{end}}
+                                        {{end}}
+                                        {{$allAvailable := true}}
+                                            {{range .Bookings}}
+                                                {{if ne .Status -1}}
+                                                    {{ $allAvailable = false }}
+                                                    {{break}}
+                                                {{end}}
+                                            {{end}}
+                                            {{if $allAvailable}}
+                                                    <span class="mt-1 p-1 bg-gray-500 text-white text-xs font-bold rounded-xl" >
+                                                        Disponible
+                                                    </span>
+                                            {{end}}                                        
+                                    {{end}}
+                                    </div>
+                                </td>
                                 <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
                                     <div class="text-gray-900" >{{.Data.licence_plate}}</div>
                                 </td>

web/layouts/vehicles_management/booking-display.html

@@ -6,8 +6,19 @@
         <div class="sm:flex-auto">
             <p class="mt-2 text-sm text-gray-700"></p>
         </div>
-        <!-- <div class="mt-4 sm:mt-0 sm:ml-16 sm:flex-none">
-            <button type="button"
+        <div class="mt-4 sm:mt-0 sm:ml-16 sm:flex-none"
+            x-data="{
+                changeVehicle: false,
+                selectedvehicle: '',
+                submitSelectedvehicle(event) {
+                    if(this.selectedvehicle == '') {
+                        event.preventDefault()
+                    }
+                    return true
+                }
+            }">
+            {{if and (ne .ViewState.booking.Status -1) (not (or .ViewState.booking.Deleted .ViewState.booking.Data.Deleted))}}
+            <button type="button" @click="changeVehicle = ! changeVehicle"
                 class="inline-flex items-center justify-center px-4 py-2 border border-gray-300 shadow-sm text-sm font-medium rounded-2xl text-gray-700 bg-white hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-co-blue">
                 Changer de véhicule
             </button>
@@ -17,7 +28,37 @@
                     Annuler
                 </button>
             </a>
-        </div> -->
+            {{end}}
+            
+
+            <div class="relative z-10" aria-labelledby="modal-title" role="dialog" aria-modal="true" x-show="changeVehicle">
+                <div class="fixed inset-0 bg-gray-900 bg-opacity-30 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-3xl bg-white px-4 pt-5 pb-4 text-left shadow-xl transition-all sm:my-8 sm:w-full sm:max-w-sm sm:p-6">
+                            <div class="text-center">
+                                <h3 class="text-lg font-medium leading-6 text-gray-900" id="modal-title">Changer de véhicule</h3>
+                            </div>
+                            <form method="POST" action="/app/vehicles-management/bookings/{{.ViewState.booking.ID}}/change-vehicle" class="mt-4" @submit="submitSelectedvehicle">
+                                <select x-model="selectedvehicle" id="vehicle" name="vehicle" class="mt-1 block w-full rounded-2xl border-gray-300 py-2 pl-3 pr-10 text-base focus:border-co-blue focus:outline-none focus:ring-co-blue sm:text-sm">
+                                    <option value=""></option>
+                                    {{range .ViewState.alternative_vehicles }}
+                                    <option value="{{.ID}}">{{.Data.licence_plate}} - {{.Data.name}} ({{.Type}})</option>
+                                    {{end}}
+                                </select>
+                                <div class="mt-5 sm:mt-6">
+                                    <button type="submit" class="inline-flex w-full justify-center rounded-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:text-sm">Changer de véhicule</button>
+                                </div>
+                            </form>
+                            <div class="mt-5 sm:mt-6">
+                                <button @click="changeVehicle=false" type="button" class="inline-flex w-full justify-center max-w-xs bg-white hover:bg-gray-50 border-gray-300 border px-4 py-2 text-gray-700 items-center text-sm rounded-2xl focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">Annuler</button>
+                              </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
     </div>
     <div class="mt-8 max-w-3xl mx-auto grid grid-cols-1 gap-6 lg:max-w-7xl lg:grid-flow-col-dense lg:grid-cols-3">
         <div class="space-y-6 lg:col-start-1 lg:col-span-1">
@@ -43,29 +84,44 @@
                                     <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
                                         {{.ViewState.beneficiary.Data.phone_number}}</dd>
                                 </div>
-                                {{if .ViewState.Data.birthdate}}
+                                {{if .ViewState.beneficiary.Data.birthdate}}
                                 <div class="py-4 sm:py-5 sm:grid sm:grid-cols-3 sm:gap-4">
                                     <dt class="text-sm font-medium text-gray-500">Date de naissance</dt>
                                     <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">{{(timeFrom
-                                        .ViewState.Data.birthdate).Format
+                                        .ViewState.beneficiary.Data.birthdate).Format
                                         "02/01/2006"}}</dd>
                                 </div>
                                 {{end}}
-                                {{if and .ViewState.Data.gender (ne .ViewState.Data.gender "0")}}
+                                {{if and .ViewState.beneficiary.Data.gender (ne .ViewState.Data.gender "0")}}
                                 <div class="py-4 sm:py-5 sm:grid sm:grid-cols-3 sm:gap-4">
                                     <dt class="text-sm font-medium text-gray-500">Date de naissance</dt>
                                     <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">{{genderISO5218
-                                        .ViewState.Data.gender}}</dd>
+                                        .ViewState.beneficiary.Data.gender}}</dd>
                                 </div>
                                 {{end}}
-                                {{if .ViewState.Data.address}}
+                                {{if .ViewState.beneficiary.Data.address}}
                                 <div class="py-4 sm:py-5 sm:grid sm:grid-cols-3 sm:gap-4">
                                     <dt class="text-sm font-medium text-gray-500">Adresse</dt>
                                     <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
-                                        {{.ViewState.Data.address.properties.label}}
+                                        {{.ViewState.beneficiary.Data.address.properties.label}}
                                     </dd>
                                 </div>
                                 {{end}}
+                                {{if .ViewState.beneficiary.Data.file_number}}
+                                <div class="py-4 sm:py-5 sm:grid sm:grid-cols-3 sm:gap-4">
+                                    <dt class="text-sm font-medium text-gray-500">Numéro de dossier (CAF / Pole emploi)</dt>
+                                    <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
+                                        {{.ViewState.beneficiary.Data.file_number}}
+                                    </dd>
+                                </div>
+                                {{end}}
+                                <div>
+                                    <a href="/app/beneficiaries/{{.ViewState.beneficiary.ID}}">
+                                        <button type="button"
+                                            class="w-full items-center px-4 py-2 border border-transparent shadow-sm text-xs font-medium rounded-2xl text-white bg-co-blue hover:bg-co-blue hover:text-white focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">Fiche bénéficiaire</button>
+                                    </a>
+                                </div>
+                                
                             </dl>
                         </div>
                     </div>
@@ -77,8 +133,13 @@
                 <div class="bg-white px-4 py-5 border-b border-gray-200 sm:px-6">
                     <div class="-ml-4 -mt-4 flex justify-between items-center flex-wrap sm:flex-nowrap">
                         <div class="ml-4 mt-4">
+                            {{if or .ViewState.booking.Data.Deleted .ViewState.booking.Deleted}}
+                            <h3 class="text-lg leading-6 font-medium text-gray-900">Réservation annulée le {{(timeFrom .ViewState.booking.Unavailableto).Format "02/01/2006"}}</h3>
+                            <p class="mt-1 text-sm text-gray-500">Motif : {{.ViewState.booking.Data.motif}}</p>
+                            {{else}}
                             <h3 class="text-lg leading-6 font-medium text-gray-900">Réservation</h3>
                             <p class="mt-1 text-sm text-gray-500">Informations utiles sur la réservation.</p>
+                            {{end}}
                         </div>
                         <div class="ml-4 mt-4 flex-shrink-0">
                             <!-- <button type="button"
@@ -129,7 +190,7 @@
                                 <div class="py-4 sm:py-5 sm:grid sm:grid-cols-3 sm:gap-4">
                                     <dt class="text-sm font-medium text-gray-500">Type</dt>
                                     <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
-                                        Voiture</dd>
+                                        {{.ViewState.vehicle.Type}}</dd>
                                 </div>
                                 {{if .ViewState.vehicle.Data.address}}
                                 <div class="py-4 sm:py-5 sm:grid sm:grid-cols-3 sm:gap-4">
@@ -143,7 +204,9 @@
                                     x-data="{ updateOpen: false }">
                                     <div class="w-full inline-flex" x-show="!updateOpen">
                                         <div class="flex-1">{{(timeFrom .ViewState.booking.Startdate).Format "02/01/2006"}}</div>
+                                        {{if (not (or .ViewState.booking.Deleted .ViewState.booking.Data.Deleted))}}
                                         <a href="#" class="text-co-blue hover:text-co-blue ml-5" @click="updateOpen = ! updateOpen">Modifier</a>
+                                        {{end}}
                                     </div>
                                     <form method="POST" class="inline-flex" x-show="updateOpen">
                                         <div class="flex-1">
@@ -163,7 +226,9 @@
                                         x-data="{ updateOpen: false }">
                                         <div class="w-full inline-flex" x-show="!updateOpen">
                                             <div class="flex-1">{{(timeFrom .ViewState.booking.Enddate).Format "02/01/2006"}}</div>
+                                            {{if (not (or .ViewState.booking.Deleted .ViewState.booking.Data.Deleted))}}
                                             <a href="#" class="text-co-blue hover:text-co-blue ml-5" @click="updateOpen = ! updateOpen">Modifier</a>
+                                            {{end}}
                                         </div>
                                         <form method="POST" class="inline-flex" x-show="updateOpen">
                                             <div class="flex-1">
@@ -183,7 +248,9 @@
                                     x-data="{ updateOpen: false }">
                                     <div class="w-full inline-flex" x-show="!updateOpen">
                                         <div class="flex-1">{{(timeFrom .ViewState.booking.Unavailablefrom).Format "02/01/2006"}}</div>
+                                        {{if (not (or .ViewState.booking.Deleted .ViewState.booking.Data.Deleted))}}
                                         <a href="#" class="text-co-blue hover:text-co-blue ml-5" @click="updateOpen = ! updateOpen">Modifier</a>
+                                        {{end}}
                                     </div>
                                     <form method="POST" class="inline-flex" x-show="updateOpen">
                                         <div class="flex-1">
@@ -203,7 +270,9 @@
                                     x-data="{ updateOpen: false }">
                                     <div class="w-full inline-flex" x-show="!updateOpen">
                                         <div class="flex-1">{{(timeFrom .ViewState.booking.Unavailableto).Format "02/01/2006"}}</div>
+                                        {{if (not (or .ViewState.booking.Deleted .ViewState.booking.Data.Deleted))}}
                                         <a href="#" class="text-co-blue hover:text-co-blue ml-5" @click="updateOpen = ! updateOpen">Modifier</a>
+                                        {{end}}
                                     </div>
                                     <form method="POST" class="inline-flex" x-show="updateOpen">
                                         <div class="flex-1">

web/layouts/vehicles_management/bookings-list.html

@@ -9,7 +9,7 @@
         </div>
         <div class="mt-4 sm:mt-0 sm:ml-16 sm:flex-none">
             
-            <a href="/api/cache/{{.ViewState.cacheid}}/export">
+            <a href="/exports/fleets/bookings">
                 <button type="button"
                     class="inline-flex items-center justify-center bg-white hover:bg-gray-50 border-gray-300 border px-4 py-2 text-gray-700 flex items-center text-sm rounded-2xl focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">
                     {{$.IconSet.Icon "hero:outline/document-arrow-down" "h-5 w-5 mr-3"}}

web/layouts/vehicles_management/delete-booking.html

@@ -0,0 +1,39 @@
+{{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 d'annulation</h3>
+                        <div class="mt-2">
+                            <p class="text-sm text-gray-500">Souhaitez-vous vraiment annuler cette réservaton ?</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/vehicles-management/bookings/{{.ViewState.booking.ID}}" 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}}

web/layouts/vehicles_management/fleet-display.html

@@ -104,6 +104,10 @@
                                                     <span class="p-1 bg-black text-white text-xs font-bold rounded-xl" >
                                                         Retiré
                                                     </span>
+                                                    {{else if or .Deleted .Data.Deleted}}
+                                                    <span class="p-1 bg-co-red text-white text-xs font-bold rounded-xl" >
+                                                        Annulé
+                                                    </span>
                                                     {{else}}
                                                         {{if eq .Status 1 }}
                                                         <span class="p-1 bg-co-blue text-white text-xs font-bold rounded-xl" >

web/layouts/vehicles_management/fleet-update.html

@@ -78,7 +78,12 @@
                 </div>
                 <div class="mt-5 md:mt-0 md:col-span-2">
                     {{ $fieldName := "address" }}
-                    {{ template "address_autocomplete" (dict "FieldName" $fieldName "Address" .ViewState.vehicle.Data.address) }}
+                    {{if .ViewState.Data.address}}
+                    {{$default := .ViewState.Data.address}}
+                    {{ template "address" dict "FieldName" $fieldName  "Default" $default}}
+                    {{else}}
+                    {{ template "address_autocomplete" dict "FieldName" $fieldName}}
+                    {{end}}
 
                     <div class="mt-5">
                         <label for="informations" class="block text-sm font-medium text-gray-700">Informations pratiques pour le bénéficiaire</label>

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;
@@ -1665,6 +1659,11 @@ html {
   background-color: rgb(238 242 255 / var(--tw-bg-opacity));
 }
 
+.bg-black {
+  --tw-bg-opacity: 1;
+  background-color: rgb(0 0 0 / var(--tw-bg-opacity));
+}
+
 .bg-indigo-600 {
   --tw-bg-opacity: 1;
   background-color: rgb(79 70 229 / var(--tw-bg-opacity));
@@ -1680,11 +1679,6 @@ html {
   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-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)));