fix the type of vehicle

LICENSE.md

@@ -1,660 +0,0 @@
-# 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/>.

README.md

@@ -24,4 +24,3 @@ To bundle Javascript with esbuild inside the web/ directory :
 ```
 npx esbuild assets/js/main.js --bundle --outfile=public/js/main.js
 ```
-

config.yaml

@@ -1,73 +1,5 @@
 name: PARCOURSMOB
 
-menu_items:
-  - name: dashboard
-    title: Tableau de bord
-    link: /app/
-    icon: hero:outline/home
-  - name: beneficiaries
-    title: Bénéficiaires
-    link: /app/beneficiaries/
-    icon: hero:outline/user-group
-  - name: journeys
-    title: Déplacements
-    link: /app/journeys/
-    icon: hero:outline/map
-  - name: solidarity_transport
-    title: Transport solidaire
-    link: /app/solidarity-transport/
-    icon: tabler-icons:car
-  - name: organized_carpool
-    title: Covoiturage solidaire
-    link: /app/organized-carpool/
-    icon: tabler-icons:car
-  - name: vehicles
-    title: Véhicules partagés
-    link: /app/vehicles/
-    icon: tabler-icons:car
-  - name: vehicles_management
-    title: Gestion des véhicules
-    link: /app/vehicles-management/
-    icon: hero:outline/briefcase
-  - name: agenda
-    title: Agenda dispositifs
-    link: /app/agenda/
-    icon: hero:outline/calendar
-  # - name: directory
-  #   title: Répertoire solutions
-  #   link: /app/directory/
-  #   icon: hero:outline/document-text
-  - name: support
-    title: Support
-    link: /app/support/
-    icon: hero:outline/support
-
-journey_tabs:
-  - name: all
-    title: Tous modes
-    enabled: true
-  - name: public-transit
-    title: Transports
-    enabled: true
-  - name: directory
-    title: Solutions locales
-    module: directory
-  - name: carpool
-    title: Covoiturage
-    enabled: true
-  - name: organized-carpool
-    title: Covoiturage solidaire
-    module: organized_carpool
-  - name: solidarity-transport
-    title: Transport solidaire
-    module: solidarity_transport
-  - name: vehicles
-    title: Véhicules
-    module: vehicles
-  # - name: others
-  #   title: Autres
-  #   enabled: true
-
 views:
   generic:
     files:
@@ -77,8 +9,6 @@ views:
     files:
       - web/layouts/dashboard/_partials/agenda-widget.html
       - web/layouts/dashboard/_partials/beneficiaries-widget.html
-      - web/layouts/dashboard/_partials/bookings-widget.html
-      - web/layouts/dashboard/_partials/drivers-map-widget.html
       - web/layouts/dashboard/dashboard.html
   beneficiaries:
     list:
@@ -98,14 +28,10 @@ views:
         - web/layouts/beneficiaries/_partials/beneficiary-events.html
         - web/layouts/beneficiaries/_partials/beneficiary-files.html
         - web/layouts/beneficiaries/_partials/beneficiary-organizations.html
-        - web/layouts/beneficiaries/_partials/beneficiary-wallet.html
-        - web/layouts/beneficiaries/_partials/beneficiary-solidarity-transport.html
-        - web/layouts/beneficiaries/_partials/beneficiary-organized-carpool.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
   members:
     display:
@@ -123,7 +49,6 @@ views:
         - web/layouts/administration/_partials/groups_admins.html
         - web/layouts/administration/_partials/group_members.html
         - web/layouts/group/settings.html
-
   vehicles:
     search: 
       files: 
@@ -145,7 +70,6 @@ views:
         - web/layouts/vehicles_management/overview.html
     bookings_list: 
       files: 
-        - web/layouts/vehicles_management/_partials/booking_filters.html
         - web/layouts/vehicles_management/_partials/bookings-list.html
         - web/layouts/vehicles_management/bookings-list.html
     fleet_add:
@@ -166,26 +90,18 @@ views:
     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
-        - web/layouts/agenda/_partials/event-files.html
     create_event: 
       files: 
         - web/layouts/_partials/address_autocomplete.html
         - web/layouts/agenda/create-event.html
-        - web/layouts/agenda/_partials/event-files.html
     delete_subscriber: 
       files: 
         - web/layouts/agenda/delete-subscriber.html
@@ -207,21 +123,12 @@ views:
   journeys: 
     search: 
       files: 
-        - web/layouts/_partials/orb_address_autocomplete.html
+        - web/layouts/_partials/address_autocomplete.html
         - web/layouts/journeys/_partials/journeys-all.html
         - web/layouts/journeys/_partials/journeys-others.html
-        - web/layouts/journeys/_partials/journeys-vehicles.html
-        - web/layouts/journeys/_partials/journeys-local-solutions.html
         - web/layouts/journeys/_partials/journeys-carpool.html
-        - web/layouts/journeys/_partials/journeys-public-transit-transitous.html
+        - web/layouts/journeys/_partials/journeys-public-transit.html
-        - web/layouts/journeys/_partials/journeys-solidarity-transport.html
-        - web/layouts/journeys/_partials/journeys-organized-carpools.html
-        - web/layouts/journeys/_partials/saved-searches.html
         - web/layouts/journeys/search.html
-    search_compact:
-      files:
-        - web/layouts/_partials/orb_address_autocomplete.html
-        - web/layouts/journeys/search-compact.html
     list:
       files:
         - web/layouts/journeys/group_management.html
@@ -254,90 +161,6 @@ views:
       files:
         - web/layouts/group_module/display_group.html
 
-  solidarity_transport:
-    overview:
-      files:
-        - web/layouts/solidarity_transport/_partials/drivers_list.html
-        - web/layouts/solidarity_transport/_partials/booking_filters.html
-        - web/layouts/solidarity_transport/_partials/bookings_list.html
-        - web/layouts/solidarity_transport/_partials/bookings_history.html
-        - web/layouts/solidarity_transport/overview.html
-    driver_create:
-      files:
-        - web/layouts/_partials/address_autocomplete.html
-        - web/layouts/solidarity_transport/driver_create.html
-    driver_update:
-      files:
-        - web/layouts/agenda/_partials/address.html
-        - web/layouts/_partials/address_autocomplete.html
-        - web/layouts/solidarity_transport/driver_update.html
-    driver_display:
-      files:
-        - web/layouts/_partials/address_autocomplete.html
-        - web/layouts/solidarity_transport/_partials/driver_availabilities.html
-        - web/layouts/solidarity_transport/_partials/driver_history.html
-        - web/layouts/solidarity_transport/_partials/driver_documents.html
-        - web/layouts/solidarity_transport/_partials/driver_wallet.html
-        - web/layouts/solidarity_transport/driver_display.html
-    driver_journey:
-      files:
-        - web/layouts/solidarity_transport/_partials/journey_map.html
-        - sms/solidarity_transport/request_driver.tmpl
-        - web/layouts/_partials/submit_with_sms.html
-        - web/layouts/solidarity_transport/_partials/journey_preview.html
-        - web/layouts/solidarity_transport/driver_journey.html
-    booking_display:
-      files:
-        - sms/solidarity_transport/request_driver.tmpl
-        - web/layouts/solidarity_transport/_partials/journey_map.html
-        - web/layouts/solidarity_transport/_partials/journey_preview.html
-        - web/layouts/solidarity_transport/booking_display.html
-
-    ext:
-      booking_proposal:
-        files:
-          - sms/solidarity_transport/driver_accept.tmpl
-          - web/layouts/_partials/submit_with_sms.html
-          - web/layouts/solidarity_transport/_partials/journey_map.html
-          - web/layouts/solidarity_transport/_partials/journey_preview.html
-          - web/layouts/solidarity_transport/ext/booking_proposal.html
-
-  organized_carpool:
-    overview:
-      files:
-        - web/layouts/organized_carpool/_partials/booking_filters.html
-        - web/layouts/organized_carpool/_partials/drivers_list.html
-        - web/layouts/organized_carpool/_partials/bookings_list.html
-        - web/layouts/organized_carpool/_partials/bookings_history.html
-        - web/layouts/organized_carpool/overview.html
-    driver_create:
-      files:
-        - web/layouts/_partials/address_autocomplete.html
-        - web/layouts/organized_carpool/driver_create.html
-    driver_update:
-      files:
-        - web/layouts/agenda/_partials/address.html
-        - web/layouts/_partials/address_autocomplete.html
-        - web/layouts/organized_carpool/driver_update.html
-    driver_display:
-      files:
-        - web/layouts/_partials/address_autocomplete.html
-        - web/layouts/organized_carpool/_partials/driver_availabilities.html
-        - web/layouts/organized_carpool/_partials/driver_documents.html
-        - web/layouts/organized_carpool/_partials/driver_wallet.html
-        - web/layouts/organized_carpool/_partials/driver_history.html
-        - web/layouts/organized_carpool/driver_display.html
-    journey:
-      files:
-        - sms/organized_carpool/request_driver.tmpl
-        - web/layouts/_partials/submit_with_sms.html
-        - web/layouts/organized_carpool/_partials/journey_preview.html
-        - web/layouts/organized_carpool/journey.html
-    booking_display:
-      files:
-        - web/layouts/organized_carpool/_partials/booking_map.html
-        - web/layouts/organized_carpool/booking_display.html
-
   administration:
     home:
       files:
@@ -359,11 +182,6 @@ views:
     vehicles_list:
       files:
         - web/layouts/administration/vehicles_stats.html
-    bookings_list:
-      files:
-        - web/layouts/vehicles_management/_partials/booking_filters.html
-        - web/layouts/administration/_partials/bookings_list.html
-        - web/layouts/administration/bookings_stats.html
     settings: 
       files:
         - web/layouts/administration/_partials/groups_admins.html
@@ -395,10 +213,6 @@ views:
 icons:
   svg:
     coopgo:parcoursmob/monogram: <svg xmlns="http://www.w3.org/2000/svg" class="%s" viewBox="0 0 61.85 33.58"><defs><style>.cls-1{fill:#ff1300;}.cls-2{fill:#243887;}</style></defs><g id="Calque_2" data-name="Calque 2"><g id="Calque_1-2" data-name="Calque 1"><path class="cls-1" d="M44.978,0C31.337,0,28.1,6.824,27.875,15.505H39.536V9.434a.727.727,0,0,1,1.123-.607L52.6,16.453,40.659,24.08a.729.729,0,0,1-1.123-.608v-6.1H27.865c.075,8.427,1.527,16.213,17.113,16.213,14.867,0,16.872-7.764,16.872-17.032C61.85,7.91,59.894,0,44.978,0Z"/><polygon class="cls-1" points="41.412 21.385 49.133 16.453 41.412 11.521 41.412 21.385"/><path class="cls-2" d="M14.175,11.4l-.019,4.151H26.311a14.781,14.781,0,0,0,.819-5.141C27.046,3.767,22.545,0,14.764,0H1.052A1.147,1.147,0,0,0,0,1.24V31.87a1.149,1.149,0,0,0,1.094,1.239H11.525a1.145,1.145,0,0,0,1.051-1.239V10.41h.758C13.88,10.41,14.175,10.756,14.175,11.4Z"/><path class="cls-2" d="M14.148,17.3l-.015,3.514H18.97A7.521,7.521,0,0,0,25.458,17.3Z"/></g></g></svg>
-    hero:outline/archive-box: <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="%s"><path stroke-linecap="round" stroke-linejoin="round" d="m20.25 7.5-.625 10.632a2.25 2.25 0 0 1-2.247 2.118H6.622a2.25 2.25 0 0 1-2.247-2.118L3.75 7.5M10 11.25h4M3.375 7.5h17.25c.621 0 1.125-.504 1.125-1.125v-1.5c0-.621-.504-1.125-1.125-1.125H3.375c-.621 0-1.125.504-1.125 1.125v1.5c0 .621.504 1.125 1.125 1.125Z" /></svg>
-    hero:outline/archive-box-x-mark: <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="%s"><path stroke-linecap="round" stroke-linejoin="round" d="m20.25 7.5-.625 10.632a2.25 2.25 0 0 1-2.247 2.118H6.622a2.25 2.25 0 0 1-2.247-2.118L3.75 7.5m6 4.125 2.25 2.25m0 0 2.25 2.25M12 13.875l2.25-2.25M12 13.875l-2.25 2.25M3.375 7.5h17.25c.621 0 1.125-.504 1.125-1.125v-1.5c0-.621-.504-1.125-1.125-1.125H3.375c-.621 0-1.125.504-1.125 1.125v1.5c0 .621.504 1.125 1.125 1.125Z" /></svg>
-    hero:outline/arrow-long-right: <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="%s"><path stroke-linecap="round" stroke-linejoin="round" d="M17.25 8.25 21 12m0 0-3.75 3.75M21 12H3" /></svg>
-    hero:outline/arrow-path-rounded-square: <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="%s"><path stroke-linecap="round" stroke-linejoin="round" d="M19.5 12c0-1.232-.046-2.453-.138-3.662a4.006 4.006 0 0 0-3.7-3.7 48.678 48.678 0 0 0-7.324 0 4.006 4.006 0 0 0-3.7 3.7c-.017.22-.032.441-.046.662M19.5 12l3-3m-3 3-3-3m-12 3c0 1.232.046 2.453.138 3.662a4.006 4.006 0 0 0 3.7 3.7 48.656 48.656 0 0 0 7.324 0 4.006 4.006 0 0 0 3.7-3.7c.017-.22.032-.441.046-.662M4.5 12l3 3m-3-3-3 3" /></svg>
     hero:outline/briefcase: <svg xmlns="http://www.w3.org/2000/svg" class="%s" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M21 13.255A23.931 23.931 0 0112 15c-3.183 0-6.22-.62-9-1.745M16 6V4a2 2 0 00-2-2h-4a2 2 0 00-2 2v2m4 6h.01M5 20h14a2 2 0 002-2V8a2 2 0 00-2-2H5a2 2 0 00-2 2v10a2 2 0 002 2z" /></svg>
     hero:outline/support: <svg xmlns="http://www.w3.org/2000/svg" class="%s" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="%s"><path stroke-linecap="round" stroke-linejoin="round" d="M7.5 8.25h9m-9 3H12m-9.75 1.51c0 1.6 1.123 2.994 2.707 3.227 1.129.166 2.27.293 3.423.379.35.026.67.21.865.501L12 21l2.755-4.133a1.14 1.14 0 01.865-.501 48.172 48.172 0 003.423-.379c1.584-.233 2.707-1.626 2.707-3.228V6.741c0-1.602-1.123-2.995-2.707-3.228A48.394 48.394 0 0012 3c-2.392 0-4.744.175-7.043.513C3.373 3.746 2.25 5.14 2.25 6.741v6.018z" /></svg>
     hero:outline/group_module: <svg xmlns="http://www.w3.org/2000/svg" class="%s" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6 h-6"><path stroke-linecap="round" stroke-linejoin="round" d="M18 18.72a9.094 9.094 0 003.741-.479 3 3 0 00-4.682-2.72m.94 3.198l.001.031c0 .225-.012.447-.037.666A11.944 11.944 0 0112 21c-2.17 0-4.207-.576-5.963-1.584A6.062 6.062 0 016 18.719m12 0a5.971 5.971 0 00-.941-3.197m0 0A5.995 5.995 0 0012 12.75a5.995 5.995 0 00-5.058 2.772m0 0a3 3 0 00-4.681 2.72 8.986 8.986 0 003.74.477m.94-3.197a5.971 5.971 0 00-.94 3.197M15 6.75a3 3 0 11-6 0 3 3 0 016 0zm6 3a2.25 2.25 0 11-4.5 0 2.25 2.25 0 014.5 0zm-13.5 0a2.25 2.25 0 11-4.5 0 2.25 2.25 0 014.5 0z" /></svg>
@@ -412,7 +226,6 @@ icons:
     hero:outline/information-circle: <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="%s"><path stroke-linecap="round" stroke-linejoin="round" d="M11.25 11.25l.041-.02a.75.75 0 011.063.852l-.708 2.836a.75.75 0 001.063.853l.041-.021M21 12a9 9 0 11-18 0 9 9 0 0118 0zm-9-3.75h.008v.008H12V8.25z" /></svg>
     hero:outline/map: <svg xmlns="http://www.w3.org/2000/svg" class="%s" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M9 20l-5.447-2.724A1 1 0 013 16.382V5.618a1 1 0 011.447-.894L9 7m0 13l6-3m-6 3V7m6 10l4.553 2.276A1 1 0 0021 18.382V7.618a1 1 0 00-.553-.894L15 4m0 13V4m0 0L9 7" /></svg>
     hero:outline/office-building: <svg xmlns="http://www.w3.org/2000/svg" class="%s" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M19 21V5a2 2 0 00-2-2H7a2 2 0 00-2 2v16m14 0h2m-2 0h-5m-9 0H3m2 0h5M9 7h1m-1 4h1m4-4h1m-1 4h1m-5 10v-5a1 1 0 011-1h2a1 1 0 011 1v5m-4 0h4" /></svg>
-    hero:outline/paper-airplane: <svg xmlns="http://www.w3.org/2000/svg" class="%s" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="%s"><path stroke-linecap="round" stroke-linejoin="round" d="M6 12 3.269 3.125A59.769 59.769 0 0 1 21.485 12 59.768 59.768 0 0 1 3.27 20.875L5.999 12Zm0 0h7.5" /></svg>
     hero:outline/paper-clip: <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="%s"><path stroke-linecap="round" stroke-linejoin="round" d="M18.375 12.739l-7.693 7.693a4.5 4.5 0 01-6.364-6.364l10.94-10.94A3 3 0 1119.5 7.372L8.552 18.32m.009-.01l-.01.01m5.699-9.941l-7.81 7.81a1.5 1.5 0 002.112 2.13" /></svg>
     hero:outline/plus-circle: <svg xmlns="http://www.w3.org/2000/svg" class="%s" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M12 9v3m0 0v3m0-3h3m-3 0H9m12 0a9 9 0 11-18 0 9 9 0 0118 0z" /></svg>
     hero:outline/shield-check: <svg xmlns="http://www.w3.org/2000/svg" class="%s" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M9 12l2 2 4-4m5.618-4.016A11.955 11.955 0 0112 2.944a11.955 11.955 0 01-8.618 3.04A12.02 12.02 0 003 9c0 5.591 3.824 10.29 9 11.622 5.176-1.332 9-6.03 9-11.622 0-1.042-.133-2.052-.382-3.016z" /></svg>
@@ -427,9 +240,6 @@ icons:
     tabler-icons:car: <svg xmlns="http://www.w3.org/2000/svg" class="icon icon-tabler icon-tabler-car %s" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round"><path stroke="none" d="M0 0h24v24H0z" fill="none"></path><circle cx="7" cy="17" r="2"></circle><circle cx="17" cy="17" r="2"></circle><path d="M5 17h-2v-6l2 -5h9l4 5h1a2 2 0 0 1 2 2v4h-2m-4 0h-6m-6 -6h15m-6 0v-5"></path></svg>
     tabler-icons:walk: <svg xmlns="http://www.w3.org/2000/svg" class="icon icon-tabler icon-tabler-walk %s" width="44" height="44" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round"><path stroke="none" d="M0 0h24v24H0z" fill="none"/><circle cx="13" cy="4" r="1" /><line x1="7" y1="21" x2="10" y2="17" /><path d="M16 21l-2 -4l-3 -3l1 -6" /><path d="M6 12l2 -3l4 -1l3 3l3 1" /></svg>
     tabler-icons:bus: <svg xmlns="http://www.w3.org/2000/svg" class="icon icon-tabler icon-tabler-bus %s" width="44" height="44" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round"><path stroke="none" d="M0 0h24v24H0z" fill="none"/><circle cx="6" cy="17" r="2" /><circle cx="18" cy="17" r="2" /><path d="M4 17h-2v-11a1 1 0 0 1 1 -1h14a5 7 0 0 1 5 7v5h-2m-4 0h-8" /><polyline points="16 5 17.5 12 22 12" /><line x1="2" y1="10" x2="17" y2="10" /><line x1="7" y1="5" x2="7" y2="10" /><line x1="12" y1="5" x2="12" y2="10" /></svg>
-    tabler-icons:train: <svg  xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"  fill="none"  stroke="currentColor"  stroke-width="2"  stroke-linecap="round"  stroke-linejoin="round"  class="icon icon-tabler icons-tabler-outline icon-tabler-train %s"><path stroke="none" d="M0 0h24v24H0z" fill="none"/><path d="M21 13c0 -3.87 -3.37 -7 -10 -7h-8" /><path d="M3 15h16a2 2 0 0 0 2 -2" /><path d="M3 6v5h17.5" /><path d="M3 11v4" /><path d="M8 11v-5" /><path d="M13 11v-4.5" /><path d="M3 19h18" /></svg>
-    hero:outline/map-pin: <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="%s"><path stroke-linecap="round" stroke-linejoin="round" d="M15 10.5a3 3 0 11-6 0 3 3 0 016 0z" /><path stroke-linecap="round" stroke-linejoin="round" d="M19.5 10.5c0 7.142-7.5 11.25-7.5 11.25s-7.5-4.108-7.5-11.25a7.5 7.5 0 1115 0z" /></svg>
-    hero:outline/flag: <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="%s"><path stroke-linecap="round" stroke-linejoin="round" d="M3 3v1.5M3 21v-6m0 0l2.77-.693a9 9 0 016.208.682l.108.054a9 9 0 006.086.71l3.114-.732a48.524 48.524 0 01-.005-10.499l-3.11.732a9 9 0 01-6.085-.711l-.108-.054a9 9 0 00-6.208-.682L3 4.5M3 15V4.5" /></svg>
 
 emails:
   onboarding: 
@@ -478,22 +288,3 @@ emails:
       files:
         - emails/layout.html
         - emails/onboarding/delete-subscriber.html
-  solidarity_transport:
-    booking_driver_accept:
-      subject: Trajet accepté par un conducteur
-      files:
-        - emails/layout.html
-        - emails/solidarity_transport/booking_driver_accept.html
-    booking_driver_decline:
-      subject: Trajet refusé par un conducteur
-      files:
-        - emails/layout.html
-        - emails/solidarity_transport/booking_driver_decline.html
-
-sms:
-  solidarity_transport:
-    request_driver:
-      - sms/solidarity_transport/request_driver.tmpl
-  organized_carpool:
-    request_driver:
-      - sms/organized_carpool/request_driver.tmpl

emails/auth/retrieve-password.html

@@ -1,5 +1,5 @@
 {{define "content"}}
 <p>Bonjour,</p>
 <p>Vous avez demandé à réinitialiser votre mot de passe pour <b>{{.username}}</b></p>
-<p>Pour créer votre nouveau mot de passe, cliquez sur le lien suivant : <a href="{{ .baseUrl }}/auth/lost-password/recover?key={{.key}}">{{ .baseUrl }}/auth/lost-password/recover?key={{.key}}</a></p>
+<p>Pour créer votre nouveau mot de passe, cliquez sur le lien suivant : <a href="http://localhost:9000/auth/lost-password/recover?key={{.key}}">http://localhost:9000/auth/lost-password/recover?key={{.key}}</a></p>
 {{end}}

emails/onboarding/existing-administrator.html

@@ -1,4 +1,4 @@
 {{define "content"}}
 <p>Vous avez été ajouté comme administrateur de l'organisation {{.group}} sur PARCOURSMOB.</p>
-<p>Connectez vous sur <a href="{{ .baseUrl }}">{{ .baseUrl }}</a> pour y accéder</p>
+<p>Connectez vous sur <a href="http://localhost:9000">http://localhost:9000</a> pour y accéder</p>
 {{end}}

emails/onboarding/existing-member.html

@@ -1,4 +1,4 @@
 {{define "content"}}
 <p>Vous avez été ajouté à l'organisation {{.group}} sur PARCOURSMOB.</p>
-<p>Connectez vous sur <a href="{{ .baseUrl }}">{{ .baseUrl }}</a> pour y accéder</p>
+<p>Connectez vous sur <a href="http://localhost:9000">http://localhost:9000</a> pour y accéder</p>
 {{end}}

emails/onboarding/new-administrator.html

@@ -1,5 +1,5 @@
 {{define "content"}}
 <p>Vous avez été ajouté comme administrateur de l'organisation {{.group}} sur PARCOURSMOB.</p>
 <p>Vous devez créer votre compte pour y accéder.</p>
-<p>Pour créer votre compte PARCOURSMOB, cliquez sur : <a href="{{ .baseUrl }}/auth/onboarding?key={{.key}}">{{ .baseUrl }}/auth/onboarding?key={{.key}}</a></p>
+<p>Pour créer votre compte PARCOURSMOB, cliquez sur : <a href="http://localhost:9000/auth/onboarding?key={{.key}}">http://localhost:9000/auth/onboarding?key={{.key}}</a></p>
 {{end}}

emails/onboarding/new-member.html

@@ -1,5 +1,5 @@
 {{define "content"}}
 <p>Vous avez été ajouté à l'organisation {{.group}} sur PARCOURSMOB.</p>
 <p>Vous devez créer votre compte pour y accéder.</p>
-<p>Pour créer votre compte PARCOURSMOB, cliquez sur : <a href="{{ .baseUrl }}/auth/onboarding?key={{.key}}">{{ .baseUrl }}/auth/onboarding?key={{.key}}</a></p>
+<p>Pour créer votre compte PARCOURSMOB, cliquez sur : <a href="http://localhost:9000/auth/onboarding?key={{.key}}">http://localhost:9000/auth/onboarding?key={{.key}}</a></p>
 {{end}}

emails/onboarding/support_emailing.html

@@ -1,4 +1,4 @@
 {{define "content"}}
 <p>Vous avez reçu un commentaire sur PARCOURSMOB de la part de <b>{{.user}}</b></p>
-<p>{{unescapeHTML .key}}</p>
+<p>{{.key}}</p>
 {{end}}

emails/solidarity_transport/booking_driver_accept.html

@@ -1,5 +0,0 @@
-{{define "content"}}
-<p>Bonjour,</p>
-<p>Trajet accepté par un conducteur.</p>
-<p>Voir le trajet : <a href="{{ .baseUrl }}/solidarity-transport/bookings/{{.bookingid}}">{{ .baseUrl }}/solidarity-transport/bookings/{{.bookingid}}</a></p>
-{{end}}

emails/solidarity_transport/booking_driver_decline.html

@@ -1,5 +0,0 @@
-{{define "content"}}
-<p>Bonjour,</p>
-<p>Trajet refusé par un conducteur.</p>
-<p>Voir le trajet : <a href="{{ .baseUrl }}/app/solidarity-transport/bookings/{{.bookingid}}">{{ .baseUrl }}/app/solidarity-transport/bookings/{{.bookingid}}</a></p>
-{{end}}

sms/organized_carpool/request_driver.tmpl

@@ -1,2 +0,0 @@
-{{ define "sms_template" }}[{{ .name }}] Nouvelle demande de covoiturage solidaire le {{ .datetime }}.
-Acceptez ou refusez sur {{ .baseUrl }}/ext/oc/bp/{booking_id}{{ end }}

sms/solidarity_transport/driver_accept.tmpl

@@ -1 +0,0 @@
-{{ define "sms_template" }}[{{ .name }}] {{ .driver_first_name }} {{ .driver_last_name }} vient d'accepter votre trajet vers {{.address}} le {{.date}}. Le conducteur vous contactera pour organiser le trajet.{{ end }}

sms/solidarity_transport/request_driver.tmpl

@@ -1,2 +0,0 @@
-{{ define "sms_template" }}[{{ .name }}] Nouvelle demande de trajet solidaire le {{ .datetime }}.
-Acceptez ou refusez sur {{ .baseUrl }}/ext/st/bp/{booking_id}{{ end }}

web/assets/css/main.css

@@ -1,15 +1,6 @@
-@import "tailwindcss";
+@tailwind base;
-
+@tailwind components;
-@theme {
+@tailwind utilities;
-  --color-co-blue: #243887;
-  --color-co-lightblue: #907eff;
-  --color-co-red: #ff1300;
-  --color-co-green: #6cc11f;
-  --color-co-yellow: #ffdd00;
-  --color-co-orange: #ff5300;
-
-  --radius-co: 40%;
-}
 
 @font-face {
     font-family: "Manometer";
@@ -25,7 +16,4 @@
     html {
         font-family: Bitter, serif; 
     }
-    input {
-      padding: 2px;
-    }
 }

web/assets/js/main.js

@@ -1,11 +1,6 @@
 import '@kingshott/iodine';
 import Alpine from 'alpinejs'
-import { Protocol } from "pmtiles";
-import { layers, namedFlavor } from '@protomaps/basemaps';
  
 window.Alpine = Alpine
  
 Alpine.start()
-
-let protocol = new Protocol();
-maplibregl.addProtocol("pmtiles",protocol.tile);

web/layouts/_partials/address_autocomplete.html

@@ -1,12 +1,13 @@
 {{ define "address_autocomplete" }}
 
-<div class="col-span-6 relative" x-data='{
+
-    input: {{if .Address}}"{{.Address.properties.label}}"{{else}}null{{end}},
+<div class="col-span-6 relative" x-data="{
-    address: {{if .Address}}JSON.stringify({{template "geojson" .Address}}){{else}}null{{end}},
+    input: {{if .Address}}'{{.Address.Properties.label}}'{{else}}null{{end}},
-    addressObject: {{if .Address}}{{template "geojson" .Address }}{{else}}null{{end}},
+    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 == "") {
+        if(this.input == null || this.input == '') {
             this.responselength = 0
             return []
         }
@@ -14,31 +15,26 @@
             this.responselength = 0
             return []
         }
-        if(this.input.length < 3) {
+        result = await fetch('https://geocode.ridygo.fr/v1/autocomplete/\?text=' + this.input)
-            this.responselength = 0
-            return []
-        }
-        result = await fetch("https://api-adresse.data.gouv.fr/search/?q=" + this.input)
         json = await result.json()
-        console.log(json)
 
-        this.responselength = json["features"].length
+        this.responselength = json['features'].length
-        return json["features"]
+        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="p-2 mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm border-gray-300 rounded-2xl"
+        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 overflow-auto focus:outline-none sm:text-sm" tabindex="-1" role="listbox" aria-labelledby="listbox-label" aria-activedescendant="listbox-option-3">
+    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" 
@@ -50,14 +46,3 @@
     </ul>
 </div>
 {{ end }}
-
-{{define "geojson"}}{
-  "type": "Feature",
-  "geometry": {
-    "type": "Point",
-    "coordinates": [{{index .geometry.coordinates 0}}, {{index .geometry.coordinates 1}}],
-  },
-  "properties": {
-    "label": "{{.properties.label}}"
-  }
-}{{end}}

web/layouts/_partials/beneficiary_autocomplete.html

@@ -1,21 +0,0 @@
-{{ define "beneficiary_autocomplete" }}
-<div x-model="{
-		input: '',
-	}">
-    <input type="text" 
-        class="p-2 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 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/_partials/mainmenu.html

@@ -1,20 +1,19 @@
 {{define "mainmenu"}}
 
-{{range .LayoutState.Menu}}
+{{range .LayoutState.MenuItems}}
-{{if moduleAvailable .name }}
 <nav class="px-2 space-y-1">
-    <a href="{{.link}}"
+    <a href="{{.Link}}"
-        {{ if eq .name $.LayoutState.ActiveMenu }}
+        {{ if .Active }}
         class="bg-white text-co-blue group flex items-center px-2 py-2 text-base font-medium rounded-2xl">
         {{ else}}
-        class="text-white hover:bg-white hover:bg-opacity-5 hover:text-co-blue group flex items-center px-2 py-2 text-base font-medium rounded-2xl">
+        class="text-white hover:bg-white hover:bg-opacity-5 group flex items-center px-2 py-2 text-base font-medium rounded-2xl">
         {{end}}
 
-        {{$.IconSet.Icon .icon "mr-4 flex-shrink-0 h-6 w-6"}}
+        {{$.IconSet.Icon .Icon "mr-4 flex-shrink-0 h-6 w-6"}}
         
-        {{.title}}
+        {{.Title}}
     </a>
 </nav>
 {{end}}
-{{end}}
+
 {{end}}

web/layouts/_partials/orb_address_autocomplete.html

@@ -1,64 +0,0 @@
-
-{{ define "address_autocomplete" }}
-
-<div class="col-span-6 relative" x-data='{
-    input: {{if .Address}}"{{.Address.Properties.label}}"{{else}}null{{end}},
-    address: {{if .Address}}JSON.stringify({{template "geojson" .Address}}){{else}}null{{end}},
-    addressObject: {{if .Address}}{{template "geojson" .Address }}{{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.length < 3) {
-            this.responselength = 0
-            return []
-        }
-        result = await fetch("https://api-adresse.data.gouv.fr/search/?q=" + this.input)
-        json = await result.json()
-        console.log(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="p-2 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 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 }}
-
-{{define "geojson"}}{
-  "type": "Feature",
-  "geometry": {
-    "type": "Point",
-    "coordinates": [{{index .Point 0}}, {{index .Point 1}}],
-  },
-  "properties": {
-    "label": "{{.Properties.label}}"
-  }
-}{{end}}

web/layouts/_partials/submit_with_sms.html

@@ -1,56 +0,0 @@
-{{ define "submit_with_sms" }}
-{{ $dialog := (or .ComponentState.dialogVar "dialog") }}
-{{ $fieldName := (or .ComponentState.fieldName "message") }}
-{{ $submitText := (or .ComponentState.submitText "Valider") }}
-{{ $headerText := (or .ComponentState.headerText "Envoyer un message") }}
-{{ $cancelText := (or .ComponentState.cancelText "Annuler" )}}
-{{ $validateText := (or .ComponentState.validateText "Envoyer" )}}
-{{ $infoText := (or .ComponentState.infoText "Le message suivant sera envoyé. Vous pouvez le personnaliser." )}}
-{{ $doNotSendText := (or .ComponentState.doNotSendText "Ne pas envoyer le message par SMS." )}}
-{{ $doNotSendOption := eq .ComponentState.doNotSendOption true }}
-<div  x-data="{ {{ $dialog }}: false}" class="text-center">
-  <button @click="{{ $dialog }} = !{{ $dialog }}" type="button" class="bg-co-blue  border-gray-300 border px-4 py-2 text-white items-center text-sm rounded-2xl focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">
-    {{ .ComponentState.submitText }}
-  </button>
-  <div x-show="{{$dialog}}" class="relative z-10" aria-labelledby="modal-title" role="dialog" aria-modal="true">
-     <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/paper-airplane" "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">{{ $headerText }}</h3>
-               <div class="mt-2">
-                 <p class="text-sm text-gray-500"></p>
-               </div>
-               <div>
-                 <label for="message" class="block text-sm font-medium text-gray-700">{{$infoText}}</label>
-                 <div class="mt-1">
-                   <textarea rows="4" name="message" id="message" class="block w-full rounded-2xl border-gray-300 shadow-sm focus:border-co-blue focus:ring-co-blue sm:text-sm">{{template "sms_template" .SMSState }}</textarea>
-                 </div>
-               </div>
-              {{ if $doNotSendOption}}
-               <div>
-                 <div class="mt-1 flex flex-row justify-items-center items-center">
-                  <div class="flex-none m-4"><input type="checkbox" name="do_not_send" id="do_not_send" class="block w-full rounded-2xl border-gray-300 shadow-sm focus:border-co-blue focus:ring-co-blue sm:text-sm" /></div>
-                  <label for="do_not_send" class="flex text-sm text-gray-700 align-middle">{{$doNotSendText}}</label>
-                 </div>
-               </div>
-             </div>
-            {{end}}
-             <div class="mt-5 sm:mt-6 sm:grid sm:grid-flow-row-dense sm:grid-cols-2">
-               <button @click="{{$dialog}} = !{{$dialog}}" type="button" 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">{{ $cancelText }}</button>
-               <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">{{ $validateText }}</button>
-             </div>
-           </div>
-         </div>
-       </div>
-     </div>
-  </div>
-</div>
-{{ end }}

web/layouts/administration/_partials/bookings_list.html

@@ -1,115 +0,0 @@
-{{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/bookings_stats.html

@@ -1,33 +0,0 @@
-{{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 flex gap-2">
-            <a href="/app/administration/stats/vehicles">
-                <button type="button"
-                    class="inline-flex items-center justify-center bg-co-blue hover:bg-blue-700 border-co-blue border px-4 py-2 text-white 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="/exports/fleets/bookings/all_bookings.xlsx?status={{.ViewState.filters.status}}&date_start={{.ViewState.filters.date_start}}&date_end={{.ViewState.filters.date_end}}">
-                <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 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"}}
-                    Export
-                </button>
-            </a>
-        </div>
-    </div>
-</div>
-
-{{template "vehicle_booking_filters" .}}
-
-{{template "bookings_list" .}}
-
-{{end}}

web/layouts/administration/create_group.html

@@ -89,28 +89,6 @@
                                     <p class="text-gray-500">Trouver des solutions et organiser les déplacements de ses bénéficiaires.</p>
                                 </div>
                             </div>
-                            <div class="flex items-start">
-                                <div class="flex items-center h-5">
-                                    <input id="solidarity_transport" name="modules.solidarity_transport" 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="modules.vehicles" class="font-medium text-gray-700">Transport solidaire</label>
-                                    <p class="text-gray-500">Organiser le transport solidaire ou transport d'utilité sociale avec des conducteurs solidaires.
-                                    </p>
-                                </div>
-                            </div>
-                            <div class="flex items-start">
-                                <div class="flex items-center h-5">
-                                    <input id="organized_carpool" name="modules.organized_carpool" 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="modules.vehicles" class="font-medium text-gray-700">Covoiturage solidaire</label>
-                                    <p class="text-gray-500">Organiser le covoiturage solidaire, mettez en relation covoitureurs solidaires avec vos bénéficiaires.
-                                    </p>
-                                </div>
-                            </div>
                             <div class="flex items-start">
                                 <div class="flex items-center h-5">
                                     <input id="vehicles" name="modules.vehicles" type="checkbox"

web/layouts/administration/events_stats.html

@@ -6,12 +6,6 @@
             <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">

web/layouts/administration/vehicles_stats.html

@@ -2,18 +2,14 @@
 <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>
+            <h1 class="text-2xl font-semibold text-gray-900">La liste des voitures</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"
-                    <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">
-                        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">
+                   Retour
-                        {{$.IconSet.Icon "hero:outline/document-arrow-left" "h-5 w-5 mr-3"}}
+                </button>
-                        Liste des réservations
-                    </button>
-                </a>
-                
             </a>
         </div>
     </div>

web/layouts/agenda/_partials/address.html

@@ -22,7 +22,7 @@
             this.responselength = 0
             this.address = this.def
             this.input = `{{ .Default.properties.label}}`
-            result = await fetch('https://api-adresse.data.gouv.fr/search/?q=' + this.input)
+            result = await fetch('https://geocode.ridygo.fr/v1/autocomplete/\?text=' + this.input)
             json = await result.json()
 
             bb = json['features'][0]
@@ -33,7 +33,7 @@
                 return [bb]
         }
         
-            result = await fetch('https://api-adresse.data.gouv.fr/search/?q=' + this.input)
+            result = await fetch('https://geocode.ridygo.fr/v1/autocomplete/\?text=' + this.input)
             json = await result.json()
 
         this.responselength = json['features'].length

web/layouts/agenda/_partials/event-files.html

@@ -1,134 +0,0 @@
-{{define "event_files"}}
-<div class="px-4 py-6 sm:px-6"
-x-data="{
-    fields: {
-        name: null,
-        type: null,
-        file: null,
-    },
-    rules: {
-        name: ['required'],
-        type: ['required'],
-        file: ['required'],
-    },
-    formValidation: {
-        valid: false,
-        fields: {
-            name: {valid: null},
-            type: {valid: null},
-            file: {valid: null},
-        }
-    },
-    isFormValid: true,
-    validate() {
-        this.formValidation = Iodine.assert(this.fields, this.rules)
-    },
-    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
-    }
-}">
-    {{if eq (len .ViewState.documents) 0}}
-    <p class="p-12 text-gray-500 text-center text-md">Aucun document</p>
-    {{end}}
-    
-    {{if gt (len .ViewState.documents) 0}}
-    
-    <div class="-mx-4 mb-10 ring-1 ring-gray-300 sm:-mx-6 md:mx-0 md:rounded-lg">
-        <table class="min-w-full divide-y divide-gray-300">
-          <thead>
-            <tr>
-              <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Type</th>
-              <th scope="col" class="hidden px-3 py-3.5 text-left text-sm font-semibold text-gray-900 lg:table-cell">Nom du document</th>
-              <th scope="col" class="hidden px-3 py-3.5 text-left text-sm font-semibold text-gray-900 lg:table-cell">Ajouté le</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>
-            {{range .ViewState.documents}}
-            <tr>
-              <td class="relative py-4 pl-4 sm:pl-6 pr-3 text-sm">
-                <div class="font-medium text-gray-900">
-                    <span class="bg-co-blue text-xs text-white rounded-xl p-1 mr-2">{{index $.ViewState.file_types_map .Metadata.Type}}</span>
-                </div>
-              </td>
-              <td class="px-3 py-3.5 text-sm text-gray-900 lg:table-cell">{{.Metadata.Name}}</td>
-              <td class="px-3 py-3.5 text-sm text-gray-500 lg:table-cell">{{.LastModified.Format "02/01/2006"}}</td>
-              <td class="relative py-3.5 pl-3 pr-4 sm:pr-6 text-right text-sm font-medium">
-                <a href="/app/agenda/{{$.ViewState.event.ID}}/documents/{{.FileName}}" target="_blank">
-                <button type="button" class="inline-flex items-center rounded-md border border-gray-300 bg-white px-3 py-2 text-sm font-medium leading-4 text-gray-700 shadow-sm hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-30">Voir<span class="sr-only"> le document</span></button>
-                </a>
-              </td>
-            </tr>
-            {{end}}
-    
-    
-            <!-- More plans... -->
-          </tbody>
-        </table>
-      </div>
-    
-    {{end}}
-    {{ if eq (index .ViewState.event.Owners 0) .Group.ID }}
-    <h3 class="text-lg">Ajouter un document</h3>
-    <form method="POST" action="/app/agenda/{{.ViewState.event.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>
-            <select id="type" name="type" class="mt-1 block w-full rounded-l-2xl border-gray-300 py-2 pl-3 pr-10 text-base focus:border-indigo-500 focus:outline-none focus:ring-indigo-500 sm:text-sm"
-                x-model="fields.type" @blur="validateField('type')"
-                :class="formValidation.fields.type.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
-                <option value="" selected>Sélectionner un type</option>
-                {{range .ViewState.events_file_types}}
-                <option value="{{.}}">{{index $.ViewState.file_types_map .}}</option>
-                {{end}}
-            </select>
-          </div>
-              <div class="sm:col-span-4">
-                <label for="name" class="block text-sm font-medium text-gray-700">Nom</label>
-                      <input type="text" name="name" id="name"
-                          placeholder="Nom du fichier"
-                          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.name" @blur="validateField('name')"
-                          :class="formValidation.fields.name.valid == false ? 'border-co-red border-2' : 'border-gray-300'" />
-              </div>
-              <div class="sm:col-span-6 mt-4">
-                <label for="cover-photo" class="block text-sm font-medium text-gray-700">Téléchargement</label>
-                <div class="mt-1 flex justify-center rounded-md border-2 border-dashed px-6 pt-5 pb-6"
-                x-on:drop="console.log('toto')"
-                :class="formValidation.fields.file.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
-                  <div class="space-y-1 text-center">
-                    {{.IconSet.Icon "hero:outline/folder-plus" "mx-auto h-12 w-12 text-gray-400"}}
-                    <div class="flex text-sm text-gray-600">
-                      <label for="file-upload" class="relative cursor-pointer rounded-md bg-white font-medium text-co-blue focus-within:outline-none focus-within:ring-2 focus-within:ring-co-blue focus-within:ring-offset-2 hover:text-co-blue">
-                        <span>Sélectionnez un fichier </span>
-                        <input id="file-upload" name="file-upload" type="file" class="sr-only"
-                        x-model="fields.file" @blur="validateField('file')">
-                      </label>
-                      <!-- <p class="pl-1">ou glissez-déposez</p>  -->
-
-                        
-                    </div>
-                    <p class="text-xs text-gray-500">Jusqu'à 10MB</p>
-                    <p class="text-co-blue p-2" x-text="fields.file" x-if="fields.file"></p>
-                  </div>
-                </div>
-              </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 le document
-        </button>
-    </form>
-    {{end}}
-</div>
-{{end}}

web/layouts/agenda/create-event.html

@@ -4,20 +4,18 @@
     <h1 class="text-2xl font-semibold text-gray-900">Ajouter à l'agenda</h1>
 </div>
 
-<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8 mt-8" x-data="{
+<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8 mt-8"
+    x-data="{
         fields: {
             name: null,
             type: null,
-            description: '',
+            description: null,
             allday: false,
             startdate: null,
             enddate: null,
             starttime: null,
             endtime: null,
             max_subscribers: 0,
-            file_name: null,
-            file_type: null,
-            file: null,
         },
         rules: {
             name: ['required'],
@@ -27,10 +25,7 @@
             starttime: ['optional'],
             endtime: ['optional'],
             description: ['optional'],
-            max_subscribers: ['required', 'min:0'],
+            max_subscribers: ['required', 'min:0']
-            file_name: ['optional'],
-            file_type: ['optional'],
-            file: ['optional'],
         },
         formValidation: {
             valid: false,
@@ -44,22 +39,9 @@
                 endtime: {valid: null},
                 allday: {valid: null},
                 max_subscribers: {valid: null},
-                file_name: {valid: null},
-                file_type: {valid: null},
-                file: {valid: null},
             }
         },
         isFormValid: true,
-        init() {
-          let quill = new Quill(this.$refs.quill, { theme: 'snow' })
- 
-          quill.root.innerHTML = this.fields.description 
- 
-          quill.on('text-change', () => {
-                this.fields.description = quill.root.innerHTML
-          })
-
-        },
         validate() {
             this.formValidation = Iodine.assert(this.fields, this.rules)
 
@@ -80,14 +62,12 @@
             return this.formValidation.valid
         }
     }">
-
+    <form class="space-y-6" method="POST" @submit="submit">
-    <form id="eventForm" 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 à
+                    <p class="mt-1 text-sm text-gray-500">Informations générales sur le dispositif d'accompagnement à ajouter à l'agenda</p>
-                        ajouter à l'agenda</p>
                 </div>
                 <div class="mt-5 md:mt-0 md:col-span-2">
                     <div class="grid grid-cols-6 gap-6">
@@ -100,7 +80,8 @@
                         </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" x-model="fields.type" @blur="validateField('type')"
+                            <select id="type" name="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>
@@ -113,12 +94,10 @@
                         <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" x-model="fields.description"
+                                <textarea rows="4" name="description" id="descrpition" 
-                                    @blur="validateField('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> -->
+                                    class="shadow-sm focus:ring-co-blue focus:border-co-blue block w-full sm:text-sm border-gray-300 rounded-2xl"></textarea>
-                                <input type="hidden" name="description" x-model="fields.description" />
-                                <div x-ref="quill" class="shadow-sm focus:ring-co-blue focus:border-co-blue block w-full sm:text-sm border-gray-300 rounded-b-2xl">></div>
                             </div>
                         </div>
 
@@ -140,14 +119,12 @@
 
                         <div class="col-span-6">
 
-                            <button type="button"
+                            <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="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"
+                                :class="fields.allday ? 'bg-co-blue' : 'bg-gray-200'"
-                                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"
+                                <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="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">
@@ -157,20 +134,18 @@
                         <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
+                                    <label for="startdate" class="block text-sm font-medium text-gray-700">Date de début</label>
-                                        début</label>
                                     <input type="date" name="startdate" id="startdate" placeholder="JJ/MM/AAAA"
-                                        class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-l-2xl"
+                                            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')"
+                                            x-model="fields.startdate" @blur="validateField('startdate')"
-                                        :class="formValidation.fields.startdate.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
+                                            :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
+                                    <label for="enddate" class="block text-sm font-medium text-gray-700">Date de fin</label>
-                                        fin</label>
                                     <input type="date" name="enddate" id="enddate" placeholder="JJ/MM/AAAA"
-                                        class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-r-2xl"
+                                            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')"
+                                            x-model="fields.enddate" @blur="validateField('enddate')"
-                                        :class="formValidation.fields.enddate.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
+                                            :class="formValidation.fields.enddate.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
                                 </div>
                                 
                                 
@@ -180,20 +155,18 @@
                         <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
+                                    <label for="startdate" class="block text-sm font-medium text-gray-700">Horaire de début</label>
-                                        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"
+                                            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')"
+                                            x-model="fields.starttime" @blur="validateField('starttime')"
-                                        :class="formValidation.fields.starttime.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
+                                            :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
+                                    <label for="endtime" class="block text-sm font-medium text-gray-700">Horaire de fin</label>
-                                        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"
+                                            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')"
+                                            x-model="fields.endtime" @blur="validateField('endtime')"
-                                        :class="formValidation.fields.endtime.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
+                                            :class="formValidation.fields.endtime.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
                                 </div>
                                 
                                 
@@ -211,14 +184,12 @@
             <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 dispositif (nombre de places disponibles,
+                    <p class="mt-1 text-sm text-gray-500">Paramètres du dispositift (nombre de places disponibles, etc...)</p>
-                        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
+                            <label for="max_subscribers" class="block text-sm font-medium text-gray-700">Places disponibles (0 = illimité)</label>
-                                disponibles (0 = illimité)</label>
                             <input type="number" 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')"
@@ -228,54 +199,8 @@
                 </div>
             </div>
         </div>
-        <!-- <div class="bg-white shadow px-4 py-5 sm:rounded-lg sm:p-6 mt-8">
+
-            <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">Ajouter un document</h3>
-                    <p class="mt-1 text-sm text-gray-500">Téléchargez un document lié à cet événement</p>
-                </div>
-                    <div class="md:grid md:grid-cols-6 p-2">
-                      <div class="sm:col-span-2">
-                        <label for="file_type" class="block text-sm font-medium text-gray-700">Type</label>
-                        <select id="file_type" name="file_type" class="mt-1 block w-full rounded-l-2xl border-gray-300 py-2 pl-3 pr-10 text-base focus:border-indigo-500 focus:outline-none focus:ring-indigo-500 sm:text-sm"
-                            x-model="fields.file_type" @blur="validateField('file_type')"
-                            :class="formValidation.fields.file_type.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
-                            <option value="" selected>Sélectionner un type</option>
-                            {{range .ViewState.events_file_types}}
-                            <option value="{{.}}">{{index $.ViewState.file_types_map .}}</option>
-                            {{end}}
-                        </select>
-                      </div>
-                          <div class="sm:col-span-4">
-                            <label for="file_name" class="block text-sm font-medium text-gray-700">Nom</label>
-                                  <input type="text" name="file_name" id="file_name"
-                                      placeholder="Nom du fichier"
-                                      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.file_name" @blur="validateField('file_name')"
-                                      :class="formValidation.fields.file_name.valid == false ? 'border-co-red border-2' : 'border-gray-300'" />
-                          </div>
-                          <div class="sm:col-span-6 mt-4">
-                            <label for="cover-photo" class="block text-sm font-medium text-gray-700">Téléchargement</label>
-                            <div class="mt-1 flex justify-center rounded-md border-2 border-dashed px-6 pt-5 pb-6"
-                            x-on:drop="console.log('toto')"
-                            :class="formValidation.fields.file.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
-                              <div class="space-y-1 text-center">
-                                {{.IconSet.Icon "hero:outline/folder-plus" "mx-auto h-12 w-12 text-gray-400"}}
-                                <div class="flex text-sm text-gray-600">
-                                  <label for="file-upload" class="relative cursor-pointer rounded-md bg-white font-medium text-co-blue focus-within:outline-none focus-within:ring-2 focus-within:ring-co-blue focus-within:ring-offset-2 hover:text-co-blue">
-                                    <span>Sélectionnez un fichier </span>
-                                    <input id="file-upload" name="file-upload" type="file" class="sr-only"
-                                    x-model="fields.file" @blur="validateField('file')">
-                                  </label>                                      
-                                </div>
-                                <p class="text-xs text-gray-500">Jusqu'à 10MB</p>
-                                <p class="text-co-blue p-2" x-text="fields.file" x-if="fields.file"></p>
-                              </div>
-                            </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>

web/layouts/agenda/display-event.html

@@ -28,8 +28,7 @@
             <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>
-        </div>
             {{end}}
     {{end}}
    
@@ -78,36 +77,25 @@
                             {{if .ViewState.event.Description}}
                             <div class="sm:col-span-2">
                                 <dt class="text-sm font-medium text-gray-500">Description</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{ unescapeHTML .ViewState.event.Description}}</dd>
+                                <dd class="mt-1 text-sm text-gray-900">{{.ViewState.event.Description}}</dd>
                             </div>
                             {{end}}
                         </dl>
                     </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" .}}
-
-                        {{template "subscribers_table" .}}
                 </div>
             </section>
             {{end}}
@@ -206,17 +194,5 @@
             </div>
         </section>
     </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">
-        <div class="space-y-6 lg:col-start-1 lg:col-span-2">
-            <section aria-labelledby="event-documents">
-                <div class="bg-white mt-4 px-4 py-5 shadow sm:rounded-lg sm:px-6">
-                    <h2 id="documents-title" class="text-lg font-medium text-gray-900">Documents</h2>
-                    <div class="flex justify-between items-center">
-                        <div>{{template "event_files" .}}</div>
-                    </div>
-                </div>
-            </section>
-        </div>
-    </div>
 </main>
 {{ end }}

web/layouts/agenda/history.html

@@ -1,105 +0,0 @@
-{{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,13 +7,6 @@
             <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">
@@ -29,7 +22,7 @@
     <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 md:rounded-lg">
+                <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>

web/layouts/agenda/updateEvent.html

@@ -44,16 +44,6 @@
             }
         },
         isFormValid: true,
-        init() {
-          let quill = new Quill(this.$refs.quill, { theme: 'snow' })
- 
-          quill.root.innerHTML = this.fields.description 
- 
-          quill.on('text-change', () => {
-                this.fields.description = quill.root.innerHTML
-          })
-
-        },
         validate() {
             this.formValidation = Iodine.assert(this.fields, this.rules)
 
@@ -109,12 +99,10 @@
                             <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}}"
+                                <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>-->
+                                    class="shadow-sm focus:ring-co-blue focus:border-co-blue block w-full sm:text-sm border-gray-300 rounded-2xl"></textarea>
-                                <input type="hidden" name="description" x-model="fields.description" />
-                                <div x-ref="quill" class="shadow-sm focus:ring-co-blue focus:border-co-blue block w-full sm:text-sm border-gray-300 rounded-b-2xl">></div>
                                
                                 </div>
                         </div>

web/layouts/auth/groups.html

@@ -5,7 +5,7 @@
         <link rel="stylesheet" href="/public/css/main.css" />
         <!-- <script defer type="text/javascript" src="/public/js/main.js" defer></script> -->
         <script src="https://cdn.jsdelivr.net/npm/@kingshott/iodine@8.1.0/dist/iodine.min.umd.js" defer></script>
-        <script defer src="https://cdn.jsdelivr.net/npm/alpinejs@3.x.x/dist/cdn.min.js" defer></script>
+        <script defer src="https://unpkg.com/alpinejs@3.x.x/dist/cdn.min.js" defer></script>
     </head>
     <body class="h-full">
         <div class="min-h-full flex flex-col justify-center py-12 sm:px-6 lg:px-8 h-">

web/layouts/auth/onboarding.html

@@ -2,7 +2,7 @@
 <html class="h-full bg-gray-50">
     <head>
         <title>PARCOURSMOB - Identification</title>
-    <link rel="stylesheet" href="/public/css/main.css" />
+        <link rel="stylesheet" href="http://localhost:9000/public/css/main.css" />
     </head>
     <body class="h-full">
         <form method="post">

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

@@ -1,63 +1,4 @@
 {{define "beneficiary_events"}}
-{{ $calendarIcon := .IconSet.Icon "hero:outline/calendar" "h-6 w-6" }}
+<div class="px-4 py-6 sm:px-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

@@ -65,20 +65,9 @@ x-data="{
               <td class="px-3 py-3.5 text-sm text-gray-900 lg:table-cell">{{.Metadata.Name}}</td>
               <td class="px-3 py-3.5 text-sm text-gray-500 lg:table-cell">{{.LastModified.Format "02/01/2006"}}</td>
               <td class="relative py-3.5 pl-3 pr-4 sm:pr-6 text-right text-sm font-medium">
-                <div class="flex gap-2 justify-end">
+                <a href="/app/beneficiaries/{{$.ViewState.beneficiary.ID}}/documents/{{.FileName}}" target="_blank">
-                  <a href="/app/beneficiaries/{{$.ViewState.beneficiary.ID}}/documents/{{.FileName}}" target="_blank">
+                <button type="button" class="inline-flex items-center rounded-md border border-gray-300 bg-white px-3 py-2 text-sm font-medium leading-4 text-gray-700 shadow-sm hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-30">Voir<span class="sr-only"> le document</span></button>
-                  <button type="button" class="inline-flex items-center rounded-md border border-gray-300 bg-white px-3 py-2 text-sm font-medium leading-4 text-gray-700 shadow-sm hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-30">
+                </a>
-                    {{$.IconSet.Icon "hero:outline/document-arrow-down" "h-4 w-4 mr-1"}}
-                    Télécharger<span class="sr-only"> le document</span>
-                  </button>
-                  </a>
-                  <button type="button"
-                    onclick="if(confirm('Êtes-vous sûr de vouloir supprimer ce document ?')) { window.location.href='/app/beneficiaries/{{$.ViewState.beneficiary.ID}}/documents/{{.FileName}}/delete'; }"
-                    class="inline-flex items-center rounded-md border border-transparent bg-co-red px-3 py-2 text-sm font-medium leading-4 text-white shadow-sm hover:bg-red-700 focus:outline-none focus:ring-2 focus:ring-co-red focus:ring-offset-2">
-                    {{$.IconSet.Icon "hero:outline/trash" "h-4 w-4 mr-1"}}
-                    Supprimer<span class="sr-only"> le document</span>
-                  </button>
-                </div>
               </td>
             </tr>
             {{end}}
@@ -92,7 +81,7 @@ x-data="{
     {{end}}
 
     <h3 class="text-lg">Ajouter un document</h3>
-    <form method="POST" action="/app/beneficiaries/{{.ViewState.beneficiary.ID}}/documents"  @submit="submit"  enctype="multipart/form-data">
+    <form method="POST" action="/app/beneficiaries/e7616eac-4a87-4396-a505-23e0421b9c4c/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>
@@ -131,9 +120,7 @@ x-data="{
                         
                     </div>
                     <p class="text-xs text-gray-500">Jusqu'à 10MB</p>
-                    <template x-if="fields.file">
+                    <p class="text-co-blue p-2" x-text="fields.file" x-if="fields.file"></p>
-                      <p class="text-co-blue p-2" x-text="fields.file"></p>
-                    </template>
                   </div>
                 </div>
               </div>

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

@@ -1,6 +1,6 @@
 {{define "beneficiary_journeys"}}
 <div class="px-4 py-6 sm:px-6">
-    <form action="{{if eq $.ViewState.search_view "compact"}}/app/journeys/search{{else}}/app/journeys/{{end}}" method="GET">
+    <form action="/app/journeys/" method="GET">
 
         {{ $departureField := "departure" }}
         {{ $departureLabel := "Départ" }}

web/layouts/beneficiaries/_partials/beneficiary-organized-carpool.html

@@ -1,73 +0,0 @@
-{{define "beneficiary_organized_carpool"}}
-<div class="py-6">
-  {{if .ViewState.organized_carpool_stats}}
-  <div class="py-5 text-center">
-    <p class="text-lg">Trajets réalisés : {{ .ViewState.organized_carpool_stats.count }}</p>
-    <p class="text-lg">Kilomètres réalisés : {{ .ViewState.organized_carpool_stats.km}} km</p>
-  </div>
-  {{end}}
-
-  <div class="text-center py-5">
-    <a href="/app/journeys/?passengerid={{.ViewState.beneficiary.ID}}" class="inline-flex">
-      <button type="button" class="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">Chercher un trajet</button>
-    </a>
-  </div>
-
-  {{if .ViewState.organized_carpool_bookings}}
-  <div class="py-5">
-    <h4 class="text-lg font-medium text-gray-900 mb-4 text-center">Historique des covoiturages solidaires</h4>
-    <table class="min-w-full divide-y divide-gray-300 border-gray-300 border-t-1">
-      <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">Date</th>
-          <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Conducteur</th>
-          <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Départ</th>
-          <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Arrivée</th>
-          <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 scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6"></th>
-        </tr>
-      </thead>
-      <tbody class="divide-y divide-gray-200 bg-white">
-        {{range .ViewState.organized_carpool_bookings}}
-        {{if or (eq .Status.String "CONFIRMED") (eq .Status.String "WAITING_DRIVER_CONFIRMATION")}}
-        <tr>
-          <td class="py-4 pl-4 pr-3 text-sm sm:pl-6">
-            {{timeFormat .PassengerPickupDate.AsTime "02/01/2006 15:04"}}
-          </td>
-          <td class="py-4 pl-4 pr-3 text-sm sm:pl-6">
-            {{if .Driver}}
-              <a class="text-co-blue" href="/app/organized-carpool/drivers/{{.Driver.Id}}">
-                {{ (index $.ViewState.organized_carpool_drivers_map .Driver.Id).Data.first_name }}
-                {{ (index $.ViewState.organized_carpool_drivers_map .Driver.Id).Data.last_name }}
-              </a>
-            {{end}}
-          </td>
-          <td class="py-4 pl-4 pr-3 text-sm sm:pl-6">
-            {{.PassengerPickupAddress}}
-          </td>
-          <td class="py-4 pl-4 pr-3 text-sm sm:pl-6">
-            {{.PassengerDropAddress}}
-          </td>
-          <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-            {{if eq .Status.String "CONFIRMED"}}
-              <span class="p-1 px-2 text-xs bg-co-green rounded-2xl">Confirmé</span>
-            {{else if eq .Status.String "WAITING_DRIVER_CONFIRMATION"}}
-              <span class="p-1 px-2 text-xs bg-gray-300 rounded-2xl">Attente confirmation</span>
-            {{end}}
-          </td>
-          <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-            <a class="text-co-blue" href="/app/organized-carpool/bookings/{{.Id}}">Voir</a>
-          </td>
-        </tr>
-        {{end}}
-        {{end}}
-      </tbody>
-    </table>
-  </div>
-  {{else}}
-  <div class="py-5">
-    <p class="text-sm text-gray-500 text-center">Aucun covoiturage solidaire enregistré</p>
-  </div>
-  {{end}}
-</div>
-{{end}}

web/layouts/beneficiaries/_partials/beneficiary-solidarity-transport.html

@@ -1,75 +0,0 @@
-{{define "beneficiary_solidarity_transport"}}
-<div class="py-6">
-  {{if .ViewState.solidarity_transport_stats}}
-  <div class="py-5 text-center">
-    <p class="text-lg">Trajets réalisés : {{ .ViewState.solidarity_transport_stats.count }}</p>
-    <p class="text-lg">Kilomètres réalisés : {{ .ViewState.solidarity_transport_stats.km}} km</p>
-  </div>
-  {{end}}
-
-  <div class="text-center py-5">
-    <a href="/app/journeys/?passengerid={{.ViewState.beneficiary.ID}}" class="inline-flex">
-      <button type="button" class="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">Chercher un trajet</button>
-    </a>
-  </div>
-
-  {{if .ViewState.solidarity_transport_bookings}}
-  <div class="py-5">
-    <h4 class="text-lg font-medium text-gray-900 mb-4 text-center">Historique des transports solidaires</h4>
-    <table class="min-w-full divide-y divide-gray-300 border-gray-300 border-t-1">
-      <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">Date</th>
-          <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Conducteur</th>
-          <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Départ</th>
-          <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Arrivée</th>
-          <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 scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6"></th>
-        </tr>
-      </thead>
-      <tbody class="divide-y divide-gray-200 bg-white">
-        {{range .ViewState.solidarity_transport_bookings}}
-        {{if or (eq .Status "VALIDATED") (eq .Status "WAITING_CONFIRMATION")}}
-        <tr>
-          <td class="py-4 pl-4 pr-3 text-sm sm:pl-6">
-            {{if .Journey}}
-              {{timeFormat .Journey.PassengerPickupDate "02/01/2006 15:04"}}
-            {{end}}
-          </td>
-          <td class="py-4 pl-4 pr-3 text-sm sm:pl-6">
-            {{if .DriverId}}
-              <a class="text-co-blue" href="/app/solidarity-transport/drivers/{{.DriverId}}">
-                {{ (index $.ViewState.solidarity_transport_drivers_map .DriverId).Data.first_name }}
-                {{ (index $.ViewState.solidarity_transport_drivers_map .DriverId).Data.last_name }}
-              </a>
-            {{end}}
-          </td>
-          <td class="py-4 pl-4 pr-3 text-sm sm:pl-6">
-            {{if .Journey}}{{if .Journey.PassengerPickup}}{{.Journey.PassengerPickup.Properties.label}}{{end}}{{end}}
-          </td>
-          <td class="py-4 pl-4 pr-3 text-sm sm:pl-6">
-            {{if .Journey}}{{if .Journey.PassengerDrop}}{{.Journey.PassengerDrop.Properties.label}}{{end}}{{end}}
-          </td>
-          <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-            {{if eq .Status "VALIDATED"}}
-              <span class="p-1 px-2 text-xs bg-co-green rounded-2xl">Validé</span>
-            {{else if eq .Status "WAITING_CONFIRMATION"}}
-              <span class="p-1 px-2 text-xs bg-gray-300 rounded-2xl">Attente confirmation</span>
-            {{end}}
-          </td>
-          <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-            <a class="text-co-blue" href="/app/solidarity-transport/bookings/{{.Id}}">Voir</a>
-          </td>
-        </tr>
-        {{end}}
-        {{end}}
-      </tbody>
-    </table>
-  </div>
-  {{else}}
-  <div class="py-5">
-    <p class="text-sm text-gray-500 text-center">Aucun transport solidaire enregistré</p>
-  </div>
-  {{end}}
-</div>
-{{end}}

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

@@ -1,131 +0,0 @@
-{{define "beneficiary_wallet"}}
-<div class="py-6"
-  x-data="{
-    walletdialog: false
-  }">
-  <div class="py-5 text-center">
-    <p class="text-lg">Solde : {{ printf "%.2f" .ViewState.wallet_balance }} €</p>
-  <button  @click="walletdialog = !walletdialog"
-    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">
-    Créditer le compte
-  </button>
-  <div class="relative z-10" aria-labelledby="modal-title" role="dialog" aria-modal="true"
-       x-show="walletdialog">
-    <div class="fixed inset-0 bg-gray-900 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-lg bg-white px-4 pt-5 pb-4 text-left shadow-xl transition-all sm:my-8 sm:w-full sm:max-w-lg sm:p-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">Créditer le compte</h3>
-                <div class="mt-2">
-                  <p class="text-sm text-gray-500">Créditer le compte mobilité de l'utilisateur</p>
-                </div>
-              </div>
-            </div>
-          <form method="POST" action="/app/wallets/{{.ViewState.beneficiary.ID}}/credit" class="my-4">
-              <div class="space-y-4">
-                <div>
-                  <label for="amount" class="block text-sm font-medium text-gray-700">Montant</label>
-                  <input type="number" step="0.01" id="amount" name="amount" value="0"
-                         class="mt-1 w-full shadow-sm focus:ring-co-blue focus:border-co-blue px-3 py-2 sm:text-sm border-gray-300 rounded-2xl">
-                </div>
-
-                <div>
-                  <label for="payment_method" class="block text-sm font-medium text-gray-700">Moyen de paiement</label>
-                  <select id="payment_method" name="payment_method"
-                          class="mt-1 w-full shadow-sm focus:ring-co-blue focus:border-co-blue px-3 py-2 sm:text-sm border-gray-300 rounded-2xl">
-                    <option value="Paiement en espèce (MMS)">Paiement en espèce (MMS)</option>
-                    <option value="Virement bancaire">Virement bancaire</option>
-                    <option value="Autre">Autre</option>
-                  </select>
-                </div>
-
-                <div>
-                  <label for="description" class="block text-sm font-medium text-gray-700">Description</label>
-                  <textarea id="description" name="description" rows="3" placeholder="Description de l'opération..."
-                            class="mt-1 w-full shadow-sm focus:ring-co-blue focus:border-co-blue px-3 py-2 sm:text-sm border-gray-300 rounded-2xl"></textarea>
-                </div>
-              </div>
-
-              <div class="mt-6 flex flex-col space-y-3">
-                <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">Ajouter</button>
-                <button @click="walletdialog=false" type="button" class="inline-flex w-full justify-center 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>
-            </form>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-
-  <!-- Wallet Operations History -->
-  {{if .ViewState.beneficiary.Data.wallet_history}}
-  <div class="py-5">
-    <h4 class="text-lg font-medium text-gray-900 mb-4 text-center">Historique des opérations</h4>
-    <table class="min-w-full divide-y divide-gray-300 border-gray-300 border-t-1">
-      <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">Date</th>
-          <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Crédit</th>
-          <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Débit</th>
-          <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Moyen de paiement</th>
-          <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Description</th>
-        </tr>
-      </thead>
-      <tbody class="divide-y divide-gray-200 bg-white">
-        <!-- Initial Balance Row -->
-        <tr class="bg-gray-50">
-          <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm text-gray-500 italic sm:pl-6">
-            Solde initial
-          </td>
-          <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm font-medium text-gray-900 sm:pl-6">
-            {{if .ViewState.beneficiary.Data.wallet}}{{ printf "%.2f" .ViewState.beneficiary.Data.wallet }} €{{else}}0.00 €{{end}}
-          </td>
-          <td class="py-4 pl-4 pr-3 text-sm text-gray-500 sm:pl-6">
-            -
-          </td>
-          <td class="py-4 pl-4 pr-3 text-sm text-gray-500 sm:pl-6">
-            -
-          </td>
-          <td class="py-4 pl-4 pr-3 text-sm text-gray-500 sm:pl-6">
-            -
-          </td>
-        </tr>
-        {{range $index, $operation := .ViewState.beneficiary.Data.wallet_history}}
-        <tr>
-          <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-            {{if $operation.timestamp}}{{timeFormat $operation.timestamp "02/01/2006 15:04"}}{{end}}
-          </td>
-          <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm font-medium text-green-600 sm:pl-6">
-            {{if $operation.amount}}
-              {{if or (eq $operation.operation_type "credit") (not $operation.operation_type)}}
-                {{ printf "%.2f" $operation.amount }} €
-              {{end}}
-            {{end}}
-          </td>
-          <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm font-medium text-red-600 sm:pl-6">
-            {{if eq $operation.operation_type "debit"}}
-              {{ printf "%.2f" $operation.amount }} €
-            {{end}}
-          </td>
-          <td class="py-4 pl-4 pr-3 text-sm sm:pl-6">
-            {{$operation.payment_method}}
-          </td>
-          <td class="py-4 pl-4 pr-3 text-sm sm:pl-6">
-            {{$operation.description}}
-          </td>
-        </tr>
-        {{end}}
-      </tbody>
-    </table>
-  </div>
-  {{else}}
-  <div class="py-5">
-    <p class="text-sm text-gray-500 text-center">Aucune opération enregistrée</p>
-  </div>
-  {{end}}
-
-</div>
-{{end}}

web/layouts/beneficiaries/create.html

@@ -14,15 +14,13 @@
             birthdate: null,
             file_number: null
         },
-        other_properties: {},
-        other_properties_serialized: null,
         rules: {
             first_name: ['required'],
             last_name: ['required'],
             email: ['required', 'email'],
             phone_number: ['required', 'regexMatch:^((\\+)33|0)[1-9](\\d{2}){4}$'],
             birthdate: ['required'],
-            file_number: ['required'],
+            file_number: ['optional'],
         },
         formValidation: {
             valid: false,
@@ -43,7 +41,6 @@
             this.formValidation.fields[field] = Iodine.assert(this.fields[field], this.rules[field])
         },
         submit(event) {
-            this.other_properties_serialized = JSON.stringify(this.other_properties)
             this.validate()
             if(!this.formValidation.valid) {
                 this.isFormValid = false
@@ -53,7 +50,6 @@
         }
     }">
     <form class="space-y-6" method="POST" @submit="submit">
-        <input type="hidden" name="other_properties" x-model="other_properties_serialized" />
         <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">
@@ -104,19 +100,6 @@
                                 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</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>
-
-                    {{ $fieldName := "address" }}
-                    {{ template "address_autocomplete" dict "FieldName" $fieldName }}
-
-                    <!-- will dolater : tags, groups, ... -->
-
                     </div>
                 </div>
             </div>
@@ -131,34 +114,26 @@
                 <div class="mt-5 space-y-6 md:mt-0 md:col-span-2">
                     <div class="grid grid-cols-6 gap-6">
 
-                        {{range .ViewState.profile_optional_fields}}
                         <div class="col-span-6 sm:col-span-3">
-                            <label for="{{.name}}" class="block text-sm font-medium text-gray-700">{{.label}}</label>
+                            <label for="file_number" class="block text-sm font-medium text-gray-700">Numéro de dossier (allocataire, ...)</label>
-                            {{if eq .type "select"}}
+                            <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">
-                                <select id="{{.name}}" name="{{.name}}"
+                                <select id="gender" name="gender" autocomplete="gender" x-model="gender"
-                                    {{if eq .name "gender"}}x-model="gender"{{else}}x-model="other_properties.{{.name}}"{{end}}
                                     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 border-gray-300 rounded-2xl">
-                                    {{range .options}}
+                                    <option value="0">Inconnu</option>
-                                    <option value="{{.value}}">{{.label}}</option>
+                                    <option value="1">Masculin</option>
-                                    {{end}}
+                                    <option value="2">Féminin</option>
+                                    <option value="9">Sans objet</option>
                                 </select>
                             </div>
-                            {{else if eq .type "textarea"}}
-                            <textarea id="{{.name}}" name="{{.name}}" rows="3" x-model="other_properties.{{.name}}"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm border-gray-300 rounded-2xl"></textarea>
-                            {{else if eq .type "date"}}
-                            <input type="date" id="{{.name}}" name="{{.name}}" x-model="other_properties.{{.name}}"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm border-gray-300 rounded-2xl">
-                            {{else if eq .type "number"}}
-                            <input type="number" id="{{.name}}" name="{{.name}}" x-model="other_properties.{{.name}}"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm border-gray-300 rounded-2xl">
-                            {{else}}
-                            <input type="text" id="{{.name}}" name="{{.name}}" x-model="other_properties.{{.name}}"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm border-gray-300 rounded-2xl">
-                            {{end}}
                         </div>
-                        {{end}}
 
                         <!-- <div class="col-span-3 sm:col-span-3">
                             <label class="block text-sm font-medium text-gray-700"> Photo </label>
@@ -178,6 +153,22 @@
                 </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 liés au bénéficiaire, utiles pour exploiter les fonctionnalités de PARCOURSMOB</p>
+                </div>
+                <div class="mt-5 space-y-6 md:mt-0 md:col-span-2">
+
+                    {{ $fieldName := "address" }}
+                    {{ template "address_autocomplete" dict "FieldName" $fieldName }}
+
+                    <!-- will dolater : tags, groups, ... -->
+
+                </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>

web/layouts/beneficiaries/display.html

@@ -12,18 +12,16 @@
             <div>
                 <h1 class="text-2xl font-bold text-gray-900">{{.ViewState.beneficiary.Data.first_name}}
                     {{.ViewState.beneficiary.Data.last_name}}</h1>
-                <p class="text-sm font-bold text-co-red">{{if .ViewState.beneficiary.Data.archived}}Bénéficiaire archivé{{end}}
                 <p class="text-sm font-medium text-gray-500">{{if .ViewState.beneficiary.Metadata.created}}Ajouté le <time
-                        datetime="2022-07-25">{{.ViewState.beneficiary.Metadata.created}}</time>{{end}}
+                        datetime="2022-07-25">{{.ViewState.beneficiary.Metadata.created}}</time> par
+                    <a href="#" class="text-gray-900">Conseiller 1</a>{{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">
-            {{if not .ViewState.beneficiary.Data.archived}}<a href="/app/beneficiaries/{{ .ViewState.beneficiary.ID }}/archive"><button type="button"
+            <!-- <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">Archiver</button></a>{{end}}
+                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> -->
-            {{if .ViewState.beneficiary.Data.archived}}<a href="/app/beneficiaries/{{ .ViewState.beneficiary.ID }}/unarchive"><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">Désarchiver</button></a>{{end}}
             <a href="/app/beneficiaries/{{.ViewState.beneficiary.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>
         </div>
@@ -40,18 +38,6 @@
                     </div>
                     <div class="border-t border-gray-200 px-4 py-5 sm:px-6">
                         <dl class="grid grid-cols-1 gap-x-4 gap-y-8 sm:grid-cols-2">
-                            {{if moduleAvailable "solidarity_transport"}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Profil validé</dt>
-                                <dd class="mt-1 text-sm text-gray-900">
-                                  {{if beneficiaryValidatedProfile .ViewState.beneficiary .ViewState.documents}}
-                                    <span class="p-1 px-2 text-xs bg-co-green rounded-2xl">Oui</span>
-                                  {{else}}
-                                    <span class="p-1 px-2 text-xs bg-co-red text-white rounded-2xl">Non</span>
-                                  {{end}}
-                                </dd>
-                            </div>
-                            {{end}}
                             {{if .ViewState.beneficiary.Data.email}}
                             <div class="sm:col-span-1">
                                 <dt class="text-sm font-medium text-gray-500">Email</dt>
@@ -83,49 +69,13 @@
                                 <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</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{.ViewState.beneficiary.Data.file_number}}</dd>
-                            </div>
-                            {{end}}
-                            {{if and .ViewState.beneficiary.Data.other_properties .ViewState.beneficiary.Data.other_properties.status}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Statut</dt>
-                <dd class="mt-1 text-sm text-gray-900">{{.ViewState.beneficiary.Data.other_properties.status}}</dd>
-                            </div>
-                            {{end}}
-                            {{if and .ViewState.beneficiary.Data.other_properties .ViewState.beneficiary.Data.other_properties.situation}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Situation sociale</dt>
-                <dd class="mt-1 text-sm text-gray-900">{{.ViewState.beneficiary.Data.other_properties.situation}}</dd>
-                            </div>
-                            {{end}}
-                            {{if and .ViewState.beneficiary.Data.other_properties .ViewState.beneficiary.Data.other_properties.subscription_reason}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Motif d'inscription</dt>
-                <dd class="mt-1 text-sm text-gray-900">{{.ViewState.beneficiary.Data.other_properties.subscription_reason}}</dd>
-                            </div>
-                            {{end}}
-                            {{if and .ViewState.beneficiary.Data.other_properties .ViewState.beneficiary.Data.other_properties.last_subscription_date}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Dernière adhésion</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{ (timeFrom .ViewState.beneficiary.Data.other_properties.last_subscription_date).Format "02/01/2006" }}</dd>
-                            </div>
-                            {{end}}
-                            {{if and .ViewState.beneficiary.Data.other_properties .ViewState.beneficiary.Data.other_properties.comment}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Commentaire</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{.ViewState.beneficiary.Data.other_properties.comment}}</dd>
-                            </div>
-                            {{end}}
                         </dl>
                     </div>
                 </div>
             </section>
 
             <section aria-labelledby="functionalities-title" x-data="{
-                    tab: '{{ if .ViewState.tab }}{{ .ViewState.tab }}{{ else }}documents{{ end }}',
+                    tab: 'documents',
                     to(event) {
                         this.tab = event.target.value
                     }
@@ -177,25 +127,6 @@
                                         :class="tab == 'documents' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
                                         Documents </a>
 
-                                        {{if moduleAvailable "solidarity_transport"}}
-                                        <a href="#" @click="tab = 'wallet'"
-                                        class="whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm"
-                                        :class="tab == 'wallet' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
-                                        Compte mobilité </a>
-                                        
-                                        <a href="#" @click="tab = 'solidarity_transport'"
-                                            class="whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm"
-                                            :class="tab == 'solidarity_transport' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
-                                            Transport solidaire </a>
-                                        {{end}}
-
-                                        {{if moduleAvailable "organized_carpool"}}
-                                        <a href="#" @click="tab = 'organized_carpool'"
-                                            class="whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm"
-                                            :class="tab == 'organized_carpool' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
-                                            Covoiturage solidaire </a>
-                                        {{end}}
-
                                         <a href="#" @click="tab = 'organizations'"
                                             class="whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm"
                                             :class="tab == 'organizations' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
@@ -207,9 +138,6 @@
 
                         <div x-show="tab == 'documents'">{{template "beneficiary_files" .}}</div>
                         <div x-show="tab == 'notes'">{{template "beneficiary_notes" .}}</div>
-                        <div x-show="tab == 'wallet'">{{template "beneficiary_wallet" .}}</div>
-                        {{if moduleAvailable "solidarity_transport"}}<div x-show="tab == 'solidarity_transport'">{{template "beneficiary_solidarity_transport" .}}</div>{{end}}
-                        {{if moduleAvailable "organized_carpool"}}<div x-show="tab == 'organized_carpool'">{{template "beneficiary_organized_carpool" .}}</div>{{end}}
                         <div x-show="tab == 'organizations'">{{template "beneficiary_organizations" .}}</div>
                     </div>
                 </div>
@@ -217,7 +145,10 @@
         </div>
 
         <section aria-labelledby="timeline-title" class="lg:col-start-3 lg:col-span-1">
-        {{template "beneficiary_events" .}}
+            <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>
         </section>
     </div>
 </main>

web/layouts/beneficiaries/list.html

@@ -14,23 +14,6 @@
                     Exporter
                 </button>
             </a>
-            {{if .ViewState.Archived}}
-            <a href="/app/beneficiaries/">
-                <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/archive-box-x-mark" "h-5 w-5 mr-3"}}
-                    Bénéficiaires actifs
-                </button>
-            </a>
-            {{else}}
-            <a href="/app/beneficiaries/?archived=true">
-                <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/archive-box" "h-5 w-5 mr-3"}}
-                    Bénéficiaires archivés
-                </button>
-            </a>
-            {{end}}
             <a href="/app/beneficiaries/create">
                 <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">
@@ -62,7 +45,7 @@
     <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 md:rounded-lg">
+                <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>

web/layouts/beneficiaries/update.html

@@ -7,23 +7,21 @@
 <div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8 mt-8"
     x-data="{
         fields: {
-            first_name: '{{ .ViewState.beneficiary.Data.first_name }}',
+            first_name: '{{ .ViewState.Data.first_name }}',
-            last_name: '{{ .ViewState.beneficiary.Data.last_name }}',
+            last_name: '{{ .ViewState.Data.last_name }}',
-            email: '{{ .ViewState.beneficiary.Data.email }}',
+            email: '{{ .ViewState.Data.email }}',
-            phone_number: '{{ .ViewState.beneficiary.Data.phone_number }}',
+            phone_number: '{{ .ViewState.Data.phone_number }}',
-            birthdate: {{if .ViewState.beneficiary.Data.birthdate}}'{{ (timeFrom .ViewState.beneficiary.Data.birthdate).Format "2006-01-02" }}'{{else}}null{{end}},
+            birthdate: {{if .ViewState.Data.birthdate}}'{{ (timeFrom .ViewState.Data.birthdate).Format "2006-01-02" }}'{{else}}null{{end}},
-            file_number: '{{ .ViewState.beneficiary.Data.file_number }}',
+            file_number: '{{ .ViewState.Data.file_number }}',
-            gender: {{.ViewState.beneficiary.Data.gender}}
+            gender: {{.ViewState.Data.gender}}
         },
-        other_properties: {{if .ViewState.beneficiary.Data.other_properties}}{{ json .ViewState.beneficiary.Data.other_properties }}{{else}}{}{{end}},
-        other_properties_serialized: null,
         rules: {
             first_name: ['required'],
             last_name: ['required'],
             email: ['required', 'email'],
             phone_number: ['required', 'regexMatch:^((\\+)33|0)[1-9](\\d{2}){4}$'],
             birthdate: ['required'],
-            file_number: ['required'],
+            file_number: ['optional'],
         },
         formValidation: {
             valid: false,
@@ -44,7 +42,6 @@
             this.formValidation.fields[field] = Iodine.assert(this.fields[field], this.rules[field])
         },
         submit(event) {
-            this.other_properties_serialized = JSON.stringify(this.other_properties)
             this.validate()
             if(!this.formValidation.valid) {
                 this.isFormValid = false
@@ -54,7 +51,6 @@
         }
     }">
     <form class="space-y-6" method="POST" @submit="submit">
-        <input type="hidden" name="other_properties" x-model="other_properties_serialized" />
         <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">
@@ -105,23 +101,6 @@
                                 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</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>
-                    
-		    {{ $fieldName := "address" }}
-                    {{if .ViewState.beneficiary.Data.address}}
-                    {{$default := .ViewState.beneficiary.Data.address}}
-                    {{ template "address" dict "FieldName" $fieldName  "Default" $default}}
-                    {{else}}
-                    {{ template "address_autocomplete" dict "FieldName" $fieldName}}
-                    {{end}}
-
                     </div>
                 </div>
             </div>
@@ -135,42 +114,65 @@
                 </div>
                 <div class="mt-5 space-y-6 md:mt-0 md:col-span-2">
                     <div class="grid grid-cols-6 gap-6">
-                        {{range .ViewState.profile_optional_fields}}
+
                         <div class="col-span-6 sm:col-span-3">
-                            <label for="{{.name}}" class="block text-sm font-medium text-gray-700">{{.label}}</label>
+                            <label for="file_number" class="block text-sm font-medium text-gray-700">Numéro de dossier (allocataire, ...)</label>
-                            {{if eq .type "select"}}
+                            <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">
-                                <select id="{{.name}}" name="{{.name}}"
+                                <select id="gender" name="gender" autocomplete="gender" x-model="gender"
-                                    {{if eq .name "gender"}}x-model="fields.gender"{{else}}x-model="other_properties.{{.name}}"{{end}}
                                     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 border-gray-300 rounded-2xl">
-                                    {{range .options}}
+                                    <option value="0">Inconnu</option>
-                                    <option value="{{.value}}">{{.label}}</option>
+                                    <option value="1" :selected="fields.gender == '1'">Masculin</option>
-                                    {{end}}
+                                    <option value="2" :selected="fields.gender == '2'">Féminin</option>
+                                    <option value="9" :selected="fields.gender == '9'">Sans objet</option>
                                 </select>
                             </div>
-                            {{else if eq .type "textarea"}}
-                            <textarea id="{{.name}}" name="{{.name}}" rows="3" x-model="other_properties.{{.name}}"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm border-gray-300 rounded-2xl"></textarea>
-                            {{else if eq .type "date"}}
-                            <input type="date" id="{{.name}}" name="{{.name}}" x-model="other_properties.{{.name}}"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm border-gray-300 rounded-2xl">
-                            {{else if eq .type "number"}}
-                            <input type="number" id="{{.name}}" name="{{.name}}" x-model="other_properties.{{.name}}"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm border-gray-300 rounded-2xl">
-                            {{else}}
-                            <input type="text" id="{{.name}}" name="{{.name}}" x-model="other_properties.{{.name}}"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm border-gray-300 rounded-2xl">
-                            {{end}}
                         </div>
-                        {{end}}
+
+                        <!-- <div class="col-span-3 sm:col-span-3">
+                            <label class="block text-sm font-medium text-gray-700"> Photo </label>
+                            <div class="mt-1 flex items-center space-x-5">
+                                <span class="inline-block h-12 w-12 rounded-co overflow-hidden bg-gray-100">
+                                    {{.IconSet.Icon "img:profile-picture-placeholder" "h-full w-full"}}
+                                </span>
+                                <button type="button"
+                                    class="bg-white py-2 px-3 border border-gray-300 rounded-2xl shadow-sm text-sm leading-4 font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">
+                                    Charger la photo
+                                </button>
+                            </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 liés au bénéficiaire, utiles pour exploiter les fonctionnalités de PARCOURSMOB</p>
+                </div>
+                <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) }}
+                    <!-- will dolater : tags, groups, ... -->
+
+                </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/beneficiaries/{{.ViewState.beneficiary.ID}}">
+            <a href="/app/beneficiaries/{{.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>

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

@@ -10,7 +10,6 @@
     </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">
@@ -19,7 +18,6 @@
             </a>
             </li>
         {{end}}
-        {{end}}
     </ul>
 
     <a href="/app/agenda/">

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

@@ -1,29 +0,0 @@
-{{define "bookings_widget"}}
-<!--<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">Prochaines réservations</h3>
-        </div>
-    </div>
-    <ul role="list" class="divide-y divide-gray-200 flex-1">
-        {{range .}}
-        {{if not .Deleted}}
-            <li class="py-2 px-4 flex">
-                <a href="/app/vehicles-management/bookings/{{.ID}}" class="flex w-full">
-                <div class="ml-3">
-                    
-                    <p class="text-sm font-medium text-gray-900">Du {{(timeFrom .Startdate).Format "02/01"}} au {{(timeFrom .Enddate).Format "02/01"}}</p>
-                </div>
-            </a>
-            </li>
-        {{end}}
-        {{end}}
-    </ul>
-
-    <a href="/app/vehicles-management/">
-        <button class="w-full p-2 text-center bg-co-blue text-white rounded-b-2xl text-sm">
-            Reservation des véhicules
-        </button>
-    </a>
-</div>-->
-{{end}}

web/layouts/dashboard/_partials/drivers-map-widget.html

@@ -1,190 +0,0 @@
-{{define "drivers_map_widget"}}
-<div class="bg-white overflow-hidden shadow rounded-2xl">
-    <div class="p-6">
-        <div class="flex items-center justify-between mb-4">
-            <h3 class="text-lg leading-6 font-medium text-gray-900">
-                Carte des conducteurs
-            </h3>
-            {{if .geography_filters_enabled}}
-            <form>
-                <div class="grid grid-cols-1">
-                    <select id="driver_address_geo" name="driver_address_geo" class="col-start-1 row-start-1 w-48 appearance-none rounded-md bg-white py-1.5 pr-8 pl-3 text-base text-gray-900 outline-1 -outline-offset-1 outline-gray-300 focus-visible:outline-2 focus-visible:-outline-offset-2 focus-visible:outline-indigo-600 sm:text-sm/6 dark:bg-white/5 dark:text-white dark:outline-white/10 dark:*:bg-gray-800 dark:focus-visible:outline-co-blue" onchange="this.form.submit()">
-                        <option value="">Toutes les zones</option>
-                        {{range .geography_filters_list}}
-                        {{$geoValue := printf "%s:%s" .layer .code}}
-                        <option value="{{$geoValue}}"{{if eq $.filters.driver_address_geo $geoValue}} selected{{end}}>{{.name}}</option>
-                        {{end}}
-                    </select>
-                    <svg viewBox="0 0 16 16" fill="currentColor" data-slot="icon" aria-hidden="true" class="pointer-events-none col-start-1 row-start-1 mr-2 size-5 self-center justify-self-end text-gray-500 sm:size-4 dark:text-gray-400">
-                        <path d="M4.22 6.22a.75.75 0 0 1 1.06 0L8 8.94l2.72-2.72a.75.75 0 1 1 1.06 1.06l-3.25 3.25a.75.75 0 0 1-1.06 0L4.22 7.28a.75.75 0 0 1 0-1.06Z" clip-rule="evenodd" fill-rule="evenodd" />
-                    </svg>
-                </div>
-            </form>
-            {{end}}
-        </div>
-
-        <div id="drivers-map" class="w-full rounded-lg overflow-hidden border border-gray-200" style="height: 500px;"></div>
-
-        <div class="mt-4 flex items-center justify-center gap-6 text-sm">
-            {{if moduleAvailable "solidarity_transport"}}
-            <div class="flex items-center">
-                <div class="w-6 h-6 rounded-co bg-co-blue border border-white shadow-md mr-2"></div>
-                <span class="text-gray-700">Transport solidaire ({{len .solidarity_drivers}})</span>
-            </div>
-            {{end}}
-            {{if moduleAvailable "organized_carpool"}}
-            <div class="flex items-center">
-                <div class="w-6 h-6 rounded-co bg-co-green border border-white shadow-md mr-2"></div>
-                <span class="text-gray-700">Covoiturage solidaire ({{len .organized_carpool_drivers}})</span>
-            </div>
-            {{end}}
-        </div>
-    </div>
-</div>
-
-<script>
-document.addEventListener('DOMContentLoaded', function() {
-    // Check if map libraries are available
-    if (typeof maplibregl === 'undefined' || typeof pmtiles === 'undefined') {
-        console.warn('Map libraries not available');
-        return;
-    }
-
-    // Initialize PMTiles protocol
-    let protocol = new pmtiles.Protocol();
-    maplibregl.addProtocol("pmtiles", protocol.tile);
-
-    // Initialize map centered on France with protomaps style
-    const map = new maplibregl.Map({
-        container: 'drivers-map',
-        style: '/public/maps/protomaps-light/style.json',
-        center: [2.3522, 48.8566], // Paris
-        zoom: 5
-    });
-
-    map.addControl(new maplibregl.NavigationControl(), 'top-right');
-
-    const bounds = new maplibregl.LngLatBounds();
-    let hasMarkers = false;
-
-    map.on('load', function() {
-        // Add solidarity transport drivers
-        {{if moduleAvailable "solidarity_transport"}}
-        const solidarityDrivers = [
-            {{range .solidarity_drivers}}
-            {{if .Data.address}}
-            {
-                name: '{{.Data.first_name}} {{.Data.last_name}}',
-                coordinates: {{if and .Data.address.geometry .Data.address.geometry.coordinates}}[{{index .Data.address.geometry.coordinates 0}}, {{index .Data.address.geometry.coordinates 1}}]{{else}}null{{end}},
-                address: {{if .Data.address.properties}}'{{.Data.address.properties.label}}'{{else}}''{{end}},
-                type: 'solidarity-transport',
-                driverId: '{{.ID}}'
-            },
-            {{end}}
-            {{end}}
-        ].filter(d => d.coordinates !== null);
-
-        solidarityDrivers.forEach(function(driver) {
-            // Create custom marker element matching compact search style
-            const el = document.createElement('div');
-            el.className = 'w-8 h-8 rounded-co bg-co-blue border border-white shadow-md flex items-center justify-center cursor-pointer';
-
-            // User icon matching compact search
-            el.innerHTML = `
-                <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
-                    <path d="M20 21v-2a4 4 0 0 0-4-4H8a4 4 0 0 0-4 4v2"></path>
-                    <circle cx="12" cy="7" r="4"></circle>
-                </svg>
-            `;
-
-            const marker = new maplibregl.Marker({element: el})
-                .setLngLat(driver.coordinates)
-                .setPopup(new maplibregl.Popup({offset: 25, className: 'rounded-lg'})
-                    .setHTML(`
-                        <div class="p-3">
-                            <a href="/app/solidarity-transport/drivers/${driver.driverId}" class="font-semibold text-sm text-gray-900 hover:text-co-blue">${driver.name}</a>
-                            <p class="text-xs text-gray-600 mt-1">${driver.address}</p>
-                            <p class="text-xs text-co-blue font-medium mt-2">Transport solidaire</p>
-                        </div>
-                    `))
-                .addTo(map);
-
-            bounds.extend(driver.coordinates);
-            hasMarkers = true;
-        });
-        {{end}}
-
-        // Add organized carpool drivers
-        {{if moduleAvailable "organized_carpool"}}
-        const organizedCarpoolDrivers = [
-            {{range .organized_carpool_drivers}}
-            {{if .Data.address}}
-            {
-                name: '{{.Data.first_name}} {{.Data.last_name}}',
-                coordinates: {{if and .Data.address.geometry .Data.address.geometry.coordinates}}[{{index .Data.address.geometry.coordinates 0}}, {{index .Data.address.geometry.coordinates 1}}]{{else}}null{{end}},
-                address: {{if .Data.address.properties}}'{{.Data.address.properties.label}}'{{else}}''{{end}},
-                type: 'organized-carpool',
-                driverId: '{{.ID}}'
-            },
-            {{end}}
-            {{end}}
-        ].filter(d => d.coordinates !== null);
-
-        organizedCarpoolDrivers.forEach(function(driver) {
-            // Create custom marker element matching compact search style
-            const el = document.createElement('div');
-            el.className = 'w-8 h-8 rounded-co bg-co-green border border-white shadow-md flex items-center justify-center cursor-pointer';
-
-            // User icon matching compact search
-            el.innerHTML = `
-                <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
-                    <path d="M20 21v-2a4 4 0 0 0-4-4H8a4 4 0 0 0-4 4v2"></path>
-                    <circle cx="12" cy="7" r="4"></circle>
-                </svg>
-            `;
-
-            const marker = new maplibregl.Marker({element: el})
-                .setLngLat(driver.coordinates)
-                .setPopup(new maplibregl.Popup({offset: 25, className: 'rounded-lg'})
-                    .setHTML(`
-                        <div class="p-3">
-                            <a href="/app/organized-carpool/drivers/${driver.driverId}" class="font-semibold text-sm text-gray-900 hover:text-co-green">${driver.name}</a>
-                            <p class="text-xs text-gray-600 mt-1">${driver.address}</p>
-                            <p class="text-xs text-co-green font-medium mt-2">Covoiturage solidaire</p>
-                        </div>
-                    `))
-                .addTo(map);
-
-            bounds.extend(driver.coordinates);
-            hasMarkers = true;
-        });
-        {{end}}
-
-        // Fit map to markers bounds with padding
-        if (hasMarkers) {
-            map.fitBounds(bounds, {
-                padding: 50,
-                maxZoom: 12
-            });
-        }
-    });
-});
-</script>
-
-<style>
-.maplibregl-popup-content {
-    padding: 0;
-    border-radius: 0.5rem;
-    box-shadow: 0 4px 6px -1px rgba(0, 0, 0, 0.1), 0 2px 4px -1px rgba(0, 0, 0, 0.06);
-}
-.maplibregl-popup-close-button {
-    font-size: 20px;
-    padding: 4px;
-    color: #6B7280;
-}
-.maplibregl-popup-close-button:hover {
-    background-color: #F3F4F6;
-    color: #111827;
-}
-</style>
-{{end}}

web/layouts/dashboard/dashboard.html

@@ -14,12 +14,40 @@
         <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="/app/beneficiaries/" class="text-gray-900 font-medium hover:text-gray-600">Bénéficiaires</a>
+            <a href="#" class="text-gray-900 font-medium hover:text-gray-600">Bénéficiaires</a>
             <p class="text-gray-500">{{.ViewState.beneficiaries.count}} bénéficiaires</p>
           </div>
         </div>
       </li>
   
+      <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/shield-check" "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>
+          </div>
+        </div>
+      </li>
+  
+      <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/office-building" "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">Groupes</a>
+            <p class="text-gray-500">0 groupes créés</p>
+          </div>
+        </div>
+      </li>
+  
       <li class="col-span-1 flex shadow-sm rounded-3xl">
         <div
           class="flex-shrink-0 flex items-center justify-center w-16 bg-co-red text-white text-sm font-medium rounded-l-3xl">
@@ -33,44 +61,6 @@
           </div>
         </div>
       </li>
-
-      {{if moduleAvailable "solidarity_transport"}}
-      <li class="col-span-1 flex shadow-sm rounded-3xl">
-        <div
-          class="flex-shrink-0 flex items-center justify-center w-16 bg-co-orange text-white text-sm font-medium rounded-l-3xl">
-          <svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
-            <path d="M20 21v-2a4 4 0 0 0-4-4H8a4 4 0 0 0-4 4v2"></path>
-            <circle cx="12" cy="7" r="4"></circle>
-          </svg>
-        </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="/app/solidarity-transport/?tab=drivers" class="text-gray-900 font-medium hover:text-gray-600">Conducteurs solidaires</a>
-            <p class="text-gray-500">{{len .ViewState.solidarity_drivers}} conducteurs</p>
-          </div>
-        </div>
-      </li>
-      {{end}}
-
-      {{if moduleAvailable "organized_carpool"}}
-      <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">
-          <svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
-            <path d="M20 21v-2a4 4 0 0 0-4-4H8a4 4 0 0 0-4 4v2"></path>
-            <circle cx="12" cy="7" r="4"></circle>
-          </svg>
-        </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="/app/organized-carpool/?tab=drivers" class="text-gray-900 font-medium hover:text-gray-600">Covoitureurs solidaires</a>
-            <p class="text-gray-500">{{len .ViewState.organized_carpool_drivers}} covoitureurs</p>
-          </div>
-        </div>
-      </li>
-      {{end}}
     </ul>
   </div>
 
@@ -79,21 +69,9 @@
 
 
       {{template "beneficiaries_widget" .ViewState.beneficiaries}}
+      {{template "agenda_widget" .ViewState.events}}
 
-      {{if moduleAvailable "agenda"}}
-        {{template "agenda_widget" .ViewState.events}}
-      {{end}}
-
-      {{if moduleAvailable "vehicles_management"}}
-        {{template "bookings_widget" .ViewState.fleets}}
-      {{end}}
 
     </div>
-
-    {{if or (moduleAvailable "solidarity_transport") (moduleAvailable "organized_carpool")}}
-    <div class="py-4">
-      {{template "drivers_map_widget" .ViewState}}
-    </div>
-    {{end}}
 </div>
 {{end}}

web/layouts/journeys/_partials/journeys-all.html

@@ -1,62 +1,97 @@
 {{define "journeys_all"}}
 <div>
     {{ if gt (len .ViewState.carpools) 0}}
-    <div class="px-4 pt-4 flex text-sm text-grey-900">
+    {{$carpool := (index .ViewState.carpools 0)}}
+    <div class="px-4 pt-4 flex text-sm text-grey-900 font-bold">
         <div class="flex-1">
-            {{.IconSet.Icon "tabler-icons:car" "h-6 w-6 inline-flex mr-4"}}
+            {{.IconSet.Icon "tabler-icons:car" "h-6 w-6 inline-flex mr-4"}} Covoiturage
-            <span class=" font-bold">{{len .ViewState.carpools}} trajets disponibles</span> sur les applications de covoiturage.
+            {{if $carpool.days.monday}}
+            entre {{$carpool.outward.monday.mintime}} et {{$carpool.outward.monday.maxtime}}
+            {{else if $carpool.days.tuesday}}
+            entre {{$carpool.outward.tuesday.mintime}} et {{$carpool.outward.tuesday.maxtime}}
+            {{else if $carpool.days.wednesday}}
+            entre {{$carpool.outward.wednesday.mintime}} et {{$carpool.outward.wednesday.maxtime}}
+            {{else if $carpool.days.thursday}}
+            entre {{$carpool.outward.thursday.mintime}} et {{$carpool.outward.thursday.maxtime}}
+            {{else if $carpool.days.friday}}
+            entre {{$carpool.outward.friday.mintime}} et {{$carpool.outward.friday.maxtime}}
+            {{else if $carpool.days.saturday}}
+            entre {{$carpool.outward.saturday.mintime}} et {{$carpool.outward.saturday.maxtime}}
+            {{else if $carpool.days.sunday}}
+            entre {{$carpool.outward.sunday.mintime}} et {{$carpool.outward.sunday.maxtime}}
+            {{end}}
+            (Temps trajet : {{divideFloat64 $carpool.duration 60.0 | printf "%.0f"}} Minutes)
         </div>
-        <div></div>
+        <div>
+            <span class="ml-2 rounded-xl px-2 py-1 bg-co-blue flex items-center justify-center ring-8 ring-white text-sm text-white whitespace-nowrap">
+                RIDYGO
+            </span>
+        </div>
+    </div>
+
+    <div class="flex items-center justify-center text-sm my-4">
+        <span class="ml-2 mt-1">
+            {{$carpool.from.address}}, {{$carpool.from.city}}
+        </span>
+        {{$.IconSet.Icon "hero:outline/chevron-right" "h-3 w-3 stroke-gray-800 m-2"}}
+        <span class="ml-2 mt-1">
+            {{$carpool.to.address}}, {{$carpool.to.city}}
+        </span>
+    </div>
+
+    <div class="p-4 pb-8 flex items-center justify-center">
+        <span class="text-xs text-md">Conducteur : </span>
+        <span class="ml-2 mt-1 h-5 rounded-xl bg-gray-200 flex items-center justify-center ring-8 ring-white text-black p-2 text-sm">
+            {{$carpool.driver.alias}}
+        </span>
     </div>
 
     <div class="p-4 text-center">
-        <button class="rounded-xl text-md px-4 py-1 bg-gray-200 text-co-blue" @click="tab = 'carpool'">Voir les trajets disponibles</button>
+        <button class="rounded-xl text-md px-4 py-1 bg-gray-200 text-co-blue" @click="tab = 'carpool'">{{ len .ViewState.carpools}} solutions en covoiturage : les voir toutes</button>
     </div>
     
 
     {{end}}
 
-    {{ if and .ViewState.journeys (gt (len .ViewState.journeys) 0)}}
+    {{ if gt (len .ViewState.journeys.Journeys) 0}}
-    {{$itinerary := index .ViewState.journeys 0}}
+    <div class="px-4 pt-4 flex text-sm text-grey-900 font-bold border-t-2">
-    <div class="px-4 pt-4 flex text-sm text-grey-900 font-bold">
         <div class="flex-1">
             {{.IconSet.Icon "tabler-icons:bus" "h-6 w-6 inline-flex mr-4"}}
-            {{ timeFormat $itinerary.StartTime "15:04" }} - {{ timeFormat $itinerary.EndTime "15:04" }}
+            {{(timeFrom (index .ViewState.journeys.Journeys 0).Departure).Format "15:04"}} - {{(timeFrom (index .ViewState.journeys.Journeys 0).Arrival).Format "15:04"}}
-            ({{shortDuration $itinerary.Duration}})
+            ({{(index .ViewState.journeys.Journeys 0).Duration.Minutes | printf "%.0f"}} Minutes)
         </div>
         <div></div>
     </div>
     <div class="p-4 pb-8 flex">
-        {{range $itinerary.Legs }}
+        {{$firstwalk := true}}
-        {{if or (or (or (eq .Mode "BUS") (eq .Mode "REGIONAL_FAST_RAIL")) (eq .Mode "REGIONAL_RAIL") (eq .Mode "COACH")) }}
+        {{range (index .ViewState.journeys.Journeys 0).Sections}}
-        <!--<span class="ml-2 px-2 py-1 text-sm text-gray-500 whitespace-nowrap">
+        {{if eq .Type "street_network"}}
-        {{.AgencyName}} 
+        <span class="ml-2 mt-1 h-5 w-5 rounded-co bg-gray-200 flex items-center justify-center ring-8 ring-white text-white">
-        </span>-->
+            {{$.IconSet.Icon "tabler-icons:walk" "h-4 w-4 stroke-gray-800"}}
-    <span class="ml-2 rounded-xl px-2 py-1 flex items-center justify-center ring-8 ring-white text-sm whitespace-nowrap" style="background-color: #{{.RouteColor}}; color: #{{.RouteTextColor}}">
-            {{.RouteShortName}}
         </span>
+        {{if $firstwalk}}
+        {{$firstwalk = false}}
+        {{$.IconSet.Icon "hero:outline/chevron-right" "h-3 w-3 stroke-gray-800 m-2"}}
+        {{end}}
+        {{end}}
+        {{if eq .Type "public_transport"}}
+        <span class="ml-2 rounded-xl px-2 py-1 bg-co-blue flex items-center justify-center ring-8 ring-white text-sm text-white whitespace-nowrap">
+            {{if eq .Display.Network "Antibes - Envibus"}}Envibus{{else}}{{.Display.Network}}{{end}} Ligne {{.Display.Label}}
+        </span>
+        {{$.IconSet.Icon "hero:outline/chevron-right" "h-3 w-3 stroke-gray-800 m-2"}}
         {{end}}
         {{end}}
         <div class="flex-1"></div>
         <button class="text-sm px-2 py-1 bg-gray-200 text-co-blue rounded-xl" @click="tab = 'public-transit'">Voir le détail</button>
     </div>
     <div class="p-4 text-center">
-        <button class="rounded-xl text-md px-4 py-1 bg-gray-200 text-co-blue" @click="tab = 'public-transit'">{{ len .ViewState.journeys}} solutions en transports en commun : les voir toutes</button>
+        <button class="rounded-xl text-md px-4 py-1 bg-gray-200 text-co-blue" @click="tab = 'public-transit'">{{ len .ViewState.journeys.Journeys}} solutions en transports en commun : les voir toutes</button>
     </div>
 
     {{end}}
 
-  {{if moduleAvailable "organized_carpool"}}
-  {{template "journeys_organized_carpool" .}}
-  {{end}}
-
-  {{if moduleAvailable "solidarity_transport"}}
-  {{template "journeys_solidarity_transport" .}}
-  {{end}}
-
-  {{if moduleAvailable "vehicles"}}
     <!--VEHICLES-->
-    <div class="px-4 pt-16 flex text-sm text-grey-900">
+    <div class="px-4 pt-16 flex text-sm text-grey-900  border-t-2">
         <div class="flex-1">
             {{.IconSet.Icon "tabler-icons:car" "h-6 w-6 inline-flex mr-4"}}
             <span class=" font-bold">{{len .ViewState.vehicles}} véhicules</span> partagés disponibles ce jour là et la semaine suivante
@@ -66,6 +101,5 @@
     <div class="p-4 text-center">
         <a href="/app/vehicles/"><button class="text-md px-4 py-1 bg-gray-200 text-co-blue rounded-xl">Réserver un véhicule</button></a>
     </div>
-  {{end}}
 </div>
 {{end}}

web/layouts/journeys/_partials/journeys-carpool.html

@@ -1,162 +1,56 @@
 {{define "journeys_carpool"}}
-<div>
+
 {{ if eq (len .ViewState.carpools) 0}}
 <p class="p-12 text-gray-500 text-center text-md">Aucun covoiturage disponible pour ce trajet.</p>
 {{end}}
 
 {{$first := true}}
-{{$i := 0}}
 {{range .ViewState.carpools}}
-{{$carpoolData := index .ExtraMembers "ocss"}}
 {{if $first}}
 {{$first = false}}
 <div class="p-4 pb-8">
 {{else}}
 <div class="p-4 border-t-2 pb-8">
 {{end}}
-    <div class="flex items-center justify-between mb-3">
+    <div class="flex text-sm text-grey-900 font-bold">
-      <div class="flex-1">
+        {{if .days.monday}}
-        <div class="text-sm text-grey-900 font-bold">Trajet en covoiturage avec {{$carpoolData.Driver.Alias}}</div>
+        <div class="flex-1">Départ entre {{.outward.monday.mintime}} et {{.outward.monday.maxtime}}</div>
-        {{$pickupDate := timeFrom $carpoolData.PassengerPickupDate}}
+        {{else if .days.tuesday}}
-        {{if $pickupDate}}<div class="text-xs text-gray-600">Départ {{$pickupDate}}</div>{{end}}
+        <div class="flex-1">Départ entre {{.outward.tuesday.mintime}} et {{.outward.tuesday.maxtime}}</div>
-      </div>
+        {{else if .days.wednesday}}
-      {{if and $carpoolData.Price $carpoolData.Price.Amount}}
+        <div class="flex-1">Départ entre {{.outward.wednesday.mintime}} et {{.outward.wednesday.maxtime}}</div>
-      <div class="text-lg font-bold text-co-blue">{{printf "%.2f" (round2 $carpoolData.Price.Amount)}}€</div>
+        {{else if .days.thursday}}
-      {{end}}
+        <div class="flex-1">Départ entre {{.outward.thursday.mintime}} et {{.outward.thursday.maxtime}}</div>
-    </div>
+        {{else if .days.friday}}
-
+        <div class="flex-1">Départ entre {{.outward.friday.mintime}} et {{.outward.friday.maxtime}}</div>
-    <!-- Pickup and Drop addresses -->
+        {{else if .days.saturday}}
-    <div class="mb-4 space-y-2">
+        <div class="flex-1">Départ entre {{.outward.saturday.mintime}} et {{.outward.saturday.maxtime}}</div>
-      {{if $carpoolData.PassengerPickupAddress}}
+        {{else if .days.sunday}}
-      <div class="flex items-start gap-2 text-sm">
+        <div class="flex-1">Départ entre {{.outward.sunday.mintime}} et {{.outward.sunday.maxtime}}</div>
-        {{$.IconSet.Icon "hero:outline/map-pin" "h-4 w-4 text-co-green mt-0.5"}}
-        <div>
-          <div class="text-xs text-gray-500">Départ</div>
-          <div class="text-gray-900">{{$carpoolData.PassengerPickupAddress}}</div>
-        </div>
-      </div>
-      {{end}}
-      {{if $carpoolData.PassengerDropAddress}}
-      <div class="flex items-start gap-2 text-sm">
-        {{$.IconSet.Icon "hero:outline/flag" "h-4 w-4 text-co-red mt-0.5"}}
-        <div>
-          <div class="text-xs text-gray-500">Arrivée</div>
-          <div class="text-gray-900">{{$carpoolData.PassengerDropAddress}}</div>
-        </div>
-      </div>
-      {{end}}
-    </div>
-
-    <div class="text-center">
-        {{if $carpoolData.WebUrl}}
-        <a href="{{$carpoolData.WebUrl}}" target="_blank" class="inline-block rounded-xl px-4 py-1 bg-co-blue text-white text-sm hover:bg-co-darkblue transition-colors">
-            <span>Voir l'offre sur </span><span>{{$carpoolData.Operator}}</span>
-        </a>
         {{end}}
+        <div>{{divideFloat64 .duration 60.0 | printf "%.0f"}} Minutes</div>
     </div>
-    <div  x-data="{dialog{{$i}}: false}" class="text-center">
+    <div class="flex items-center justify-center text-sm my-4">
-        <button @click="dialog{{$i}} = !dialog{{$i}}" class="m-4 rounded-xl px-4 py-1 mt-8 bg-gray-200 text-co-blue text-sm">Envoyer le lien par SMS</button>
+        <span class="ml-2 mt-1">
-        <div x-show="dialog{{$i}}" class="relative z-10" aria-labelledby="modal-title" role="dialog" aria-modal="true">
+            {{.from.address}}, {{.from.city}}
-        <form method="POST" action="/app/sms/send">
+        </span>
-
+        {{$.IconSet.Icon "hero:outline/chevron-right" "h-3 w-3 stroke-gray-800 m-2"}}
-            <div class="fixed inset-0 bg-gray-500 bg-opacity-75 transition-opacity"></div>
+        <span class="ml-2 mt-1">
-        
+            {{.to.address}}, {{.to.city}}
-            <div class="fixed inset-0 z-10 overflow-y-auto">
+        </span>
-            <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">Envoyer un message</h3>
-                        <div class="mt-2">
-                            <p class="text-sm text-gray-500"></p>
-                        </div>
-                        <div>
-                            <label for="message" class="block text-sm font-medium text-gray-700">Message</label>
-                            <div class="mt-1">
-                              <textarea rows="4" name="message" id="message" class="block w-full rounded-2xl border-gray-300 shadow-sm focus:border-co-blue focus:ring-co-blue sm:text-sm">Un covoiturage est disponible sur {{.ExtraMembers.ocss.WebUrl}}.</textarea>
-                            </div>
-                          </div>
-                    </div>
-                </div>
-<br /><br />
-                    <div x-data="{
-                        text: '',
-                        beneficiariesListOpen: false,
-                        beneficiaries: {{json $.ViewState.beneficiaries}},
-                        filteredBeneficiaries: (beneficiaries, text) => {
-                            if(text=='') {
-                              return beneficiaries
-                            }
-                            return beneficiaries.filter(b => b['data']['first_name'].toLowerCase().includes(text.toLowerCase()) || b['data']['last_name'].toLowerCase().includes(text.toLowerCase()))
-                        },
-                        fields: {
-                            beneficiaryid: null,
-                        },
-                        selectbeneficiary(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">Selectionner un bénéficiaire</label>
-                        <div class="relative mt-1 mb-4">
-                          <input autocomplete="off" @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">
-                            <!-- Heroicon name: solid/selector -->
-                            <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">
-                            <!--
-                              Combobox option, manage highlight styles based on mouseenter/mouseleave and keyboard navigation.
-                      
-                              Active: "text-white bg-indigo-600", Not Active: "text-gray-900"
-                            -->
-                            <template x-for="beneficiary in filteredBeneficiaries(beneficiaries, text)">
-                                <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">
-                                <!-- Selected: "font-semibold" -->
-                                <span class="truncate" x-text="beneficiary.data.first_name"></span> <span class="truncate" x-text="beneficiary.data.last_name"></span>
-                        
-                                <!--
-                                    Checkmark, only display for selected option.
-                        
-                                    Active: "text-white", Not Active: "text-indigo-600"
-                                -->
-                                <span class="absolute inset-y-0 right-0 flex items-center pr-4 text-co-blue">
-                                    <!-- Heroicon name: solid/check -->
-                                    <!-- <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="M16.707 5.293a1 1 0 010 1.414l-8 8a1 1 0 01-1.414 0l-4-4a1 1 0 011.414-1.414L8 12.586l7.293-7.293a1 1 0 011.414 0z" clip-rule="evenodd" />
-                                    </svg> -->
-                                </span>
-                                </li>
-                            </template>
-                      
-                            <!-- More items... -->
-                          </ul>
-                        </div>
-                      </div>
-
-
-                <div class="mt-5 sm:mt-6 sm:grid sm:grid-flow-row-dense sm:grid-cols-2">
-                    <button @click="dialog{{$i}} = !dialog{{$i}}" type="button" 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</button>
-                    <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">Envoyer</button>
-                </div>
-                </div>
-            </div>
-            </div>
-        </form>
     </div>
 
+    <div class="p-4 pb-8 flex items-center justify-center">
+        <span class="text-xs text-md">Avec </span>
+        <span class="ml-2 mt-1 h-5 rounded-xl bg-gray-200 flex items-center justify-center ring-8 ring-white text-black p-2 text-sm">
+            {{.driver.alias}}
+        </span>
+
+        <span class="text-xs text-md"> sur l'application </span>
+        <span class="ml-2 rounded-xl px-2 py-1 bg-co-blue flex items-center justify-center ring-8 ring-white text-sm text-white whitespace-nowrap">
+            RIDYGO
+        </span>
     </div>
 </div>
 {{end}}
-</div>
 {{end}}

web/layouts/journeys/_partials/journeys-local-solutions.html

@@ -1,13 +0,0 @@
-
-{{define "journeys_local_solutions"}}
-<!--KNOWLEDGE BASE-->
-<div class="p-10">
-  {{ range .ViewState.kb_data }}
-    <div class="m-4">
-      <h2 class="text-sm font-bold">{{.title}}</h2>
-      <p class="text-sm">{{.description}}</p>
-      <p class="text-sm text-co-blue"><a href="{{.url}}" target="_blank">Voir plus ...</a></p>
-    </div>
-  {{ end }}
-</div>
-{{end}}

web/layouts/journeys/_partials/journeys-organized-carpools.html

@@ -1,68 +0,0 @@
-
-{{define "journeys_organized_carpool"}}
-{{if .ViewState.organized_carpools}}
-{{ if eq (len .ViewState.organized_carpools) 0}}
-<p class="p-12 text-gray-500 text-center text-md">Aucun covoitureur solidaire disponible pour ce trajet.</p>
-{{else}}
-
-<table class="min-w-full divide-y divide-gray-300 border-gray-300 border-t-1">
-  <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">
-          Covoitureurs solidaires
-      </th>
-      <th scope="col"
-          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-          Départ conducteur
-      </th>
-      <th scope="col"
-          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-          Arrivée conducteur
-      </th>
-      <th scope="col"
-          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-          Date et heure
-      </th>
-      <th scope="col"
-          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-          Profil validé
-      </th>
-      <th scope="col"
-          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-          &nbsp;
-      </th>
-    </tr>
-  </thead>
-  <tbody class="divide-y divide-gray-200 bg-white">
-    {{ range .ViewState.organized_carpools }}
-    {{ $driver := (index $.ViewState.solidarity_drivers .Driver.Id)}}
-    <tr>
-      <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">{{ $driver.Data.first_name }} {{ $driver.Data.last_name }}</td>
-      <td class="py-4 pl-4 pr-3 text-sm sm:pl-6">{{ .DriverDepartureAddress }}</td>
-      <td class="py-4 pl-4 pr-3 text-sm sm:pl-6">{{ .DriverArrivalAddress }}</td>
-      <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-        {{ if .PassengerPickupDate }}
-          {{ .PassengerPickupDate.AsTime.Format "02/01/2006 15:04" }}
-        {{ end }}
-      </td>
-      <td class="py-4 pl-4 pr-3 text-sm sm:pl-6">
-        {{if carpoolDriverValidatedProfile $driver (carpoolDocuments $driver.ID) }}
-        <span class="p-1 px-2 text-xs bg-co-green rounded-2xl">Oui</span>
-        {{else}}
-        <span class="p-1 px-2 text-xs bg-co-red text-white rounded-2xl">Non</span>
-        {{end}}
-      </td>
-      <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-        <a class="text-co-blue hover:text-co-blue"
-          href="/app/organized-carpool/drivers/{{$driver.ID}}/journeys/{{.Id}}?passengerid={{$.ViewState.passengerid}}">
-          Organiser
-        </a>
-      </td>
-    </tr>
-    {{ end }}
-  </tbody>
-</table>
-{{end}}
-{{end}}
-{{end}}

web/layouts/journeys/_partials/journeys-others.html

@@ -1,16 +1,6 @@
 {{define "journeys_others"}}
-<!--KNOWLEDGE BASE-->
+
-<div class="p-10">
-  {{ range .ViewState.kb_data }}
-    <div class="m-4">
-      <h2 class="text-sm font-bold">{{.title}}</h2>
-      <p class="text-sm">{{.description}}</p>
-      <p class="text-sm text-co-blue"><a href="{{.url}}">Voir plus ...</a></p>
-    </div>
-  {{ end }}
-</div>
 <!--VEHICLES-->
-{{if moduleAvailable "vehicles"}}
 <div class="p-4 flex text-sm text-grey-900">
     <div class="flex-1">
         {{.IconSet.Icon "tabler-icons:car" "h-6 w-6 inline-flex mr-4"}}
@@ -25,6 +15,7 @@
       <tr>
         <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6 md:pl-0">Véhicule</th>
         <th scope="col" class="py-3.5 px-3 text-left text-sm font-semibold text-gray-900">Numéro</th>
+        <th scope="col" class="py-3.5 px-3 text-left text-sm font-semibold text-gray-900">Gestionnaire</th>
         <th scope="col" class="py-3.5 px-3 text-left text-sm font-semibold text-gray-900">Lieu</th>
       </tr>
     </thead>
@@ -33,6 +24,7 @@
       <tr>
         <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm font-medium text-gray-900 sm:pl-6 md:pl-0">{{.Data.name}}</td>
         <td class="whitespace-nowrap py-4 px-3 text-sm text-gray-500">{{.Data.licence_plate}}</td>
+        <td class="whitespace-nowrap py-4 px-3 text-sm text-gray-500">COOPGO</td>
         <td class="whitespace-nowrap py-4 px-3 text-sm text-gray-500">{{if .Data.address}}{{.Data.address.properties.label}}{{end}}</td>
       </tr>
       {{end}}
@@ -42,5 +34,5 @@
 <div class="p-4 text-center">
     <a href="/app/vehicles/"><button class="text-md px-4 py-1 bg-gray-200 text-co-blue rounded-xl">Réserver un véhicule</button></a>
 </div>
-{{end}}
+
 {{end}}

web/layouts/journeys/_partials/journeys-public-transit-transitous.html

@@ -1,108 +0,0 @@
-{{ define "journeys_public_transit" }}
-{{ range .ViewState.journeys }}
-<div class="p-4 pb-8">
-    <div class="flex text-md text-grey-900 font-bold">
-        <div class="flex-1">{{ timeFormat .StartTime "15:04" }} - {{ timeFormat .EndTime "15:04" }}</div>
-        <div>{{ shortDuration .Duration }}</div>
-    </div>
-    <div class="flow-root">
-        <ul role="list" class="-mb-8">
-            {{$firstwalk := true}}
-            {{range .Legs}}
-            {{if eq .Mode "WALK" }}
-            {{if .Distance}}
-            <li>
-                <div class="relative py-4">
-                    {{if $firstwalk}}
-                    {{$firstwalk = false}}
-                    <span class="absolute top-4 left-4 -ml-px h-full w-0.5 bg-gray-200" aria-hidden="true"></span>
-                    {{end}}
-                    <div class="relative flex space-x-3">
-                        <div>
-                          <span class="ml-2 h-4 w-4 rounded-co bg-gray-200 flex items-center justify-center ring-8 ring-white text-white">
-                            {{$.IconSet.Icon "tabler-icons:walk" "h-3 w-3 stroke-gray-800"}}
-                          </span>
-                        </div>
-                        <div class="flex min-w-0 flex-1 justify-between space-x-4 pt-1.5">
-                          {{if .Distance}}
-                          <div>
-                            <p class="text-xs text-gray-500">Marcher  <a href="#" class="font-medium text-gray-900">{{ .Distance }}m</a></p>
-                          </div>
-                          {{ else }}
-                          <div>
-                            <p class="text-xs text-gray-500">Attendre  <a href="#" class="font-medium text-gray-900">{{ shortDuration .Duration }}</a></p>
-                          </div>
-                          {{ end }}
-                        </div>
-                      </div>
-                </div>
-            </li>
-            {{end}}
-            {{end}}
-            {{if or (eq .Mode "BUS") (eq .Mode "COACH")}}
-            <li>
-                <div class="relative py-4">
-                    <span class="absolute top-4 left-4 -ml-px h-full w-0.5 bg-gray-200" aria-hidden="true"></span>
-                    <div class="relative flex space-x-3">
-                        <div>
-              <span class="h-8 w-8 rounded-co bg-co-blue flex items-center justify-center ring-8 ring-white" style="background-color: #{{.RouteColor}}; color: #{{.RouteTextColor}}">
-                            {{$.IconSet.Icon "tabler-icons:bus" "h-5 w-5 stroke-white"}}
-                          </span>
-                        </div>
-                        <div class="flex min-w-0 flex-1 justify-between space-x-4 pt-1.5">
-                            <div>
-                              <p class="text-md text-gray-500">{{.AgencyName}} <a href="#" class="font-medium text-gray-900">Ligne {{.RouteShortName}}</a></p>
-                            </div>
-                        </div>
-                      </div>
-                      <div class="ml-16 pt-2">
-                        <div>
-                            <p class="text-sm text-gray-500">Départ <a href="#" class="font-medium text-gray-900">{{timeFormat .StartTime "15:04"}}</a> - Arrivée <a href="#" class="font-medium text-gray-900">{{timeFormat .EndTime "15:04"}}</a></p>
-                          </div>
-                          <div>
-                            <p class="text-sm text-gray-500">De <a href="#" class="font-medium text-gray-900">{{.From.Name}}</a> à <a href="#" class="font-medium text-gray-900">{{.To.Name}}</a></p>
-                          </div>
-                          <div>
-                            <p class="text-sm text-gray-500">Direction <a href="#" class="font-medium text-gray-900">{{.Headsign}}</a></p>
-                          </div>
-                      </div>
-                </div>
-            </li>
-            {{end}}
-            {{if or (eq .Mode "REGIONAL_FAST_RAIL") (eq .Mode "REGIONAL_RAIL") }}
-            <li>
-                <div class="relative py-4">
-                    <span class="absolute top-4 left-4 -ml-px h-full w-0.5 bg-gray-200" aria-hidden="true"></span>
-                    <div class="relative flex space-x-3">
-                        <div>
-              <span class="h-8 w-8 rounded-co bg-co-blue flex items-center justify-center ring-8 ring-white" style="background-color: #{{.RouteColor}}; color: #{{.RouteTextColor}}">
-                            {{$.IconSet.Icon "tabler-icons:train" "h-5 w-5 stroke-white"}}
-                          </span>
-                        </div>
-                        <div class="flex min-w-0 flex-1 justify-between space-x-4 pt-1.5">
-                            <div>
-                              <p class="text-md text-gray-500">{{.AgencyName}} <a href="#" class="font-medium text-gray-900">TER {{.RouteShortName}}</a></p>
-                            </div>
-                        </div>
-                      </div>
-                      <div class="ml-16 pt-2">
-                        <div>
-                            <p class="text-sm text-gray-500">Départ <a href="#" class="font-medium text-gray-900">{{timeFormat .StartTime "15:04"}}</a> - Arrivée <a href="#" class="font-medium text-gray-900">{{timeFormat .EndTime "15:04"}}</a></p>
-                          </div>
-                          <div>
-                            <p class="text-sm text-gray-500">De <a href="#" class="font-medium text-gray-900">{{.From.Name}}</a> à <a href="#" class="font-medium text-gray-900">{{.To.Name}}</a></p>
-                          </div>
-                          <div>
-                            <p class="text-sm text-gray-500">Direction <a href="#" class="font-medium text-gray-900">{{.Headsign}}</a></p>
-                          </div>
-                      </div>
-                </div>
-            </li>
-            {{end}}
-            {{end}}
-        </ul>
-    </div>
-
-</div>
-{{ end }}
-{{ end }}

web/layouts/journeys/_partials/journeys-public-transit.html

@@ -1,11 +1,10 @@
 {{define "journeys_public_transit"}}
 
-{{ if or (not .ViewState.journeys) (eq (len .ViewState.journeys.Journeys) 0)}}
+{{ if eq (len .ViewState.journeys.Journeys) 0}}
 <p class="p-12 text-gray-500 text-center text-md">Aucun transport en commun pour ce trajet.</p>
 {{end}}
 
 {{$first := true}}
-{{if .ViewState.journeys}}
 {{range .ViewState.journeys.Journeys}}
 {{if $first}}
 {{$first = false}}
@@ -80,4 +79,3 @@
 </div>
 {{end}}
 {{end}}
-{{end}}

web/layouts/journeys/_partials/journeys-solidarity-transport.html

@@ -1,65 +0,0 @@
-
-{{define "journeys_solidarity_transport"}}
-
-{{ if eq (len .ViewState.driver_journeys) 0}}
-<p class="p-12 text-gray-500 text-center text-md">Aucun conducteur solidaire disponible pour ce trajet.</p>
-{{else}}
-
-<h3 class="p-4 text-lg">Transport solidaire</h3>
-<table class="min-w-full divide-y divide-gray-300 border-gray-300 border-t-1">
-  <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">
-          Conducteurs disponibles
-      </th>
-      <th scope="col"
-          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-          Distance conducteur
-      </th>
-      <th scope="col"
-          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-          Distance passager
-      </th>
-      <th scope="col"
-          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-          Commentaire
-      </th>
-      <th scope="col"
-          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-          Profil validé
-      </th>
-      <th scope="col"
-          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-          &nbsp;
-      </th>
-    </tr>
-  </thead>
-  <tbody class="divide-y divide-gray-200 bg-white">
-    {{ range .ViewState.driver_journeys }}
-    {{ $driver := (index $.ViewState.solidarity_drivers .DriverId)}}
-
-    <tr>
-      <td class="py-4 pl-4 pr-3 text-sm sm:pl-6">{{ $driver.Data.first_name }} {{ $driver.Data.last_name }}</td>
-      <td class="py-4 pl-4 pr-3 text-sm sm:pl-6">{{ .DriverDistance }} km</td>
-      <td class="py-4 pl-4 pr-3 text-sm sm:pl-6">{{ .PassengerDistance }} km</td>
-      <td class="py-4 pl-4 pr-3 text-sm sm:pl-6">{{if $driver.Data.other_properties}}{{ $driver.Data.other_properties.comment }}{{end}}</td>
-      <td class="py-4 pl-4 pr-3 text-sm sm:pl-6">
-        {{if solidarityDriverValidatedProfile $driver (solidarityDocuments $driver.ID) }}
-        <span class="p-1 px-2 text-xs bg-co-green rounded-2xl">Oui</span>
-        {{else}}
-        <span class="p-1 px-2 text-xs bg-co-red text-white rounded-2xl">Non</span>
-        {{end}}
-      </td>
-      <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-        <a class="text-co-blue hover:text-co-blue" 
-		href="/app/solidarity-transport/drivers/{{$driver.ID}}/journeys/{{.Id}}{{if ne $.ViewState.passengerid ""}}?passengerid={{$.ViewState.passengerid}}{{end}}">
-          Organiser
-        </a>
-      </td>
-    </tr>
-    {{ end }}
-  </tbody>
-</table>
-{{end}}
-{{end}}

web/layouts/journeys/_partials/journeys-vehicles.html

@@ -1,36 +0,0 @@
-{{define "journeys_vehicles"}}
-<!--VEHICLES-->
-{{if moduleAvailable "vehicles"}}
-<div class="p-4 flex text-sm text-grey-900">
-    <div class="flex-1">
-        {{.IconSet.Icon "tabler-icons:car" "h-6 w-6 inline-flex mr-4"}}
-        <span class=" font-bold">{{len .ViewState.vehicles}} véhicules</span> partagés disponibles ce jour là et la semaine suivante
-    </div>
-    <div>
-    </div>
-</div>
-<div class="p-2">
-<table class="min-w-full divide-y divide-gray-300">
-    <thead>
-      <tr>
-        <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6 md:pl-0">Véhicule</th>
-        <th scope="col" class="py-3.5 px-3 text-left text-sm font-semibold text-gray-900">Numéro</th>
-        <th scope="col" class="py-3.5 px-3 text-left text-sm font-semibold text-gray-900">Lieu</th>
-      </tr>
-    </thead>
-    <tbody class="divide-y divide-gray-200">
-      {{range .ViewState.vehicles}}
-      <tr>
-        <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm font-medium text-gray-900 sm:pl-6 md:pl-0">{{.Data.name}}</td>
-        <td class="whitespace-nowrap py-4 px-3 text-sm text-gray-500">{{.Data.licence_plate}}</td>
-        <td class="whitespace-nowrap py-4 px-3 text-sm text-gray-500">{{if .Data.address}}{{.Data.address.properties.label}}{{end}}</td>
-      </tr>
-      {{end}}
-    </tbody>
-  </table>
-</div>
-<div class="p-4 text-center">
-    <a href="/app/vehicles/"><button class="text-md px-4 py-1 bg-gray-200 text-co-blue rounded-xl">Réserver un véhicule</button></a>
-</div>
-{{end}}
-{{end}}

web/layouts/journeys/_partials/saved-searches.html

@@ -1,110 +0,0 @@
-{{define "saved_searches"}}
-<div class="bg-white shadow sm:rounded-2xl sm:overflow-hidden">
-    <h2 class="text-lg font-medium text-gray-900 p-4 sm:px-6">Recherches sauvegardées</h2>
-    <div class="border-t border-gray-200">
-
-        {{if .ViewState.saved_searches}}
-        <div class="overflow-x-auto">
-            <table class="min-w-full divide-y divide-gray-300">
-                <thead class="bg-gray-50">
-                    <tr>
-                        <th scope="col" class="w-1/6 py-2 px-3 text-left text-sm font-semibold text-gray-900">
-                            Bénéficiaire
-                        </th>
-                        <th scope="col" class="w-1/4 px-3 py-2 text-left text-sm font-semibold text-gray-900">
-                            Départ
-                        </th>
-                        <th scope="col" class="w-1/4 px-3 py-2 text-left text-sm font-semibold text-gray-900">
-                            Destination
-                        </th>
-                        <th scope="col" class="w-1/6 px-3 py-2 text-left text-sm font-semibold text-gray-900">
-                            Date/Heure
-                        </th>
-                        <th scope="col" class="w-1/6 relative py-2 px-3 text-right text-sm font-semibold text-gray-900">
-                            <span class="sr-only">Actions</span>
-                        </th>
-                    </tr>
-                </thead>
-                <tbody class="divide-y divide-gray-200 bg-white">
-                    {{range .ViewState.saved_searches}}
-                    <tr>
-                        <td class="py-3 px-3 text-sm text-gray-500">
-                            {{if and .Data .Data.passenger_id}}
-                                {{$beneficiary := index $.ViewState.beneficiaries .Data.passenger_id}}
-                                {{if $beneficiary}}
-                                    <a href="/app/beneficiaries/{{.Data.passenger_id}}" class="text-co-blue hover:text-co-blue-dark">
-                                        {{$beneficiary.Data.first_name}} {{$beneficiary.Data.last_name}}
-                                    </a>
-                                {{else}}
-                                    -
-                                {{end}}
-                            {{else}}
-                                -
-                            {{end}}
-                        </td>
-                        <td class="px-3 py-3 text-sm text-gray-500 break-words">
-                            {{if .Departure}}
-                                {{if .Departure.Properties}}
-                                    {{if .Departure.Properties.city}}
-                                        {{.Departure.Properties.city}}
-                                    {{else}}
-                                        {{.Departure.Properties.label}}
-                                    {{end}}
-                                {{else}}
-                                    -
-                                {{end}}
-                            {{else}}
-                                -
-                            {{end}}
-                        </td>
-                        <td class="px-3 py-3 text-sm text-gray-500 break-words">
-                            {{if .Destination}}
-                                {{if .Destination.Properties}}
-                                    {{if .Destination.Properties.city}}
-                                        {{.Destination.Properties.city}}
-                                    {{else}}
-                                        {{.Destination.Properties.label}}
-                                    {{end}}
-                                {{else}}
-                                    -
-                                {{end}}
-                            {{else}}
-                                -
-                            {{end}}
-                        </td>
-                        <td class="px-3 py-3 text-sm text-gray-500 whitespace-nowrap">
-                            {{if .DateTime}}
-                                {{timeFormat .DateTime "02/01/2006 15:04"}}
-                            {{else}}
-                                -
-                            {{end}}
-                        </td>
-                        <td class="relative py-3 px-3 text-right text-sm font-medium whitespace-nowrap">
-                            <a href="{{if eq $.ViewState.search_view "compact"}}/app/journeys/search{{else}}/app/journeys/{{end}}?departure={{json .Departure}}&destination={{json .Destination}}&departuredate={{timeFormat .DateTime "2006-01-02"}}&departuretime={{timeFormat .DateTime "15:04"}}{{if and .Data .Data.passenger_id}}&passengerid={{.Data.passenger_id}}{{end}}" class="text-co-blue hover:text-co-blue-dark mr-4">
-                                Rechercher
-                            </a>
-                            <a href="/app/journeys/saved-searches/{{.ID}}/delete"
-                               class="text-red-600 hover:text-red-900"
-                               onclick="return confirm('Êtes-vous sûr de vouloir supprimer cette recherche sauvegardée ?')">
-                                Supprimer
-                            </a>
-                        </td>
-                    </tr>
-                    {{end}}
-                </tbody>
-            </table>
-        </div>
-        {{else}}
-        <div class="text-center py-8">
-            <div class="text-gray-500">
-                <svg class="mx-auto h-12 w-12 text-gray-400" fill="none" viewBox="0 0 24 24" stroke="currentColor">
-                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M21 21l-6-6m2-5a7 7 0 11-14 0 7 7 0 0114 0z" />
-                </svg>
-                <h3 class="mt-2 text-sm font-medium text-gray-900">Aucune recherche sauvegardée</h3>
-                <p class="mt-1 text-sm text-gray-500">Effectuez une recherche et cliquez sur "Enregistrer pour plus tard" pour commencer.</p>
-            </div>
-        </div>
-        {{end}}
-    </div>
-</div>
-{{end}}

web/layouts/journeys/search.html

@@ -6,13 +6,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/journeys/groups_covoiturage">
+          <a href="/app/journeys/groups_covoiturage">
             <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">
               {{$.IconSet.Icon "hero:outline/plus-circle" "h-5 w-5 mr-3"}}
               Gestion des groupes
             </button>
-          </a>-->
+          </a>
         </div>
       </div>
 
@@ -21,30 +21,7 @@
             <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">Chercher une solution</h2>
                 <div class="border-t border-gray-200 px-4 py-5 sm:px-6">
-                    <form method="GET" action="{{if eq .ViewState.search_view "compact"}}/app/journeys/search{{else}}/app/journeys/{{end}}" x-data="journeySearch()">
+                    <form method="GET">
-
-                        <div class="py-4">
-                            <label for="beneficiary" class="block text-sm font-medium text-gray-700">Bénéficiaire (optionnel)</label>
-                            <div class="mt-1 relative" x-data="beneficiaryAutocomplete()">
-                                <input type="text"
-                                       x-model="input"
-                                       @input="onInput()"
-                                       @focus="showResults = true"
-                                       @blur="setTimeout(() => showResults = false, 200)"
-                                       class="p-2 shadow-sm focus:ring-co-blue focus:border-co-blue block w-full sm:text-sm border-gray-300 rounded-2xl">
-
-                                <ul x-show="showResults && filteredBeneficiaries.length > 0"
-                                    class="absolute z-10 mt-1 w-full bg-white shadow-lg max-h-60 rounded-xl py-1 text-base overflow-auto focus:outline-none sm:text-sm border border-gray-300"
-                                    tabindex="-1" role="listbox">
-                                    <template x-for="beneficiary in filteredBeneficiaries" :key="beneficiary.id">
-                                        <li class="text-gray-900 hover:bg-gray-200 cursor-default select-none relative py-2 pl-3 pr-9"
-                                            @click="selectBeneficiary(beneficiary)">
-                                            <span class="font-normal block truncate" x-text="beneficiary.name"></span>
-                                        </li>
-                                    </template>
-                                </ul>
-                            </div>
-                        </div>
 
                         {{ $departureField := "departure" }}
                         {{ $departureLabel := "Départ" }}
@@ -56,120 +33,30 @@
                         {{ $destination := .ViewState.destination }}
                         {{ template "address_autocomplete" dict "FieldName" $destinationField "FieldLabel" $destinationLabel "Address" $destination }}
                         
-                        <input type="hidden" name="passengerid" value="{{.ViewState.passengerid}}" />
 
                         <div class="py-4 grid grid-cols-2">
                             <div class="lg:col-span-1">
-                                <label for="departuredate" class="block text-sm font-medium text-gray-700">Date de départ</label>
+                                <label for="departuredate" class="block text-sm font-medium text-gray-700">Le</label>
                                 <div class="mt-1">
                                     <input type="date" id="departuredate" name="departuredate" value="{{.ViewState.departuredate}}"
-                                        class="p-2 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="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">
                                 </div>
                             </div>
                             <div class="lg:col-span-1">
-                                <label for="departuretime" class="block text-sm font-medium text-gray-700">Heure de départ</label>
+                                <label for="departuretime" class="block text-sm font-medium text-gray-700">A</label>
                                 <div class="mt-1">
                                     <input type="time" id="departuretime" name="departuretime" value="{{.ViewState.departuretime}}"
-                                        class="p-2 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">
+                                        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 class="flex gap-2 mt-8">
+                        <button type="submit"
-                            <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">
-                                class="rounded-2xl border border-transparent bg-co-blue px-4 py-2 my-4 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">
+                            Chercher
-                                Chercher
+                        </button>
-                            </button>
-                            {{if .ViewState.searched}}
-			    <a href="/app/journeys/save?departure={{json .ViewState.departure}}&destination={{ json .ViewState.destination }}&departuredate={{.ViewState.departuredate}}&departuretime={{.ViewState.departuretime}}&passengerid={{.ViewState.passengerid}}"
-                                class="rounded-2xl border border-gray-300 bg-white px-4 py-2 my-4 text-sm 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:w-auto inline-flex items-center">
-                                Enregistrer pour plus tard
-                            </a>
-                            {{end}}
-                        </div>
                     </form>
-
-                    <script>
-                    function journeySearch() {
-                        return {
-                            selectedBeneficiaryId: '{{.ViewState.passengerid}}',
-                        }
-                    }
-
-                    function beneficiaryAutocomplete() {
-                        const beneficiaries = [
-                            {{range .ViewState.beneficiaries_list}}
-                            {
-                                id: '{{.ID}}',
-                                name: '{{.Data.first_name}} {{.Data.last_name}}',
-                                address: {{json .Data.address}}
-                            },
-                            {{end}}
-                        ];
-
-                        return {
-                            input: '',
-                            showResults: false,
-                            filteredBeneficiaries: [],
-                            selectedBeneficiary: null,
-
-                            init() {
-                                // Set initial value if passengerid is set
-                                const currentPassengerId = '{{.ViewState.passengerid}}';
-                                if (currentPassengerId) {
-                                    const beneficiary = beneficiaries.find(b => b.id === currentPassengerId);
-                                    if (beneficiary) {
-                                        this.input = beneficiary.name;
-                                        this.selectedBeneficiary = beneficiary;
-                                    }
-                                }
-                            },
-
-                            onInput() {
-                                if (this.input.length === 0) {
-                                    this.filteredBeneficiaries = [];
-                                    this.selectedBeneficiary = null;
-                                    this.updatePassengerId('');
-                                    return;
-                                }
-
-                                this.filteredBeneficiaries = beneficiaries.filter(beneficiary =>
-                                    beneficiary.name.toLowerCase().includes(this.input.toLowerCase())
-                                ).slice(0, 10); // Limit to 10 results
-                            },
-
-                            selectBeneficiary(beneficiary) {
-                                this.input = beneficiary.name;
-                                this.selectedBeneficiary = beneficiary;
-                                this.showResults = false;
-                                this.updatePassengerId(beneficiary.id);
-                                this.setDepartureAddress(beneficiary.address);
-                            },
-
-                            updatePassengerId(id) {
-                                const passengerInput = document.querySelector('input[name="passengerid"]');
-                                if (passengerInput) {
-                                    passengerInput.value = id;
-                                }
-                            },
-
-                            setDepartureAddress(address) {
-                                if (address) {
-                                    // Find the departure address autocomplete container
-                                    const departureContainer = document.querySelector('input[name="departure"]').closest('[x-data]');
-                                    if (departureContainer && departureContainer._x_dataStack && departureContainer._x_dataStack[0]) {
-                                        const addressAutocomplete = departureContainer._x_dataStack[0];
-                                        // Update the address autocomplete component directly
-                                        addressAutocomplete.address = JSON.stringify(address);
-                                        addressAutocomplete.addressObject = address;
-                                        addressAutocomplete.input = address.properties.label;
-                                    }
-                                }
-                            }
-                        }
-                    }
-                    </script>
                 </div>
             </div>
         </div>
@@ -188,25 +75,45 @@
                             <label for="tabs" class="sr-only">Select a tab</label>
                             <select id="tabs" name="tabs" @change="to"
                                 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">
-                                {{range .ViewState.journey_tabs}}
+                                <option value="all">Tous modes</option>
-                                {{if or .enabled (and .module (moduleAvailable .module))}}
+
-                                <option value="{{.name}}">{{.title}}</option>
+                                <option value="carpool">Covoiturage</option>
-                                {{end}}
+
-                                {{end}}
+                                <option value="public-transit">Transports</option>
+
+                                <!-- <option value="active-modes">Modes actifs</option> -->
+
+                                <option value="others">Autres</option>
                             </select>
                         </div>
                         <div class="hidden sm:block">
-                            <div class="border-b border-gray-200 pl-4 overflow-x-auto">
+                            <div class="border-b border-gray-200 pl-4">
-                                <nav class="-mb-px flex space-x-8 min-w-max" aria-label="Tabs">
+                                <nav class="-mb-px flex space-x-8" aria-label="Tabs">
                                     <!-- Current: "border-indigo-500 text-indigo-600", Default: "border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300" -->
-                                    {{range .ViewState.journey_tabs}}
+                                    <a href="#" @click="tab = 'all'"
-                                    {{if or .enabled (and .module (moduleAvailable .module))}}
-                                    <a href="#" @click="tab = '{{.name}}'"
                                         class="whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm"
-                                        :class="tab == '{{.name}}' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
+                                        :class="tab == 'all' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
-                                        {{.title}} </a>
+                                        Tous modes </a>
-                                    {{end}}
+
-                                    {{end}}
+                                    <a href="#" @click="tab = 'carpool'"
+                                        class="whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm"
+                                        :class="tab == 'carpool' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
+                                        Covoiturage </a>
+
+                                    <a href="#" @click="tab = 'public-transit'"
+                                        class="whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm"
+                                        :class="tab == 'public-transit' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
+                                        Transports </a>
+
+                                    <!-- <a href="#" @click="tab = 'active-modes'"
+                                        class="whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm"
+                                        :class="tab == 'active-modes' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
+                                        Modes actifs </a> -->
+
+                                    <a href="#" @click="tab = 'others'"
+                                        class="whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm"
+                                        :class="tab == 'others' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
+                                        Autres </a>
                                 </nav>
                             </div>
                         </div>
@@ -215,16 +122,10 @@
                     <div x-show="tab == 'all'">{{template "journeys_all" .}}</div>
                     <div x-show="tab == 'carpool'">{{template "journeys_carpool" .}}</div>
                     <div x-show="tab == 'public-transit'">{{template "journeys_public_transit" .}}</div>
-                    <div x-show="tab == 'organized-carpool'">{{template "journeys_organized_carpool" .}}</div>
-                    <div x-show="tab == 'solidarity-transport'">{{template "journeys_solidarity_transport" .}}</div>
-                    <div x-show="tab == 'vehicles'">{{template "journeys_vehicles" .}}</div>
-                    <div x-show="tab == 'directory'">{{template "journeys_local_solutions" .}}</div>
                     <div x-show="tab == 'others'">{{template "journeys_others" .}}</div>
                 </div>
             </div>
         </section>
-            {{else}}
-            {{template "saved_searches" .}}
             {{end}}
         </div>
     </div>

web/layouts/layout.html

@@ -5,17 +5,9 @@
 <head>
   <title>PARCOURSMOB</title>
   <link rel="stylesheet" href="/public/css/main.css" />
-  <link href="https://cdn.jsdelivr.net/npm/quill@2.0.2/dist/quill.snow.css" rel="stylesheet" />
+  <!-- <script defer type="text/javascript" src="/public/js/main.js" defer></script> -->
-  <link href="https://cdn.jsdelivr.net/npm/maplibre-gl@^5.2.0/dist/maplibre-gl.css" rel="stylesheet" />
   <script src="https://cdn.jsdelivr.net/npm/@kingshott/iodine@8.1.0/dist/iodine.min.umd.js" defer></script>
-  <script defer src="https://cdn.jsdelivr.net/npm/alpinejs@3.x.x/dist/cdn.min.js"></script>
+  <script defer src="https://unpkg.com/alpinejs@3.x.x/dist/cdn.min.js" defer></script>
-  <script src="https://cdn.jsdelivr.net/npm/quill@2.0.2/dist/quill.js"></script>
-  <script src="https://cdn.jsdelivr.net/npm/maplibre-gl@^5.2.0/dist/maplibre-gl.js"></script>
-  <script src="https://cdn.jsdelivr.net/npm/pmtiles@^4.3.0/dist/pmtiles.js"></script>
-  <script src="https://cdn.jsdelivr.net/npm/@protomaps/basemaps@5/dist/basemaps.js" crossorigin="anonymous"></script>
-  <script src="https://cdn.jsdelivr.net/npm/@turf/turf@7/turf.min.js"></script>
-  <script src="https://cdn.jsdelivr.net/npm/polyline@0.2.0/src/polyline.js"></script>
-  <!--<script defer type="text/javascript" src="/public/js/main.js" defer></script>-->
 </head>
 
 <body class="h-full" x-data="{ offCanvasMenu: false }">

web/layouts/members/display.html

@@ -54,7 +54,7 @@
                                 <dd class="mt-1 text-sm text-gray-900">{{.ViewState.admins.Data.first_name}}</dd>
                             </div>
                             <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Prénom</dt>
+                                <dt class="text-sm font-medium text-gray-500">Prénon</dt>
                                 <dd class="mt-1 text-sm text-gray-900">{{.ViewState.admins.Data.last_name}}
                                </dd>
                             </div>

web/layouts/members/update.html

@@ -1,5 +1,5 @@
 {{define "content"}}
-{{if eq .UserID .ViewState.user.ID}}
+{{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>
@@ -8,11 +8,11 @@
 <div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8 mt-8"
     x-data="{
         fields: {
-            first_name: '{{ .ViewState.user.Data.first_name }}',
+            first_name: '{{ .ViewState.Data.first_name }}',
-            last_name: '{{ .ViewState.user.Data.last_name }}',
+            last_name: '{{ .ViewState.Data.last_name }}',
-            email: '{{ .ViewState.user.Data.email }}',
+            email: '{{ .ViewState.Data.email }}',
-            phone_number: '{{ .ViewState.user.Data.phone_number }}',
+            phone_number: '{{ .ViewState.Data.phone_number }}',
-            gender: {{.ViewState.user.Data.gender}}
+            gender: {{.ViewState.Data.gender}}
         },
         rules: {
             first_name: ['required'],
@@ -58,7 +58,7 @@
                     <div class="grid grid-cols-6 gap-6">
                         <div class="col-span-6 sm:col-span-3">
                             <label for="first_name" class="block text-sm font-medium text-gray-700">Prénom</label>
-                            <input type="text" value="{{.ViewState.user.Data.first_name}}" name="first_name" id="first_name" autocomplete="given-name"
+                            <input type="text" value="{{.ViewState.Data.first_name}}" name="first_name" id="first_name" autocomplete="given-name"
                                 class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-2xl"
                                  @blur="validateField('first_name')" 
                                 :class="formValidation.fields.first_name.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
@@ -66,7 +66,7 @@
 
                         <div class="col-span-6 sm:col-span-3">
                             <label for="last_name" class="block text-sm font-medium text-gray-700">Nom</label>
-                            <input type="text" name="last_name" id="last_name" value="{{.ViewState.user.Data.last_name}}" autocomplete="family-name"
+                            <input type="text" name="last_name" id="last_name" value="{{.ViewState.Data.last_name}}" autocomplete="family-name"
                                 class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-2xl"
                                @blur="validateField('last_name')"
                                 :class="formValidation.fields.last_name.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
@@ -74,7 +74,7 @@
 
                         <div class="col-span-6 sm:col-span-3">
                             <label for="email" class="block text-sm font-medium text-gray-700">Email</label>
-                            <input type="text" name="email" id="email" autocomplete="email" value="{{.ViewState.user.Data.email}}"
+                            <input type="text" name="email" id="email" autocomplete="email" value="{{.ViewState.Data.email}}"
                                 class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-2xl"
                                  @blur="validateField('email')"
                                 :class="formValidation.fields.email.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
@@ -101,33 +101,19 @@
                 </div>
                 <div class="mt-5 space-y-6 md:mt-0 md:col-span-2">
                     <div class="grid grid-cols-6 gap-6">
-                        {{range .ViewState.profile_optional_fields}}
                         <div class="col-span-6 sm:col-span-3">
-                            <label for="{{.name}}" class="block text-sm font-medium text-gray-700">{{.label}}</label>
+                            <label for="gender" class="block text-sm font-medium text-gray-700">Genre</label>
-                            {{if eq .type "select"}}
                             <div class="sm:mt-0 sm:col-span-2">
-                                <select id="{{.name}}" name="{{.name}}"
+                                <select id="gender" name="gender" autocomplete="gender" x-model="gender"
                                     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 border-gray-300 rounded-2xl">
-                                    {{range .options}}
+                                    <option value="0">Inconnu</option>
-                                    <option value="{{.value}}">{{.label}}</option>
+                                    <option value="1" :selected="fields.gender == '1'">Masculin</option>
-                                    {{end}}
+                                    <option value="2" :selected="fields.gender == '2'">Féminin</option>
+                                    <option value="9" :selected="fields.gender == '9'">Sans objet</option>
                                 </select>
                             </div>
-                            {{else if eq .type "textarea"}}
-                            <textarea id="{{.name}}" name="{{.name}}" rows="3"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm border-gray-300 rounded-2xl"></textarea>
-                            {{else if eq .type "date"}}
-                            <input type="date" id="{{.name}}" name="{{.name}}"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm border-gray-300 rounded-2xl">
-                            {{else if eq .type "number"}}
-                            <input type="number" id="{{.name}}" name="{{.name}}"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm border-gray-300 rounded-2xl">
-                            {{else}}
-                            <input type="text" id="{{.name}}" name="{{.name}}"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm border-gray-300 rounded-2xl">
-                            {{end}}
                         </div>
-                        {{end}}
+
                     </div>
                 </div>
             </div>
@@ -135,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/members/{{.ViewState.user.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>
@@ -160,7 +146,7 @@
          </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.user.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>
+         <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>

web/layouts/organized_carpool/_partials/booking_filters.html

@@ -1,88 +0,0 @@
-{{ define "booking_filters" }}
-{{$tab := or .tab "carpoolService"}}
-
-<form>
-
-<input type="hidden" name="tab" value="{{$tab}}" />
-
-<div class="flex flex-row justify-end items-end">
-
-<div class="m-2">
-<div>
-  <label for="{{$tab}}_date_start" class="block text-sm/6 font-medium text-gray-900 dark:text-white">Dates (début / fin)</label>
-  <div class="mt-2 flex">
-	  <input id="{{$tab}}_date_start" type="date" name="date_start" class="block w-full rounded-md bg-white px-3 py-1.5 text-base text-gray-900 outline-1 -outline-offset-1 outline-gray-300 placeholder:text-gray-400 focus:outline-2 focus:-outline-offset-2 focus:outline-indigo-600 sm:text-sm/6 dark:bg-white/5 dark:text-white dark:outline-white/10 dark:placeholder:text-gray-500 dark:focus:outline-co-blue" value="{{.filters.date_start}}" onchange="this.form.submit()" />
-	  <input id="{{$tab}}_date_end" type="date" name="date_end" class="mx-2 block w-full rounded-md bg-white px-3 py-1.5 text-base text-gray-900 outline-1 -outline-offset-1 outline-gray-300 placeholder:text-gray-400 focus:outline-2 focus:-outline-offset-2 focus:outline-indigo-600 sm:text-sm/6 dark:bg-white/5 dark:text-white dark:outline-white/10 dark:placeholder:text-gray-500 dark:focus:outline-co-blue" value="{{.filters.date_end}}" onchange="this.form.submit()" />
-  </div>
-</div>
-</div>
-
-<div class="m-2">
-<label for="{{$tab}}_status" class="block text-sm/6 font-medium text-gray-900 dark:text-white">Statut</label>
-<div class="mt-2 grid grid-cols-1">
-<select id="{{$tab}}_status" name="status" class="col-start-1 row-start-1 w-36 appearance-none rounded-md bg-white py-1.5 pr-8 pl-3 text-base text-gray-900 outline-1 -outline-offset-1 outline-gray-300 focus-visible:outline-2 focus-visible:-outline-offset-2 focus-visible:outline-indigo-600 sm:text-sm/6 dark:bg-white/5 dark:text-white dark:outline-white/10 dark:*:bg-gray-800 dark:focus-visible:outline-co-blue" onchange="this.form.submit()">
-    <option></option>
-    <option value="WAITING_DRIVER_CONFIRMATION"{{if eq .filters.status "WAITING_DRIVER_CONFIRMATION"}} selected{{end}}>Attente confirmation conducteur</option>
-    <option value="CONFIRMED"{{if eq .filters.status "CONFIRMED"}} selected{{end}}>Confirmé</option>
-    <option value="CANCELLED"{{if eq .filters.status "CANCELLED"}} selected{{end}}>Annulé</option>
-  </select>
-  <svg viewBox="0 0 16 16" fill="currentColor" data-slot="icon" aria-hidden="true" class="pointer-events-none col-start-1 row-start-1 mr-2 size-5 self-center justify-self-end text-gray-500 sm:size-4 dark:text-gray-400">
-    <path d="M4.22 6.22a.75.75 0 0 1 1.06 0L8 8.94l2.72-2.72a.75.75 0 1 1 1.06 1.06l-3.25 3.25a.75.75 0 0 1-1.06 0L4.22 7.28a.75.75 0 0 1 0-1.06Z" clip-rule="evenodd" fill-rule="evenodd" />
-  </svg>
-</div>
-</div>
-
-{{if $.geography_filters_enabled}}
-<div class="m-2">
-<label for="{{$tab}}_passenger_address_geo" class="block text-sm/6 font-medium text-gray-900 dark:text-white">Adresse passager</label>
-<div class="mt-2 grid grid-cols-1">
-<select id="{{$tab}}_passenger_address_geo" name="passenger_address_geo" class="col-start-1 row-start-1 w-36 appearance-none rounded-md bg-white py-1.5 pr-8 pl-3 text-base text-gray-900 outline-1 -outline-offset-1 outline-gray-300 focus-visible:outline-2 focus-visible:-outline-offset-2 focus-visible:outline-indigo-600 sm:text-sm/6 dark:bg-white/5 dark:text-white dark:outline-white/10 dark:*:bg-gray-800 dark:focus-visible:outline-co-blue" onchange="this.form.submit()">
-    <option value="">Toutes les zones</option>
-    {{range $.geography_filters_list}}
-    {{$geoValue := printf "%s:%s" .layer .code}}
-    <option value="{{$geoValue}}"{{if eq $.filters.passenger_address_geo $geoValue}} selected{{end}}>{{.name}}</option>
-    {{end}}
-  </select>
-  <svg viewBox="0 0 16 16" fill="currentColor" data-slot="icon" aria-hidden="true" class="pointer-events-none col-start-1 row-start-1 mr-2 size-5 self-center justify-self-end text-gray-500 sm:size-4 dark:text-gray-400">
-    <path d="M4.22 6.22a.75.75 0 0 1 1.06 0L8 8.94l2.72-2.72a.75.75 0 1 1 1.06 1.06l-3.25 3.25a.75.75 0 0 1-1.06 0L4.22 7.28a.75.75 0 0 1 0-1.06Z" clip-rule="evenodd" fill-rule="evenodd" />
-  </svg>
-</div>
-</div>
-
-<div class="m-2">
-<label for="{{$tab}}_departure_geo" class="block text-sm/6 font-medium text-gray-900 dark:text-white">Départ</label>
-<div class="mt-2 grid grid-cols-1">
-<select id="{{$tab}}_departure_geo" name="departure_geo" class="col-start-1 row-start-1 w-36 appearance-none rounded-md bg-white py-1.5 pr-8 pl-3 text-base text-gray-900 outline-1 -outline-offset-1 outline-gray-300 focus-visible:outline-2 focus-visible:-outline-offset-2 focus-visible:outline-indigo-600 sm:text-sm/6 dark:bg-white/5 dark:text-white dark:outline-white/10 dark:*:bg-gray-800 dark:focus-visible:outline-co-blue" onchange="this.form.submit()">
-    <option value="">Toutes les zones</option>
-    {{range $.geography_filters_list}}
-    {{$geoValue := printf "%s:%s" .layer .code}}
-    <option value="{{$geoValue}}"{{if eq $.filters.departure_geo $geoValue}} selected{{end}}>{{.name}}</option>
-    {{end}}
-  </select>
-  <svg viewBox="0 0 16 16" fill="currentColor" data-slot="icon" aria-hidden="true" class="pointer-events-none col-start-1 row-start-1 mr-2 size-5 self-center justify-self-end text-gray-500 sm:size-4 dark:text-gray-400">
-    <path d="M4.22 6.22a.75.75 0 0 1 1.06 0L8 8.94l2.72-2.72a.75.75 0 1 1 1.06 1.06l-3.25 3.25a.75.75 0 0 1-1.06 0L4.22 7.28a.75.75 0 0 1 0-1.06Z" clip-rule="evenodd" fill-rule="evenodd" />
-  </svg>
-</div>
-</div>
-
-<div class="m-2">
-<label for="{{$tab}}_destination_geo" class="block text-sm/6 font-medium text-gray-900 dark:text-white">Destination</label>
-<div class="mt-2 grid grid-cols-1">
-<select id="{{$tab}}_destination_geo" name="destination_geo" class="col-start-1 row-start-1 w-36 appearance-none rounded-md bg-white py-1.5 pr-8 pl-3 text-base text-gray-900 outline-1 -outline-offset-1 outline-gray-300 focus-visible:outline-2 focus-visible:-outline-offset-2 focus-visible:outline-indigo-600 sm:text-sm/6 dark:bg-white/5 dark:text-white dark:outline-white/10 dark:*:bg-gray-800 dark:focus-visible:outline-co-blue" onchange="this.form.submit()">
-    <option value="">Toutes les zones</option>
-    {{range $.geography_filters_list}}
-    {{$geoValue := printf "%s:%s" .layer .code}}
-    <option value="{{$geoValue}}"{{if eq $.filters.destination_geo $geoValue}} selected{{end}}>{{.name}}</option>
-    {{end}}
-  </select>
-  <svg viewBox="0 0 16 16" fill="currentColor" data-slot="icon" aria-hidden="true" class="pointer-events-none col-start-1 row-start-1 mr-2 size-5 self-center justify-self-end text-gray-500 sm:size-4 dark:text-gray-400">
-    <path d="M4.22 6.22a.75.75 0 0 1 1.06 0L8 8.94l2.72-2.72a.75.75 0 1 1 1.06 1.06l-3.25 3.25a.75.75 0 0 1-1.06 0L4.22 7.28a.75.75 0 0 1 0-1.06Z" clip-rule="evenodd" fill-rule="evenodd" />
-  </svg>
-</div>
-</div>
-{{end}}
-
-</div>
-
-</form>
-{{ end }}

web/layouts/organized_carpool/_partials/booking_map.html

@@ -1,180 +0,0 @@
-{{ define "organized_carpool_map" }}
-<div id="map" class="w-full h-full min-h-96"></div>
-<script>
-  let protocol = new pmtiles.Protocol();
-  maplibregl.addProtocol("pmtiles",protocol.tile);
-  var map = new maplibregl.Map({
-    container: 'map', // container id
-    style: "/public/maps/protomaps-light/style.json",
-  });
-
-  const geojsonPoints = {
-    "type": "FeatureCollection",
-    "features": [
-      {
-        "type": "Feature",
-        "geometry": {
-          "type": "Point",
-          "coordinates": [{{ .booking.PassengerPickupLng }}, {{ .booking.PassengerPickupLat }}]
-        },
-        "properties": {
-          "label": "{{ .booking.PassengerPickupAddress }}",
-          "type": "pickup"
-        }
-      },
-      {
-        "type": "Feature",
-        "geometry": {
-          "type": "Point",
-          "coordinates": [{{ .booking.PassengerDropLng }}, {{ .booking.PassengerDropLat }}]
-        },
-        "properties": {
-          "label": "{{ .booking.PassengerDropAddress }}",
-          "type": "drop"
-        }
-      }
-    ]
-  }
-
-  map.on('load', async () => {
-    // Add route polyline if available
-    // Add driver route if available
-    {{if .booking.DriverRoute}}
-    console.log("DriverRoute found");
-    try {
-      const driverRoute = JSON.parse(`{{ .booking.DriverRoute.Serialized }}`);
-      console.log("Parsed driverRoute:", driverRoute);
-      console.log("DriverRoute type:", driverRoute.type);
-      console.log("DriverRoute features:", driverRoute.features);
-      console.log("DriverRoute features count:", driverRoute.features ? driverRoute.features.length : 0);
-      console.log("DriverRoute keys:", Object.keys(driverRoute));
-      if (driverRoute.features && driverRoute.features.length > 0) {
-        console.log("First feature:", driverRoute.features[0]);
-        console.log("LineString features:", driverRoute.features.filter(f => f.geometry && f.geometry.type === 'LineString'));
-      } else {
-        console.log("No features found, checking alternative structure");
-        console.log("All driverRoute properties:", driverRoute);
-      }
-
-      map.addSource('driver_route', {
-        type: "geojson",
-        data: driverRoute
-      });
-
-      map.addLayer({
-        'id': 'driver_route',
-        'type': 'line',
-        'source': 'driver_route',
-        'filter': ['==', ['geometry-type'], 'LineString'], // Only show LineString geometries
-        'layout': {
-          'line-join': 'round',
-          'line-cap': 'round',
-        },
-        'paint': {
-          'line-color': '#243887', // Blue - main application color
-          'line-width': 3
-        },
-      });
-      console.log("Driver route layer added successfully");
-    } catch (error) {
-      console.error("Error adding driver route:", error);
-    }
-    {{else}}
-    console.log("No DriverRoute available");
-    {{end}}
-
-    // Add passenger route if available
-    {{if .booking.PassengerRoute}}
-    console.log("PassengerRoute found");
-    try {
-      const passengerRoute = JSON.parse(`{{ .booking.PassengerRoute.Serialized }}`);
-      console.log("Parsed passengerRoute:", passengerRoute);
-      console.log("PassengerRoute type:", passengerRoute.type);
-      console.log("PassengerRoute features count:", passengerRoute.features ? passengerRoute.features.length : 0);
-
-      map.addSource('passenger_route', {
-        type: "geojson",
-        data: passengerRoute
-      });
-
-      map.addLayer({
-        'id': 'passenger_route',
-        'type': 'line',
-        'source': 'passenger_route',
-        'filter': ['==', ['geometry-type'], 'LineString'], // Only show LineString geometries
-        'layout': {
-          'line-join': 'round',
-          'line-cap': 'round',
-        },
-        'paint': {
-          'line-color': '#243887', // Blue - main application color
-          'line-width': 3
-        },
-      });
-      console.log("Passenger route layer added successfully");
-    } catch (error) {
-      console.error("Error adding passenger route:", error);
-    }
-    {{else}}
-    console.log("No PassengerRoute available");
-    {{end}}
-
-    map.addSource('carpool_points', {
-      type: "geojson",
-      data: geojsonPoints
-    })
-
-    // Add pickup point
-    map.addLayer({
-      'id': 'pickup_point',
-      'type': 'circle',
-      'source': 'carpool_points',
-      'filter': ['==', ['get', 'type'], 'pickup'],
-      'paint': {
-        'circle-color': '#243887', // Blue - main application color
-        'circle-radius': 8,
-        'circle-stroke-color': '#fff',
-        'circle-stroke-width': 2
-      },
-    });
-
-    // Add drop point
-    map.addLayer({
-      'id': 'drop_point',
-      'type': 'circle',
-      'source': 'carpool_points',
-      'filter': ['==', ['get', 'type'], 'drop'],
-      'paint': {
-        'circle-color': '#243887', // Blue - main application color
-        'circle-radius': 8,
-        'circle-stroke-color': '#fff',
-        'circle-stroke-width': 2
-      },
-    });
-
-    // Add popup on click
-    map.on('click', 'pickup_point', (e) => {
-      new maplibregl.Popup()
-        .setLngLat(e.lngLat)
-        .setHTML(`<strong>Point de départ</strong><br>${e.features[0].properties.label}`)
-        .addTo(map);
-    });
-
-    map.on('click', 'drop_point', (e) => {
-      new maplibregl.Popup()
-        .setLngLat(e.lngLat)
-        .setHTML(`<strong>Destination</strong><br>${e.features[0].properties.label}`)
-        .addTo(map);
-    });
-
-    // Change cursor on hover
-    map.on('mouseenter', 'pickup_point', () => map.getCanvas().style.cursor = 'pointer');
-    map.on('mouseleave', 'pickup_point', () => map.getCanvas().style.cursor = '');
-    map.on('mouseenter', 'drop_point', () => map.getCanvas().style.cursor = 'pointer');
-    map.on('mouseleave', 'drop_point', () => map.getCanvas().style.cursor = '');
-
-    var bbox = turf.bbox(geojsonPoints)
-    map.fitBounds(bbox, { padding: 50 })
-  })
-</script>
-{{ end }}

web/layouts/organized_carpool/_partials/bookings_history.html

@@ -1,175 +0,0 @@
-
-{{ define "carpool_bookings_history" }}
-{{template "booking_filters" dict "tab" "carpoolHistory" "filters" .ViewState.hist_filters "geography_filters_enabled" .ViewState.geography_filters_enabled "geography_filters_list" .ViewState.geography_filters_list }}
-{{if eq (len .ViewState.bookings_history) 0}}
-<div class="m-10 text-center text-gray-600">Aucun trajet dans le passé</div>
-{{else}}
-{{$inrange := false}}
-
-<div x-data="{
-  bookings: [
-  {{range .ViewState.bookings_history}}{{if $inrange}},{{end}}{{$inrange = true}}{{$driver := index $.ViewState.drivers_map .Driver.Id}}{{$passenger := index $.ViewState.passengers_map .Passenger.Id}}{
-      id: '{{.Id}}',
-      driverId: '{{if .Driver}}{{.Driver.Id}}{{end}}',
-      driverFirstName: '{{if $driver.ID}}{{ jsEscape $driver.Data.first_name }}{{end}}',
-      driverLastName: '{{if $driver.ID}}{{ jsEscape $driver.Data.last_name }}{{end}}',
-      passengerId: '{{if .Passenger}}{{.Passenger.Id}}{{end}}',
-      passengerFirstName: '{{if $passenger.Data}}{{ jsEscape $passenger.Data.first_name }}{{end}}',
-      passengerLastName: '{{if $passenger.Data}}{{ jsEscape $passenger.Data.last_name }}{{end}}',
-      pickupAddress: '{{ jsEscape .PassengerPickupAddress }}',
-      dropAddress: '{{ jsEscape .PassengerDropAddress }}',
-      pickupDate: '{{if .PassengerPickupDate}}{{ timeFormat .PassengerPickupDate.AsTime "02/01/2006 15:04" }}{{end}}',
-      status: '{{.Status.String}}',
-      price: '{{if .Price}}{{ printf "%.2f" (round2 .Price.Amount) }}{{else}}N/A{{end}}',
-      currency: '{{if .Price}}{{.Price.Currency}}{{end}}'
-    }{{end}}
-  ],
-  currentPage: 1,
-  itemsPerPage: {{ if .ViewState.trips_items_per_page }}{{ .ViewState.trips_items_per_page }}{{ else }}10{{ end }},
-  get totalPages() {
-    return Math.ceil(this.bookings.length / this.itemsPerPage);
-  },
-  get paginatedBookings() {
-    const start = (this.currentPage - 1) * this.itemsPerPage;
-    const end = start + this.itemsPerPage;
-    return this.bookings.slice(start, end);
-  },
-  nextPage() {
-    if (this.currentPage < this.totalPages) this.currentPage++;
-  },
-  prevPage() {
-    if (this.currentPage > 1) this.currentPage--;
-  },
-  goToPage(page) {
-    this.currentPage = page;
-  },
-  getStatusBadge(status) {
-    if (status === 'WAITING_DRIVER_CONFIRMATION') return { class: 'p-1 text-xs bg-gray-300 rounded-xl', text: 'Attente confirmation' };
-    if (status === 'CONFIRMED') return { class: 'p-1 text-xs bg-co-green rounded-xl', text: 'Confirmé' };
-    if (status === 'VALIDATED') return { class: 'p-1 text-xs bg-co-green rounded-xl', text: 'Validé' };
-    if (status === 'CANCELLED') return { class: 'p-1 text-xs bg-co-red text-white rounded-xl', text: 'Annulé' };
-    return { class: '', text: '' };
-  }
-}">
-
-<table class="min-w-full divide-y divide-gray-300 border-gray-300 border-t-1">
-  <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">
-          Conducteur
-      </th>
-      <th scope="col"
-          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-          Passager
-      </th>
-      <th scope="col"
-          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-          Départ
-      </th>
-      <th scope="col"
-          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-          Destination
-      </th>
-      <th scope="col"
-          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-          Date
-      </th>
-      <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 scope="col"
-          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-          Prix
-      </th>
-      <th scope="col"
-          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-          &nbsp;
-      </th>
-    </tr>
-  </thead>
-  <tbody class="divide-y divide-gray-200 bg-white">
-    <template x-for="booking in paginatedBookings" :key="booking.id">
-      <tr>
-        <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-          <a class="text-co-blue" :href="'/app/organized-carpool/drivers/' + booking.driverId">
-            <span x-text="booking.driverFirstName + ' ' + booking.driverLastName"></span>
-          </a>
-        </td>
-        <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-          <a class="text-co-blue" :href="'/app/beneficiaries/' + booking.passengerId">
-            <span x-text="booking.passengerFirstName + ' ' + booking.passengerLastName"></span>
-          </a>
-        </td>
-        <td class="py-4 pl-4 pr-3 text-sm sm:pl-6" x-text="booking.pickupAddress"></td>
-        <td class="py-4 pl-4 pr-3 text-sm sm:pl-6" x-text="booking.dropAddress"></td>
-        <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6" x-text="booking.pickupDate"></td>
-        <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-          <span :class="getStatusBadge(booking.status).class" x-text="getStatusBadge(booking.status).text"></span>
-        </td>
-        <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-          <span x-text="booking.price !== 'N/A' ? booking.price + ' ' + booking.currency : 'N/A'"></span>
-        </td>
-        <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-          <a class="text-co-blue" :href="'/app/organized-carpool/bookings/' + booking.id">Voir</a>
-        </td>
-      </tr>
-    </template>
-  </tbody>
-</table>
-
-<!-- Pagination -->
-<div class="flex items-center justify-between border-t border-gray-200 bg-white px-4 py-3 sm:px-6">
-  <div class="flex flex-1 justify-between sm:hidden">
-    <button @click="prevPage()" :disabled="currentPage === 1"
-            class="relative inline-flex items-center rounded-md border border-gray-300 bg-white px-4 py-2 text-sm font-medium text-gray-700 hover:bg-gray-50 disabled:opacity-50 disabled:cursor-not-allowed">
-      Précédent
-    </button>
-    <button @click="nextPage()" :disabled="currentPage === totalPages"
-            class="relative ml-3 inline-flex items-center rounded-md border border-gray-300 bg-white px-4 py-2 text-sm font-medium text-gray-700 hover:bg-gray-50 disabled:opacity-50 disabled:cursor-not-allowed">
-      Suivant
-    </button>
-  </div>
-  <div class="hidden sm:flex sm:flex-1 sm:items-center sm:justify-between">
-    <div>
-      <p class="text-sm text-gray-700">
-        Affichage de
-        <span class="font-medium" x-text="(currentPage - 1) * itemsPerPage + 1"></span>
-        à
-        <span class="font-medium" x-text="Math.min(currentPage * itemsPerPage, bookings.length)"></span>
-        sur
-        <span class="font-medium" x-text="bookings.length"></span>
-        résultats
-      </p>
-    </div>
-    <div>
-      <nav class="isolate inline-flex -space-x-px rounded-md shadow-sm" aria-label="Pagination">
-        <button @click="prevPage()" :disabled="currentPage === 1"
-                class="relative inline-flex items-center rounded-l-md px-2 py-2 text-gray-400 ring-1 ring-inset ring-gray-300 hover:bg-gray-50 focus:z-20 focus:outline-offset-0 disabled:opacity-50 disabled:cursor-not-allowed">
-          <span class="sr-only">Précédent</span>
-          <svg class="h-5 w-5" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
-            <path fill-rule="evenodd" d="M12.79 5.23a.75.75 0 01-.02 1.06L8.832 10l3.938 3.71a.75.75 0 11-1.04 1.08l-4.5-4.25a.75.75 0 010-1.08l4.5-4.25a.75.75 0 011.06.02z" clip-rule="evenodd" />
-          </svg>
-        </button>
-        <template x-for="page in totalPages" :key="page">
-          <button @click="goToPage(page)"
-                  :class="page === currentPage ? 'z-10 bg-co-blue text-white focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-co-blue' : 'text-gray-900 ring-1 ring-inset ring-gray-300 hover:bg-gray-50 focus:outline-offset-0'"
-                  class="relative inline-flex items-center px-4 py-2 text-sm font-semibold focus:z-20"
-                  x-text="page"></button>
-        </template>
-        <button @click="nextPage()" :disabled="currentPage === totalPages"
-                class="relative inline-flex items-center rounded-r-md px-2 py-2 text-gray-400 ring-1 ring-inset ring-gray-300 hover:bg-gray-50 focus:z-20 focus:outline-offset-0 disabled:opacity-50 disabled:cursor-not-allowed">
-          <span class="sr-only">Suivant</span>
-          <svg class="h-5 w-5" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
-            <path fill-rule="evenodd" d="M7.21 14.77a.75.75 0 01.02-1.06L11.168 10 7.23 6.29a.75.75 0 111.04-1.08l4.5 4.25a.75.75 0 010 1.08l-4.5 4.25a.75.75 0 01-1.06-.02z" clip-rule="evenodd" />
-          </svg>
-        </button>
-      </nav>
-    </div>
-  </div>
-</div>
-
-</div>
-{{end}}
-{{end}}

web/layouts/organized_carpool/_partials/bookings_list.html

@@ -1,176 +0,0 @@
-
-{{ define "carpool_bookings_list" }}
-{{template "booking_filters" dict "tab" "carpoolService" "filters" .ViewState.filters "geography_filters_enabled" .ViewState.geography_filters_enabled "geography_filters_list" .ViewState.geography_filters_list }}
-{{if eq (len .ViewState.bookings) 0}}
-<div class="m-10 text-center text-gray-600">Aucun trajet déclaré</div>
-{{else}}
-{{$inrange := false}}
-
-<div x-data="{
-  bookings: [
-  {{range .ViewState.bookings}}{{if $inrange}},{{end}}{{$inrange = true}}{{$driver := index $.ViewState.drivers_map .Driver.Id}}{{$passenger := index $.ViewState.passengers_map .Passenger.Id}}{
-      id: '{{.Id}}',
-      driverId: '{{if .Driver}}{{.Driver.Id}}{{end}}',
-      driverFirstName: '{{if $driver.ID}}{{ jsEscape $driver.Data.first_name }}{{end}}',
-      driverLastName: '{{if $driver.ID}}{{ jsEscape $driver.Data.last_name }}{{end}}',
-      passengerId: '{{if .Passenger}}{{.Passenger.Id}}{{end}}',
-      passengerFirstName: '{{if $passenger.Data}}{{ jsEscape $passenger.Data.first_name }}{{end}}',
-      passengerLastName: '{{if $passenger.Data}}{{ jsEscape $passenger.Data.last_name }}{{end}}',
-      pickupAddress: '{{ jsEscape .PassengerPickupAddress }}',
-      dropAddress: '{{ jsEscape .PassengerDropAddress }}',
-      pickupDate: '{{if .PassengerPickupDate}}{{ timeFormat .PassengerPickupDate.AsTime "02/01/2006 15:04" }}{{end}}',
-      status: '{{.Status.String}}',
-      price: '{{if .Price}}{{ printf "%.2f" (round2 .Price.Amount) }}{{else}}N/A{{end}}',
-      currency: '{{if .Price}}{{.Price.Currency}}{{end}}'
-    }{{end}}
-  ],
-  currentPage: 1,
-  itemsPerPage: {{ if .ViewState.trips_items_per_page }}{{ .ViewState.trips_items_per_page }}{{ else }}10{{ end }},
-  get totalPages() {
-    return Math.ceil(this.bookings.length / this.itemsPerPage);
-  },
-  get paginatedBookings() {
-    const start = (this.currentPage - 1) * this.itemsPerPage;
-    const end = start + this.itemsPerPage;
-    return this.bookings.slice(start, end);
-  },
-  nextPage() {
-    if (this.currentPage < this.totalPages) this.currentPage++;
-  },
-  prevPage() {
-    if (this.currentPage > 1) this.currentPage--;
-  },
-  goToPage(page) {
-    this.currentPage = page;
-  },
-  getStatusBadge(status) {
-    if (status === 'WAITING_DRIVER_CONFIRMATION') return { class: 'p-1 text-xs bg-gray-300 rounded-xl', text: 'Attente confirmation' };
-    if (status === 'WAITING_PASSENGER_CONFIRMATION') return { class: 'p-1 text-xs bg-gray-300 rounded-xl', text: 'Attente confirmation passager' };
-    if (status === 'CONFIRMED') return { class: 'p-1 text-xs bg-co-green rounded-xl', text: 'Confirmé' };
-    if (status === 'VALIDATED') return { class: 'p-1 text-xs bg-co-green rounded-xl', text: 'Validé' };
-    if (status === 'CANCELLED') return { class: 'p-1 text-xs bg-co-red text-white rounded-xl', text: 'Annulé' };
-    return { class: '', text: '' };
-  }
-}">
-
-<table class="min-w-full divide-y divide-gray-300 border-gray-300 border-t-1">
-  <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">
-          Conducteur
-      </th>
-      <th scope="col"
-          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-          Passager
-      </th>
-      <th scope="col"
-          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-          Départ
-      </th>
-      <th scope="col"
-          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-          Destination
-      </th>
-      <th scope="col"
-          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-          Date
-      </th>
-      <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 scope="col"
-          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-          Prix
-      </th>
-      <th scope="col"
-          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-          &nbsp;
-      </th>
-    </tr>
-  </thead>
-  <tbody class="divide-y divide-gray-200 bg-white">
-    <template x-for="booking in paginatedBookings" :key="booking.id">
-      <tr>
-        <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-          <a class="text-co-blue" :href="'/app/organized-carpool/drivers/' + booking.driverId">
-            <span x-text="booking.driverFirstName + ' ' + booking.driverLastName"></span>
-          </a>
-        </td>
-        <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-          <a class="text-co-blue" :href="'/app/beneficiaries/' + booking.passengerId">
-            <span x-text="booking.passengerFirstName + ' ' + booking.passengerLastName"></span>
-          </a>
-        </td>
-        <td class="py-4 pl-4 pr-3 text-sm sm:pl-6" x-text="booking.pickupAddress"></td>
-        <td class="py-4 pl-4 pr-3 text-sm sm:pl-6" x-text="booking.dropAddress"></td>
-        <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6" x-text="booking.pickupDate"></td>
-        <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-          <span :class="getStatusBadge(booking.status).class" x-text="getStatusBadge(booking.status).text"></span>
-        </td>
-        <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-          <span x-text="booking.price !== 'N/A' ? booking.price + ' ' + booking.currency : 'N/A'"></span>
-        </td>
-        <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-          <a class="text-co-blue" :href="'/app/organized-carpool/bookings/' + booking.id">Voir</a>
-        </td>
-      </tr>
-    </template>
-  </tbody>
-</table>
-
-<!-- Pagination -->
-<div class="flex items-center justify-between border-t border-gray-200 bg-white px-4 py-3 sm:px-6">
-  <div class="flex flex-1 justify-between sm:hidden">
-    <button @click="prevPage()" :disabled="currentPage === 1"
-            class="relative inline-flex items-center rounded-md border border-gray-300 bg-white px-4 py-2 text-sm font-medium text-gray-700 hover:bg-gray-50 disabled:opacity-50 disabled:cursor-not-allowed">
-      Précédent
-    </button>
-    <button @click="nextPage()" :disabled="currentPage === totalPages"
-            class="relative ml-3 inline-flex items-center rounded-md border border-gray-300 bg-white px-4 py-2 text-sm font-medium text-gray-700 hover:bg-gray-50 disabled:opacity-50 disabled:cursor-not-allowed">
-      Suivant
-    </button>
-  </div>
-  <div class="hidden sm:flex sm:flex-1 sm:items-center sm:justify-between">
-    <div>
-      <p class="text-sm text-gray-700">
-        Affichage de
-        <span class="font-medium" x-text="(currentPage - 1) * itemsPerPage + 1"></span>
-        à
-        <span class="font-medium" x-text="Math.min(currentPage * itemsPerPage, bookings.length)"></span>
-        sur
-        <span class="font-medium" x-text="bookings.length"></span>
-        résultats
-      </p>
-    </div>
-    <div>
-      <nav class="isolate inline-flex -space-x-px rounded-md shadow-sm" aria-label="Pagination">
-        <button @click="prevPage()" :disabled="currentPage === 1"
-                class="relative inline-flex items-center rounded-l-md px-2 py-2 text-gray-400 ring-1 ring-inset ring-gray-300 hover:bg-gray-50 focus:z-20 focus:outline-offset-0 disabled:opacity-50 disabled:cursor-not-allowed">
-          <span class="sr-only">Précédent</span>
-          <svg class="h-5 w-5" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
-            <path fill-rule="evenodd" d="M12.79 5.23a.75.75 0 01-.02 1.06L8.832 10l3.938 3.71a.75.75 0 11-1.04 1.08l-4.5-4.25a.75.75 0 010-1.08l4.5-4.25a.75.75 0 011.06.02z" clip-rule="evenodd" />
-          </svg>
-        </button>
-        <template x-for="page in totalPages" :key="page">
-          <button @click="goToPage(page)"
-                  :class="page === currentPage ? 'z-10 bg-co-blue text-white focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-co-blue' : 'text-gray-900 ring-1 ring-inset ring-gray-300 hover:bg-gray-50 focus:outline-offset-0'"
-                  class="relative inline-flex items-center px-4 py-2 text-sm font-semibold focus:z-20"
-                  x-text="page"></button>
-        </template>
-        <button @click="nextPage()" :disabled="currentPage === totalPages"
-                class="relative inline-flex items-center rounded-r-md px-2 py-2 text-gray-400 ring-1 ring-inset ring-gray-300 hover:bg-gray-50 focus:z-20 focus:outline-offset-0 disabled:opacity-50 disabled:cursor-not-allowed">
-          <span class="sr-only">Suivant</span>
-          <svg class="h-5 w-5" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
-            <path fill-rule="evenodd" d="M7.21 14.77a.75.75 0 01.02-1.06L11.168 10 7.23 6.29a.75.75 0 111.04-1.08l4.5 4.25a.75.75 0 010 1.08l-4.5 4.25a.75.75 0 01-1.06-.02z" clip-rule="evenodd" />
-          </svg>
-        </button>
-      </nav>
-    </div>
-  </div>
-</div>
-
-</div>
-{{end}}
-{{end}}

web/layouts/organized_carpool/_partials/driver_availabilities.html

@@ -1,119 +0,0 @@
-
-{{define "driver_availabilities"}}
-
-<div class="bg-white shadow sm:rounded-lg"
-  x-data="{
-    availabilitiesdialog: false
-  }">
-  <div class="px-4 py-5 sm:px-6">
-    <h2 id="timeline-title" class="text-lg font-medium text-gray-900">Trajets</h2>
-  </div>
-  <div class="border-t border-gray-200 px-4">
-    <div class="">
-      {{ range .ViewState.trips }}
-      {{$departure := index .Features 0}}
-      {{$destination := index .Features 1}}
-      <div class="my-10">
-      <div class="flex flex-row my-2">
-        {{range .ExtraMembers.properties.schedules}}
-        <span class="p-1 text-xs mr-2 bg-co-blue text-white rounded-lg">
-        {{ if eq .day "SUN"}}Dimanche
-        {{ else if eq .day "MON"}}Lundi
-        {{ else if eq .day "TUE"}}Mardi
-        {{ else if eq .day "WED"}}Mercredi
-        {{ else if eq .day "THU"}}Jeudi
-        {{ else if eq .day "FRI"}}Vendredi
-        {{ else if eq .day "SAT"}}Samedi
-        {{ end }}
-        {{.time_of_day}}
-
-        </span>
-        {{end}}
-      </div>
-      <div class="flex flex-row">
-        <div class="flex-1 text-sm">
-          {{$departure.Properties.label}}
-        </div>
-        <div>
-          {{$.IconSet.Icon "hero:outline/chevron-right" "h-5 w-5 mr-3"}}
-        </div>
-        <div class="flex-1 text-sm text-right">
-          {{$destination.Properties.label}}
-        </div>
-      </div>
-      <div>
-        <div class="flex-none text-sm text-right"><a class="text-co-blue" href="/app/organized-carpool/drivers/{{$.ViewState.driver.ID}}/trips/{{.ExtraMembers.id}}/delete">Supprimer</a></div>
-      </div>
-      </div>
-      {{ end }}
-    </div>
-    <button type="button" @click="availabilitiesdialog = !availabilitiesdialog" 
-      class="inline-flex items-center justify-center rounded-2xl border border-transparent bg-co-blue my-4 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">
-      {{$.IconSet.Icon "hero:outline/plus-circle" "h-5 w-5 mr-3"}}
-      Ajouter un trajet
-    </button>
-  </div>
-  <div class="relative z-10" aria-labelledby="modal-title" role="dialog" aria-modal="true"
-       x-show="availabilitiesdialog">
-    <div class="fixed inset-0 bg-gray-900 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-lg 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>
-            <div class="mt-3 text-center sm:mt-5">
-              <h3 class="text-lg font-medium leading-6 text-gray-900" id="modal-title">Ajouter un trajet</h3>
-                <div class="mt-2">
-                  <p class="text-sm text-gray-500">Paramétrer un nouveau trajet du conducteur</p>
-                </div>
-              </div>
-            </div>
-          <form method="POST" action="/app/organized-carpool/drivers/{{.ViewState.driver.ID}}/trips" class="my-4">
-              <div class="my-8">
-                
-                    {{ $fieldName := "address_departure" }}
-                    {{ template "address_autocomplete" (dict "FieldName" $fieldName "Address" .ViewState.driver.Data.address "FieldLabel" "Départ") }}
-
-              </div>
-              <div class="my-8">
-                
-                    {{ $fieldName := "address_destination" }}
-                    {{ template "address_autocomplete" (dict "FieldName" $fieldName "Address" .ViewState.driver.Data.address_destination "FieldLabel" "Destination") }}
-
-              </div>
-              <div class="my-4">
-                <input name="days.monday" type="checkbox" class="focus:ring-co-blue h-4 w-4 text-co-blue border-gray-300 rounded"> Lundi &nbsp;&nbsp;
-                <input name="days.tuesday" type="checkbox" class="focus:ring-co-blue h-4 w-4 text-co-blue border-gray-300 rounded"> Mardi &nbsp;&nbsp;
-                <input name="days.wednesday" type="checkbox" class="focus:ring-co-blue h-4 w-4 text-co-blue border-gray-300 rounded"> Mercredi &nbsp;&nbsp;
-                <input name="days.thursday" type="checkbox" class="focus:ring-co-blue h-4 w-4 text-co-blue border-gray-300 rounded"> Jeudi &nbsp;&nbsp;
-                <input name="days.friday" type="checkbox" class="focus:ring-co-blue h-4 w-4 text-co-blue border-gray-300 rounded"> Vendredi &nbsp;&nbsp;
-                <input name="days.saturday" type="checkbox" class="focus:ring-co-blue h-4 w-4 text-co-blue border-gray-300 rounded"> Samedi &nbsp;&nbsp;
-                <input name="days.sunday" type="checkbox" class="focus:ring-co-blue h-4 w-4 text-co-blue border-gray-300 rounded"> Dimanche &nbsp;&nbsp;
-              </div>
-              <div class="my-4 inline-flex justify-items-center">
-                <div class="p-1">Aller à :</div>
-                <input type="time" id="outwardtime" name="outwardtime" value="08:00"
-                       class="shadow-sm focus:ring-co-blue focus:border-co-blue p-1 sm:text-sm border-gray-300 rounded-2xl" />
-                
-              </div>
-              <div class="my-4 inline-flex justify-items-center">
-                <div class="p-1">Retour à :</div>
-                <input type="time" id="returntime" name="returntime" value="18:00"
-                       class="shadow-sm focus:ring-co-blue focus:border-co-blue p-1 sm:text-sm border-gray-300 rounded-2xl" />
-                
-              </div>
-              <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">Ajouter</button>
-              </div>
-              <div class="mt-5 sm:mt-6">
-                <button @click="availabilitiesdialog=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>
-            </form>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
- </div>
-
-{{end}}

web/layouts/organized_carpool/_partials/driver_documents.html

@@ -1,148 +0,0 @@
-{{define "driver_files"}}
-<div class="px-4 py-6 sm:px-6"
-x-data="{
-    fields: {
-        name: null,
-        type: null,
-        file: null,
-    },
-    rules: {
-        name: ['required'],
-        type: ['required'],
-        file: ['required'],
-    },
-    formValidation: {
-        valid: false,
-        fields: {
-            name: {valid: null},
-            type: {valid: null},
-            file: {valid: null},
-        }
-    },
-    isFormValid: true,
-    validate() {
-        this.formValidation = Iodine.assert(this.fields, this.rules)
-    },
-    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
-    }
-}">
-    {{if eq (len .ViewState.documents) 0}}
-    <p class="p-12 text-gray-500 text-center text-md">Aucun document</p>
-    {{end}}
-
-
-    {{if gt (len .ViewState.documents) 0}}
-
-    <div class="-mx-4 mb-10 ring-1 ring-gray-300 sm:-mx-6 md:mx-0 md:rounded-lg">
-        <table class="min-w-full divide-y divide-gray-300">
-          <thead>
-            <tr>
-              <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Type</th>
-              <th scope="col" class="hidden px-3 py-3.5 text-left text-sm font-semibold text-gray-900 lg:table-cell">Nom du document</th>
-              <th scope="col" class="hidden px-3 py-3.5 text-left text-sm font-semibold text-gray-900 lg:table-cell">Ajouté le</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>
-            {{range .ViewState.documents}}
-            <tr>
-              <td class="relative py-4 pl-4 sm:pl-6 pr-3 text-sm">
-                <div class="font-medium text-gray-900">
-                    <span class="bg-co-blue text-xs text-white rounded-xl p-1 mr-2">{{index $.ViewState.file_types_map .Metadata.Type}}</span>
-                </div>
-              </td>
-              <td class="px-3 py-3.5 text-sm text-gray-900 lg:table-cell">{{.Metadata.Name}}</td>
-              <td class="px-3 py-3.5 text-sm text-gray-500 lg:table-cell">{{.LastModified.Format "02/01/2006"}}</td>
-              <td class="relative py-3.5 pl-3 pr-4 sm:pr-6 text-right text-sm font-medium">
-                <div class="flex gap-2 justify-end">
-                  <a href="/app/organized-carpool/drivers/{{$.ViewState.driver.ID}}/documents/{{.FileName}}" target="_blank">
-                  <button type="button" class="inline-flex items-center rounded-md border border-gray-300 bg-white px-3 py-2 text-sm font-medium leading-4 text-gray-700 shadow-sm hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-30">
-                    {{$.IconSet.Icon "hero:outline/document-arrow-down" "h-4 w-4 mr-1"}}
-                    Télécharger<span class="sr-only"> le document</span>
-                  </button>
-                  </a>
-                  <button type="button"
-                    onclick="if(confirm('Êtes-vous sûr de vouloir supprimer ce document ?')) { window.location.href='/app/organized-carpool/drivers/{{$.ViewState.driver.ID}}/documents/{{.FileName}}/delete'; }"
-                    class="inline-flex items-center rounded-md border border-transparent bg-co-red px-3 py-2 text-sm font-medium leading-4 text-white shadow-sm hover:bg-red-700 focus:outline-none focus:ring-2 focus:ring-co-red focus:ring-offset-2">
-                    {{$.IconSet.Icon "hero:outline/trash" "h-4 w-4 mr-1"}}
-                    Supprimer<span class="sr-only"> le document</span>
-                  </button>
-                </div>
-              </td>
-            </tr>
-            {{end}}
-
-
-            <!-- More plans... -->
-          </tbody>
-        </table>
-      </div>
-
-    {{end}}
-
-    <h3 class="text-lg">Ajouter un document</h3>
-    <form method="POST" action="/app/organized-carpool/drivers/{{.ViewState.driver.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>
-                <select id="type" name="type" class="mt-1 block w-full rounded-l-2xl border-gray-300 py-2 pl-3 pr-10 text-base focus:border-indigo-500 focus:outline-none focus:ring-indigo-500 sm:text-sm"
-                    x-model="fields.type" @blur="validateField('type')"
-                    :class="formValidation.fields.type.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
-                    <option value="" selected>Sélectionner un type</option>
-                    {{range .ViewState.drivers_file_types}}
-                    <option value="{{.}}">{{index $.ViewState.file_types_map .}}</option>
-                    {{end}}
-                </select>
-              </div>
-              <div class="sm:col-span-4">
-                <label for="name" class="block text-sm font-medium text-gray-700">Nom</label>
-                      <input type="text" name="name" id="name"
-                          placeholder="Nom du fichier"
-                          class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-r-2xl p-2"
-                          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-6 mt-4">
-                <label for="cover-photo" class="block text-sm font-medium text-gray-700">Téléchargement</label>
-                <div class="mt-1 flex justify-center rounded-md border-2 border-dashed px-6 pt-5 pb-6"
-                x-on:drop="console.log('toto')"
-                :class="formValidation.fields.file.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
-                  <div class="space-y-1 text-center">
-                    {{.IconSet.Icon "hero:outline/folder-plus" "mx-auto h-12 w-12 text-gray-400"}}
-                    <div class="flex text-sm text-gray-600">
-                      <label for="file-upload" class="relative cursor-pointer rounded-md bg-white font-medium text-co-blue focus-within:outline-none focus-within:ring-2 focus-within:ring-co-blue focus-within:ring-offset-2 hover:text-co-blue">
-                        <span>Sélectionnez un fichier </span>
-                        <input id="file-upload" name="file-upload" type="file" class="sr-only"
-                        x-model="fields.file" @blur="validateField('file')">
-                      </label>
-                      <!-- <p class="pl-1">ou glissez-déposez</p>  -->
-
-
-                    </div>
-                    <p class="text-xs text-gray-500">Jusqu'à 10MB</p>
-                    <template x-if="fields.file">
-                      <p class="text-co-blue p-2" x-text="fields.file"></p>
-                    </template>
-                  </div>
-                </div>
-              </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 le document
-        </button>
-    </form>
-
-</div>
-{{end}}

web/layouts/organized_carpool/_partials/driver_history.html

@@ -1,61 +0,0 @@
-{{define "organized_carpool_driver_history"}}
-<div class="py-6">
-  {{if .ViewState.stats}}
-  <div class="py-5 text-center">
-    <p class="text-lg">Covoiturages réalisés : {{ .ViewState.stats.bookings.confirmed }}</p>
-    <p class="text-lg">Kilomètres parcourus : {{ .ViewState.stats.bookings.km }} km</p>
-  </div>
-  {{end}}
-
-  {{if .ViewState.bookings}}
-  <div class="py-5">
-    <h4 class="text-lg font-medium text-gray-900 mb-4 text-center">Historique des covoiturages</h4>
-    <table class="min-w-full divide-y divide-gray-300 border-gray-300 border-t-1">
-      <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">Date</th>
-          <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Passager</th>
-          <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Départ</th>
-          <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Arrivée</th>
-          <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Actions</th>
-        </tr>
-      </thead>
-      <tbody class="divide-y divide-gray-200 bg-white">
-        {{range .ViewState.bookings}}
-        {{if eq .Status.String "CONFIRMED"}}
-        <tr>
-          <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-            {{if .PassengerPickupDate}}
-              {{timeFormat .PassengerPickupDate.AsTime "02/01/2006 15:04"}}
-            {{end}}
-          </td>
-          <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-            {{if .Passenger}}
-              <a class="text-co-blue" href="/app/beneficiaries/{{.Passenger.Id}}">
-                {{ (index $.ViewState.beneficiaries_map .Passenger.Id).Data.first_name }}
-                {{ (index $.ViewState.beneficiaries_map .Passenger.Id).Data.last_name }}
-              </a>
-            {{end}}
-          </td>
-          <td class="py-4 pl-4 pr-3 text-sm sm:pl-6">
-            {{.PassengerPickupAddress}}
-          </td>
-          <td class="py-4 pl-4 pr-3 text-sm sm:pl-6">
-            {{.PassengerDropAddress}}
-          </td>
-          <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-            <a class="text-co-blue" href="/app/organized-carpool/bookings/{{.Id}}">Voir</a>
-          </td>
-        </tr>
-        {{end}}
-        {{end}}
-      </tbody>
-    </table>
-  </div>
-  {{else}}
-  <div class="py-5">
-    <p class="text-sm text-gray-500 text-center">Aucun covoiturage enregistré</p>
-  </div>
-  {{end}}
-</div>
-{{end}}

web/layouts/organized_carpool/_partials/driver_wallet.html

@@ -1,113 +0,0 @@
-{{define "organized_carpool_driver_wallet"}}
-<div class="py-6"
-  x-data="{
-    walletdialog: false
-  }">
-  <div class="py-5 text-center">
-    <p class="text-lg">Solde : {{ printf "%.2f" .ViewState.wallet_balance }} €</p>
-  <button  @click="walletdialog = !walletdialog"
-    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">
-    Créditer le compte
-  </button>
-  <div class="relative z-10" aria-labelledby="modal-title" role="dialog" aria-modal="true"
-       x-show="walletdialog">
-    <div class="fixed inset-0 bg-gray-900 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-lg 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>
-            <div class="mt-3 text-center sm:mt-5">
-              <h3 class="text-lg font-medium leading-6 text-gray-900" id="modal-title">Créditer le compte</h3>
-                <div class="mt-2">
-                  <p class="text-sm text-gray-500">Créditer le compte mobilité du conducteur</p>
-                </div>
-              </div>
-            </div>
-          <form method="POST" action="/app/wallets/{{.ViewState.driver.ID}}/credit" class="my-4">
-              <div class="my-8">
-                <input type="number" step="0.01" id="amount" name="amount" value="0"
-                       class="w-full shadow-sm focus:ring-co-blue focus:border-co-blue px-2 p-1 sm:text-sm border-gray-300 rounded-2xl">
-              </div>
-              <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">Ajouter</button>
-              </div>
-              <div class="mt-5 sm:mt-6">
-                <button @click="walletdialog=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>
-            </form>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-
-  <!-- Wallet Operations History -->
-  {{if .ViewState.driver.Data.wallet_history}}
-  <div class="py-5">
-    <h4 class="text-lg font-medium text-gray-900 mb-4 text-center">Historique des opérations</h4>
-    <table class="min-w-full divide-y divide-gray-300 border-gray-300 border-t-1">
-      <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">Date</th>
-          <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Crédit</th>
-          <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Débit</th>
-          <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Moyen de paiement</th>
-          <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Description</th>
-        </tr>
-      </thead>
-      <tbody class="divide-y divide-gray-200 bg-white">
-        <!-- Initial Balance Row -->
-        <tr class="bg-gray-50">
-          <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm text-gray-500 italic sm:pl-6">
-            Solde initial
-          </td>
-          <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm font-medium text-gray-900 sm:pl-6">
-            {{if .ViewState.driver.Data.wallet}}{{ printf "%.2f" .ViewState.driver.Data.wallet }} €{{else}}0.00 €{{end}}
-          </td>
-          <td class="py-4 pl-4 pr-3 text-sm text-gray-500 sm:pl-6">
-            -
-          </td>
-          <td class="py-4 pl-4 pr-3 text-sm text-gray-500 sm:pl-6">
-            -
-          </td>
-          <td class="py-4 pl-4 pr-3 text-sm text-gray-500 sm:pl-6">
-            -
-          </td>
-        </tr>
-        {{range $index, $operation := .ViewState.driver.Data.wallet_history}}
-        <tr>
-          <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-            {{if $operation.timestamp}}{{timeFormat $operation.timestamp "02/01/2006 15:04"}}{{end}}
-          </td>
-          <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm font-medium text-green-600 sm:pl-6">
-            {{if $operation.amount}}
-              {{if or (eq $operation.operation_type "credit") (not $operation.operation_type)}}
-                {{ printf "%.2f" $operation.amount }} €
-              {{end}}
-            {{end}}
-          </td>
-          <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm font-medium text-red-600 sm:pl-6">
-            {{if eq $operation.operation_type "debit"}}
-              {{ printf "%.2f" $operation.amount }} €
-            {{end}}
-          </td>
-          <td class="py-4 pl-4 pr-3 text-sm sm:pl-6">
-            {{$operation.payment_method}}
-          </td>
-          <td class="py-4 pl-4 pr-3 text-sm sm:pl-6">
-            {{$operation.description}}
-          </td>
-        </tr>
-        {{end}}
-      </tbody>
-    </table>
-  </div>
-  {{else}}
-  <div class="py-5">
-    <p class="text-sm text-gray-500 text-center">Aucune opération enregistrée</p>
-  </div>
-  {{end}}
-
-</div>
-{{end}}

web/layouts/organized_carpool/_partials/drivers_list.html

@@ -1,201 +0,0 @@
-
-{{ define "carpool_drivers_list" }}
-
-<div class="sm:flex sm:items-center sm:justify-between">
-  {{if $.ViewState.geography_filters_enabled}}
-  <form class="flex flex-row items-end m-4">
-    <input type="hidden" name="tab" value="drivers" />
-    {{if $.ViewState.archived}}<input type="hidden" name="archived" value="true" />{{end}}
-
-    <div>
-      <label for="drivers_driver_address_geo" class="block text-sm/6 font-medium text-gray-900 dark:text-white">Adresse conducteur</label>
-      <div class="mt-2 grid grid-cols-1">
-        <select id="drivers_driver_address_geo" name="driver_address_geo" class="col-start-1 row-start-1 w-48 appearance-none rounded-md bg-white py-1.5 pr-8 pl-3 text-base text-gray-900 outline-1 -outline-offset-1 outline-gray-300 focus-visible:outline-2 focus-visible:-outline-offset-2 focus-visible:outline-indigo-600 sm:text-sm/6 dark:bg-white/5 dark:text-white dark:outline-white/10 dark:*:bg-gray-800 dark:focus-visible:outline-co-blue" onchange="this.form.submit()">
-          <option value="">Toutes les zones</option>
-          {{range $.ViewState.geography_filters_list}}
-          {{$geoValue := printf "%s:%s" .layer .code}}
-          <option value="{{$geoValue}}"{{if eq $.ViewState.filters.driver_address_geo $geoValue}} selected{{end}}>{{.name}}</option>
-          {{end}}
-        </select>
-        <svg viewBox="0 0 16 16" fill="currentColor" data-slot="icon" aria-hidden="true" class="pointer-events-none col-start-1 row-start-1 mr-2 size-5 self-center justify-self-end text-gray-500 sm:size-4 dark:text-gray-400">
-          <path d="M4.22 6.22a.75.75 0 0 1 1.06 0L8 8.94l2.72-2.72a.75.75 0 1 1 1.06 1.06l-3.25 3.25a.75.75 0 0 1-1.06 0L4.22 7.28a.75.75 0 0 1 0-1.06Z" clip-rule="evenodd" fill-rule="evenodd" />
-        </svg>
-      </div>
-    </div>
-  </form>
-  {{else}}
-  <div class="sm:flex-auto">
-    <p class="mt-2 text-sm text-gray-700"></p>
-  </div>
-  {{end}}
-
-  <div class="m-4 sm:flex-none">
-    <a href="/exports/organized-carpool/drivers.xlsx?{{if $.ViewState.archived}}archived=true&{{end}}{{if $.ViewState.filters.driver_address_geo}}driver_address_geo={{$.ViewState.filters.driver_address_geo}}{{end}}">
-      <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>
-    {{if .ViewState.archived}}
-    <a href="/app/organized-carpool/?tab=drivers">
-      <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/archive-box-x-mark" "h-5 w-5 mr-3"}}
-            Covoitureurs actifs
-      </button>
-    </a>
-    {{else}}
-    <a href="/app/organized-carpool/?tab=drivers&archived=true">
-      <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/archive-box" "h-5 w-5 mr-3"}}
-            Covoitureurs archivés
-      </button>
-    </a>
-    {{end}}
-    <a href="/app/organized-carpool/drivers/create">
-      <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">
-        {{$.IconSet.Icon "hero:outline/plus-circle" "h-5 w-5 mr-3"}}
-        Ajouter un covoitureur solidaire
-      </button>
-    </a>
-  </div>
-</div>
-<div x-data="{
-  drivers: [
-    {{range $index, $driver := .ViewState.drivers}}{{if $index}},{{end}}{
-      id: '{{$driver.ID}}',
-      firstName: '{{ jsEscape $driver.Data.first_name }}',
-      lastName: '{{ jsEscape $driver.Data.last_name }}',
-      address: '{{if $driver.Data.address}}{{ jsEscape $driver.Data.address.properties.label }}{{end}}',
-      addressDestination: '{{if $driver.Data.address_destination}}{{ jsEscape $driver.Data.address_destination.properties.label }}{{end}}',
-      phoneNumber: '{{ jsEscape $driver.Data.phone_number }}',
-      validated: {{if carpoolDriverValidatedProfile $driver (carpoolDocuments $driver.ID)}}true{{else}}false{{end}}
-    }{{end}}
-  ],
-  currentPage: 1,
-  itemsPerPage: {{ if .ViewState.drivers_items_per_page }}{{ .ViewState.drivers_items_per_page }}{{ else }}10{{ end }},
-  get totalPages() {
-    return Math.ceil(this.drivers.length / this.itemsPerPage);
-  },
-  get paginatedDrivers() {
-    const start = (this.currentPage - 1) * this.itemsPerPage;
-    const end = start + this.itemsPerPage;
-    return this.drivers.slice(start, end);
-  },
-  nextPage() {
-    if (this.currentPage < this.totalPages) this.currentPage++;
-  },
-  prevPage() {
-    if (this.currentPage > 1) this.currentPage--;
-  },
-  goToPage(page) {
-    this.currentPage = page;
-  }
-}">
-
-<table class="min-w-full divide-y divide-gray-300 border-gray-300 border-t-1">
-  <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="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-          Adresse départ
-      </th>
-      <th scope="col"
-          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-          Adresse destination
-      </th>
-      <th scope="col"
-          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-          Téléphone
-      </th>
-      <th scope="col"
-          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-          Profil validé
-      </th>
-      <th scope="col"
-          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-          &nbsp;
-      </th>
-    </tr>
-  </thead>
-  <tbody class="divide-y divide-gray-200 bg-white">
-    <template x-for="driver in paginatedDrivers" :key="driver.id">
-      <tr>
-        <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6" x-text="driver.firstName + ' ' + driver.lastName"></td>
-        <td class="py-4 pl-4 pr-3 text-sm sm:pl-6" x-text="driver.address"></td>
-        <td class="py-4 pl-4 pr-3 text-sm sm:pl-6" x-text="driver.addressDestination"></td>
-        <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6" x-text="driver.phoneNumber"></td>
-        <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-          <span x-show="driver.validated" class="p-1 px-2 text-xs bg-co-green rounded-2xl">Oui</span>
-          <span x-show="!driver.validated" class="p-1 px-2 text-xs bg-co-red text-white rounded-2xl">Non</span>
-        </td>
-        <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-          <a class="text-co-blue hover:text-co-blue" :href="'/app/organized-carpool/drivers/' + driver.id">
-            Voir
-          </a>
-        </td>
-      </tr>
-    </template>
-  </tbody>
-</table>
-
-<!-- Pagination -->
-<div class="flex items-center justify-between border-t border-gray-200 bg-white px-4 py-3 sm:px-6">
-  <div class="flex flex-1 justify-between sm:hidden">
-    <button @click="prevPage()" :disabled="currentPage === 1"
-            class="relative inline-flex items-center rounded-md border border-gray-300 bg-white px-4 py-2 text-sm font-medium text-gray-700 hover:bg-gray-50 disabled:opacity-50 disabled:cursor-not-allowed">
-      Précédent
-    </button>
-    <button @click="nextPage()" :disabled="currentPage === totalPages"
-            class="relative ml-3 inline-flex items-center rounded-md border border-gray-300 bg-white px-4 py-2 text-sm font-medium text-gray-700 hover:bg-gray-50 disabled:opacity-50 disabled:cursor-not-allowed">
-      Suivant
-    </button>
-  </div>
-  <div class="hidden sm:flex sm:flex-1 sm:items-center sm:justify-between">
-    <div>
-      <p class="text-sm text-gray-700">
-        Affichage de
-        <span class="font-medium" x-text="(currentPage - 1) * itemsPerPage + 1"></span>
-        à
-        <span class="font-medium" x-text="Math.min(currentPage * itemsPerPage, drivers.length)"></span>
-        sur
-        <span class="font-medium" x-text="drivers.length"></span>
-        résultats
-      </p>
-    </div>
-    <div>
-      <nav class="isolate inline-flex -space-x-px rounded-md shadow-sm" aria-label="Pagination">
-        <button @click="prevPage()" :disabled="currentPage === 1"
-                class="relative inline-flex items-center rounded-l-md px-2 py-2 text-gray-400 ring-1 ring-inset ring-gray-300 hover:bg-gray-50 focus:z-20 focus:outline-offset-0 disabled:opacity-50 disabled:cursor-not-allowed">
-          <span class="sr-only">Précédent</span>
-          <svg class="h-5 w-5" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
-            <path fill-rule="evenodd" d="M12.79 5.23a.75.75 0 01-.02 1.06L8.832 10l3.938 3.71a.75.75 0 11-1.04 1.08l-4.5-4.25a.75.75 0 010-1.08l4.5-4.25a.75.75 0 011.06.02z" clip-rule="evenodd" />
-          </svg>
-        </button>
-        <template x-for="page in totalPages" :key="page">
-          <button @click="goToPage(page)"
-                  :class="page === currentPage ? 'z-10 bg-co-blue text-white focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-co-blue' : 'text-gray-900 ring-1 ring-inset ring-gray-300 hover:bg-gray-50 focus:outline-offset-0'"
-                  class="relative inline-flex items-center px-4 py-2 text-sm font-semibold focus:z-20"
-                  x-text="page"></button>
-        </template>
-        <button @click="nextPage()" :disabled="currentPage === totalPages"
-                class="relative inline-flex items-center rounded-r-md px-2 py-2 text-gray-400 ring-1 ring-inset ring-gray-300 hover:bg-gray-50 focus:z-20 focus:outline-offset-0 disabled:opacity-50 disabled:cursor-not-allowed">
-          <span class="sr-only">Suivant</span>
-          <svg class="h-5 w-5" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
-            <path fill-rule="evenodd" d="M7.21 14.77a.75.75 0 01.02-1.06L11.168 10 7.23 6.29a.75.75 0 111.04-1.08l4.5 4.25a.75.75 0 010 1.08l-4.5 4.25a.75.75 0 01-1.06-.02z" clip-rule="evenodd" />
-          </svg>
-        </button>
-      </nav>
-    </div>
-  </div>
-</div>
-
-</div>
-{{ end }}

web/layouts/organized_carpool/_partials/journey_preview.html

@@ -1,333 +0,0 @@
-
-{{define "journey_preview"}}
-<div class="col-span-1 bg-white rounded-2xl shadow divide-y divide-gray-200 flex flex-col">
-      <div class="px-4 py-2 flex items-center justify-between flex-wrap sm:flex-nowrap">
-        <div class="ml-4 mt-2 grid-cols-2">
-          <h3 class="text-lg leading-6 font-medium text-gray-900">Le trajet</h3>
-          <h2 class="text-sm leading-6 font-medium text-gray-600">Informations sur le trajet</h2>
-        </div>
-      </div>
-      <div class="grid grid-cols-1 gap-6 sm:grid-cols-2">
-                    <div class="p-4 py-5 sm:px-6">
-                        <dl class="grid grid-cols-1 gap-x-4 gap-y-8 sm:grid-cols-2">
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Départ passager</dt>
-            <dd class="mt-1 text-sm text-gray-900">
-              {{ if .journey.ExtraMembers.passenger_pickup }}
-                {{ .journey.ExtraMembers.passenger_pickup.properties.label }}
-              {{ else }}
-                Adresse non disponible
-              {{ end }}
-            </dd>
-                            </div>
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Destination passager</dt>
-            <dd class="mt-1 text-sm text-gray-900">
-              {{ if .journey.ExtraMembers.passenger_drop }}
-                {{ .journey.ExtraMembers.passenger_drop.properties.label }}
-              {{ else }}
-                Adresse non disponible
-              {{ end }}
-            </dd>
-                            </div>
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Départ conducteur</dt>
-            <dd class="mt-1 text-sm text-gray-900">{{(index .journey.Features 0).Properties.MustString "label"}}</dd>
-                            </div>
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Destination conducteur</dt>
-            <dd class="mt-1 text-sm text-gray-900">{{(index .journey.Features 1).Properties.MustString "label"}}</dd>
-                            </div>
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Date et heure</dt>
-            <dd class="mt-1 text-sm text-gray-900">
-              {{ if .journey.ExtraMembers.departure_date }}
-                {{ timeFormat .journey.ExtraMembers.departure_date "02/01/2006 15:04" }}
-              {{ else }}
-                Non définie
-              {{ end }}
-            </dd>
-                            </div>
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Prix (passager)</dt>
-            <dd class="mt-1 text-sm text-gray-900">
-                                    {{if .pricing_result}}
-                                        {{ printf "%.2f" (round2 .pricing_result.passenger.Amount) }} {{.pricing_result.passenger.Currency}}
-                                    {{else}}
-                                        0.00 EUR
-                                    {{end}}
-                                </dd>
-                            </div>
-                            {{if and .pricing_result .pricing_result.driver (gt (round2 .pricing_result.driver.Amount) 0.0)}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Indemnité conducteur</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{ printf "%.2f" (round2 .pricing_result.driver.Amount) }} {{.pricing_result.driver.Currency}}</dd>
-                            </div>
-                            {{end}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Distance passager</dt>
-            			<dd class="mt-1 text-sm text-gray-900">{{ printf "%.2f" .journey.ExtraMembers.passenger_distance }} km</dd>
-                            </div>
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Distance conducteur</dt>
-            			<dd class="mt-1 text-sm text-gray-900">{{ printf "%.2f" .journey.ExtraMembers.driver_distance }} km</dd>
-                            </div>
-                        </dl>
-                    </div>
-                    <div>
-        <div id="map" class="w-full h-full"></div>
-<script>
-  let protocol = new pmtiles.Protocol();
-  maplibregl.addProtocol("pmtiles",protocol.tile);
-  var map = new maplibregl.Map({
-    container: 'map', // container id
-    style: "/public/maps/protomaps-light/style.json",
-  });
-
-  const geojsonPoints = {
-    "type": "FeatureCollection",
-    "features": [
-      {{ json (index .journey.Features 0) }},
-      {{ json (index .journey.Features 1) }},
-    ]
-  }
-
-
-  map.on('load', async () => {
-    map.addSource('trip', {
-      type: "geojson",
-      data: {{ json (index .journey.Features 2) }}
-    })
-    map.addLayer({
-      'id': 'trip',
-      'type': 'line',
-      'source': 'trip',
-      'layout': {
-        'line-join': 'round',
-        'line-cap': 'round',
-      },
-      'paint': {
-        'line-color': '#243887',
-        'line-width': 3
-      },
-    });
-
-    map.addSource('points', {
-      type: "geojson",
-      data: geojsonPoints
-    })
-    map.addLayer({
-      'id': 'points',
-      'type': 'circle',
-      'source': 'points',
-      'paint': {
-        'circle-color': '#243887',
-        'circle-radius': 8
-      },
-    });
-    var bbox=turf.bbox(geojsonPoints)
-    map.fitBounds(bbox, { padding: 30 })
-  })
-</script>
-                    </div>
-      </div>
-    </div>
-  <div class="py-4 grid grid-cols-1 gap-6 sm:grid-cols-2">
-    <div class="col-span-1 bg-white rounded-2xl shadow divide-y divide-gray-200 flex flex-col">
-      <div class="px-4 py-2 flex items-center justify-between flex-wrap sm:flex-nowrap">
-        <div class="ml-4 mt-2 grid-cols-2">
-          <h3 class="text-lg leading-6 font-medium text-gray-900">Conducteur</h3>
-          <h2 class="text-sm leading-6 font-medium text-gray-600">{{.driver.Data.first_name}} {{.driver.Data.last_name}}</h2>
-        </div>
-      </div>
-                    <div class="border-t border-gray-200 px-4 py-5 sm:px-6">
-                        <dl class="grid grid-cols-1 gap-x-4 gap-y-8 sm:grid-cols-2">
-                            {{if .driver.Data.email}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Email</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{.driver.Data.email}}</dd>
-                            </div>
-                            {{end}}
-                            {{if .driver.Data.phone_number}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Téléphone</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{.driver.Data.phone_number}}</dd>
-                            </div>
-                            {{end}}
-                            {{if .driver.Data.birthdate}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Date de naissance</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{(timeFrom .driver.Data.birthdate).Format
-                                    "02/01/2006"}}</dd>
-                            </div>
-                            {{end}}
-                            {{if and .driver.Data.gender (ne .driver.Data.gender "0")}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Genre</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{genderISO5218 .driver.Data.gender}}</dd>
-                            </div>
-                            {{end}}
-                            {{if .driver.Data.address}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Adresse</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{.driver.Data.address.properties.label}}</dd>
-                            </div>
-                            {{end}}
-                            {{if .driver.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">{{.driver.Data.file_number}}</dd>
-                            </div>
-                            {{end}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Profil validé</dt>
-                                <dd class="mt-1 text-sm text-gray-900">
-                                    {{if carpoolDriverValidatedProfile .driver (carpoolDocuments .driver.ID) }}
-                                    <span class="p-1 px-2 text-xs bg-co-green rounded-2xl">Oui</span>
-                                    {{else}}
-                                    <span class="p-1 px-2 text-xs bg-co-red text-white rounded-2xl">Non</span>
-                                    {{end}}
-                                </dd>
-                            </div>
-                        </dl>
-                    </div>
-
-    </div>
-    <div class="col-span-1 bg-white rounded-2xl shadow divide-y divide-gray-200 flex flex-col">
-      <div class="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">Passager</h3>
-        <h2 class="text-sm leading-6 font-medium text-gray-600">{{if ne .passenger.ID "" }}{{.passenger.Data.first_name}} {{.passenger.Data.last_name}}{{end}}</h2>
-        </div>
-      </div>
-      <div class="border-t border-gray-200 px-4 py-5 sm:px-6">
-        {{if eq .passenger.ID ""}}
-        <form method="GET">
-                        
-                    <div x-data="{
-                        text: '',
-                        beneficiariesListOpen: false,
-                        beneficiaries: {{json .beneficiaries}},
-                        filteredBeneficiaries: (beneficiaries, text) => {
-                            if(text=='') {
-                              return beneficiaries
-                            }
-                            return beneficiaries.filter(b => b['data']['first_name'].toLowerCase().includes(text.toLowerCase()) || b['data']['last_name'].toLowerCase().includes(text.toLowerCase()))
-                        },
-                        fields: {
-                            beneficiaryid: {{if .search}}'{{.search.beneficiary.ID}}'{{else}}null{{end}},
-                        },
-                        selectbeneficiary(beneficiary) {
-                            this.fields.beneficiaryid = beneficiary.id 
-                            this.text = beneficiary.data.first_name + ' ' + beneficiary.data.last_name
-                            this.beneficiariesListOpen = false
-                        },
-                    }">
-                        <input type="hidden" name="passengerid" x-model="fields.beneficiaryid">
-                        <label for="combobox" class="block text-sm font-medium text-gray-700">Selectionner un bénéficiaire</label>
-                        <div class="relative mt-1 mb-4">
-                          <input autocomplete="off" @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">
-                            <!-- Heroicon name: solid/selector -->
-                            <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">
-                            <!--
-                              Combobox option, manage highlight styles based on mouseenter/mouseleave and keyboard navigation.
-                      
-                              Active: "text-white bg-indigo-600", Not Active: "text-gray-900"
-                            -->
-                            <template x-for="beneficiary in filteredBeneficiaries(beneficiaries, text)">
-                                <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">
-                                <!-- Selected: "font-semibold" -->
-                                <span class="truncate" x-text="beneficiary.data.first_name"></span> <span class="truncate" x-text="beneficiary.data.last_name"></span>
-                        
-                                <!--
-                                    Checkmark, only display for selected option.
-                        
-                                    Active: "text-white", Not Active: "text-indigo-600"
-                                -->
-                                <span class="absolute inset-y-0 right-0 flex items-center pr-4 text-co-blue">
-                                    <!-- Heroicon name: solid/check -->
-                                    <!-- <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="M16.707 5.293a1 1 0 010 1.414l-8 8a1 1 0 01-1.414 0l-4-4a1 1 0 011.414-1.414L8 12.586l7.293-7.293a1 1 0 011.414 0z" clip-rule="evenodd" />
-                                    </svg> -->
-                                </span>
-                                </li>
-                            </template>
-                      
-                            <!-- More items... -->
-                          </ul>
-                        </div>
-                      </div>
-                    <button type="submit" class="inline-flex w-full justify-center max-w-xs bg-co-blue  border-gray-300 border px-4 py-2 text-white items-center text-sm rounded-2xl focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">
-                      Valider
-                    </button>
-                    </div>
-                  </form>
-
-        {{ else }}
-                        <dl class="grid grid-cols-1 gap-x-4 gap-y-8 sm:grid-cols-2">
-                            {{if .passenger.Data.email}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Email</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{.passenger.Data.email}}</dd>
-                            </div>
-                            {{end}}
-                            {{if .passenger.Data.phone_number}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Téléphone</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{.passenger.Data.phone_number}}</dd>
-                            </div>
-                            {{end}}
-                            {{if .passenger.Data.birthdate}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Date de naissance</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{(timeFrom .passenger.Data.birthdate).Format
-                                    "02/01/2006"}}</dd>
-                            </div>
-                            {{end}}
-                            {{if and .passenger.Data.gender (ne .passenger.Data.gender "0")}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Genre</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{genderISO5218 .passenger.Data.gender}}</dd>
-                            </div>
-                            {{end}}
-                            {{if .passenger.Data.address}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Adresse</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{.passenger.Data.address.properties.label}}</dd>
-                            </div>
-                            {{end}}
-                            {{if .passenger.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">{{.passenger.Data.file_number}}</dd>
-                            </div>
-                            {{end}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Profil validé</dt>
-                                <dd class="mt-1 text-sm text-gray-900">
-                                    {{if carpoolDriverValidatedProfile .passenger (carpoolDocuments .passenger.ID) }}
-                                    <span class="p-1 px-2 text-xs bg-co-green rounded-2xl">Oui</span>
-                                    {{else}}
-                                    <span class="p-1 px-2 text-xs bg-co-red text-white rounded-2xl">Non</span>
-                                    {{end}}
-                                </dd>
-                            </div>
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Compte mobilié (solde)</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{ printf "%.2f" (round2 .passenger_wallet_balance) }} EUR</dd>
-                            </div>
-                        </dl>
-                    </div>
-
-        {{end}}
-      </div>
-      </div>
-
-{{end}}

web/layouts/organized_carpool/booking_display.html

@@ -1,194 +0,0 @@
-{{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">
-      Covoiturage solidaire
-    </h1>
-
-    {{ if eq .ViewState.booking.Status.String "WAITING_DRIVER_CONFIRMATION"}}
-    <div class="mt-4"><span class="p-2 text-sm bg-gray-300 rounded-2xl px-4">Attente confirmation</span></div>
-    {{ else if eq .ViewState.booking.Status.String "CONFIRMED"}}
-    <div class="mt-4"><span class="p-1 text-sm bg-co-green rounded-2xl px-4">Confirmé</span></div>
-    {{ else if eq .ViewState.booking.Status.String "CANCELLED"}}
-    <div class="mt-4"><span class="p-1 text-sm bg-co-red text-white rounded-2xl px-4">Annulé</span></div>
-    {{ end }}
-
-    <div class="mt-6 flex justify-end space-x-3">
-      {{if eq .ViewState.booking.Status.String "WAITING_DRIVER_CONFIRMATION" }}
-      <a href="/app/organized-carpool/bookings/{{.ViewState.booking.Id}}/confirm" class="inline-flex">
-        <button type="button" class="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">
-          Confirmer
-        </button>
-      </a>
-      {{end}}
-
-      {{if ne .ViewState.booking.Status.String "WAITING_DRIVER_CONFIRMATION" }}
-      <a href="/app/organized-carpool/bookings/{{.ViewState.booking.Id}}/waitconfirmation" class="inline-flex">
-        <button type="button" class="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">
-          Remettre en attente
-        </button>
-      </a>
-      {{end}}
-
-      {{if ne .ViewState.booking.Status.String "CANCELLED" }}
-      {{$dialog := "cancel"}}
-      <div x-data="{ {{ $dialog }}: false}">
-        <button @click="{{ $dialog }} = !{{ $dialog }}" type="button" class="bg-co-red border-gray-300 border px-4 py-2 text-white items-center text-sm rounded-2xl focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">
-          Annuler
-        </button>
-        <div x-show="{{$dialog}}" class="relative z-10" aria-labelledby="modal-title" role="dialog" aria-modal="true">
-          <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">
-                <form method="POST" action="/app/organized-carpool/bookings/{{.ViewState.booking.Id}}/cancel">
-                  <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">Annuler</h3>
-                    <div class="mt-2">
-                      <p class="text-sm text-gray-500">Êtes-vous sûr de vouloir annuler ce covoiturage ?</p>
-                    </div>
-                  </div>
-                  <div class="mt-5 sm:mt-6 sm:grid sm:grid-flow-row-dense sm:grid-cols-2">
-                    <button @click="{{$dialog}} = !{{$dialog}}" type="button" 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</button>
-                    <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">Confirmer</button>
-                  </div>
-                </form>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-      {{end}}
-
-      <a href='/app/journeys/?departure={"type":"Feature","geometry":{"type":"Point","coordinates":[{{.ViewState.booking.PassengerPickupLng}},{{.ViewState.booking.PassengerPickupLat}}]},"properties":{"label":"{{.ViewState.booking.PassengerPickupAddress}}"}}&destination={"type":"Feature","geometry":{"type":"Point","coordinates":[{{.ViewState.booking.PassengerDropLng}},{{.ViewState.booking.PassengerDropLat}}]},"properties":{"label":"{{.ViewState.booking.PassengerDropAddress}}"}}&passengerid={{.ViewState.passenger.ID}}' class="inline-flex">
-        <button type="button" class="px-4 py-2 border border-transparent text-sm font-medium rounded-2xl shadow-sm bg-white text-gray-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-co-blue">
-          Dupliquer
-        </button>
-      </a>
-
-      {{if eq .ViewState.booking.Status.String "CANCELLED" }}
-      <a href='/app/journeys/?departure={"type":"Feature","geometry":{"type":"Point","coordinates":[{{.ViewState.booking.PassengerPickupLng}},{{.ViewState.booking.PassengerPickupLat}}]},"properties":{"label":"{{.ViewState.booking.PassengerPickupAddress}}"}}&destination={"type":"Feature","geometry":{"type":"Point","coordinates":[{{.ViewState.booking.PassengerDropLng}},{{.ViewState.booking.PassengerDropLat}}]},"properties":{"label":"{{.ViewState.booking.PassengerDropAddress}}"}}&departuredate={{ timeFormat .ViewState.booking.PassengerPickupDate.AsTime "2006-01-02"}}&departuretime={{ timeFormat .ViewState.booking.PassengerPickupDate.AsTime "15:04"}}&passengerid={{.ViewState.passenger.ID}}&organized_carpool_exclude_driver={{.ViewState.driver.ID}}' class="inline-flex">
-        <button type="button" class="px-4 py-2 border border-transparent text-sm font-medium rounded-2xl shadow-sm bg-white text-gray-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-co-blue">
-          Solliciter un autre conducteur
-        </button>
-      </a>
-      {{end}}
-    </div>
-</div>
-
-<div class="max-w-7xl mx-auto py-8 px-4 sm:px-6 md:px-8">
-  <div class="grid grid-cols-1 lg:grid-cols-2 gap-8">
-    <!-- Booking Details -->
-    <div class="bg-white shadow overflow-hidden sm:rounded-lg">
-      <div class="px-4 py-5 sm:px-6">
-        <h3 class="text-lg leading-6 font-medium text-gray-900">Détails du covoiturage</h3>
-        <p class="mt-1 max-w-2xl text-sm text-gray-500">Informations sur le trajet</p>
-      </div>
-      <div class="border-t border-gray-200 px-4 py-5 sm:p-0">
-        <dl class="sm:divide-y sm:divide-gray-200">
-          <div class="py-4 sm:py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
-            <dt class="text-sm font-medium text-gray-500">Conducteur</dt>
-            <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
-		    <a class="text-co-blue" href="/app/organized-carpool/drivers/{{ .ViewState.driver.ID }}">{{ .ViewState.driver.Data.first_name }} {{ .ViewState.driver.Data.last_name }}</a>
-            </dd>
-          </div>
-          <div class="py-4 sm:py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
-            <dt class="text-sm font-medium text-gray-500">Passager</dt>
-            <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
-		    <a class="text-co-blue" href="/app/beneficiaries/{{ .ViewState.passenger.ID }}">{{ .ViewState.passenger.Data.first_name }} {{ .ViewState.passenger.Data.last_name }}</a>
-            </dd>
-          </div>
-          <div class="py-4 sm:py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
-            <dt class="text-sm font-medium text-gray-500">Départ conducteur</dt>
-            <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
-                {{ .ViewState.driverDepartureAddress }}
-            </dd>
-          </div>
-          <div class="py-4 sm:py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
-            <dt class="text-sm font-medium text-gray-500">Prise en charge passager</dt>
-            <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
-              {{ .ViewState.booking.PassengerPickupAddress }}
-            </dd>
-          </div>
-          <div class="py-4 sm:py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
-            <dt class="text-sm font-medium text-gray-500">Dépose passager</dt>
-            <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
-              {{ .ViewState.booking.PassengerDropAddress }}
-            </dd>
-          </div>
-          <div class="py-4 sm:py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
-            <dt class="text-sm font-medium text-gray-500">Arrivée conducteur</dt>
-            <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
-              {{ if .ViewState.driverArrivalAddress }}
-                {{ .ViewState.driverArrivalAddress }}
-              {{ end }}
-            </dd>
-          </div>
-          <div class="py-4 sm:py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
-            <dt class="text-sm font-medium text-gray-500">Date et heure</dt>
-            <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
-              {{ timeFormat .ViewState.booking.PassengerPickupDate.AsTime "02/01/2006 15:04" }}
-            </dd>
-          </div>
-          {{if .ViewState.booking.Distance}}
-          <div class="py-4 sm:py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
-            <dt class="text-sm font-medium text-gray-500">Distance</dt>
-            <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
-              {{ .ViewState.booking.Distance }} km
-            </dd>
-          </div>
-          {{end}}
-          <div class="py-4 sm:py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
-            <dt class="text-sm font-medium text-gray-500">Prix (passager)</dt>
-            <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
-              {{ if .ViewState.booking.Price }}
-                {{ if eq .ViewState.booking.Price.Type.String "FREE" }}
-                  <span class="text-co-green font-medium">Gratuit</span>
-                {{ else if eq .ViewState.booking.Price.Type.String "PAYING" }}
-                  <span class="font-medium">{{ printf "%.2f" (round2 .ViewState.booking.Price.Amount) }} {{ .ViewState.booking.Price.Currency }}</span>
-                {{ else }}
-                  <span class="text-gray-500">Prix non défini</span>
-                {{ end }}
-              {{ else }}
-                <span class="text-gray-500">Prix non disponible</span>
-              {{ end }}
-            </dd>
-          </div>
-          {{if and .ViewState.booking.DriverCompensationAmount .ViewState.booking.DriverCompensationCurrency}}
-            {{if gt (round2 .ViewState.booking.DriverCompensationAmount) 0.0}}
-            <div class="py-4 sm:py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
-              <dt class="text-sm font-medium text-gray-500">Indemnité conducteur</dt>
-              <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
-                <span class="font-medium">{{ printf "%.2f" (round2 .ViewState.booking.DriverCompensationAmount) }} {{ .ViewState.booking.DriverCompensationCurrency }}</span>
-              </dd>
-            </div>
-            {{end}}
-          {{end}}
-          {{if .ViewState.booking.Motivation}}
-          <div class="py-4 sm:py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
-            <dt class="text-sm font-medium text-gray-500">Motif</dt>
-            <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
-              {{.ViewState.booking.Motivation}}
-            </dd>
-          </div>
-          {{end}}
-        </dl>
-      </div>
-    </div>
-
-    <!-- Map -->
-    <div class="bg-white shadow overflow-hidden sm:rounded-lg">
-      <div class="border-t border-gray-200 h-full">
-        <div class="h-full min-h-96">
-          {{ template "organized_carpool_map" .ViewState }}
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-
-{{ end }}

web/layouts/organized_carpool/driver_create.html

@@ -1,178 +0,0 @@
-
-{{ 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">Créer un covoitureur solidaire</h1>
-</div>
-
-<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8 mt-8"
-    x-data="{
-        fields: {
-            first_name: null,
-            last_name: null,
-            email: null,
-            phone_number: null,
-            birthdate: null,
-        },
-        rules: {
-            first_name: ['required'],
-            last_name: ['required'],
-            email: ['required', 'email'],
-            phone_number: ['required', 'regexMatch:^((\\+)33|0)[1-9](\\d{2}){4}$'],
-            birthdate: ['required'],
-        },
-        formValidation: {
-            valid: false,
-            fields: {
-                first_name: {valid: null},
-                last_name: {valid: null},
-                email: {valid: null},
-                phone_number: {valid: null},
-                birthdate: {valid: null},
-            }
-        },
-        isFormValid: true,
-        validate() {
-            this.formValidation = Iodine.assert(this.fields, this.rules)
-        },
-        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 obligatoires</h3>
-                    <p class="mt-1 text-sm text-gray-500">Informations personnelles obligatoires pour créer le conducteur</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="first_name" class="block text-sm font-medium text-gray-700">Prénom</label>
-                            <input type="text" name="first_name" id="first_name" autocomplete="given-name"
-                                class="p-2 mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-2xl"
-                                x-model="fields.first_name" @blur="validateField('first_name')"
-                                :class="formValidation.fields.first_name.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
-                        </div>
-
-                        <div class="col-span-6 sm:col-span-3">
-                            <label for="last_name" class="block text-sm font-medium text-gray-700">Nom</label>
-                            <input type="text" name="last_name" id="last_name" autocomplete="family-name"
-                                class="p-2 mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-2xl"
-                                x-model="fields.last_name" @blur="validateField('last_name')"
-                                :class="formValidation.fields.last_name.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
-                        </div>
-
-                        <div class="col-span-6 sm:col-span-3">
-                            <label for="email" class="block text-sm font-medium text-gray-700">Email</label>
-                            <input type="text" name="email" id="email" autocomplete="email"
-                                class="p-2 mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-2xl"
-                                x-model="fields.email" @blur="validateField('email')"
-                                :class="formValidation.fields.email.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
-                        </div>
-
-                        <div class="col-span-6 sm:col-span-3">
-                            <label for="phone_number" class="block text-sm font-medium text-gray-700">Numéro de
-                                téléphone</label>
-                            <input type="text" name="phone_number" id="phone_number" autocomplete="phone" placeholder="+33612345678"
-                                class="p-2 mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-2xl"
-                                x-model="fields.phone_number" @blur="validateField('phone_number')"
-                                :class="formValidation.fields.phone_number.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
-                        </div>
-
-                        <div class="col-span-6 sm:col-span-3">
-                            <label for="birthdate" class="block text-sm font-medium text-gray-700">Date de
-                                naissance</label>
-                            <input type="date" name="birthdate" id="birthdate" autocomplete="birthdate" placeholder="JJ/MM/AAAA"
-                                class="p-2 mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-2xl"
-                                x-model="fields.birthdate" @blur="validateField('birthdate')"
-                                :class="formValidation.fields.birthdate.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
-                        </div>
-                    {{ $fieldName := "address" }}
-                    {{ template "address_autocomplete" dict "FieldName" $fieldName "FieldLabel" "Adresse principale" }}
-
-                    </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">Informations optionnelles</h3>
-                    <p class="mt-1 text-sm text-gray-500">Autres informations de profil optionnelles</p>
-                </div>
-                <div class="mt-5 space-y-6 md:mt-0 md:col-span-2">
-                    <div class="grid grid-cols-6 gap-6">
-                    {{ $fieldName2 := "address_destination" }}
-                    {{ template "address_autocomplete" dict "FieldName" $fieldName2 "FieldLabel" "Adresse destination" }}
-
-                        <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">
-                                <select id="gender" name="gender" autocomplete="gender" x-model="gender"
-                                    class="p-2 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 border-gray-300 rounded-2xl">
-                                    <option value="0">Inconnu</option>
-                                    <option value="1">Masculin</option>
-                                    <option value="2">Féminin</option>
-                                    <option value="9">Sans objet</option>
-                                </select>
-                            </div>
-                        </div>
-
-                        <!-- <div class="col-span-3 sm:col-span-3">
-                            <label class="block text-sm font-medium text-gray-700"> Photo </label>
-                            <div class="mt-1 flex items-center space-x-5">
-                                <span class="inline-block h-12 w-12 rounded-co overflow-hidden bg-gray-100">
-                                    {{.IconSet.Icon "img:profile-picture-placeholder" "h-full w-full"}}
-                                </span>
-                                <button type="button"
-                                    class="bg-white py-2 px-3 border border-gray-300 rounded-2xl shadow-sm text-sm leading-4 font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">
-                                    Charger la photo
-                                </button>
-                            </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 liés au conducteur, utiles pour exploiter les fonctionnalités de PARCOURSMOB</p>
-                </div>
-                <div class="mt-5 space-y-6 md:mt-0 md:col-span-2">
-
-                    {{ $fieldName := "address" }}
-                    {{ template "address_autocomplete" dict "FieldName" $fieldName }}
-
-                </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/organized-carpool/">
-                <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">
-            Créer le covoitureur solidaire</button>
-        </div>
-    </form>
-</div>
-{{end}}
-

web/layouts/organized_carpool/driver_display.html

@@ -1,170 +0,0 @@
-
-{{define "content"}}
-<main class="py-10">
-    <!-- Page header -->
-    <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 class="flex-shrink-0">
-                <div class="relative">
-                    <img class="h-16 w-16 rounded-co" src="/app/beneficiaries/{{.ViewState.driver.ID}}/picture" alt="">
-                    <span class="absolute inset-0 shadow-inner rounded-full" aria-hidden="true"></span>
-                </div>
-            </div>
-            <div>
-                <h1 class="text-2xl font-bold text-gray-900">{{.ViewState.driver.Data.first_name}}
-                    {{.ViewState.driver.Data.last_name}}</h1>
-                <p class="text-sm font-bold text-co-red">{{if .ViewState.driver.Data.archived}}Conducteur archivé{{end}}
-                <p class="text-sm font-medium text-gray-500">{{if .ViewState.driver.Metadata.created}}Ajouté le <time
-                        datetime="2022-07-25">{{.ViewState.driver.Metadata.created}}</time> par
-                    <a href="#" class="text-gray-900">Conseiller 1</a>{{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">
-            {{if not .ViewState.driver.Data.archived}}<a href="/app/organized-carpool/drivers/{{ .ViewState.driver.ID }}/archive"><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">Archiver</button></a>{{end}}
-            {{if .ViewState.driver.Data.archived}}<a href="/app/organized-carpool/drivers/{{ .ViewState.driver.ID }}/unarchive"><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">Désarchiver</button></a>{{end}}
-            <!-- <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/organized-carpool/drivers/{{.ViewState.driver.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>
-        </div>
-    </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">
-        <div class="space-y-6 lg:col-start-1 lg:col-span-2">
-            <section aria-labelledby="driver-information-title">
-                <div class="bg-white shadow sm:rounded-lg">
-                    <div class="px-4 py-5 sm:px-6">
-                        <h2 id="driver-information-title" class="text-lg leading-6 font-medium text-gray-900">
-                            Informations personnelles</h2>
-                        <p class="mt-1 max-w-2xl text-sm text-gray-500">Informations générales sur le conducteur solidaire.</p>
-                    </div>
-                    <div class="border-t border-gray-200 px-4 py-5 sm:px-6">
-                        <dl class="grid grid-cols-1 gap-x-4 gap-y-8 sm:grid-cols-2">
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Profil validé</dt>
-                                <dd class="mt-1 text-sm text-gray-900">
-                                  {{if carpoolDriverValidatedProfile .ViewState.driver .ViewState.documents}}
-                                    <span class="p-1 px-2 text-xs bg-co-green rounded-2xl">Oui</span>
-                                  {{else}}
-                                    <span class="p-1 px-2 text-xs bg-co-red text-white rounded-2xl">Non</span>
-                                  {{end}}
-                                </dd>
-                            </div>
-                            {{if .ViewState.driver.Data.email}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Email</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{.ViewState.driver.Data.email}}</dd>
-                            </div>
-                            {{end}}
-                            {{if .ViewState.driver.Data.phone_number}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Téléphone</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{.ViewState.driver.Data.phone_number}}</dd>
-                            </div>
-                            {{end}}
-                            {{if .ViewState.driver.Data.birthdate}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Date de naissance</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{(timeFrom .ViewState.driver.Data.birthdate).Format
-                                    "02/01/2006"}}</dd>
-                            </div>
-                            {{end}}
-                            {{if and .ViewState.driver.Data.gender (ne .ViewState.driver.Data.gender "0")}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Genre</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{genderISO5218 .ViewState.driver.Data.gender}}</dd>
-                            </div>
-                            {{end}}
-                            {{if .ViewState.driver.Data.address}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Adresse principale</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{.ViewState.driver.Data.address.properties.label}}</dd>
-                            </div>
-                            {{end}}
-                            {{if .ViewState.driver.Data.address_destination}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Adresse destination</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{.ViewState.driver.Data.address_destination.properties.label}}</dd>
-                            </div>
-                            {{end}}
-                        </dl>
-                    </div>
-                </div>
-            </section>
-
-            <section aria-labelledby="functionalities-title" x-data="{
-                    tab: '{{ if .ViewState.tab }}{{ .ViewState.tab }}{{ else }}documents{{ end }}',
-                    to(event) {
-                        this.tab = event.target.value
-                    }
-                }">
-                <div class="bg-white shadow sm:rounded-lg sm:overflow-hidden">
-                    <div class="divide-y divide-gray-200">
-                        <div>
-                            <div class="sm:hidden">
-                                <label for="tabs" class="sr-only">Select a tab</label>
-                                <select id="tabs" name="tabs" @change="to"
-                                    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="vehicles">Véhicules</option>
-
-                                    <option value="events">Dispositifs</option> -->
-
-                                    <option value="documents">Documents</option>
-
-                                    <option value="wallet">Compte mobilité</option>
-
-                                    <option value="history">Covoiturage solidaire</option>
-                                </select>
-                            </div>
-                            <div class="hidden sm:block">
-                                <div class="border-b border-gray-200 pl-4">
-                                    <nav class="-mb-px flex space-x-8" aria-label="Tabs">
-                                        <!-- Current: "border-indigo-500 text-indigo-600", Default: "border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300" -->
-                                        <!--<a href="#" @click="tab = 'notes'"
-                                            class="whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm"
-                                            :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 = '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 = 'wallet'"
-                                        class="whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm"
-                                        :class="tab == 'wallet' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
-                                        Compte mobilité </a>
-
-                                        <a href="#" @click="tab = 'history'"
-                                        class="whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm"
-                                        :class="tab == 'history' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
-                                        Covoiturage solidaire </a>
-
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-
-                        <div x-show="tab == 'documents'">{{template "driver_files" .}}</div>
-                        <div x-show="tab == 'wallet'">{{template "organized_carpool_driver_wallet" .}}</div>
-                        <div x-show="tab == 'history'">{{template "organized_carpool_driver_history" .}}</div>
-
-                    </div>
-                </div>
-            </section>
-        </div>
-
-        <section class="lg:col-start-3 lg:col-span-1">
-        {{template "driver_availabilities" .}}
-        </section>
-    </div>
-</main>
-{{end}}

web/layouts/organized_carpool/driver_update.html

@@ -1,174 +0,0 @@
-{{ 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">Modifier le covoitureur solidaire</h1>
-</div>
-
-<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8 mt-8"
-    x-data="{
-        fields: {
-          first_name: '{{.ViewState.driver.Data.first_name}}',
-          last_name: '{{.ViewState.driver.Data.last_name}}',
-          email: '{{.ViewState.driver.Data.email}}' ,
-          phone_number: '{{.ViewState.driver.Data.phone_number}}',
-          birthdate: {{if .ViewState.driver.Data.birthdate}}'{{ (timeFrom .ViewState.driver.Data.birthdate).Format "2006-01-02" }}'{{else}}null{{end}},
-        },
-        other_properties: {{if .ViewState.driver.Data.other_properties}}{{ json .ViewState.driver.Data.other_properties }}{{else}}{}{{end}},
-        other_properties_serialized: '{{ json .ViewState.driver.Data.other_properties }}',
-        rules: {
-            first_name: ['required'],
-            last_name: ['required'],
-            email: ['required', 'email'],
-            phone_number: ['required', 'regexMatch:^((\\+)33|0)[1-9](\\d{2}){4}$'],
-            birthdate: ['required'],
-        },
-        formValidation: {
-            valid: false,
-            fields: {
-                first_name: {valid: null},
-                last_name: {valid: null},
-                email: {valid: null},
-                phone_number: {valid: null},
-                birthdate: {valid: null},
-            }
-        },
-        isFormValid: true,
-        validate() {
-            this.formValidation = Iodine.assert(this.fields, this.rules)
-        },
-        validateField(field) {
-            this.formValidation.fields[field] = Iodine.assert(this.fields[field], this.rules[field])
-        },
-        submit(event) {
-            this.other_properties_serialized = JSON.stringify(this.other_properties)
-            this.validate()
-            if(!this.formValidation.valid) {
-                this.isFormValid = false
-                event.preventDefault()
-            }
-            return this.formValidation.valid
-        }
-    }">
-    <form class="space-y-6" method="POST" @submit="submit">
-        <input type="hidden" name="other_properties" x-model="other_properties_serialized" />
-        <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 obligatoires</h3>
-                    <p class="mt-1 text-sm text-gray-500">Informations personnelles obligatoires pour créer le covoitureur solidaire</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="first_name" class="block text-sm font-medium text-gray-700">Prénom</label>
-                            <input type="text" name="first_name" id="first_name" autocomplete="given-name"
-                                class="p-2 mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-2xl"
-                                x-model="fields.first_name" @blur="validateField('first_name')"
-                                :class="formValidation.fields.first_name.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
-                        </div>
-
-                        <div class="col-span-6 sm:col-span-3">
-                            <label for="last_name" class="block text-sm font-medium text-gray-700">Nom</label>
-                            <input type="text" name="last_name" id="last_name" autocomplete="family-name"
-                                class="p-2 mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-2xl"
-                                x-model="fields.last_name" @blur="validateField('last_name')"
-                                :class="formValidation.fields.last_name.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
-                        </div>
-
-                        <div class="col-span-6 sm:col-span-3">
-                            <label for="email" class="block text-sm font-medium text-gray-700">Email</label>
-                            <input type="text" name="email" id="email" autocomplete="email"
-                                class="p-2 mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-2xl"
-                                x-model="fields.email" @blur="validateField('email')"
-                                :class="formValidation.fields.email.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
-                        </div>
-
-                        <div class="col-span-6 sm:col-span-3">
-                            <label for="phone_number" class="block text-sm font-medium text-gray-700">Numéro de
-                                téléphone</label>
-                            <input type="text" name="phone_number" id="phone_number" autocomplete="phone" placeholder="+33612345678"
-                                class="p-2 mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-2xl"
-                                x-model="fields.phone_number" @blur="validateField('phone_number')"
-                                :class="formValidation.fields.phone_number.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
-                        </div>
-
-                        <div class="col-span-6 sm:col-span-3">
-                            <label for="birthdate" class="block text-sm font-medium text-gray-700">Date de
-                                naissance</label>
-                            <input type="date" name="birthdate" id="birthdate" autocomplete="birthdate" placeholder="JJ/MM/AAAA"
-                                class="p-2 mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-2xl"
-                                x-model="fields.birthdate" @blur="validateField('birthdate')"
-                                :class="formValidation.fields.birthdate.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
-                        </div>
-                    {{ $fieldName := "address" }}
-                    {{if .ViewState.driver.Data.address}}
-                    {{$default := .ViewState.driver.Data.address}}
-                    {{ template "address" dict "FieldName" $fieldName  "Default" $default}}
-                    {{else}}
-                    {{ template "address_autocomplete" dict "FieldName" $fieldName}}
-                    {{end}}
-
-                    {{ $fieldName := "address_destination" }}
-                    {{if .ViewState.driver.Data.address_destination}}
-                    {{$default := .ViewState.driver.Data.address_destination}}
-                    {{ template "address" dict "FieldName" $fieldName  "Default" $default "Label" "Adresse destination"}}
-                    {{else}}
-                    {{ template "address_autocomplete" dict "FieldName" $fieldName "Label" "Adresse destination"}}
-                    {{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-gray-900">Informations optionnelles</h3>
-                    <p class="mt-1 text-sm text-gray-500">Autres informations de profil optionnelles</p>
-                </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="gender" class="block text-sm font-medium text-gray-700">Genre</label>
-                            <div class="sm:mt-0 sm:col-span-2">
-                                <select id="gender" name="gender" autocomplete="gender" x-model="other_properties.gender"
-                                    class="p-2 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 border-gray-300 rounded-2xl">
-                                    <option value="0">Inconnu</option>
-                                    <option value="1">Masculin</option>
-                                    <option value="2">Féminin</option>
-                                    <option value="9">Sans objet</option>
-                                </select>
-                            </div>
-                        </div>
-
-                        <div class="col-span-6 sm:col-span-3">
-                            <label for="last_subscription_date" class="block text-sm font-medium text-gray-700">Date de dernière adhésion</label>
-                            <input type="date" name="last_subscription_date" id="last_subscription_date" autocomplete="last_subscription_date" placeholder="JJ/MM/AAAA"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-2xl"
-                                x-model="other_properties.last_subscription_date">
-                        </div>
-                        <div class="col-span-6 sm:col-span-3">
-                            <label for="comment" class="block text-sm font-medium text-gray-700">Commentaire</label>
-                            <textarea name="comment" id="comment"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-2xl"
-                                x-model="other_properties.comment"></textarea>
-                        </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/organized-carpool/drivers/{{.ViewState.driver.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 le covoitureur solidaire</button>
-        </div>
-    </form>
-</div>
-{{end}}

web/layouts/organized_carpool/journey.html

@@ -1,36 +0,0 @@
-{{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">Organiser le covoiturage</h1>
-</div>
-<div class="max-w-7xl mx-auto py-8 px-4 sm:px-6 md:px-8">
-  {{template "journey_preview" (dict "journey" .ViewState.journey "driver" .ViewState.driver "passenger" .ViewState.passenger "beneficiaries" .ViewState.beneficiaries "passenger_wallet_balance" .ViewState.passenger_wallet_balance "pricing_result" .ViewState.pricing_result)}}
-{{if ne .ViewState.passenger.ID ""}}
-<div class="max-w-7xl m-auto px-4 sm:px-6 md:px-8 flex flex-col justify-items-center">
-  {{if .ViewState.passenger}}
-  {{if lt .ViewState.passenger_wallet_balance .ViewState.pricing_result.passenger.Amount}}
-    <p class="text-xl text-co-red text-center p-4">Le solde du compte mobilité est insuffisant.</p>
-    {{end}}
-  {{end}}
-  <form method="POST">
-    <div class="m-auto text-center">
-      <label for="motivation" class="block text-sm font-medium text-gray-700">Motif du trajet</label>
-      <select name="motivation" id="motivation"
-          class="p-2 mt-1 mb-4 focus:ring-co-blue focus:border-co-blue block shadow-sm sm:text-sm  rounded-2xl bg-white m-auto">
-        {{range .ViewState.booking_motivations}}
-        <option value="{{.value}}"{{if eq .value ""}} selected="selected"{{end}}>{{.label}}</option>
-        {{end}}
-      </select>
-    </div>
-    {{template "submit_with_sms"
-      dict  "IconSet" .IconSet
-            "Viewstate" .ViewState
-            "ComponentState" (dict "submitText" "Envoyer la demande de covoiturage"
-                                   "doNotSendOption" true)
-            "SMSState" (dict "name" (.ViewState.config.GetString "service_name")
-                             "datetime" (or (timeFormat .ViewState.journey.ExtraMembers.departure_date "02/01/2006") "À définir")
-                             "baseUrl" (.ViewState.config.GetString "base_url") )}}
-  </form>
-</div>
-{{end}}
-
-{{end}}

web/layouts/organized_carpool/overview.html

@@ -1,69 +0,0 @@
-{{ define "content" }}
-{{$defaultTab := "carpoolService"}}
-<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8">
-  <h1 class="text-2xl font-semibold text-gray-900">Covoiturage solidaire</h1>
-
-    <div class="bg-white shadow sm:rounded-lg sm:overflow-hidden my-4" x-data="{
-        tab: '{{or .ViewState.tab $defaultTab}}',
-        to(event) {
-            this.tab = event.target.value
-        }
-    }">
-        <div class="divide-y divide-gray-200">
-            <div>
-                <div class="hidden sm:block">
-                    <div class="border-b border-gray-200 pl-4 flex justify-between items-center">
-                        <nav class="-mb-px flex space-x-8" aria-label="Tabs">
-                            <a href="#" @click="tab = 'carpoolService'"
-                                class="whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm"
-                                :class="tab == 'carpoolService' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
-                                Trajets </a>
-
-                            <a href="#" @click="tab = 'drivers'"
-                                class="whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm"
-                                :class="tab == 'drivers' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
-                                Covoitureurs solidaires </a>
-
-                            <a href="#" @click="tab = 'carpoolHistory'"
-                                class="whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm"
-                                :class="tab == 'carpoolHistory' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
-                                Trajets passés </a>
-                        </nav>
-
-                        <div class="pr-4" x-show="tab == 'carpoolHistory'">
-                            {{$exportURL := "/exports/organized-carpool/bookings.xlsx"}}
-                            {{$hasParams := false}}
-                            {{if .ViewState.hist_filters.date_start}}{{$exportURL = printf "%s?start_date=%s" $exportURL .ViewState.hist_filters.date_start}}{{$hasParams = true}}{{end}}
-                            {{if .ViewState.hist_filters.date_end}}{{if $hasParams}}{{$exportURL = printf "%s&end_date=%s" $exportURL .ViewState.hist_filters.date_end}}{{else}}{{$exportURL = printf "%s?end_date=%s" $exportURL .ViewState.hist_filters.date_end}}{{$hasParams = true}}{{end}}{{end}}
-                            {{if .ViewState.hist_filters.status}}{{if $hasParams}}{{$exportURL = printf "%s&status=%s" $exportURL .ViewState.hist_filters.status}}{{else}}{{$exportURL = printf "%s?status=%s" $exportURL .ViewState.hist_filters.status}}{{$hasParams = true}}{{end}}{{end}}
-                            {{if .ViewState.hist_filters.departure_geo}}{{if $hasParams}}{{$exportURL = printf "%s&departure_geo=%s" $exportURL .ViewState.hist_filters.departure_geo}}{{else}}{{$exportURL = printf "%s?departure_geo=%s" $exportURL .ViewState.hist_filters.departure_geo}}{{$hasParams = true}}{{end}}{{end}}
-                            {{if .ViewState.hist_filters.destination_geo}}{{if $hasParams}}{{$exportURL = printf "%s&destination_geo=%s" $exportURL .ViewState.hist_filters.destination_geo}}{{else}}{{$exportURL = printf "%s?destination_geo=%s" $exportURL .ViewState.hist_filters.destination_geo}}{{$hasParams = true}}{{end}}{{end}}
-                            {{if .ViewState.hist_filters.passenger_address_geo}}{{if $hasParams}}{{$exportURL = printf "%s&passenger_address_geo=%s" $exportURL .ViewState.hist_filters.passenger_address_geo}}{{else}}{{$exportURL = printf "%s?passenger_address_geo=%s" $exportURL .ViewState.hist_filters.passenger_address_geo}}{{$hasParams = true}}{{end}}{{end}}
-
-                            <a href="{{$exportURL}}">
-                                <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">
-                                    <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 mr-3" fill="none" viewBox="0 0 24 24" stroke="currentColor">
-                                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 10v6m0 0l-3-3m3 3l3-3m2 8H7a2 2 0 01-2-2V5a2 2 0 012-2h5.586a1 1 0 01.707.293l5.414 5.414a1 1 0 01.293.707V19a2 2 0 01-2 2z" />
-                                    </svg>
-                                    Exporter
-                                </button>
-                            </a>
-                        </div>
-                    </div>
-                </div>
-            </div>
-
-            <div x-show="tab == 'carpoolService'">{{template "carpool_bookings_list" .}}</div>
-
-            <div x-show="tab == 'drivers'">{{template "carpool_drivers_list" .}}</div>
-
-            <div x-show="tab == 'carpoolHistory'">{{template "carpool_bookings_history" .}}</div>
-
-        </div>
-    </div>
-
-
-</div>
-
-{{ end }}

web/layouts/solidarity_transport/_partials/booking_filters.html

@@ -1,92 +0,0 @@
-{{ define "booking_filters" }}
-{{$tab := or .tab "solidarityTransport"}}
-
-<form>
-
-<input type="hidden" name="tab" value="{{$tab}}" />
-
-<div class="flex flex-row justify-end items-end">
-
-<div class="m-2">
-<div>
-  <label for="{{$tab}}_date_start" class="block text-sm/6 font-medium text-gray-900 dark:text-white">Dates (début / fin)</label>
-  <div class="mt-2 flex">
-	  <input id="{{$tab}}_date_start" type="date" name="date_start" class="block w-full rounded-md bg-white px-3 py-1.5 text-base text-gray-900 outline-1 -outline-offset-1 outline-gray-300 placeholder:text-gray-400 focus:outline-2 focus:-outline-offset-2 focus:outline-indigo-600 sm:text-sm/6 dark:bg-white/5 dark:text-white dark:outline-white/10 dark:placeholder:text-gray-500 dark:focus:outline-co-blue" value="{{.filters.date_start}}" onchange="this.form.submit()" />
-	  <input id="{{$tab}}_date_end" type="date" name="date_end" class="mx-2 block w-full rounded-md bg-white px-3 py-1.5 text-base text-gray-900 outline-1 -outline-offset-1 outline-gray-300 placeholder:text-gray-400 focus:outline-2 focus:-outline-offset-2 focus:outline-indigo-600 sm:text-sm/6 dark:bg-white/5 dark:text-white dark:outline-white/10 dark:placeholder:text-gray-500 dark:focus:outline-co-blue" value="{{.filters.date_end}}" onchange="this.form.submit()" />
-  </div>
-</div>
-</div>
-
-<div class="m-2">
-<label for="{{$tab}}_status" class="block text-sm/6 font-medium text-gray-900 dark:text-white">Statut</label>
-<div class="mt-2 grid grid-cols-1">
-<select id="{{$tab}}_status" name="status" class="col-start-1 row-start-1 w-36 appearance-none rounded-md bg-white py-1.5 pr-8 pl-3 text-base text-gray-900 outline-1 -outline-offset-1 outline-gray-300 focus-visible:outline-2 focus-visible:-outline-offset-2 focus-visible:outline-indigo-600 sm:text-sm/6 dark:bg-white/5 dark:text-white dark:outline-white/10 dark:*:bg-gray-800 dark:focus-visible:outline-co-blue" onchange="this.form.submit()">
-    <option></option>
-    <option value="VALIDATED"{{if eq .filters.status "VALIDATED"}} selected{{end}}>Validé</option>
-    <option value="CANCELLED"{{if eq .filters.status "CANCELLED"}} selected{{end}}>Annulé</option>
-    <option value="WAITING_CONFIRMATION"{{if eq .filters.status "WAITING_CONFIRMATION"}} selected{{end}}>Attente confirmation</option>
-  </select>
-  <svg viewBox="0 0 16 16" fill="currentColor" data-slot="icon" aria-hidden="true" class="pointer-events-none col-start-1 row-start-1 mr-2 size-5 self-center justify-self-end text-gray-500 sm:size-4 dark:text-gray-400">
-    <path d="M4.22 6.22a.75.75 0 0 1 1.06 0L8 8.94l2.72-2.72a.75.75 0 1 1 1.06 1.06l-3.25 3.25a.75.75 0 0 1-1.06 0L4.22 7.28a.75.75 0 0 1 0-1.06Z" clip-rule="evenodd" fill-rule="evenodd" />
-  </svg>
-</div>
-</div>
-
-
-{{if $.geography_filters_enabled}}
-<div class="m-2">
-<label for="{{$tab}}_passenger_address_geo" class="block text-sm/6 font-medium text-gray-900 dark:text-white">Adresse passager</label>
-<div class="mt-2 grid grid-cols-1">
-<select id="{{$tab}}_passenger_address_geo" name="passenger_address_geo" class="col-start-1 row-start-1 w-36 appearance-none rounded-md bg-white py-1.5 pr-8 pl-3 text-base text-gray-900 outline-1 -outline-offset-1 outline-gray-300 focus-visible:outline-2 focus-visible:-outline-offset-2 focus-visible:outline-indigo-600 sm:text-sm/6 dark:bg-white/5 dark:text-white dark:outline-white/10 dark:*:bg-gray-800 dark:focus-visible:outline-co-blue" onchange="this.form.submit()">
-    <option value="">Toutes les zones</option>
-    {{range $.geography_filters_list}}
-    {{$geoValue := printf "%s:%s" .layer .code}}
-    <option value="{{$geoValue}}"{{if eq $.filters.passenger_address_geo $geoValue}} selected{{end}}>{{.name}}</option>
-    {{end}}
-  </select>
-  <svg viewBox="0 0 16 16" fill="currentColor" data-slot="icon" aria-hidden="true" class="pointer-events-none col-start-1 row-start-1 mr-2 size-5 self-center justify-self-end text-gray-500 sm:size-4 dark:text-gray-400">
-    <path d="M4.22 6.22a.75.75 0 0 1 1.06 0L8 8.94l2.72-2.72a.75.75 0 1 1 1.06 1.06l-3.25 3.25a.75.75 0 0 1-1.06 0L4.22 7.28a.75.75 0 0 1 0-1.06Z" clip-rule="evenodd" fill-rule="evenodd" />
-  </svg>
-</div>
-</div>
-
-{{end}}
-
-{{if $.geography_filters_enabled}}
-<div class="m-2">
-<label for="{{$tab}}_departure_geo" class="block text-sm/6 font-medium text-gray-900 dark:text-white">Départ</label>
-<div class="mt-2 grid grid-cols-1">
-<select id="{{$tab}}_departure_geo" name="departure_geo" class="col-start-1 row-start-1 w-36 appearance-none rounded-md bg-white py-1.5 pr-8 pl-3 text-base text-gray-900 outline-1 -outline-offset-1 outline-gray-300 focus-visible:outline-2 focus-visible:-outline-offset-2 focus-visible:outline-indigo-600 sm:text-sm/6 dark:bg-white/5 dark:text-white dark:outline-white/10 dark:*:bg-gray-800 dark:focus-visible:outline-co-blue" onchange="this.form.submit()">
-    <option value="">Toutes les zones</option>
-    {{range $.geography_filters_list}}
-    {{$geoValue := printf "%s:%s" .layer .code}}
-    <option value="{{$geoValue}}"{{if eq $.filters.departure_geo $geoValue}} selected{{end}}>{{.name}}</option>
-    {{end}}
-  </select>
-  <svg viewBox="0 0 16 16" fill="currentColor" data-slot="icon" aria-hidden="true" class="pointer-events-none col-start-1 row-start-1 mr-2 size-5 self-center justify-self-end text-gray-500 sm:size-4 dark:text-gray-400">
-    <path d="M4.22 6.22a.75.75 0 0 1 1.06 0L8 8.94l2.72-2.72a.75.75 0 1 1 1.06 1.06l-3.25 3.25a.75.75 0 0 1-1.06 0L4.22 7.28a.75.75 0 0 1 0-1.06Z" clip-rule="evenodd" fill-rule="evenodd" />
-  </svg>
-</div>
-</div>
-
-<div class="m-2">
-<label for="{{$tab}}_destination_geo" class="block text-sm/6 font-medium text-gray-900 dark:text-white">Destination</label>
-<div class="mt-2 grid grid-cols-1">
-<select id="{{$tab}}_destination_geo" name="destination_geo" class="col-start-1 row-start-1 w-36 appearance-none rounded-md bg-white py-1.5 pr-8 pl-3 text-base text-gray-900 outline-1 -outline-offset-1 outline-gray-300 focus-visible:outline-2 focus-visible:-outline-offset-2 focus-visible:outline-indigo-600 sm:text-sm/6 dark:bg-white/5 dark:text-white dark:outline-white/10 dark:*:bg-gray-800 dark:focus-visible:outline-co-blue" onchange="this.form.submit()">
-    <option value="">Toutes les zones</option>
-    {{range $.geography_filters_list}}
-    {{$geoValue := printf "%s:%s" .layer .code}}
-    <option value="{{$geoValue}}"{{if eq $.filters.destination_geo $geoValue}} selected{{end}}>{{.name}}</option>
-    {{end}}
-  </select>
-  <svg viewBox="0 0 16 16" fill="currentColor" data-slot="icon" aria-hidden="true" class="pointer-events-none col-start-1 row-start-1 mr-2 size-5 self-center justify-self-end text-gray-500 sm:size-4 dark:text-gray-400">
-    <path d="M4.22 6.22a.75.75 0 0 1 1.06 0L8 8.94l2.72-2.72a.75.75 0 1 1 1.06 1.06l-3.25 3.25a.75.75 0 0 1-1.06 0L4.22 7.28a.75.75 0 0 1 0-1.06Z" clip-rule="evenodd" fill-rule="evenodd" />
-  </svg>
-</div>
-</div>
-{{end}}
-
-</div>
-
-</form>
-{{ end }}

web/layouts/solidarity_transport/_partials/bookings_history.html

@@ -1,161 +0,0 @@
-
-{{ define "solidarity_bookings_history" }}
-{{template "booking_filters" dict "tab" "solidarityHistory" "filters" .ViewState.hist_filters "geography_filters_enabled" .ViewState.geography_filters_enabled "geography_filters_list" .ViewState.geography_filters_list }}
-{{if eq (len .ViewState.bookings_history) 0}}
-<div class="m-10 text-center text-gray-600">Aucun trajet dans le passé</div>
-{{else}}
-{{$inrange := false}}
-
-<div x-data="{
-  bookings: [
-  {{range .ViewState.bookings_history}}{{if $inrange}},{{end}}{{$inrange = true}}{{$driver := index $.ViewState.drivers_map .DriverId}}{{$passenger := index $.ViewState.passengers_map .PassengerId}}{
-      id: '{{.Id}}',
-      driverId: '{{.DriverId}}',
-      driverFirstName: '{{if $driver.ID}}{{ jsEscape $driver.Data.first_name }}{{end}}',
-      driverLastName: '{{if $driver.ID}}{{ jsEscape $driver.Data.last_name }}{{end}}',
-      passengerId: '{{.PassengerId}}',
-      passengerFirstName: '{{if $passenger.Data}}{{ jsEscape $passenger.Data.first_name }}{{end}}',
-      passengerLastName: '{{if $passenger.Data}}{{ jsEscape $passenger.Data.last_name }}{{end}}',
-      pickupLabel: '{{if .Journey}}{{ jsEscape .Journey.PassengerPickup.Properties.label }}{{end}}',
-      dropLabel: '{{if .Journey}}{{ jsEscape .Journey.PassengerDrop.Properties.label }}{{end}}',
-      pickupDate: '{{if .Journey}}{{ timeFormat .Journey.PassengerPickupDate "02/01/2006 15:04" }}{{end}}',
-      status: '{{.Status}}',
-      price: '{{if .Journey}}{{ printf "%.2f" (round2 .Journey.Price.Amount) }}{{end}}',
-      currency: '{{if .Journey}}{{.Journey.Price.Currency}}{{end}}',
-      motivation: {{ if .Data.motivation }}'{{ jsEscape .Data.motivation }}'{{ else }}''{{ end }},
-      replacedBy: {{ if .Data.replaced_by }}'{{ .Data.replaced_by }}'{{ else }}''{{ end }}
-    }{{end}}
-  ],
-  currentPage: 1,
-  itemsPerPage: {{ if .ViewState.trips_items_per_page }}{{ .ViewState.trips_items_per_page }}{{ else }}10{{ end }},
-  get totalPages() {
-    return Math.ceil(this.bookings.length / this.itemsPerPage);
-  },
-  get paginatedBookings() {
-    const start = (this.currentPage - 1) * this.itemsPerPage;
-    const end = start + this.itemsPerPage;
-    return this.bookings.slice(start, end);
-  },
-  nextPage() {
-    if (this.currentPage < this.totalPages) this.currentPage++;
-  },
-  prevPage() {
-    if (this.currentPage > 1) this.currentPage--;
-  },
-  goToPage(page) {
-    this.currentPage = page;
-  },
-  getStatusBadge(status) {
-    if (status === 'WAITING_CONFIRMATION') return { class: 'p-1 text-xs bg-gray-300 rounded-xl', text: 'Attente confirmation' };
-    if (status === 'VALIDATED') return { class: 'p-1 text-xs bg-co-green rounded-xl', text: 'Validé' };
-    if (status === 'CANCELLED') return { class: 'p-1 text-xs bg-co-red text-white rounded-xl', text: 'Annulé' };
-    return { class: '', text: '' };
-  },
-  guaranteedMotivations: {{ json .ViewState.guaranteed_trip_motivations }},
-  isGuaranteedTrip(motivation) {
-    return this.guaranteedMotivations.includes(motivation);
-  }
-}">
-
-<table class="min-w-full divide-y divide-gray-300 border-gray-300 border-t-1">
-  <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">Conducteur</th>
-      <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Passager</th>
-      <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Départ</th>
-      <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Destination</th>
-      <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Date</th>
-      <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 scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Prix</th>
-      <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">&nbsp;</th>
-    </tr>
-  </thead>
-  <tbody class="divide-y divide-gray-200 bg-white">
-    <template x-for="booking in paginatedBookings" :key="booking.id">
-      <tr :class="booking.replacedBy ? 'bg-gray-200' : ''">
-        <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-          <a class="text-co-blue" :href="'/app/solidarity-transport/drivers/' + booking.driverId">
-            <span x-text="booking.driverFirstName + ' ' + booking.driverLastName"></span>
-          </a>
-        </td>
-        <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-          <a class="text-co-blue" :href="'/app/beneficiaries/' + booking.passengerId">
-            <span x-text="booking.passengerFirstName + ' ' + booking.passengerLastName"></span>
-          </a>
-        </td>
-        <td class="py-4 pl-4 pr-3 text-sm sm:pl-6" x-text="booking.pickupLabel"></td>
-        <td class="py-4 pl-4 pr-3 text-sm sm:pl-6" x-text="booking.dropLabel"></td>
-        <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6" x-text="booking.pickupDate"></td>
-        <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-          <span :class="getStatusBadge(booking.status).class" x-text="getStatusBadge(booking.status).text"></span>
-          <template x-if="booking.motivation && isGuaranteedTrip(booking.motivation)">
-            <div class="mt-4">
-              <span class="text-xs p-2 bg-co-green text-white rounded-2xl" x-text="'Trajet garanti : ' + booking.motivation"></span>
-            </div>
-          </template>
-        </td>
-        <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-          <span x-text="booking.price + ' ' + booking.currency"></span>
-        </td>
-        <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-          <a class="text-co-blue" :href="'/app/solidarity-transport/bookings/' + booking.id">Voir</a>
-        </td>
-      </tr>
-    </template>
-  </tbody>
-</table>
-
-<!-- Pagination -->
-<div class="flex items-center justify-between border-t border-gray-200 bg-white px-4 py-3 sm:px-6">
-  <div class="flex flex-1 justify-between sm:hidden">
-    <button @click="prevPage()" :disabled="currentPage === 1"
-            class="relative inline-flex items-center rounded-md border border-gray-300 bg-white px-4 py-2 text-sm font-medium text-gray-700 hover:bg-gray-50 disabled:opacity-50 disabled:cursor-not-allowed">
-      Précédent
-    </button>
-    <button @click="nextPage()" :disabled="currentPage === totalPages"
-            class="relative ml-3 inline-flex items-center rounded-md border border-gray-300 bg-white px-4 py-2 text-sm font-medium text-gray-700 hover:bg-gray-50 disabled:opacity-50 disabled:cursor-not-allowed">
-      Suivant
-    </button>
-  </div>
-  <div class="hidden sm:flex sm:flex-1 sm:items-center sm:justify-between">
-    <div>
-      <p class="text-sm text-gray-700">
-        Affichage de
-        <span class="font-medium" x-text="(currentPage - 1) * itemsPerPage + 1"></span>
-        à
-        <span class="font-medium" x-text="Math.min(currentPage * itemsPerPage, bookings.length)"></span>
-        sur
-        <span class="font-medium" x-text="bookings.length"></span>
-        résultats
-      </p>
-    </div>
-    <div>
-      <nav class="isolate inline-flex -space-x-px rounded-md shadow-sm" aria-label="Pagination">
-        <button @click="prevPage()" :disabled="currentPage === 1"
-                class="relative inline-flex items-center rounded-l-md px-2 py-2 text-gray-400 ring-1 ring-inset ring-gray-300 hover:bg-gray-50 focus:z-20 focus:outline-offset-0 disabled:opacity-50 disabled:cursor-not-allowed">
-          <span class="sr-only">Précédent</span>
-          <svg class="h-5 w-5" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
-            <path fill-rule="evenodd" d="M12.79 5.23a.75.75 0 01-.02 1.06L8.832 10l3.938 3.71a.75.75 0 11-1.04 1.08l-4.5-4.25a.75.75 0 010-1.08l4.5-4.25a.75.75 0 011.06.02z" clip-rule="evenodd" />
-          </svg>
-        </button>
-        <template x-for="page in totalPages" :key="page">
-          <button @click="goToPage(page)"
-                  :class="page === currentPage ? 'z-10 bg-co-blue text-white focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-co-blue' : 'text-gray-900 ring-1 ring-inset ring-gray-300 hover:bg-gray-50 focus:outline-offset-0'"
-                  class="relative inline-flex items-center px-4 py-2 text-sm font-semibold focus:z-20"
-                  x-text="page"></button>
-        </template>
-        <button @click="nextPage()" :disabled="currentPage === totalPages"
-                class="relative inline-flex items-center rounded-r-md px-2 py-2 text-gray-400 ring-1 ring-inset ring-gray-300 hover:bg-gray-50 focus:z-20 focus:outline-offset-0 disabled:opacity-50 disabled:cursor-not-allowed">
-          <span class="sr-only">Suivant</span>
-          <svg class="h-5 w-5" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
-            <path fill-rule="evenodd" d="M7.21 14.77a.75.75 0 01.02-1.06L11.168 10 7.23 6.29a.75.75 0 111.04-1.08l4.5 4.25a.75.75 0 010 1.08l-4.5 4.25a.75.75 0 01-1.06-.02z" clip-rule="evenodd" />
-          </svg>
-        </button>
-      </nav>
-    </div>
-  </div>
-</div>
-
-</div>
-{{end}}
-{{end}}

web/layouts/solidarity_transport/_partials/bookings_list.html

@@ -1,155 +0,0 @@
-
-{{ define "solidarity_bookings_list" }}
-{{template "booking_filters" dict "tab" "solidarityService" "filters" .ViewState.filters "geography_filters_enabled" .ViewState.geography_filters_enabled "geography_filters_list" .ViewState.geography_filters_list }}
-
-{{if eq (len .ViewState.bookings) 0}}
-<div class="m-10 text-center text-gray-600">Aucun trajet déclaré</div>
-{{else}}
-{{$inrange := false}}
-
-<div x-data="{
-  bookings: [
-  {{range .ViewState.bookings}}{{if $inrange}},{{end}}{{$inrange = true}}{{$driver := index $.ViewState.drivers_map .DriverId}}{{$passenger := index $.ViewState.passengers_map .PassengerId}}{
-	id: '{{.Id}}',
-      	driverId: '{{.DriverId}}',
-	driverFirstName: '{{if $driver.Data.first_name}}{{ jsEscape $driver.Data.first_name }}{{end}}',
-	driverLastName: '{{if $driver.Data.last_name}}{{ jsEscape $driver.Data.last_name }}{{end}}',
-      	passengerId: '{{ .PassengerId }}',
-	passengerFirstName: '{{if $passenger.Data.first_name}}{{ jsEscape $passenger.Data.first_name }}{{end}}',
-	passengerLastName: '{{if $passenger.Data.last_name}}{{ jsEscape $passenger.Data.last_name }}{{end}}',
-      	pickupLabel: '{{if .Journey}}{{ jsEscape .Journey.PassengerPickup.Properties.label }}{{end}}',
-      	dropLabel: '{{if .Journey}}{{ jsEscape .Journey.PassengerDrop.Properties.label }}{{end}}',
-      	pickupDate: '{{if .Journey}}{{ timeFormat .Journey.PassengerPickupDate "02/01/2006 15:04" }}{{end}}',
-      	status: '{{.Status}}',
-      	motivation: {{ if .Data.motivation }}'{{ jsEscape .Data.motivation }}'{{ else }}''{{ end }}
-      }{{end}}
-  ],
-  currentPage: 1,
-  itemsPerPage: {{ if .ViewState.trips_items_per_page }}{{ .ViewState.trips_items_per_page }}{{ else }}10{{ end }},
-  get totalPages() {
-    return Math.ceil(this.bookings.length / this.itemsPerPage);
-  },
-  get paginatedBookings() {
-    const start = (this.currentPage - 1) * this.itemsPerPage;
-    const end = start + this.itemsPerPage;
-    return this.bookings.slice(start, end);
-  },
-  nextPage() {
-    if (this.currentPage < this.totalPages) this.currentPage++;
-  },
-  prevPage() {
-    if (this.currentPage > 1) this.currentPage--;
-  },
-  goToPage(page) {
-    this.currentPage = page;
-  },
-  getStatusBadge(status) {
-    if (status === 'WAITING_CONFIRMATION') return { class: 'p-1 text-xs bg-gray-300 rounded-xl', text: 'Attente confirmation' };
-    if (status === 'VALIDATED') return { class: 'p-1 text-xs bg-co-green rounded-xl', text: 'Validé' };
-    if (status === 'CANCELLED') return { class: 'p-1 text-xs bg-co-red text-white rounded-xl', text: 'Annulé' };
-    return { class: '', text: '' };
-  },
-  guaranteedMotivations: {{ json .ViewState.guaranteed_trip_motivations }},
-  isGuaranteedTrip(motivation) {
-    return this.guaranteedMotivations.includes(motivation);
-  }
-}">
-
-<table class="min-w-full divide-y divide-gray-300 border-gray-300 border-t-1">
-  <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">Conducteur</th>
-      <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Passager</th>
-      <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Départ</th>
-      <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Destination</th>
-      <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Date</th>
-      <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 scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">&nbsp;</th>
-    </tr>
-  </thead>
-  <tbody class="divide-y divide-gray-200 bg-white">
-    <template x-for="booking in paginatedBookings" :key="booking.id">
-      <tr>
-        <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-          <a class="text-co-blue" :href="'/app/solidarity-transport/drivers/' + booking.driverId">
-            <span x-text="booking.driverFirstName + ' ' + booking.driverLastName"></span>
-          </a>
-        </td>
-        <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-          <a class="text-co-blue" :href="'/app/beneficiaries/' + booking.passengerId">
-            <span x-text="booking.passengerFirstName + ' ' + booking.passengerLastName"></span>
-          </a>
-        </td>
-        <td class="py-4 pl-4 pr-3 text-sm sm:pl-6" x-text="booking.pickupLabel"></td>
-        <td class="py-4 pl-4 pr-3 text-sm sm:pl-6" x-text="booking.dropLabel"></td>
-        <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6" x-text="booking.pickupDate"></td>
-        <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-          <span :class="getStatusBadge(booking.status).class" x-text="getStatusBadge(booking.status).text"></span>
-          <template x-if="booking.motivation && isGuaranteedTrip(booking.motivation)">
-            <div class="mt-4">
-              <span class="text-xs p-2 bg-co-green text-white rounded-2xl" x-text="'Trajet garanti : ' + booking.motivation"></span>
-            </div>
-          </template>
-        </td>
-        <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-          <a class="text-co-blue" :href="'/app/solidarity-transport/bookings/' + booking.id">Voir</a>
-        </td>
-      </tr>
-    </template>
-  </tbody>
-</table>
-
-<!-- Pagination -->
-<div class="flex items-center justify-between border-t border-gray-200 bg-white px-4 py-3 sm:px-6">
-  <div class="flex flex-1 justify-between sm:hidden">
-    <button @click="prevPage()" :disabled="currentPage === 1"
-            class="relative inline-flex items-center rounded-md border border-gray-300 bg-white px-4 py-2 text-sm font-medium text-gray-700 hover:bg-gray-50 disabled:opacity-50 disabled:cursor-not-allowed">
-      Précédent
-    </button>
-    <button @click="nextPage()" :disabled="currentPage === totalPages"
-            class="relative ml-3 inline-flex items-center rounded-md border border-gray-300 bg-white px-4 py-2 text-sm font-medium text-gray-700 hover:bg-gray-50 disabled:opacity-50 disabled:cursor-not-allowed">
-      Suivant
-    </button>
-  </div>
-  <div class="hidden sm:flex sm:flex-1 sm:items-center sm:justify-between">
-    <div>
-      <p class="text-sm text-gray-700">
-        Affichage de
-        <span class="font-medium" x-text="(currentPage - 1) * itemsPerPage + 1"></span>
-        à
-        <span class="font-medium" x-text="Math.min(currentPage * itemsPerPage, bookings.length)"></span>
-        sur
-        <span class="font-medium" x-text="bookings.length"></span>
-        résultats
-      </p>
-    </div>
-    <div>
-      <nav class="isolate inline-flex -space-x-px rounded-md shadow-sm" aria-label="Pagination">
-        <button @click="prevPage()" :disabled="currentPage === 1"
-                class="relative inline-flex items-center rounded-l-md px-2 py-2 text-gray-400 ring-1 ring-inset ring-gray-300 hover:bg-gray-50 focus:z-20 focus:outline-offset-0 disabled:opacity-50 disabled:cursor-not-allowed">
-          <span class="sr-only">Précédent</span>
-          <svg class="h-5 w-5" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
-            <path fill-rule="evenodd" d="M12.79 5.23a.75.75 0 01-.02 1.06L8.832 10l3.938 3.71a.75.75 0 11-1.04 1.08l-4.5-4.25a.75.75 0 010-1.08l4.5-4.25a.75.75 0 011.06.02z" clip-rule="evenodd" />
-          </svg>
-        </button>
-        <template x-for="page in totalPages" :key="page">
-          <button @click="goToPage(page)"
-                  :class="page === currentPage ? 'z-10 bg-co-blue text-white focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-co-blue' : 'text-gray-900 ring-1 ring-inset ring-gray-300 hover:bg-gray-50 focus:outline-offset-0'"
-                  class="relative inline-flex items-center px-4 py-2 text-sm font-semibold focus:z-20"
-                  x-text="page"></button>
-        </template>
-        <button @click="nextPage()" :disabled="currentPage === totalPages"
-                class="relative inline-flex items-center rounded-r-md px-2 py-2 text-gray-400 ring-1 ring-inset ring-gray-300 hover:bg-gray-50 focus:z-20 focus:outline-offset-0 disabled:opacity-50 disabled:cursor-not-allowed">
-          <span class="sr-only">Suivant</span>
-          <svg class="h-5 w-5" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
-            <path fill-rule="evenodd" d="M7.21 14.77a.75.75 0 01.02-1.06L11.168 10 7.23 6.29a.75.75 0 111.04-1.08l4.5 4.25a.75.75 0 010 1.08l-4.5 4.25a.75.75 0 01-1.06-.02z" clip-rule="evenodd" />
-          </svg>
-        </button>
-      </nav>
-    </div>
-  </div>
-</div>
-
-</div>
-{{end}}
-{{end}}

web/layouts/solidarity_transport/_partials/driver_availabilities.html

@@ -1,90 +0,0 @@
-{{define "driver_availabilities"}}
-
-<div class="bg-white shadow sm:rounded-lg"
-  x-data="{
-    availabilitiesdialog: false
-  }">
-  <div class="px-4 py-5 sm:px-6">
-    <h2 id="timeline-title" class="text-lg font-medium text-gray-900">Disponibilités</h2>
-  </div>
-  <div class="border-t border-gray-200 px-4">
-    <div class="py-4">
-      {{ range .ViewState.availabilities }}
-      <div class="flex flex-row">
-        <div class="flex-none">
-        {{ if eq .Day 0}}Dimanche
-        {{ else if eq .Day 1}}Lundi
-        {{ else if eq .Day 2}}Mardi
-        {{ else if eq .Day 3}}Mercredi
-        {{ else if eq .Day 4}}Jeudi
-        {{ else if eq .Day 5}}Vendredi
-        {{ else if eq .Day 6}}Samedi
-        {{ end }}
-        {{.StartTime}} - {{ .EndTime }}
-        </div>
-        <div class="flex-auto">&nbsp;</div>
-        <div class="flex-none text-sm"><a class="text-co-blue" href="/app/solidarity-transport/drivers/{{$.ViewState.driver.ID}}/availabilities/{{.Id}}/delete">Supprimer</a></div>
-      </div>
-      {{ end }}
-    </div>
-    <button type="button" @click="availabilitiesdialog = !availabilitiesdialog" 
-      class="inline-flex items-center justify-center rounded-2xl border border-transparent bg-co-blue my-4 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">
-      {{$.IconSet.Icon "hero:outline/plus-circle" "h-5 w-5 mr-3"}}
-      Ajouter une disponibilité
-    </button>
-  </div>
-  <div class="relative z-10" aria-labelledby="modal-title" role="dialog" aria-modal="true"
-       x-show="availabilitiesdialog">
-    <div class="fixed inset-0 bg-gray-900 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-lg 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>
-            <div class="mt-3 text-center sm:mt-5">
-              <h3 class="text-lg font-medium leading-6 text-gray-900" id="modal-title">Ajouter une disponibilité</h3>
-                <div class="mt-2">
-                  <p class="text-sm text-gray-500">Paramétrer la nouvelle disponibilité du conducteur</p>
-                </div>
-              </div>
-            </div>
-          <form method="POST" action="/app/solidarity-transport/drivers/{{.ViewState.driver.ID}}/availabilities" class="my-4">
-              <div class="my-8">
-                
-                    {{ $fieldName := "address" }}
-                    {{ template "address_autocomplete" (dict "FieldName" $fieldName "Address" .ViewState.driver.Data.address) }}
-
-              </div>
-              <div class="my-4">
-                <input name="days.monday" type="checkbox" class="focus:ring-co-blue h-4 w-4 text-co-blue border-gray-300 rounded"> Lundi &nbsp;&nbsp;
-                <input name="days.tuesday" type="checkbox" class="focus:ring-co-blue h-4 w-4 text-co-blue border-gray-300 rounded"> Mardi &nbsp;&nbsp;
-                <input name="days.wednesday" type="checkbox" class="focus:ring-co-blue h-4 w-4 text-co-blue border-gray-300 rounded"> Mercredi &nbsp;&nbsp;
-                <input name="days.thursday" type="checkbox" class="focus:ring-co-blue h-4 w-4 text-co-blue border-gray-300 rounded"> Jeudi &nbsp;&nbsp;
-                <input name="days.friday" type="checkbox" class="focus:ring-co-blue h-4 w-4 text-co-blue border-gray-300 rounded"> Vendredi &nbsp;&nbsp;
-                <input name="days.saturday" type="checkbox" class="focus:ring-co-blue h-4 w-4 text-co-blue border-gray-300 rounded"> Samedi &nbsp;&nbsp;
-                <input name="days.sunday" type="checkbox" class="focus:ring-co-blue h-4 w-4 text-co-blue border-gray-300 rounded"> Dimanche &nbsp;&nbsp;
-              </div>
-              <div class="my-4 inline-flex justify-items-center">
-                <div class="p-1">De</div>
-                <input type="time" id="starttime" name="starttime" value="06:00"
-                       class="shadow-sm focus:ring-co-blue focus:border-co-blue p-1 sm:text-sm border-gray-300 rounded-l-2xl border-l-0">
-                <div class="p-1 px-4">à</div>
-                <input type="time" id="endtime" name="endtime" value="20:00"
-                       class="shadow-sm focus:ring-co-blue focus:border-co-blue p-1 sm:text-sm border-gray-300 rounded-r-2xl border-l-0">
-                
-              </div>
-              <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">Ajouter</button>
-              </div>
-              <div class="mt-5 sm:mt-6">
-                <button @click="availabilitiesdialog=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>
-            </form>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
- </div>
-
-{{end}}

web/layouts/solidarity_transport/_partials/driver_documents.html

@@ -1,149 +0,0 @@
-
-{{define "driver_files"}}
-<div class="px-4 py-6 sm:px-6"
-x-data="{
-    fields: {
-        name: null,
-        type: null,
-        file: null,
-    },
-    rules: {
-        name: ['required'],
-        type: ['required'],
-        file: ['required'],
-    },
-    formValidation: {
-        valid: false,
-        fields: {
-            name: {valid: null},
-            type: {valid: null},
-            file: {valid: null},
-        }
-    },
-    isFormValid: true,
-    validate() {
-        this.formValidation = Iodine.assert(this.fields, this.rules)
-    },
-    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
-    }
-}">
-    {{if eq (len .ViewState.documents) 0}}
-    <p class="p-12 text-gray-500 text-center text-md">Aucun document</p>
-    {{end}}
-
-
-    {{if gt (len .ViewState.documents) 0}}
-    
-    <div class="-mx-4 mb-10 ring-1 ring-gray-300 sm:-mx-6 md:mx-0 md:rounded-lg">
-        <table class="min-w-full divide-y divide-gray-300">
-          <thead>
-            <tr>
-              <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Type</th>
-              <th scope="col" class="hidden px-3 py-3.5 text-left text-sm font-semibold text-gray-900 lg:table-cell">Nom du document</th>
-              <th scope="col" class="hidden px-3 py-3.5 text-left text-sm font-semibold text-gray-900 lg:table-cell">Ajouté le</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>
-            {{range .ViewState.documents}}
-            <tr>
-              <td class="relative py-4 pl-4 sm:pl-6 pr-3 text-sm">
-                <div class="font-medium text-gray-900">
-                    <span class="bg-co-blue text-xs text-white rounded-xl p-1 mr-2">{{index $.ViewState.file_types_map .Metadata.Type}}</span>
-                </div>
-              </td>
-              <td class="px-3 py-3.5 text-sm text-gray-900 lg:table-cell">{{.Metadata.Name}}</td>
-              <td class="px-3 py-3.5 text-sm text-gray-500 lg:table-cell">{{.LastModified.Format "02/01/2006"}}</td>
-              <td class="relative py-3.5 pl-3 pr-4 sm:pr-6 text-right text-sm font-medium">
-                <div class="flex gap-2 justify-end">
-                  <a href="/app/solidarity-transport/drivers/{{$.ViewState.driver.ID}}/documents/{{.FileName}}" target="_blank">
-                  <button type="button" class="inline-flex items-center rounded-md border border-gray-300 bg-white px-3 py-2 text-sm font-medium leading-4 text-gray-700 shadow-sm hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-30">
-                    {{$.IconSet.Icon "hero:outline/document-arrow-down" "h-4 w-4 mr-1"}}
-                    Télécharger<span class="sr-only"> le document</span>
-                  </button>
-                  </a>
-                  <button type="button"
-                    onclick="if(confirm('Êtes-vous sûr de vouloir supprimer ce document ?')) { window.location.href='/app/solidarity-transport/drivers/{{$.ViewState.driver.ID}}/documents/{{.FileName}}/delete'; }"
-                    class="inline-flex items-center rounded-md border border-transparent bg-co-red px-3 py-2 text-sm font-medium leading-4 text-white shadow-sm hover:bg-red-700 focus:outline-none focus:ring-2 focus:ring-co-red focus:ring-offset-2">
-                    {{$.IconSet.Icon "hero:outline/trash" "h-4 w-4 mr-1"}}
-                    Supprimer<span class="sr-only"> le document</span>
-                  </button>
-                </div>
-              </td>
-            </tr>
-            {{end}}
-    
-    
-            <!-- More plans... -->
-          </tbody>
-        </table>
-      </div>
-    
-    {{end}}
-
-    <h3 class="text-lg">Ajouter un document</h3>
-    <form method="POST" action="/app/solidarity-transport/drivers/{{.ViewState.driver.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>
-                <select id="type" name="type" class="mt-1 block w-full rounded-l-2xl border-gray-300 py-2 pl-3 pr-10 text-base focus:border-indigo-500 focus:outline-none focus:ring-indigo-500 sm:text-sm"
-                    x-model="fields.type" @blur="validateField('type')"
-                    :class="formValidation.fields.type.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
-                    <option value="" selected>Sélectionner un type</option>
-                    {{range .ViewState.drivers_file_types}}
-                    <option value="{{.}}">{{index $.ViewState.file_types_map .}}</option>
-                    {{end}}
-                </select>
-              </div>
-              <div class="sm:col-span-4">
-                <label for="name" class="block text-sm font-medium text-gray-700">Nom</label>
-                      <input type="text" name="name" id="name"
-                          placeholder="Nom du fichier"
-                          class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-r-2xl p-2"
-                          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-6 mt-4">
-                <label for="cover-photo" class="block text-sm font-medium text-gray-700">Téléchargement</label>
-                <div class="mt-1 flex justify-center rounded-md border-2 border-dashed px-6 pt-5 pb-6"
-                x-on:drop="console.log('toto')"
-                :class="formValidation.fields.file.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
-                  <div class="space-y-1 text-center">
-                    {{.IconSet.Icon "hero:outline/folder-plus" "mx-auto h-12 w-12 text-gray-400"}}
-                    <div class="flex text-sm text-gray-600">
-                      <label for="file-upload" class="relative cursor-pointer rounded-md bg-white font-medium text-co-blue focus-within:outline-none focus-within:ring-2 focus-within:ring-co-blue focus-within:ring-offset-2 hover:text-co-blue">
-                        <span>Sélectionnez un fichier </span>
-                        <input id="file-upload" name="file-upload" type="file" class="sr-only"
-                        x-model="fields.file" @blur="validateField('file')">
-                      </label>
-                      <!-- <p class="pl-1">ou glissez-déposez</p>  -->
-
-                        
-                    </div>
-                    <p class="text-xs text-gray-500">Jusqu'à 10MB</p>
-                    <template x-if="fields.file">
-                      <p class="text-co-blue p-2" x-text="fields.file"></p>
-                    </template>
-                  </div>
-                </div>
-              </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 le document
-        </button>
-    </form>
-
-</div>
-{{end}}

web/layouts/solidarity_transport/_partials/driver_history.html

@@ -1,69 +0,0 @@
-{{define "driver_history"}}
-<div class="py-6">
-  {{if .ViewState.stats}}
-  <div class="py-5 text-center">
-    <p class="text-lg">Trajets réalisés : {{ .ViewState.stats.bookings.count }}</p>
-    <p class="text-lg">Kilomètres réalisés : {{ .ViewState.stats.bookings.km}} km</p>
-  </div>
-  {{end}}
-
-  {{if .ViewState.bookings}}
-  <div class="py-5">
-    <h4 class="text-lg font-medium text-gray-900 mb-4 text-center">Historique des transports solidaires</h4>
-    <table class="min-w-full divide-y divide-gray-300 border-gray-300 border-t-1">
-      <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">Date</th>
-          <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Passager</th>
-          <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Départ</th>
-          <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Arrivée</th>
-          <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 scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6"></th>
-        </tr>
-      </thead>
-      <tbody class="divide-y divide-gray-200 bg-white">
-        {{range .ViewState.bookings}}
-        {{if or (eq .Status "VALIDATED") (eq .Status "WAITING_CONFIRMATION")}}
-        <tr>
-          <td class="py-4 pl-4 pr-3 text-sm sm:pl-6">
-            {{if .Journey}}
-              {{timeFormat .Journey.PassengerPickupDate "02/01/2006 15:04"}}
-            {{end}}
-          </td>
-          <td class="py-4 pl-4 pr-3 text-sm sm:pl-6">
-            {{if .PassengerId}}
-              <a class="text-co-blue" href="/app/beneficiaries/{{.PassengerId}}">
-                {{ (index $.ViewState.beneficiaries_map .PassengerId).Data.first_name }}
-                {{ (index $.ViewState.beneficiaries_map .PassengerId).Data.last_name }}
-              </a>
-            {{end}}
-          </td>
-          <td class="py-4 pl-4 pr-3 text-sm sm:pl-6">
-            {{if .Journey}}{{if .Journey.PassengerPickup}}{{.Journey.PassengerPickup.Properties.label}}{{end}}{{end}}
-          </td>
-          <td class="py-4 pl-4 pr-3 text-sm sm:pl-6">
-            {{if .Journey}}{{if .Journey.PassengerDrop}}{{.Journey.PassengerDrop.Properties.label}}{{end}}{{end}}
-          </td>
-          <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-            {{if eq .Status "VALIDATED"}}
-              <span class="p-1 px-2 text-xs bg-co-green rounded-2xl">Validé</span>
-            {{else if eq .Status "WAITING_CONFIRMATION"}}
-              <span class="p-1 px-2 text-xs bg-gray-300 rounded-2xl">Attente confirmation</span>
-            {{end}}
-          </td>
-          <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-            <a class="text-co-blue" href="/app/solidarity-transport/bookings/{{.Id}}">Voir</a>
-          </td>
-        </tr>
-        {{end}}
-        {{end}}
-      </tbody>
-    </table>
-  </div>
-  {{else}}
-  <div class="py-5">
-    <p class="text-sm text-gray-500 text-center">Aucun transport solidaire enregistré</p>
-  </div>
-  {{end}}
-</div>
-{{end}}

web/layouts/solidarity_transport/_partials/driver_wallet.html

@@ -1,113 +0,0 @@
-{{define "driver_wallet"}}
-<div class="py-6"
-  x-data="{
-    walletdialog: false
-  }">
-  <div class="py-5 text-center">
-    <p class="text-lg">Solde : {{ printf "%.2f" .ViewState.wallet_balance }} €</p>
-  <button  @click="walletdialog = !walletdialog"
-    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">
-    Créditer le compte
-  </button>
-  <div class="relative z-10" aria-labelledby="modal-title" role="dialog" aria-modal="true"
-       x-show="walletdialog">
-    <div class="fixed inset-0 bg-gray-900 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-lg 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>
-            <div class="mt-3 text-center sm:mt-5">
-              <h3 class="text-lg font-medium leading-6 text-gray-900" id="modal-title">Créditer le compte</h3>
-                <div class="mt-2">
-                  <p class="text-sm text-gray-500">Créditer le compte mobilité du conducteur</p>
-                </div>
-              </div>
-            </div>
-          <form method="POST" action="/app/wallets/{{.ViewState.driver.ID}}/credit" class="my-4">
-              <div class="my-8">
-                <input type="number" step="0.01" id="amount" name="amount" value="0"
-                       class="w-full shadow-sm focus:ring-co-blue focus:border-co-blue px-2 p-1 sm:text-sm border-gray-300 rounded-2xl">
-              </div>
-              <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">Ajouter</button>
-              </div>
-              <div class="mt-5 sm:mt-6">
-                <button @click="walletdialog=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>
-            </form>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-
-  <!-- Wallet Operations History -->
-  {{if .ViewState.driver.Data.wallet_history}}
-  <div class="py-5">
-    <h4 class="text-lg font-medium text-gray-900 mb-4 text-center">Historique des opérations</h4>
-    <table class="min-w-full divide-y divide-gray-300 border-gray-300 border-t-1">
-      <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">Date</th>
-          <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Crédit</th>
-          <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Débit</th>
-          <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Moyen de paiement</th>
-          <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Description</th>
-        </tr>
-      </thead>
-      <tbody class="divide-y divide-gray-200 bg-white">
-        <!-- Initial Balance Row -->
-        <tr class="bg-gray-50">
-          <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm text-gray-500 italic sm:pl-6">
-            Solde initial
-          </td>
-          <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm font-medium text-gray-900 sm:pl-6">
-            {{if .ViewState.driver.Data.wallet}}{{ printf "%.2f" .ViewState.driver.Data.wallet }} €{{else}}0.00 €{{end}}
-          </td>
-          <td class="py-4 pl-4 pr-3 text-sm text-gray-500 sm:pl-6">
-            -
-          </td>
-          <td class="py-4 pl-4 pr-3 text-sm text-gray-500 sm:pl-6">
-            -
-          </td>
-          <td class="py-4 pl-4 pr-3 text-sm text-gray-500 sm:pl-6">
-            -
-          </td>
-        </tr>
-        {{range $index, $operation := .ViewState.driver.Data.wallet_history}}
-        <tr>
-          <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-            {{if $operation.timestamp}}{{timeFormat $operation.timestamp "02/01/2006 15:04"}}{{end}}
-          </td>
-          <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm font-medium text-green-600 sm:pl-6">
-            {{if $operation.amount}}
-              {{if or (eq $operation.operation_type "credit") (not $operation.operation_type)}}
-                {{ printf "%.2f" $operation.amount }} €
-              {{end}}
-            {{end}}
-          </td>
-          <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm font-medium text-red-600 sm:pl-6">
-            {{if eq $operation.operation_type "debit"}}
-              {{ printf "%.2f" $operation.amount }} €
-            {{end}}
-          </td>
-          <td class="py-4 pl-4 pr-3 text-sm sm:pl-6">
-            {{$operation.payment_method}}
-          </td>
-          <td class="py-4 pl-4 pr-3 text-sm sm:pl-6">
-            {{$operation.description}}
-          </td>
-        </tr>
-        {{end}}
-      </tbody>
-    </table>
-  </div>
-  {{else}}
-  <div class="py-5">
-    <p class="text-sm text-gray-500 text-center">Aucune opération enregistrée</p>
-  </div>
-  {{end}}
-
-</div>
-{{end}}

web/layouts/solidarity_transport/_partials/drivers_list.html

@@ -1,194 +0,0 @@
-{{ define "solidarity_drivers_list" }}
-
-<div class="sm:flex sm:items-center sm:justify-between">
-  {{if $.ViewState.geography_filters_enabled}}
-  <form class="flex flex-row items-end m-4">
-    <input type="hidden" name="tab" value="drivers" />
-    {{if $.ViewState.archived}}<input type="hidden" name="archived" value="true" />{{end}}
-
-    <div>
-      <label for="drivers_driver_address_geo" class="block text-sm/6 font-medium text-gray-900 dark:text-white">Adresse conducteur</label>
-      <div class="mt-2 grid grid-cols-1">
-        <select id="drivers_driver_address_geo" name="driver_address_geo" class="col-start-1 row-start-1 w-48 appearance-none rounded-md bg-white py-1.5 pr-8 pl-3 text-base text-gray-900 outline-1 -outline-offset-1 outline-gray-300 focus-visible:outline-2 focus-visible:-outline-offset-2 focus-visible:outline-indigo-600 sm:text-sm/6 dark:bg-white/5 dark:text-white dark:outline-white/10 dark:*:bg-gray-800 dark:focus-visible:outline-co-blue" onchange="this.form.submit()">
-          <option value="">Toutes les zones</option>
-          {{range $.ViewState.geography_filters_list}}
-          {{$geoValue := printf "%s:%s" .layer .code}}
-          <option value="{{$geoValue}}"{{if eq $.ViewState.filters.driver_address_geo $geoValue}} selected{{end}}>{{.name}}</option>
-          {{end}}
-        </select>
-        <svg viewBox="0 0 16 16" fill="currentColor" data-slot="icon" aria-hidden="true" class="pointer-events-none col-start-1 row-start-1 mr-2 size-5 self-center justify-self-end text-gray-500 sm:size-4 dark:text-gray-400">
-          <path d="M4.22 6.22a.75.75 0 0 1 1.06 0L8 8.94l2.72-2.72a.75.75 0 1 1 1.06 1.06l-3.25 3.25a.75.75 0 0 1-1.06 0L4.22 7.28a.75.75 0 0 1 0-1.06Z" clip-rule="evenodd" fill-rule="evenodd" />
-        </svg>
-      </div>
-    </div>
-  </form>
-  {{else}}
-  <div class="sm:flex-auto">
-    <p class="mt-2 text-sm text-gray-700"></p>
-  </div>
-  {{end}}
-
-  <div class="m-4 sm:flex-none">
-    <a href="/exports/solidarity-transport/drivers.xlsx?{{if $.ViewState.archived}}archived=true&{{end}}{{if $.ViewState.filters.driver_address_geo}}driver_address_geo={{$.ViewState.filters.driver_address_geo}}{{end}}">
-      <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>
-    {{if .ViewState.archived}}
-    <a href="/app/solidarity-transport/?tab=drivers">
-      <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/archive-box-x-mark" "h-5 w-5 mr-3"}}
-            Conducteurs actifs
-      </button>
-    </a>
-    {{else}}
-    <a href="/app/solidarity-transport/?tab=drivers&archived=true">
-      <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/archive-box" "h-5 w-5 mr-3"}}
-            Conducteurs archivés
-      </button>
-    </a>
-    {{end}}
-    <a href="/app/solidarity-transport/drivers/create">
-      <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">
-        {{$.IconSet.Icon "hero:outline/plus-circle" "h-5 w-5 mr-3"}}
-        Ajouter un conducteur solidaire
-      </button>
-    </a>
-  </div>
-</div>
-<div x-data="{
-  drivers: [
-    {{range $index, $driver := .ViewState.drivers}}{{if $index}},{{end}}{
-      id: '{{$driver.ID}}',
-      firstName: '{{ jsEscape $driver.Data.first_name }}',
-      lastName: '{{ jsEscape $driver.Data.last_name }}',
-      address: '{{if $driver.Data.address}}{{ jsEscape $driver.Data.address.properties.label }}{{end}}',
-      phoneNumber: '{{ jsEscape $driver.Data.phone_number }}',
-      validated: {{if solidarityDriverValidatedProfile $driver (solidarityDocuments $driver.ID)}}true{{else}}false{{end}}
-    }{{end}}
-  ],
-  currentPage: 1,
-  itemsPerPage: {{ if .ViewState.drivers_items_per_page }}{{ .ViewState.drivers_items_per_page }}{{ else }}10{{ end }},
-  get totalPages() {
-    return Math.ceil(this.drivers.length / this.itemsPerPage);
-  },
-  get paginatedDrivers() {
-    const start = (this.currentPage - 1) * this.itemsPerPage;
-    const end = start + this.itemsPerPage;
-    return this.drivers.slice(start, end);
-  },
-  nextPage() {
-    if (this.currentPage < this.totalPages) this.currentPage++;
-  },
-  prevPage() {
-    if (this.currentPage > 1) this.currentPage--;
-  },
-  goToPage(page) {
-    this.currentPage = page;
-  }
-}">
-
-<table class="min-w-full divide-y divide-gray-300 border-gray-300 border-t-1">
-  <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="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-          Adresse
-      </th>
-      <th scope="col"
-          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-          Téléphone
-      </th>
-      <th scope="col"
-          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-          Profil validé
-      </th>
-      <th scope="col"
-          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-          &nbsp;
-      </th>
-    </tr>
-  </thead>
-  <tbody class="divide-y divide-gray-200 bg-white">
-    <template x-for="driver in paginatedDrivers" :key="driver.id">
-      <tr>
-        <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6" x-text="driver.firstName + ' ' + driver.lastName"></td>
-        <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6" x-text="driver.address"></td>
-        <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6" x-text="driver.phoneNumber"></td>
-        <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-          <span x-show="driver.validated" class="p-1 px-2 text-xs bg-co-green rounded-2xl">Oui</span>
-          <span x-show="!driver.validated" class="p-1 px-2 text-xs bg-co-red text-white rounded-2xl">Non</span>
-        </td>
-        <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-          <a class="text-co-blue hover:text-co-blue" :href="'/app/solidarity-transport/drivers/' + driver.id">
-            Voir
-          </a>
-        </td>
-      </tr>
-    </template>
-  </tbody>
-</table>
-
-<!-- Pagination -->
-<div class="flex items-center justify-between border-t border-gray-200 bg-white px-4 py-3 sm:px-6">
-  <div class="flex flex-1 justify-between sm:hidden">
-    <button @click="prevPage()" :disabled="currentPage === 1"
-            class="relative inline-flex items-center rounded-md border border-gray-300 bg-white px-4 py-2 text-sm font-medium text-gray-700 hover:bg-gray-50 disabled:opacity-50 disabled:cursor-not-allowed">
-      Précédent
-    </button>
-    <button @click="nextPage()" :disabled="currentPage === totalPages"
-            class="relative ml-3 inline-flex items-center rounded-md border border-gray-300 bg-white px-4 py-2 text-sm font-medium text-gray-700 hover:bg-gray-50 disabled:opacity-50 disabled:cursor-not-allowed">
-      Suivant
-    </button>
-  </div>
-  <div class="hidden sm:flex sm:flex-1 sm:items-center sm:justify-between">
-    <div>
-      <p class="text-sm text-gray-700">
-        Affichage de
-        <span class="font-medium" x-text="(currentPage - 1) * itemsPerPage + 1"></span>
-        à
-        <span class="font-medium" x-text="Math.min(currentPage * itemsPerPage, drivers.length)"></span>
-        sur
-        <span class="font-medium" x-text="drivers.length"></span>
-        résultats
-      </p>
-    </div>
-    <div>
-      <nav class="isolate inline-flex -space-x-px rounded-md shadow-sm" aria-label="Pagination">
-        <button @click="prevPage()" :disabled="currentPage === 1"
-                class="relative inline-flex items-center rounded-l-md px-2 py-2 text-gray-400 ring-1 ring-inset ring-gray-300 hover:bg-gray-50 focus:z-20 focus:outline-offset-0 disabled:opacity-50 disabled:cursor-not-allowed">
-          <span class="sr-only">Précédent</span>
-          <svg class="h-5 w-5" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
-            <path fill-rule="evenodd" d="M12.79 5.23a.75.75 0 01-.02 1.06L8.832 10l3.938 3.71a.75.75 0 11-1.04 1.08l-4.5-4.25a.75.75 0 010-1.08l4.5-4.25a.75.75 0 011.06.02z" clip-rule="evenodd" />
-          </svg>
-        </button>
-        <template x-for="page in totalPages" :key="page">
-          <button @click="goToPage(page)"
-                  :class="page === currentPage ? 'z-10 bg-co-blue text-white focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-co-blue' : 'text-gray-900 ring-1 ring-inset ring-gray-300 hover:bg-gray-50 focus:outline-offset-0'"
-                  class="relative inline-flex items-center px-4 py-2 text-sm font-semibold focus:z-20"
-                  x-text="page"></button>
-        </template>
-        <button @click="nextPage()" :disabled="currentPage === totalPages"
-                class="relative inline-flex items-center rounded-r-md px-2 py-2 text-gray-400 ring-1 ring-inset ring-gray-300 hover:bg-gray-50 focus:z-20 focus:outline-offset-0 disabled:opacity-50 disabled:cursor-not-allowed">
-          <span class="sr-only">Suivant</span>
-          <svg class="h-5 w-5" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
-            <path fill-rule="evenodd" d="M7.21 14.77a.75.75 0 01.02-1.06L11.168 10 7.23 6.29a.75.75 0 111.04-1.08l4.5 4.25a.75.75 0 010 1.08l-4.5 4.25a.75.75 0 01-1.06-.02z" clip-rule="evenodd" />
-          </svg>
-        </button>
-      </nav>
-    </div>
-  </div>
-</div>
-
-</div>
-{{ end }}

web/layouts/solidarity_transport/_partials/journey_map.html

@@ -1,99 +0,0 @@
-{{ define "journey_map" }}
-<div id="map" class="w-full h-full"></div>
-<script>
-  let protocol = new pmtiles.Protocol();
-  maplibregl.addProtocol("pmtiles",protocol.tile);
-  var map = new maplibregl.Map({
-    container: 'map', // container id
-    style: "/public/maps/protomaps-light/style.json",
-  });
-
-  const geojsonPoints = {
-    "type": "FeatureCollection",
-    "features": [
-      {{ json .driver_journey.DriverDeparture }},
-      {{ json .driver_journey.PassengerPickup }},
-      {{ json .driver_journey.PassengerDrop }},
-      {{ json .driver_journey.DriverArrival }}
-    ]
-  }
-
-  map.on('load', async () => {
-    {{if .driver_journey.JourneyPolyline}}
-    var linestring = polyline.toGeoJSON('{{.driver_journey.JourneyPolyline}}');
-    map.addSource('trip', {
-      type: "geojson",
-      data: linestring
-    })
-    map.addLayer({
-      'id': 'trip',
-      'type': 'line',
-      'source': 'trip',
-      'layout': {
-        'line-join': 'round',
-        'line-cap': 'round',
-      },
-      'paint': {
-        'line-color': getComputedStyle(document.documentElement).getPropertyValue('--color-co-blue').trim(),
-        'line-width': 4
-      },
-    });
-    {{end}}
-
-    // Driver departure marker
-    const driverDepartureEl = document.createElement('div');
-    driverDepartureEl.className = 'w-8 h-8 rounded-co bg-co-blue border border-white shadow-md flex items-center justify-center';
-    driverDepartureEl.innerHTML = `
-        <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
-            <path d="M20 21v-2a4 4 0 0 0-4-4H8a4 4 0 0 0-4 4v2"></path>
-            <circle cx="12" cy="7" r="4"></circle>
-        </svg>
-    `;
-    new maplibregl.Marker({element: driverDepartureEl})
-        .setLngLat({{ json .driver_journey.DriverDeparture }}.geometry.coordinates)
-        .addTo(map);
-
-    // Driver arrival marker
-    const driverArrivalEl = document.createElement('div');
-    driverArrivalEl.className = 'w-8 h-8 rounded-co bg-co-blue border border-white shadow-md flex items-center justify-center';
-    driverArrivalEl.innerHTML = `
-        <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
-            <path d="M20 21v-2a4 4 0 0 0-4-4H8a4 4 0 0 0-4 4v2"></path>
-            <circle cx="12" cy="7" r="4"></circle>
-        </svg>
-    `;
-    new maplibregl.Marker({element: driverArrivalEl})
-        .setLngLat({{ json .driver_journey.DriverArrival }}.geometry.coordinates)
-        .addTo(map);
-
-    // Passenger pickup marker
-    const passengerPickupEl = document.createElement('div');
-    passengerPickupEl.className = 'w-8 h-8 rounded-co bg-co-green border border-white shadow-md flex items-center justify-center';
-    passengerPickupEl.innerHTML = `
-        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="white" width="16" height="16">
-            <path fill-rule="evenodd" d="M11.54 22.351l.07.04.028.016a.76.76 0 00.723 0l.028-.015.071-.041a16.975 16.975 0 001.144-.742 19.58 19.58 0 002.683-2.282c1.944-1.99 3.963-4.98 3.963-8.827a8.25 8.25 0 00-16.5 0c0 3.846 2.02 6.837 3.963 8.827a19.58 19.58 0 002.682 2.282 16.975 16.975 0 001.145.742zM12 13.5a3 3 0 100-6 3 3 0 000 6z" clip-rule="evenodd" />
-        </svg>
-    `;
-    new maplibregl.Marker({element: passengerPickupEl})
-        .setLngLat({{ json .driver_journey.PassengerPickup }}.geometry.coordinates)
-        .addTo(map);
-
-    // Passenger drop marker
-    const passengerDropEl = document.createElement('div');
-    passengerDropEl.className = 'w-8 h-8 rounded-co bg-co-red border border-white shadow-md flex items-center justify-center';
-    passengerDropEl.innerHTML = `
-        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="white" width="16" height="16">
-            <path fill-rule="evenodd" d="M3 2.25a.75.75 0 01.75.75v.54l1.838-.46a9.75 9.75 0 016.725.738l.108.054a8.25 8.25 0 005.58.652l3.109-.732a.75.75 0 01.917.81 47.784 47.784 0 00.005 10.337.75.75 0 01-.574.812l-3.114.733a9.75 9.75 0 01-6.594-.77l-.108-.054a8.25 8.25 0 00-5.69-.625l-2.202.55V21a.75.75 0 01-1.5 0V3A.75.75 0 013 2.25z" clip-rule="evenodd" />
-        </svg>
-    `;
-    new maplibregl.Marker({element: passengerDropEl})
-        .setLngLat({{ json .driver_journey.PassengerDrop }}.geometry.coordinates)
-        .addTo(map);
-
-    var bbox=turf.bbox(geojsonPoints)
-
-    map.fitBounds(bbox, { padding: 50 })
-  })
-</script>
-
-{{ end }}

web/layouts/solidarity_transport/_partials/journey_preview.html

@@ -1,284 +0,0 @@
-{{define "journey_preview"}}
-<div class="col-span-1 bg-white rounded-2xl shadow divide-y divide-gray-200 flex flex-col">
-      <div class="px-4 py-2 flex items-center justify-between flex-wrap sm:flex-nowrap">
-        <div class="ml-4 mt-2 grid-cols-2">
-          <h3 class="text-lg leading-6 font-medium text-gray-900">Le trajet</h3>
-          <h2 class="text-sm leading-6 font-medium text-gray-600">Informations sur le trajet</h2>
-        </div>
-        <div>
-          {{if eq .driver_journey.Noreturn true}}<span class="text-sm p-2 bg-co-red text-white rounded-xl">Aller simple</span>{{else}}<span class="text-sm p-2 bg-co-red text-white rounded-xl">Aller-retour</span>{{end}}
-        </div>
-      </div>
-      <div class="grid grid-cols-1 gap-6 sm:grid-cols-2">
-                    <div class="p-4 py-5 sm:px-6">
-                        <dl class="grid grid-cols-1 gap-x-4 gap-y-8 sm:grid-cols-2">
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Départ passager</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{.driver_journey.PassengerPickup.Properties.label}}</dd>
-                            </div>
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Destination passager</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{.driver_journey.PassengerDrop.Properties.label}}</dd>
-                            </div>
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Départ conducteur</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{.driver_journey.DriverDeparture.Properties.label}}</dd>
-                            </div>
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Destination conducteur</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{.driver_journey.DriverArrival.Properties.label}}</dd>
-                            </div>
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Kilomètres passager</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{.driver_journey.PassengerDistance}} km</dd>
-                            </div>
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Kilomètres conducteur</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{.driver_journey.DriverDistance}} km</dd>
-                            </div>
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Horaire départ conducteur</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{ timeFormat .driver_journey.DriverDepartureDate "02/01/2006 15:04"}}</dd>
-                            </div>
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Horaire rendez vous passager</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{ timeFormat .driver_journey.PassengerPickupDate "02/01/2006 15:04"}}</dd>
-                            </div>
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Temps de trajet (passager)</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{ printf "%.0f" .driver_journey.Duration.Minutes }} min</dd>
-                            </div>
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Prix (passager)</dt>
-                                <dd class="mt-1 text-sm text-gray-900">
-                                    {{if .pricing_result}}
-                                        {{ printf "%.2f" (round2 .pricing_result.passenger.Amount) }} {{.pricing_result.passenger.Currency}}
-                                    {{else if .booking}}
-                                        {{ printf "%.2f" (round2 .booking.Journey.Price.Amount) }} {{.booking.Journey.Price.Currency}}
-                                    {{else}}
-                                        0.00 EUR
-                                    {{end}}
-                                </dd>
-                            </div>
-                            {{if and .pricing_result .pricing_result.driver (gt (round2 .pricing_result.driver.Amount) 0.0)}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Indemnité conducteur</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{ printf "%.2f" (round2 .pricing_result.driver.Amount) }} {{.pricing_result.driver.Currency}}</dd>
-                            </div>
-                            {{else if .booking}}
-                                {{if .booking.DriverCompensationAmount}}
-                                    {{if gt (round2 .booking.DriverCompensationAmount) 0.0}}
-                                    <div class="sm:col-span-1">
-                                        <dt class="text-sm font-medium text-gray-500">Indemnité conducteur</dt>
-                                        <dd class="mt-1 text-sm text-gray-900">{{ printf "%.2f" (round2 .booking.DriverCompensationAmount) }} {{.booking.DriverCompensationCurrency}}</dd>
-                                    </div>
-                                    {{end}}
-                                {{end}}
-                            {{end}}
-                        </dl>
-                    </div>
-  <div>
-      {{ template "journey_map" . }}
-
-  </div>
-      </div>
-    </div>
-  <div class="py-4 grid grid-cols-1 gap-6 sm:grid-cols-2">
-    <div class="col-span-1 bg-white rounded-2xl shadow divide-y divide-gray-200 flex flex-col">
-      <div class="px-4 py-2 flex items-center justify-between flex-wrap sm:flex-nowrap">
-        <div class="ml-4 mt-2 grid-cols-2">
-          <h3 class="text-lg leading-6 font-medium text-gray-900">Conducteur</h3>
-          <h2 class="text-sm leading-6 font-medium text-gray-600">{{.driver.Data.first_name}} {{.driver.Data.last_name}}</h2>
-        </div>
-      </div>
-                    <div class="border-t border-gray-200 px-4 py-5 sm:px-6">
-                        <dl class="grid grid-cols-1 gap-x-4 gap-y-8 sm:grid-cols-2">
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Profil validé</dt>
-                                <dd class="mt-1 text-sm text-gray-900">
-                                  {{if solidarityDriverValidatedProfile .driver (solidarityDocuments .driver.ID)}}
-                                    <span class="p-1 px-2 text-xs bg-co-green rounded-2xl">Oui</span>
-                                  {{else}}
-                                    <span class="p-1 px-2 text-xs bg-co-red text-white rounded-2xl">Non</span>
-                                  {{end}}
-                                </dd>
-                            </div>
-                            {{if .driver.Data.email}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Email</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{.driver.Data.email}}</dd>
-                            </div>
-                            {{end}}
-                            {{if .driver.Data.phone_number}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Téléphone</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{.driver.Data.phone_number}}</dd>
-                            </div>
-                            {{end}}
-                            {{if .driver.Data.birthdate}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Date de naissance</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{(timeFrom .driver.Data.birthdate).Format
-                                    "02/01/2006"}}</dd>
-                            </div>
-                            {{end}}
-                            {{if and .driver.Data.gender (ne .driver.Data.gender "0")}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Genre</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{genderISO5218 .driver.Data.gender}}</dd>
-                            </div>
-                            {{end}}
-                            {{if .driver.Data.address}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Adresse</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{.driver.Data.address.properties.label}}</dd>
-                            </div>
-                            {{end}}
-                            {{if .driver.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">{{.driver.Data.file_number}}</dd>
-                            </div>
-                            {{end}}
-                        </dl>
-                    </div>
-
-    </div>
-    <div class="col-span-1 bg-white rounded-2xl shadow divide-y divide-gray-200 flex flex-col">
-      <div class="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">Passager</h3>
-        <h2 class="text-sm leading-6 font-medium text-gray-600">{{if ne .passenger.ID "" }}{{.passenger.Data.first_name}} {{.passenger.Data.last_name}}{{end}}</h2>
-        </div>
-      </div>
-      <div class="border-t border-gray-200 px-4 py-5 sm:px-6">
-        {{if eq .passenger.ID ""}}
-        <form method="GET">
-                        
-                    <div x-data="{
-                        text: '',
-                        beneficiariesListOpen: false,
-                        beneficiaries: {{json .beneficiaries}},
-                        filteredBeneficiaries: (beneficiaries, text) => {
-                            if(text=='') {
-                              return beneficiaries
-                            }
-                            return beneficiaries.filter(b => b['data']['first_name'].toLowerCase().includes(text.toLowerCase()) || b['data']['last_name'].toLowerCase().includes(text.toLowerCase()))
-                        },
-                        fields: {
-                            beneficiaryid: {{if .search}}'{{.search.beneficiary.ID}}'{{else}}null{{end}},
-                        },
-                        selectbeneficiary(beneficiary) {
-                            this.fields.beneficiaryid = beneficiary.id 
-                            this.text = beneficiary.data.first_name + ' ' + beneficiary.data.last_name
-                            this.beneficiariesListOpen = false
-                        },
-                    }">
-                        <input type="hidden" name="passengerid" x-model="fields.beneficiaryid">
-                        <label for="combobox" class="block text-sm font-medium text-gray-700">Selectionner un bénéficiaire</label>
-                        <div class="relative mt-1 mb-4">
-                          <input autocomplete="off" @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">
-                            <!-- Heroicon name: solid/selector -->
-                            <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">
-                            <!--
-                              Combobox option, manage highlight styles based on mouseenter/mouseleave and keyboard navigation.
-                      
-                              Active: "text-white bg-indigo-600", Not Active: "text-gray-900"
-                            -->
-                            <template x-for="beneficiary in filteredBeneficiaries(beneficiaries, text)">
-                                <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">
-                                <!-- Selected: "font-semibold" -->
-                                <span class="truncate" x-text="beneficiary.data.first_name"></span> <span class="truncate" x-text="beneficiary.data.last_name"></span>
-                        
-                                <!--
-                                    Checkmark, only display for selected option.
-                        
-                                    Active: "text-white", Not Active: "text-indigo-600"
-                                -->
-                                <span class="absolute inset-y-0 right-0 flex items-center pr-4 text-co-blue">
-                                    <!-- Heroicon name: solid/check -->
-                                    <!-- <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="M16.707 5.293a1 1 0 010 1.414l-8 8a1 1 0 01-1.414 0l-4-4a1 1 0 011.414-1.414L8 12.586l7.293-7.293a1 1 0 011.414 0z" clip-rule="evenodd" />
-                                    </svg> -->
-                                </span>
-                                </li>
-                            </template>
-                      
-                            <!-- More items... -->
-                          </ul>
-                        </div>
-                      </div>
-                    <button type="submit" class="inline-flex w-full justify-center max-w-xs bg-co-blue  border-gray-300 border px-4 py-2 text-white items-center text-sm rounded-2xl focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">
-                      Valider
-                    </button>
-                    </div>
-                  </form>
-
-        {{ else }}
-                        <dl class="grid grid-cols-1 gap-x-4 gap-y-8 sm:grid-cols-2">
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Profil validé</dt>
-                                <dd class="mt-1 text-sm text-gray-900">
-                                  {{if beneficiaryValidatedProfile .passenger (beneficiaryDocuments .passenger.ID)}}
-                                    <span class="p-1 px-2 text-xs bg-co-green rounded-2xl">Oui</span>
-                                  {{else}}
-                                    <span class="p-1 px-2 text-xs bg-co-red text-white rounded-2xl">Non</span>
-                                  {{end}}
-                                </dd>
-                            </div>
-                            {{if .passenger.Data.email}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Email</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{.passenger.Data.email}}</dd>
-                            </div>
-                            {{end}}
-                            {{if .passenger.Data.phone_number}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Téléphone</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{.passenger.Data.phone_number}}</dd>
-                            </div>
-                            {{end}}
-                            {{if .passenger.Data.birthdate}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Date de naissance</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{(timeFrom .passenger.Data.birthdate).Format
-                                    "02/01/2006"}}</dd>
-                            </div>
-                            {{end}}
-                            {{if and .passenger.Data.gender (ne .passenger.Data.gender "0")}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Genre</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{genderISO5218 .passenger.Data.gender}}</dd>
-                            </div>
-                            {{end}}
-                            {{if .passenger.Data.address}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Adresse</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{.passenger.Data.address.properties.label}}</dd>
-                            </div>
-                            {{end}}
-                            {{if .passenger.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">{{.passenger.Data.file_number}}</dd>
-                            </div>
-                            {{end}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Compte mobilié (solde)</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{ printf "%.2f" (round2 .passenger_wallet_balance) }} EUR</dd>
-                            </div>
-                        </dl>
-                    </div>
-
-        {{end}}
-      </div>
-      </div>
-
-{{end}}

web/layouts/solidarity_transport/booking_display.html

@@ -1,331 +0,0 @@
-{{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">
-      Transport solidaire
-    </h1>
-
-    {{if and .ViewState.booking.Data.motivation (isGuaranteedTripMotivation .ViewState.booking.Data.motivation)}}
-    <div class="mt-4"><span class="text-sm p-2 bg-co-green text-white rounded-2xl">Trajet garanti : {{.ViewState.booking.Data.motivation}}</span></div>
-    {{end}}
-
-    {{ if eq .ViewState.booking.Status "WAITING_CONFIRMATION"}}
-    <div class="mt-4"><span class="p-2 text-sm bg-gray-300 rounded-2xl px-4">Attente confirmation</span></div>
-    {{ else if eq .ViewState.booking.Status "VALIDATED"}}
-    <div class="mt-4"><span class="p-1 text-sm bg-co-green rounded-2xl px-4">Validé</span></div>
-    {{ else if eq .ViewState.booking.Status "CANCELLED"}}
-    <div class="mt-4"><span class="p-1 text-sm bg-co-red text-white rounded-2xl px-4">Annulé{{if .ViewState.booking.Data.reason}} : {{.ViewState.booking.Data.reason}}{{end}}</span></div>
-    {{ end }}
-
-    <div class="mt-6 flex justify-end space-x-3">
-      {{if .ViewState.booking.Data.replaced_by}}
-      <!-- Booking has been replaced, show link to replacement -->
-      <a href="/app/solidarity-transport/bookings/{{.ViewState.booking.Data.replaced_by}}" class="inline-flex">
-        <button type="button" class="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">
-          Remplacé par →
-        </button>
-      </a>
-      {{else}}
-      <!-- Normal action buttons -->
-      {{if eq .ViewState.booking.Status "WAITING_CONFIRMATION" }}
-      <a href="/app/solidarity-transport/bookings/{{.ViewState.booking.Id}}/confirm" class="inline-flex">
-        <button type="button" class="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">
-          Confirmer
-        </button>
-      </a>
-      {{end}}
-
-      {{if ne .ViewState.booking.Status "WAITING_CONFIRMATION" }}
-      <a href="/app/solidarity-transport/bookings/{{.ViewState.booking.Id}}/waitconfirmation" class="inline-flex">
-        <button type="button" class="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">
-          Remettre en attente
-        </button>
-      </a>
-      {{end}}
-
-      {{if ne .ViewState.booking.Status "CANCELLED" }}
-      {{$dialog := "cancel"}}
-      <div x-data="{ {{ $dialog }}: false}">
-        <button @click="{{ $dialog }} = !{{ $dialog }}" type="button" class="bg-co-red border-gray-300 border px-4 py-2 text-white items-center text-sm rounded-2xl focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">
-          Annuler
-        </button>
-        <div x-show="{{$dialog}}" class="relative z-10" aria-labelledby="modal-title" role="dialog" aria-modal="true">
-          <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">
-                <form method="POST" action="/app/solidarity-transport/bookings/{{.ViewState.booking.Id}}/cancel">
-                  <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">Annuler</h3>
-                    <div class="mt-2">
-                      <p class="text-sm text-gray-500">Sélectionnez la raison de l'annulation</p>
-                    </div>
-                    <div>
-                      <label for="reason" class="block text-sm font-medium text-gray-700">Raison de l'annulation</label>
-                      <div class="mt-1">
-                        <select name="reason" id="reason" class="block w-full rounded-2xl border-gray-300 shadow-sm focus:border-co-blue focus:ring-co-blue sm:text-sm">
-                          <option value="Trajet annulé par le passager">Trajet annulé par le passager</option>
-                          <option value="Trajet non réalisé">Trajet non réalisé</option>
-                          <option value="Refusé par le bénévole">Refusé par le bénévole</option>
-                          <option value="Autre" selected="selected">Autre</option>
-                        </select>
-                      </div>
-                    </div>
-                  </div>
-                  <div class="mt-5 sm:mt-6 sm:grid sm:grid-flow-row-dense sm:grid-cols-2">
-                    <button @click="{{$dialog}} = !{{$dialog}}" type="button" 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</button>
-                    <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">Confirmer</button>
-                  </div>
-                </form>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-      {{end}}
-
-      <a href="/app/journeys/?departure={{json .ViewState.booking.Journey.PassengerPickup}}&destination={{ json .ViewState.booking.Journey.PassengerDrop }}&passengerid={{.ViewState.booking.PassengerId}}" class="inline-flex">
-        <button type="button" class="px-4 py-2 border border-transparent text-sm font-medium rounded-2xl shadow-sm bg-white text-gray-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-co-blue">
-          Dupliquer
-        </button>
-      </a>
-
-      {{if eq .ViewState.booking.Status "CANCELLED" }}
-      {{$dialogReplace := "replace_driver"}}
-      <div x-data="{ {{ $dialogReplace }}: false}">
-        <button @click="{{ $dialogReplace }} = !{{ $dialogReplace }}" type="button" class="px-4 py-2 border border-transparent text-sm font-medium rounded-2xl shadow-sm bg-white text-gray-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-co-blue">
-          Solliciter un autre conducteur
-        </button>
-
-        <!-- Modal for replacement drivers -->
-        <div x-show="{{$dialogReplace}}" class="relative z-10" aria-labelledby="modal-title" role="dialog" aria-modal="true">
-          <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-6">
-
-              <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-6xl sm:p-6 m-4">
-                <div class="mx-auto flex h-12 w-12 items-center justify-center rounded-co bg-co-blue text-white">
-                  {{$.IconSet.Icon "hero:outline/users" "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">Conducteurs disponibles</h3>
-                  <div class="mt-2">
-                    <p class="text-sm text-gray-500">Sélectionnez un conducteur de remplacement</p>
-                  </div>
-                </div>
-
-                <div class="mt-4">
-                  {{if .ViewState.replacement_drivers}}
-                  <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">Conducteur</th>
-                        <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900">Lieu de départ</th>
-                        <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900">Distance conducteur</th>
-                        <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900">Distance passager</th>
-                        <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900">Prix passager</th>
-                        <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900">Indemnité conducteur</th>
-                        <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900">Profil validé</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 $index, $journey := .ViewState.replacement_drivers}}
-                      {{$driver := index $.ViewState.replacement_drivers_map $journey.DriverId}}
-                      {{$pricing := index $.ViewState.replacement_pricing $journey.Id}}
-                      {{$location := index $.ViewState.replacement_locations $journey.Id}}
-                      <tr>
-                        <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm font-medium text-gray-900 sm:pl-6">
-                          {{$driver.Data.first_name}} {{$driver.Data.last_name}}
-                        </td>
-                        <td class="px-3 py-4 text-sm text-gray-500">
-                          {{if $location}}{{$location}}{{else}}-{{end}}
-                        </td>
-                        <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
-                          {{$journey.DriverDistance}} km
-                        </td>
-                        <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
-                          {{$journey.PassengerDistance}} km
-                        </td>
-                        <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
-                          {{if $pricing}}
-                          {{printf "%.2f" $pricing.passenger.amount}} {{$pricing.passenger.currency}}
-                          {{else}}-{{end}}
-                        </td>
-                        <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
-                          {{if $pricing}}
-                          {{printf "%.2f" $pricing.driver.amount}} {{$pricing.driver.currency}}
-                          {{else}}-{{end}}
-                        </td>
-                        <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
-                          {{if solidarityDriverValidatedProfile $driver (solidarityDocuments $driver.ID)}}
-                          <span class="p-1 px-2 text-xs bg-co-green text-white rounded-2xl">Oui</span>
-                          {{else}}
-                          <span class="p-1 px-2 text-xs bg-co-red text-white rounded-2xl">Non</span>
-                          {{end}}
-                        </td>
-                        <td class="relative whitespace-nowrap py-4 pl-3 pr-4 text-right text-sm font-medium sm:pr-6">
-                          <form method="POST" action="/app/solidarity-transport/bookings/{{$.ViewState.booking.Id}}/create-replacement" class="inline">
-                            <input type="hidden" name="driver_id" value="{{$journey.DriverId}}" />
-                            <input type="hidden" name="journey_id" value="{{$journey.Id}}" />
-                            <input type="hidden" name="message" value="{{template "sms_template" (dict "name" ($.ViewState.config.GetString "service_name") "datetime" (timeFormat $journey.PassengerPickupDate.AsTime "02/01/2006 15:04") "baseUrl" ($.ViewState.config.GetString "base_url"))}}" />
-                            <button type="submit" class="text-co-blue hover:text-co-blue-dark underline">
-                              Solliciter
-                            </button>
-                          </form>
-                        </td>
-                      </tr>
-                      {{end}}
-                    </tbody>
-                  </table>
-                  {{else}}
-                  <div class="text-center py-8">
-                    <p class="text-sm text-gray-500">Aucun conducteur disponible pour ce trajet</p>
-                  </div>
-                  {{end}}
-                </div>
-
-                <div class="mt-5 sm:mt-6">
-                  <button @click="{{$dialogReplace}} = !{{$dialogReplace}}" type="button" class="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:text-sm">
-                    Fermer
-                  </button>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-      {{end}}
-      {{end}}
-    </div>
-</div>
-
-<div class="max-w-7xl mx-auto py-8 px-4 sm:px-6 md:px-8">
-  <div class="grid grid-cols-1 lg:grid-cols-2 gap-8">
-    <!-- Booking Details -->
-    <div class="bg-white shadow overflow-hidden sm:rounded-lg">
-      <div class="px-4 py-5 sm:px-6">
-        <h3 class="text-lg leading-6 font-medium text-gray-900">Détails du transport solidaire</h3>
-        <p class="mt-1 max-w-2xl text-sm text-gray-500">Informations sur le trajet</p>
-      </div>
-      <div class="border-t border-gray-200 px-4 py-5 sm:p-0">
-        <dl class="sm:divide-y sm:divide-gray-200">
-          <div class="py-4 sm:py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
-            <dt class="text-sm font-medium text-gray-500">Conducteur</dt>
-            <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
-              <a class="text-co-blue" href="/app/solidarity-transport/drivers/{{ .ViewState.driver.ID }}">{{ .ViewState.driver.Data.first_name }} {{ .ViewState.driver.Data.last_name }}</a>
-            </dd>
-          </div>
-          <div class="py-4 sm:py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
-            <dt class="text-sm font-medium text-gray-500">Passager</dt>
-            <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
-              <a class="text-co-blue" href="/app/beneficiaries/{{ .ViewState.passenger.ID }}">{{ .ViewState.passenger.Data.first_name }} {{ .ViewState.passenger.Data.last_name }}</a>
-            </dd>
-          </div>
-          <div class="py-4 sm:py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
-            <dt class="text-sm font-medium text-gray-500">Départ conducteur</dt>
-            <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
-              {{ .ViewState.booking.Journey.DriverDeparture.Properties.label }}
-            </dd>
-          </div>
-          <div class="py-4 sm:py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
-            <dt class="text-sm font-medium text-gray-500">Prise en charge passager</dt>
-            <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
-              {{ .ViewState.booking.Journey.PassengerPickup.Properties.label }}
-            </dd>
-          </div>
-          <div class="py-4 sm:py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
-            <dt class="text-sm font-medium text-gray-500">Dépose passager</dt>
-            <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
-              {{ .ViewState.booking.Journey.PassengerDrop.Properties.label }}
-            </dd>
-          </div>
-          <div class="py-4 sm:py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
-            <dt class="text-sm font-medium text-gray-500">Arrivée conducteur</dt>
-            <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
-              {{ .ViewState.booking.Journey.DriverArrival.Properties.label }}
-            </dd>
-          </div>
-          <div class="py-4 sm:py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
-            <dt class="text-sm font-medium text-gray-500">Date et heure</dt>
-            <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
-              {{ timeFormat .ViewState.booking.Journey.PassengerPickupDate "02/01/2006 15:04" }}
-            </dd>
-          </div>
-          <div class="py-4 sm:py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
-            <dt class="text-sm font-medium text-gray-500">Type de trajet</dt>
-            <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
-              {{if .ViewState.booking.Journey.Noreturn}}
-                Aller simple (pas de retour)
-              {{else}}
-                Aller-retour ({{.ViewState.booking.ReturnWaitingDuration | shortDuration}} d'attente estimée sur place)
-              {{end}}
-            </dd>
-          </div>
-          {{if .ViewState.booking.Data.motivation}}
-          <div class="py-4 sm:py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
-            <dt class="text-sm font-medium text-gray-500">Motif</dt>
-            <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
-              {{$motivation := .ViewState.booking.Data.motivation}}
-              {{$found := false}}
-              {{range .ViewState.booking_motivations}}
-                {{if eq .value $motivation}}
-                  {{.label}}
-                  {{$found = true}}
-                {{end}}
-              {{end}}
-              {{if not $found}}{{$motivation}}{{end}}
-            </dd>
-          </div>
-          {{end}}
-          <div class="py-4 sm:py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
-            <dt class="text-sm font-medium text-gray-500">Distance passager</dt>
-            <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
-              {{ .ViewState.booking.Journey.PassengerDistance }} km
-            </dd>
-          </div>
-          <div class="py-4 sm:py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
-            <dt class="text-sm font-medium text-gray-500">Distance conducteur</dt>
-            <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
-              {{ .ViewState.booking.Journey.DriverDistance }} km
-            </dd>
-          </div>
-          <div class="py-4 sm:py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
-            <dt class="text-sm font-medium text-gray-500">Prix (passager)</dt>
-            <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
-              <span class="font-medium">{{ printf "%.2f" (round2 .ViewState.booking.Journey.Price.Amount) }} {{ .ViewState.booking.Journey.Price.Currency }}</span>
-            </dd>
-          </div>
-          {{if .ViewState.booking.DriverCompensationAmount}}
-            {{if gt (round2 .ViewState.booking.DriverCompensationAmount) 0.0}}
-            <div class="py-4 sm:py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
-              <dt class="text-sm font-medium text-gray-500">Indemnité conducteur</dt>
-              <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
-                <span class="font-medium">{{ printf "%.2f" (round2 .ViewState.booking.DriverCompensationAmount) }} {{.ViewState.booking.DriverCompensationCurrency}}</span>
-              </dd>
-            </div>
-            {{end}}
-          {{end}}
-        </dl>
-      </div>
-    </div>
-
-    <!-- Map -->
-    <div class="bg-white shadow overflow-hidden sm:rounded-lg">
-      <div class="border-t border-gray-200 h-full">
-        <div class="h-full min-h-96">
-          {{ template "journey_map" (dict "driver_journey" .ViewState.booking.Journey) }}
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-
-{{ end }}

web/layouts/solidarity_transport/driver_create.html

@@ -1,205 +0,0 @@
-{{ 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">Créer un conducteur solidaire</h1>
-</div>
-
-<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8 mt-8"
-    x-data="{
-        fields: {
-            first_name: null,
-            last_name: null,
-            email: null,
-            phone_number: null,
-            birthdate: null,
-        },
-        other_properties: {},
-        other_properties_serialized: null,
-        rules: {
-            first_name: ['required'],
-            last_name: ['required'],
-            email: ['required', 'email'],
-            phone_number: ['required', 'regexMatch:^((\\+)33|0)[1-9](\\d{2}){4}$'],
-            birthdate: ['required'],
-        },
-        formValidation: {
-            valid: false,
-            fields: {
-                first_name: {valid: null},
-                last_name: {valid: null},
-                email: {valid: null},
-                phone_number: {valid: null},
-                birthdate: {valid: null},
-            }
-        },
-        isFormValid: true,
-        validate() {
-            this.formValidation = Iodine.assert(this.fields, this.rules)
-        },
-        validateField(field) {
-            this.formValidation.fields[field] = Iodine.assert(this.fields[field], this.rules[field])
-        },
-        submit(event) {
-            this.other_properties_serialized = JSON.stringify(this.other_properties)
-            this.validate()
-            if(!this.formValidation.valid) {
-                this.isFormValid = false
-                event.preventDefault()
-            }
-            return this.formValidation.valid
-        }
-    }">
-    <form class="space-y-6" method="POST" @submit="submit">
-        <input type="hidden" name="other_properties" x-model="other_properties_serialized" />
-        <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 obligatoires</h3>
-                    <p class="mt-1 text-sm text-gray-500">Informations personnelles obligatoires pour créer le conducteur</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="first_name" class="block text-sm font-medium text-gray-700">Prénom</label>
-                            <input type="text" name="first_name" id="first_name" autocomplete="given-name"
-                                class="p-2 mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-2xl"
-                                x-model="fields.first_name" @blur="validateField('first_name')"
-                                :class="formValidation.fields.first_name.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
-                        </div>
-
-                        <div class="col-span-6 sm:col-span-3">
-                            <label for="last_name" class="block text-sm font-medium text-gray-700">Nom</label>
-                            <input type="text" name="last_name" id="last_name" autocomplete="family-name"
-                                class="p-2 mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-2xl"
-                                x-model="fields.last_name" @blur="validateField('last_name')"
-                                :class="formValidation.fields.last_name.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
-                        </div>
-
-                        <div class="col-span-6 sm:col-span-3">
-                            <label for="email" class="block text-sm font-medium text-gray-700">Email</label>
-                            <input type="text" name="email" id="email" autocomplete="email"
-                                class="p-2 mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-2xl"
-                                x-model="fields.email" @blur="validateField('email')"
-                                :class="formValidation.fields.email.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
-                        </div>
-
-                        <div class="col-span-6 sm:col-span-3">
-                            <label for="phone_number" class="block text-sm font-medium text-gray-700">Numéro de
-                                téléphone</label>
-                            <input type="text" name="phone_number" id="phone_number" autocomplete="phone" placeholder="+33612345678"
-                                class="p-2 mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-2xl"
-                                x-model="fields.phone_number" @blur="validateField('phone_number')"
-                                :class="formValidation.fields.phone_number.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
-                        </div>
-
-                        <div class="col-span-6 sm:col-span-3">
-                            <label for="birthdate" class="block text-sm font-medium text-gray-700">Date de
-                                naissance</label>
-                            <input type="date" name="birthdate" id="birthdate" autocomplete="birthdate" placeholder="JJ/MM/AAAA"
-                                class="p-2 mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-2xl"
-                                x-model="fields.birthdate" @blur="validateField('birthdate')"
-                                :class="formValidation.fields.birthdate.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
-                        </div>
-                    {{ $fieldName := "address" }}
-                    {{ template "address_autocomplete" dict "FieldName" $fieldName }}
-                    </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">Informations optionnelles</h3>
-                    <p class="mt-1 text-sm text-gray-500">Autres informations de profil optionnelles</p>
-                </div>
-                <div class="mt-5 space-y-6 md:mt-0 md:col-span-2">
-                    <div class="grid grid-cols-6 gap-6">
-
-                        {{range .ViewState.profile_optional_fields}}
-                        <div class="col-span-6 sm:col-span-3">
-                            <label for="{{.name}}" class="block text-sm font-medium text-gray-700">{{.label}}</label>
-                            {{if eq .type "select"}}
-                            <div class="sm:mt-0 sm:col-span-2">
-                                <select id="{{.name}}" name="{{.name}}"
-                                    {{if eq .name "gender"}}x-model="gender"{{else}}x-model="other_properties.{{.name}}"{{end}}
-                                    class="p-2 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 border-gray-300 rounded-2xl">
-                                    {{range .options}}
-                                    <option value="{{.value}}">{{.label}}</option>
-                                    {{end}}
-                                </select>
-                            </div>
-                            {{else if eq .type "textarea"}}
-                            <textarea id="{{.name}}" name="{{.name}}" rows="3" x-model="other_properties.{{.name}}"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm border-gray-300 rounded-2xl"></textarea>
-                            {{else if eq .type "multicheckbox"}}
-                            <div class="mt-1 space-y-2">
-				{{$name := .name}}
-                                {{range .options}}
-                                <label class="flex items-center">
-                                    <input type="checkbox" name="{{$name}}[]" value="{{.value}}"
-				    x-model="other_properties.{{$name}}___{{.value}}"
-                                           class="h-4 w-4 text-co-blue focus:ring-co-blue border-co-blue rounded">
-                                    <span class="ml-2 text-sm text-gray-700">{{.label}}</span>
-                                </label>
-                                {{end}}
-                            </div>
-                            {{else if eq .type "date"}}
-                            <input type="date" id="{{.name}}" name="{{.name}}" x-model="other_properties.{{.name}}"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm border-gray-300 rounded-2xl">
-                            {{else if eq .type "number"}}
-                            <input type="number" id="{{.name}}" name="{{.name}}" x-model="other_properties.{{.name}}"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm border-gray-300 rounded-2xl">
-                            {{else}}
-                            <input type="text" id="{{.name}}" name="{{.name}}" x-model="other_properties.{{.name}}"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm border-gray-300 rounded-2xl">
-                            {{end}}
-                        </div>
-                        {{end}}
-
-                        <!-- <div class="col-span-3 sm:col-span-3">
-                            <label class="block text-sm font-medium text-gray-700"> Photo </label>
-                            <div class="mt-1 flex items-center space-x-5">
-                                <span class="inline-block h-12 w-12 rounded-co overflow-hidden bg-gray-100">
-                                    {{.IconSet.Icon "img:profile-picture-placeholder" "h-full w-full"}}
-                                </span>
-                                <button type="button"
-                                    class="bg-white py-2 px-3 border border-gray-300 rounded-2xl shadow-sm text-sm leading-4 font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">
-                                    Charger la photo
-                                </button>
-                            </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 liés au conducteur, utiles pour exploiter les fonctionnalités de PARCOURSMOB</p>
-                </div>
-                <div class="mt-5 space-y-6 md:mt-0 md:col-span-2">
-
-                    {{ $fieldName := "address" }}
-                    {{ template "address_autocomplete" dict "FieldName" $fieldName }}
-
-                </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/solidarity-transport/">
-                <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">Créer le conducteur solidaire</button>
-        </div>
-    </form>
-</div>
-{{end}}
-

web/layouts/solidarity_transport/driver_display.html

@@ -1,221 +0,0 @@
-{{define "content"}}
-<main class="py-10">
-    <!-- Page header -->
-    <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 class="flex-shrink-0">
-                <div class="relative">
-                    <img class="h-16 w-16 rounded-co" src="/app/beneficiaries/{{.ViewState.driver.ID}}/picture" alt="">
-                    <span class="absolute inset-0 shadow-inner rounded-full" aria-hidden="true"></span>
-                </div>
-            </div>
-            <div>
-                <h1 class="text-2xl font-bold text-gray-900">{{.ViewState.driver.Data.first_name}}
-                    {{.ViewState.driver.Data.last_name}}</h1>
-                <p class="text-sm font-medium text-gray-500">{{if .ViewState.driver.Metadata.created}}Ajouté le <time
-                        datetime="2022-07-25">{{.ViewState.driver.Metadata.created}}</time> par
-                    <a href="#" class="text-gray-900">Conseiller 1</a>{{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">
-            {{if not .ViewState.driver.Data.archived}}<a href="/app/solidarity-transport/drivers/{{ .ViewState.driver.ID }}/archive"><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">Archiver</button></a>{{end}}
-            {{if .ViewState.driver.Data.archived}}<a href="/app/solidarity-transport/drivers/{{ .ViewState.driver.ID }}/unarchive"><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">Désarchiver</button></a>{{end}}
-            <!-- <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/solidarity-transport/drivers/{{.ViewState.driver.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>
-        </div>
-    </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">
-        <div class="space-y-6 lg:col-start-1 lg:col-span-2">
-            <section aria-labelledby="driver-information-title">
-                <div class="bg-white shadow sm:rounded-lg">
-                    <div class="px-4 py-5 sm:px-6">
-                        <h2 id="driver-information-title" class="text-lg leading-6 font-medium text-gray-900">
-                            Informations personnelles</h2>
-                        <p class="mt-1 max-w-2xl text-sm text-gray-500">Informations générales sur le conducteur solidaire.</p>
-                    </div>
-                    <div class="border-t border-gray-200 px-4 py-5 sm:px-6">
-                        <dl class="grid grid-cols-1 gap-x-4 gap-y-8 sm:grid-cols-2">
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Profil validé</dt>
-                                <dd class="mt-1 text-sm text-gray-900">
-                                  {{if solidarityDriverValidatedProfile .ViewState.driver .ViewState.documents}}
-                                    <span class="p-1 px-2 text-xs bg-co-green rounded-2xl">Oui</span>
-                                  {{else}}
-                                    <span class="p-1 px-2 text-xs bg-co-red text-white rounded-2xl">Non</span>
-                                  {{end}}
-                                </dd>
-                            </div>
-                            {{if .ViewState.driver.Data.email}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Email</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{.ViewState.driver.Data.email}}</dd>
-                            </div>
-                            {{end}}
-                            {{if .ViewState.driver.Data.phone_number}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Téléphone</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{.ViewState.driver.Data.phone_number}}</dd>
-                            </div>
-                            {{end}}
-                            {{if .ViewState.driver.Data.birthdate}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Date de naissance</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{(timeFrom .ViewState.driver.Data.birthdate).Format
-                                    "02/01/2006"}}</dd>
-                            </div>
-                            {{end}}
-                            {{if and .ViewState.driver.Data.gender (ne .ViewState.driver.Data.gender "0")}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Genre</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{genderISO5218 .ViewState.driver.Data.gender}}</dd>
-                            </div>
-                            {{end}}
-                            {{if .ViewState.driver.Data.address}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Adresse</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{.ViewState.driver.Data.address.properties.label}}</dd>
-                            </div>
-                            {{end}}
-                            {{if .ViewState.driver.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.driver.Data.file_number}}</dd>
-                            </div>
-                            {{end}}
-                            {{range .ViewState.profile_optional_fields}}
-                            {{$fieldName := .name}}
-                            {{$fieldLabel := .label}}
-                            {{$fieldType := .type}}
-                            {{if eq .type "multicheckbox"}}
-                                {{$hasValues := false}}
-                                {{range .options}}
-                                    {{$optionKey := printf "%s___%s" $fieldName .value}}
-                                    {{if index $.ViewState.driver.Data.other_properties $optionKey}}{{$hasValues = true}}{{end}}
-                                {{end}}
-                                {{if $hasValues}}
-                                <div class="sm:col-span-2">
-                                    <dt class="text-sm font-medium text-gray-500">{{$fieldLabel}}</dt>
-                                    <dd class="mt-1 text-sm text-gray-900">
-                                        <div class="flex flex-wrap gap-2">
-                                            {{range .options}}
-                                            {{$optionKey := printf "%s___%s" $fieldName .value}}
-                                            {{if index $.ViewState.driver.Data.other_properties $optionKey}}
-                                            <span class="inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium bg-gray-200 text-gray-800">
-                                                {{.label}}
-                                            </span>
-                                            {{end}}
-                                            {{end}}
-                                        </div>
-                                    </dd>
-                                </div>
-                                {{end}}
-                            {{else if eq .type "select"}}
-                                {{$fieldValue := index $.ViewState.driver.Data.other_properties $fieldName}}
-                                {{if and $fieldValue (ne $fieldValue "0") (ne $fieldValue "")}}
-                                <div class="sm:col-span-1">
-                                    <dt class="text-sm font-medium text-gray-500">{{$fieldLabel}}</dt>
-                                    <dd class="mt-1 text-sm text-gray-900">
-                                        {{if eq $fieldName "gender"}}
-                                            {{genderISO5218 $fieldValue}}
-                                        {{else}}
-                                            {{range .options}}
-                                                {{if eq .value $fieldValue}}{{.label}}{{end}}
-                                            {{end}}
-                                        {{end}}
-                                    </dd>
-                                </div>
-                                {{end}}
-                            {{else}}
-                                {{$fieldValue := index $.ViewState.driver.Data.other_properties $fieldName}}
-                                {{if $fieldValue}}
-                                <div class="sm:col-span-1">
-                                    <dt class="text-sm font-medium text-gray-500">{{$fieldLabel}}</dt>
-                                    <dd class="mt-1 text-sm text-gray-900">{{$fieldValue}}</dd>
-                                </div>
-                                {{end}}
-                            {{end}}
-                            {{end}}
-                        </dl>
-                    </div>
-                </div>
-            </section>
-
-            <section aria-labelledby="functionalities-title" x-data="{
-                    tab: '{{ if .ViewState.tab }}{{ .ViewState.tab }}{{ else }}documents{{ end }}',
-                    to(event) {
-                        this.tab = event.target.value
-                    }
-                }">
-                <div class="bg-white shadow sm:rounded-lg sm:overflow-hidden">
-                    <div class="divide-y divide-gray-200">
-                        <div>
-                            <div class="sm:hidden">
-                                <label for="tabs" class="sr-only">Select a tab</label>
-                                <select id="tabs" name="tabs" @change="to"
-                                    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="vehicles">Véhicules</option>
-
-                                    <option value="events">Dispositifs</option> -->
-
-                                    <option value="documents">Documents</option>
-
-                                    <option value="wallet">Compte mobilité</option>
-
-                                    <option value="history">Transports solidaires</option>
-                                </select>
-                            </div>
-                            <div class="hidden sm:block">
-                                <div class="border-b border-gray-200 pl-4">
-                                    <nav class="-mb-px flex space-x-8" aria-label="Tabs">
-                                        <!-- Current: "border-indigo-500 text-indigo-600", Default: "border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300" -->
-                                        <!--<a href="#" @click="tab = 'notes'"
-                                            class="whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm"
-                                            :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 = '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 = 'wallet'"
-                                        class="whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm"
-                                        :class="tab == 'wallet' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
-                                        Compte mobilité </a>
-
-                                        <a href="#" @click="tab = 'history'"
-                                        class="whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm"
-                                        :class="tab == 'history' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
-                                        Transports solidaires </a>
-
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-
-                        <div x-show="tab == 'documents'">{{template "driver_files" .}}</div>
-                        <div x-show="tab == 'wallet'">{{template "driver_wallet" .}}</div>
-                        <div x-show="tab == 'history'">{{template "driver_history" .}}</div>
-
-                    </div>
-                </div>
-            </section>
-        </div>
-
-        <section class="lg:col-start-3 lg:col-span-1">
-        {{template "driver_availabilities" .}}
-        </section>
-    </div>
-</main>
-{{end}}

web/layouts/solidarity_transport/driver_journey.html

@@ -1,69 +0,0 @@
-
-{{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">Organiser le transport solidaire</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">
-          <form method="POST" action="/app/solidarity-transport/drivers/{{.ViewState.driver.ID}}/journeys/{{.ViewState.driver_journey.Id}}/noreturn">
-            {{if .ViewState.driver_journey.Noreturn}}
-            <button type="submit"
-              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">
-              {{$.IconSet.Icon "hero:outline/arrow-path-rounded-square" "h-5 w-5 mr-3"}}
-              Changer en aller-retour
-            </button>
-            {{else}}
-            <button type="submit"
-              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">
-              {{$.IconSet.Icon "hero:outline/arrow-long-right" "h-5 w-5 mr-3"}}
-              Changer en aller simple
-            </button>
-            {{end}}
-          </form>
-        </div>
-      </div>
-</div>
-<div class="max-w-7xl mx-auto py-8 px-4 sm:px-6 md:px-8">
-  {{template "journey_preview" (dict "driver_journey" .ViewState.driver_journey "driver" .ViewState.driver "passenger" .ViewState.passenger "beneficiaries" .ViewState.beneficiaries "passenger_wallet_balance" .ViewState.passenger_wallet_balance "pricing_result" .ViewState.pricing_result)}}
-          {{if ne .ViewState.passenger.ID ""}}
-<div class="max-w-7xl m-auto px-4 sm:px-6 md:px-8 flex flex-col justify-items-center">
-  {{if .ViewState.passenger}}
-  {{if lt .ViewState.passenger_wallet_balance .ViewState.pricing_result.passenger.Amount}}
-    <p class="text-xl text-co-red text-center p-4">Le solde du compte mobilité est insuffisant. <a href="/app/beneficiaries/{{.ViewState.passenger.ID}}?tab=wallet" class="underline text-co-blue">Créditer le compte</a></p>
-    {{end}}
-  <form method="POST">
-    {{if .ViewState.replaces_booking_id}}
-    <input type="hidden" name="replaces_booking_id" value="{{.ViewState.replaces_booking_id}}" />
-    {{end}}
-    {{if not .ViewState.driver_journey.Noreturn}}
-    <div class="m-auto text-center">
-      <label for="return_waiting_time" class="block text-sm font-medium text-gray-700">Durée d'attente à destination (minutes)</label>
-      <input type="number" name="return_waiting_time" value="30"
-        class="p-2 mt-1 mb-4 focus:ring-co-blue focus:border-co-blue block shadow-sm sm:text-sm  rounded-2xl bg-white m-auto" />
-    </div>
-    {{end}}
-    <div class="m-auto text-center">
-      <label for="motivation" class="block text-sm font-medium text-gray-700">Motif du trajet</label>
-    <select name="motivation" id="motivation"
-        class="p-2 mt-1 mb-4 focus:ring-co-blue focus:border-co-blue block shadow-sm sm:text-sm  rounded-2xl bg-white m-auto">
-      {{range .ViewState.booking_motivations}}
-      <option value="{{.value}}"{{if eq .value ""}} selected="selected"{{end}}>{{.label}}</option>
-      {{end}}
-    </select>
-    </div>
-    {{template "submit_with_sms" 
-      dict  "IconSet" .IconSet 
-            "Viewstate" .ViewState 
-            "ComponentState" (dict "submitText" "Envoyer la mise en relation"
-                                   "doNotSendOption" true) 
-            "SMSState" (dict "name" (.ViewState.config.GetString "service_name") 
-                             "datetime" (timeFormat .ViewState.driver_journey.PassengerPickupDate "02/01/2006 15:04")
-                             "baseUrl" (.ViewState.config.GetString "base_url") )}}
-  </form>
-    {{end}}
-</div>
-{{end}}
-
-{{ end }}

web/layouts/solidarity_transport/driver_update.html

@@ -1,210 +0,0 @@
-{{ 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">Modifier le conducteur</h1>
-</div>
-
-<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8 mt-8"
-    x-data="{
-        fields: {
-          first_name: '{{.ViewState.driver.Data.first_name}}',
-          last_name: '{{.ViewState.driver.Data.last_name}}',
-          email: '{{.ViewState.driver.Data.email}}' ,
-          phone_number: '{{.ViewState.driver.Data.phone_number}}',
-          birthdate: {{if .ViewState.driver.Data.birthdate}}'{{ (timeFrom .ViewState.driver.Data.birthdate).Format "2006-01-02" }}'{{else}}null{{end}},
-        },
-        other_properties: {{if .ViewState.driver.Data.other_properties}}{{ json .ViewState.driver.Data.other_properties }}{{else}}{}{{end}},
-        other_properties_serialized: '{{ json .ViewState.driver.Data.other_properties }}',
-        rules: {
-            first_name: ['required'],
-            last_name: ['required'],
-            email: ['required', 'email'],
-            phone_number: ['required', 'regexMatch:^((\\+)33|0)[1-9](\\d{2}){4}$'],
-            birthdate: ['required'],
-        },
-        formValidation: {
-            valid: false,
-            fields: {
-                first_name: {valid: null},
-                last_name: {valid: null},
-                email: {valid: null},
-                phone_number: {valid: null},
-                birthdate: {valid: null},
-            }
-        },
-        isFormValid: true,
-        validate() {
-            this.formValidation = Iodine.assert(this.fields, this.rules)
-        },
-        validateField(field) {
-            this.formValidation.fields[field] = Iodine.assert(this.fields[field], this.rules[field])
-        },
-        submit(event) {
-            this.other_properties_serialized = JSON.stringify(this.other_properties)
-            this.validate()
-            if(!this.formValidation.valid) {
-                this.isFormValid = false
-                event.preventDefault()
-            }
-            return this.formValidation.valid
-        }
-    }">
-    <form class="space-y-6" method="POST" @submit="submit">
-        <input type="hidden" name="other_properties" x-model="other_properties_serialized" />
-        <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 obligatoires</h3>
-                    <p class="mt-1 text-sm text-gray-500">Informations personnelles obligatoires pour créer le conducteur</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="first_name" class="block text-sm font-medium text-gray-700">Prénom</label>
-                            <input type="text" name="first_name" id="first_name" autocomplete="given-name"
-                                class="p-2 mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-2xl"
-                                x-model="fields.first_name" @blur="validateField('first_name')"
-                                :class="formValidation.fields.first_name.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
-                        </div>
-
-                        <div class="col-span-6 sm:col-span-3">
-                            <label for="last_name" class="block text-sm font-medium text-gray-700">Nom</label>
-                            <input type="text" name="last_name" id="last_name" autocomplete="family-name"
-                                class="p-2 mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-2xl"
-                                x-model="fields.last_name" @blur="validateField('last_name')"
-                                :class="formValidation.fields.last_name.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
-                        </div>
-
-                        <div class="col-span-6 sm:col-span-3">
-                            <label for="email" class="block text-sm font-medium text-gray-700">Email</label>
-                            <input type="text" name="email" id="email" autocomplete="email"
-                                class="p-2 mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-2xl"
-                                x-model="fields.email" @blur="validateField('email')"
-                                :class="formValidation.fields.email.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
-                        </div>
-
-                        <div class="col-span-6 sm:col-span-3">
-                            <label for="phone_number" class="block text-sm font-medium text-gray-700">Numéro de
-                                téléphone</label>
-                            <input type="text" name="phone_number" id="phone_number" autocomplete="phone" placeholder="+33612345678"
-                                class="p-2 mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-2xl"
-                                x-model="fields.phone_number" @blur="validateField('phone_number')"
-                                :class="formValidation.fields.phone_number.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
-                        </div>
-
-                        <div class="col-span-6 sm:col-span-3">
-                            <label for="birthdate" class="block text-sm font-medium text-gray-700">Date de
-                                naissance</label>
-                            <input type="date" name="birthdate" id="birthdate" autocomplete="birthdate" placeholder="JJ/MM/AAAA"
-                                class="p-2 mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-2xl"
-                                x-model="fields.birthdate" @blur="validateField('birthdate')"
-                                :class="formValidation.fields.birthdate.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
-                        </div>
-                    {{ $fieldName := "address" }}
-                    {{if .ViewState.driver.Data.address}}
-                    {{$default := .ViewState.driver.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-gray-900">Informations optionnelles</h3>
-                    <p class="mt-1 text-sm text-gray-500">Autres informations de profil optionnelles</p>
-                </div>
-                <div class="mt-5 space-y-6 md:mt-0 md:col-span-2">
-                    <div class="grid grid-cols-6 gap-6">
-
-                        {{range .ViewState.profile_optional_fields}}
-                        <div class="col-span-6 sm:col-span-3">
-                            <label for="{{.name}}" class="block text-sm font-medium text-gray-700">{{.label}}</label>
-                            {{if eq .type "select"}}
-                            <div class="sm:mt-0 sm:col-span-2">
-                                <select id="{{.name}}" name="{{.name}}"
-                                    {{if eq .name "gender"}}x-model="gender"{{else}}x-model="other_properties.{{.name}}"{{end}}
-                                    class="p-2 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 border-gray-300 rounded-2xl">
-                                    {{range .options}}
-                                    <option value="{{.value}}">{{.label}}</option>
-                                    {{end}}
-                                </select>
-                            </div>
-                            {{else if eq .type "textarea"}}
-                            <textarea id="{{.name}}" name="{{.name}}" rows="3" x-model="other_properties.{{.name}}"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm border-gray-300 rounded-2xl"></textarea>
-                            {{else if eq .type "multicheckbox"}}
-                            <div class="mt-1 space-y-2">
-				{{$name := .name}}
-                                {{range .options}}
-                                <label class="flex items-center">
-                                    <input type="checkbox" name="{{$name}}[]" value="{{.value}}"
-				    x-model="other_properties.{{$name}}___{{.value}}"
-                                           class="h-4 w-4 text-co-blue focus:ring-co-blue border-co-blue rounded">
-                                    <span class="ml-2 text-sm text-gray-700">{{.label}}</span>
-                                </label>
-                                {{end}}
-                            </div>
-                            {{else if eq .type "date"}}
-                            <input type="date" id="{{.name}}" name="{{.name}}" x-model="other_properties.{{.name}}"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm border-gray-300 rounded-2xl">
-                            {{else if eq .type "number"}}
-                            <input type="number" id="{{.name}}" name="{{.name}}" x-model="other_properties.{{.name}}"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm border-gray-300 rounded-2xl">
-                            {{else}}
-                            <input type="text" id="{{.name}}" name="{{.name}}" x-model="other_properties.{{.name}}"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm border-gray-300 rounded-2xl">
-                            {{end}}
-                        </div>
-                        {{end}}
-
-                        <!-- <div class="col-span-3 sm:col-span-3">
-                            <label class="block text-sm font-medium text-gray-700"> Photo </label>
-                            <div class="mt-1 flex items-center space-x-5">
-                                <span class="inline-block h-12 w-12 rounded-co overflow-hidden bg-gray-100">
-                                    {{.IconSet.Icon "img:profile-picture-placeholder" "h-full w-full"}}
-                                </span>
-                                <button type="button"
-                                    class="bg-white py-2 px-3 border border-gray-300 rounded-2xl shadow-sm text-sm leading-4 font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">
-                                    Charger la photo
-                                </button>
-                            </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 liés au conducteur, utiles pour exploiter les fonctionnalités de PARCOURSMOB</p>
-                </div>
-                <div class="mt-5 space-y-6 md:mt-0 md:col-span-2">
-
-                    {{ $fieldName := "address" }}
-                    {{ template "address_autocomplete" dict "FieldName" $fieldName }}
-
-                </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/solidarity-transport/drivers/{{.ViewState.driver.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 le conducteur solidaire</button>
-        </div>
-    </form>
-</div>
-{{end}}
-

web/layouts/solidarity_transport/ext/booking_proposal.html

@@ -1,100 +0,0 @@
-
-{{define "main"}}
-<html class="h-full bg-gray-50">
-    <head>
-        <title>PARCOURSMOB</title>
-        <link rel="stylesheet" href="/public/css/main.css" />
-  <link href="https://cdn.jsdelivr.net/npm/quill@2.0.2/dist/quill.snow.css" rel="stylesheet" />
-  <link href="https://cdn.jsdelivr.net/npm/maplibre-gl@^5.2.0/dist/maplibre-gl.css" rel="stylesheet" />
-  <script src="https://cdn.jsdelivr.net/npm/@kingshott/iodine@8.1.0/dist/iodine.min.umd.js" defer></script>
-  <script defer src="https://cdn.jsdelivr.net/npm/alpinejs@3.x.x/dist/cdn.min.js"></script>
-  <script src="https://cdn.jsdelivr.net/npm/quill@2.0.2/dist/quill.js"></script>
-  <script src="https://cdn.jsdelivr.net/npm/maplibre-gl@^5.2.0/dist/maplibre-gl.js"></script>
-  <script src="https://cdn.jsdelivr.net/npm/pmtiles@^4.3.0/dist/pmtiles.js"></script>
-  <script src="https://cdn.jsdelivr.net/npm/@protomaps/basemaps@5/dist/basemaps.js" crossorigin="anonymous"></script>
-  <script src="https://cdn.jsdelivr.net/npm/@turf/turf@7/turf.min.js"></script>
-  <script src="https://cdn.jsdelivr.net/npm/polyline@0.2.0/src/polyline.js"></script>
-  <meta name=viewport content="width=device-width" />
-  <!--<script defer type="text/javascript" src="/public/js/main.js" defer></script>-->
-    </head>
-    <body class="h-full">
-      <div class="flex flex-col justify-center py-12">
-            <div class="">
-              <h2 class="m-4 mt-6 text-center text-3xl font-extrabold text-gray-900">Demande de trajet solidaire</h2>
-              <p class="m-4 text-center">
-              {{if eq .ViewState.booking.Status "WAITING_CONFIRMATION"}}
-                Vous avez une nouvelle demande de trajet
-              {{else if eq .ViewState.booking.Status "VALIDATED"}}
-                Demande déjà validée 
-              {{else if eq .ViewState.booking.Status "CANCELLED"}}
-                Trajet annulé
-              {{end}}
-              </p>
-      </div>
-      <div class="h-50 w-full">
-  {{template "journey_map" (dict "driver_journey" .ViewState.booking.Journey "driver" .ViewState.driver "passenger" .ViewState.passenger "beneficiaries" .ViewState.beneficiaries)}}
-      </div>
-       <div class="grid grid-cols-1">
-                    <div class="p-4 py-5 sm:px-6">
-                        <dl class="grid grid-cols-1 gap-x-4 gap-y-8 sm:grid-cols-2">
-                            <div class="sm:col-span-1">
-                                <dt class="font-medium text-gray-500">Type de de trajet</dt>
-                                {{if .ViewState.booking.Journey.Noreturn}}<dd class="mt-1 text-gray-900">Aller simple (pas de retour)</dd>
-              {{else}}<dd class="mt-1 text-gray-900">Aller-retour ({{.ViewState.booking.ReturnWaitingDuration | shortDuration}} d'attente estimée sur place)</dd>{{end}}
-                            </div>
-                            <div class="sm:col-span-1">
-                                <dt class="font-medium text-gray-500">Passager</dt>
-                                <dd class="mt-1 text-gray-900">{{.ViewState.passenger.Data.first_name}} {{.ViewState.passenger.Data.last_name}}</dd>
-                            </div>
-                            <div class="sm:col-span-1">
-                                <dt class="font-medium text-gray-500">Lieu de récupération du passager</dt>
-                                <dd class="mt-1 text-gray-900">{{.ViewState.booking.Journey.PassengerPickup.Properties.label}}</dd>
-                            </div>
-                            <div class="sm:col-span-1">
-                                <dt class="font-medium text-gray-500">Lieu de destination</dt>
-                                <dd class="mt-1 text-gray-900">{{.ViewState.booking.Journey.PassengerDrop.Properties.label}}</dd>
-                            </div>
-                            <div class="sm:col-span-1">
-                                <dt class="font-medium text-gray-500">Date et heure du rendez-vous</dt>
-                                <dd class="mt-1 text-gray-900">{{ timeFormat .ViewState.booking.Journey.PassengerPickupDate "02/01/2006 15:04"}}</dd>
-                            </div>
-                            {{if eq .ViewState.booking.Status "VALIDATED"}}
-                            <div class="sm:col-span-1">
-                                <dt class="font-medium text-gray-500">Numéro de téléphone du passager</dt>
-                                <dd class="mt-1 text-co-blue"><a href="tel:{{.ViewState.passenger.Data.phone_number}}">{{ .ViewState.passenger.Data.phone_number}}</a></dd>
-                            </div>
-                            {{end}}
-                        </dl>
-                    </div>
-  <div>
-          </div>
-          <div class="flex flex-col justify-center m-4 sm:flex-row">
-              {{if eq .ViewState.booking.Status "WAITING_CONFIRMATION"}}
-          <form method="POST">
-              <input type="hidden" name="action" value="confirm" />
-    {{template "submit_with_sms" 
-      dict  "IconSet" .IconSet 
-            "Viewstate" .ViewState 
-            "ComponentState" (dict "submitText" "Valider"
-                                   "headerText" "Validez le trajet" 
-                                   "infoText" "Le message suivant sera envoyé à votre passager. Vous pouvez le personnaliser.") 
-            "SMSState" (dict "name" (.ViewState.config.GetString "service_name") 
-                             "driver_first_name" .ViewState.driver.Data.first_name
-                             "driver_last_name" .ViewState.driver.Data.last_name
-                             "address" .ViewState.booking.Journey.PassengerDrop.Properties.label
-                             "date" (timeFormat .ViewState.booking.Journey.PassengerPickupDate "02/01/2006 15:04")
-                             "phone_number" .ViewState.driver.Data.phone_number)}}
-            </form>
-          <form method="POST">
-              <input type="hidden" name="action" value="cancel" />
-            <button type="submit"
-              class="m-4 inline-flex items-center justify-center rounded-2xl border border-transparent bg-co-red px-4 py-2 text-sm font-medium text-white shadow-sm focus:outline-none focus:ring-2 focus:ring-co-red focus:ring-offset-2 sm:w-auto">
-              Refuser
-                          </button>
-            </form>
-              {{end}}
-            </div>
-      </div>
-    </body>
-</html>
-{{end}}

web/layouts/solidarity_transport/overview.html

@@ -1,75 +0,0 @@
-{{ define "content" }}
-{{$defaultTab := "solidarityService"}}
-<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8">
-  <h1 class="text-2xl font-semibold text-gray-900">Transport solidaire</h1>
-
-    <div class="bg-white shadow sm:rounded-lg sm:overflow-hidden my-4" x-data="{
-	    tab: '{{or .ViewState.tab $defaultTab}}',
-        to(event) {
-            this.tab = event.target.value
-        }
-    }">
-        <div class="divide-y divide-gray-200">
-            <div>
-                <div class="hidden sm:block">
-                    <div class="border-b border-gray-200 pl-4 flex justify-between items-center">
-                        <nav class="-mb-px flex space-x-8" aria-label="Tabs"> 
-                            <a href="#" @click="tab = 'solidarityService'"
-                                class="whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm"
-                                :class="tab == 'solidarityService' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
-                                Trajets </a>
-                            
-                            <a href="#" @click="tab = 'drivers'"
-                                class="whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm"
-                                :class="tab == 'drivers' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
-                                Conducteurs </a>
-                            
-                            <!--<a href="#" @click="tab = 'beneficiaries'"
-                                class="whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm"
-                                :class="tab == 'beneficiaries' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
-                                Bénéficiaires </a>-->
-
-                            <a href="#" @click="tab = 'solidarityHistory'"
-                                class="whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm"
-                                :class="tab == 'solidarityHistory' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
-                                Trajets passés </a>
-                        </nav>
-
-                        <div class="pr-4" x-show="tab == 'solidarityHistory'">
-                            {{$exportURL := "/exports/solidarity-transport/bookings.xlsx"}}
-                            {{$hasParams := false}}
-                            {{if .ViewState.hist_filters.date_start}}{{$exportURL = printf "%s?start_date=%s" $exportURL .ViewState.hist_filters.date_start}}{{$hasParams = true}}{{end}}
-                            {{if .ViewState.hist_filters.date_end}}{{if $hasParams}}{{$exportURL = printf "%s&end_date=%s" $exportURL .ViewState.hist_filters.date_end}}{{else}}{{$exportURL = printf "%s?end_date=%s" $exportURL .ViewState.hist_filters.date_end}}{{$hasParams = true}}{{end}}{{end}}
-                            {{if .ViewState.hist_filters.status}}{{if $hasParams}}{{$exportURL = printf "%s&status=%s" $exportURL .ViewState.hist_filters.status}}{{else}}{{$exportURL = printf "%s?status=%s" $exportURL .ViewState.hist_filters.status}}{{$hasParams = true}}{{end}}{{end}}
-                            {{if .ViewState.hist_filters.departure_geo}}{{if $hasParams}}{{$exportURL = printf "%s&departure_geo=%s" $exportURL .ViewState.hist_filters.departure_geo}}{{else}}{{$exportURL = printf "%s?departure_geo=%s" $exportURL .ViewState.hist_filters.departure_geo}}{{$hasParams = true}}{{end}}{{end}}
-                            {{if .ViewState.hist_filters.destination_geo}}{{if $hasParams}}{{$exportURL = printf "%s&destination_geo=%s" $exportURL .ViewState.hist_filters.destination_geo}}{{else}}{{$exportURL = printf "%s?destination_geo=%s" $exportURL .ViewState.hist_filters.destination_geo}}{{$hasParams = true}}{{end}}{{end}}
-                            {{if .ViewState.hist_filters.passenger_address_geo}}{{if $hasParams}}{{$exportURL = printf "%s&passenger_address_geo=%s" $exportURL .ViewState.hist_filters.passenger_address_geo}}{{else}}{{$exportURL = printf "%s?passenger_address_geo=%s" $exportURL .ViewState.hist_filters.passenger_address_geo}}{{$hasParams = true}}{{end}}{{end}}
-
-                            <a href="{{$exportURL}}">
-                                <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">
-                                    <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 mr-3" fill="none" viewBox="0 0 24 24" stroke="currentColor">
-                                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 10v6m0 0l-3-3m3 3l3-3m2 8H7a2 2 0 01-2-2V5a2 2 0 012-2h5.586a1 1 0 01.707.293l5.414 5.414a1 1 0 01.293.707V19a2 2 0 01-2 2z" />
-                                    </svg>
-                                    Exporter
-                                </button>
-                            </a>
-                        </div>
-                    </div>
-                </div>
-            </div>
-
-            <div x-show="tab == 'drivers'">{{template "solidarity_drivers_list" .}}</div>
-
-
-            <div x-show="tab == 'beneficiaries'">1</div>
-            <div x-show="tab == 'solidarityService'">{{template "solidarity_bookings_list" .}}</div>
-            <div x-show="tab == 'solidarityHistory'">{{template "solidarity_bookings_history" .}}</div>
-
-        </div>
-    </div>
-
-
-</div>
-
-{{ end }}

web/layouts/support/support.html

@@ -1,17 +1,6 @@
 {{define "content"}}
 
-<div class="mx-auto max-w-7xl px-4 sm:px-6 lg:px-8 space-y-6" x-data="{
+ <div class="mx-auto max-w-7xl px-4 sm:px-6 lg:px-8 space-y-6">
-        comment: '',
-        init() {
-            let quill = new Quill(this.$refs.quill, { theme: 'snow', modules: { toolbar: [[{ 'header': [1, 2, 3, 4, 5, 6, false] }], ['bold', 'italic', 'underline'], ['link', 'image']] } })
- 
-            quill.root.innerHTML = this.comment
- 
-            quill.on('text-change', () => {
-                this.comment = quill.root.innerHTML
-            })
-        },
-    }">
     <h1 class="text-2xl font-semibold text-gray-900">Demande de support technique</h1>
     <div class="bg-white py-2 px-4 shadow sm:rounded-lg sm:px-10">
         <p class="text-sm text-gray-600 p-4">
@@ -21,11 +10,9 @@
 
         <div class="mb-4 w-full bg-gray-50 rounded-3xl border border-gray-200 dark:bg-gray-700 dark:border-gray-600">
             <div class="py-2 px-4 rounded-3xl bg-white dark:bg-gray-800">
-              <label class="sr-only">Votre message</label>
+                <label class="sr-only">Votre message</label>
-                
-              <div x-ref="quill" class="block w-full resize-none border-0 border-b border-transparent p-0 pb-2 focus:border-co-blue focus:ring-0 sm:text-sm"></div>
-              <input type="hidden" name="comment" x-model="comment" />
                 
+                <textarea name="comment" rows="4" class="block w-full resize-none border-0 border-b border-transparent p-0 pb-2 focus:border-co-blue focus:ring-0 sm:text-sm" placeholder="Votre message..."  required></textarea>
             </div>
             <div class="flex justify-center items-center py-2 px-3 border-t dark:border-gray-600">
                 <button type="submit" value="send message" class="px-2 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">

web/layouts/vehicles/bookings-list.html

@@ -5,12 +5,12 @@
             <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">
+            <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> -->
+            </a>
         </div>
     </div>
 </div>
@@ -54,12 +54,8 @@
                             
                             {{range .ViewState.bookings}}
                             <tr>
-                                <td class="flex-col py-4 pl-4 pr-3 text-sm sm:pl-6 text-center">
+                                <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6 text-center">
-                                    {{if .Deleted}}
+                                    {{if .Data.administrator_unavailability}}
-                                    <span class="p-1 bg-co-red text-white text-xs font-bold rounded-xl" >
-                                        Supprimé
-                                    </span>
-                                    {{else if .Data.administrator_unavailability}}
                                     <span class="p-1 bg-black text-white text-xs font-bold rounded-xl" >
                                         Retiré
                                     </span>
@@ -80,11 +76,15 @@
                                         </span>
                                         {{end}}
                                     {{end}}
+                                    {{if not .bookings}}
+                                    <span class="p-1 bg-black text-white text-xs font-bold rounded-xl" >
+                                       Disponible
+                                    </span>
+                                    {{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>
-                                
                                 <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>