diff --git a/config.yaml b/config.yaml
index 0289ca5..112dc0e 100644
--- a/config.yaml
+++ b/config.yaml
@@ -132,14 +132,10 @@ views:
     booking_display:
       files:
         - web/layouts/vehicles/booking-display.html
-        - web/layouts/vehicles_management/_partials/booking-diags.html
     bookings_list:
       files:
         - web/layouts/vehicles_management/_partials/bookings-list.html
         - web/layouts/vehicles/bookings-list.html
-    create_booking_diag:
-      files:
-        - web/layouts/vehicles/create-booking-diag.html
   vehicles_management:
     overview:
       files:
@@ -159,7 +155,6 @@ views:
       files:
         - web/layouts/vehicles_management/_partials/calendar.html
         - web/layouts/vehicles_management/fleet-display.html
-        - web/layouts/vehicles_management/_partials/vehicle-diags.html
     fleet_update:
       files:
         - web/layouts/_partials/address_autocomplete.html
@@ -169,16 +164,9 @@ views:
     booking_display:
       files:
         - web/layouts/vehicles_management/booking-display.html
-        - web/layouts/vehicles_management/_partials/booking-diags.html
     delete_booking:
       files:
         - web/layouts/vehicles_management/delete-booking.html
-    create_vehicle_diag:
-      files:
-        - web/layouts/vehicles_management/create-vehicle-diag.html
-    create_booking_diag:
-      files:
-        - web/layouts/vehicles_management/create-booking-diag.html
   agenda:
     list:
       files:
@@ -259,23 +247,6 @@ views:
     display_group:
       files:
         - web/layouts/group_module/display_group.html
-  diags:
-    list:
-      files:
-        - web/layouts/diags/home.html
-    display_diag:
-      files:
-        - web/layouts/diags/display-diag.html
-        - web/layouts/diags/_partials/diags-files.html
-    delete:
-      files:
-        - web/layouts/diags/delete-diag.html
-    update:
-      files:
-        - web/layouts/diags/update-diag.html
-    history:
-      files:
-        - web/layouts/diags/history-diags.html
 
   solidarity_transport:
     overview:
diff --git a/web/layouts/beneficiaries/_partials/beneficiary-diags.html b/web/layouts/beneficiaries/_partials/beneficiary-diags.html
deleted file mode 100644
index 4ed0fa2..0000000
--- a/web/layouts/beneficiaries/_partials/beneficiary-diags.html
+++ /dev/null
@@ -1,58 +0,0 @@
-{{define "beneficiary_diags"}}
-{{ $calendarIcon := .IconSet.Icon "hero:outline/calendar" "h-6 w-6" }}
-{{ $carIcon := .IconSet.Icon "tabler-icons:car" "h-6 w-6"}}
-<div class="bg-white shadow sm:rounded-lg">
-    <div class="px-4 py-5 sm:px-6">
-        <div class="flex items-center space-x-5">
-            <h2 id="timeline-title" class="text-lg font-medium text-gray-900">Diagnostics réalisés</h2>
-            <a href="{{.ViewState.beneficiary.ID}}/create-diag">
-                <button type="button"
-                class="flex justify-around 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"}}
-                Créer un diagnostic
-                </button>
-            </a>
-        </div>
-    </div>
-    <div class="border-t border-gray-200">
-        {{ $diagCount := len .ViewState.diags }}
-        <ul role="list" class="divide-y divide-gray-200 flex-1">
-            {{if eq $diagCount 0}}
-                <li class="py-2 px-4">
-                    <p class="py-5 mt-1 max-w-2xl text-sm text-gray-500">Aucun diagnostique effectué pour le moment.</p>
-                </li>
-            {{else}}
-                {{range .ViewState.diags}}
-                {{ $diags := .ID }}
-                {{if eq .Deleted false}}
-                    <li class="py-5 px-4 flex">
-                            <div class="flex-1 ml-3">
-                                <a href="/app/diags/{{$diags}}"class="mt-1 text-sm text-gray-900">{{.Name}}</a>
-                            </div>
-                            <div class="flex-1 ml-3">
-                                <p class="mt-1 text-sm text-gray-900">{{(timeFrom .Diagdate).Format "02/01/2006"}}</p>
-                            </div>
-                            <a href="/app/diags/{{$diags}}" 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 diagnostic</span></button>
-                            </a>
-                    </li>
-                {{end}}
-                {{if eq .Deleted true}}
-                    <li class="py-5 px-4 flex">
-                            <div class="flex-1 ml-3">
-                                <p class="mt-1 text-sm text-gray-900">{{.Name}}</p>
-                            </div>
-                            <div class="flex-1 ml-3">
-                                <p class="mt-1 text-sm text-gray-900">{{(timeFrom .Diagdate).Format "02/01/2006"}}</p>
-                            </div>
-                        <div class="flex-1 ml-3">
-                            <p class="mt-1 text-sm text-gray-900">Ce diagnostic a été retiré</p>
-                        </div>
-                    </li>
-                {{end}}
-                {{end}}
-            {{end}}
-        </ul>
-    </div>
-</div>
-{{end}}
\ No newline at end of file
diff --git a/web/layouts/beneficiaries/create-diag.html b/web/layouts/beneficiaries/create-diag.html
deleted file mode 100644
index d91e96e..0000000
--- a/web/layouts/beneficiaries/create-diag.html
+++ /dev/null
@@ -1,110 +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">Ajouter un diagnostic</h1>
-</div>
-
-<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8 mt-8"
-    x-data="{
-        fields: {
-            name: null,
-            namespace: 'parcoursmob_beneficiaries',
-        },
-        rules: {
-            name: ['required'],
-            namespace: ['required'],
-        },
-        formValidation: {
-            valid: false,
-            fields: {
-                name: {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 obligatoires
-                        pour créer un diagnostic dans PARCOURSMOB</p>
-                </div>
-                <div class="mt-5 md:mt-0 md:col-span-2">
-                    <div class="grid grid-cols-6 gap-6">
-                        <div class="col-span-6 sm:col-span-3">
-                            <label for="name" class="block text-sm font-medium text-gray-700">Nom</label>
-                            <input type="text" name="name" id="name" autocomplete="name"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-2xl"
-                                x-model="fields.name" @blur="validateField('name')"
-                                :class="formValidation.fields.name.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <input type="hidden" name="namespace" value="parcoursmob_beneficiaries" />
-        <!-- <div class="bg-white shadow px-4 py-5 sm:rounded-lg sm:p-6 mt-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">Schéma JSON</h3>
-                    <p class="mt-1 text-sm text-gray-500">Schéma JSON pour le diagnostic</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="json_schema" class="block text-sm font-medium text-gray-700">Schéma JSON</label>
-                            <textarea name="json_schema" id="json_schema" autocomplete="json_schema"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-2xl"
-                                x-model="fields.json_schema" @blur="validateField('json_schema')"
-                                :class="formValidation.fields.json_schema.valid == false ? 'border-co-red border-2' : 'border-gray-300'"></textarea>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="bg-white shadow px-4 py-5 sm:rounded-lg sm:p-6 mt-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">Schéma UI</h3>
-                    <p class="mt-1 text-sm text-gray-500">Schéma UI pour le diagnostic</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="ui_schema" class="block text-sm font-medium text-gray-700">Schéma UI</label>
-                            <textarea name="ui_schema" id="ui_schema" autocomplete="ui_schema"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-2xl"
-                                x-model="fields.ui_schema" @blur="validateField('ui_schema')"
-                                :class="formValidation.fields.ui_schema.valid == false ? 'border-co-red border-2' : 'border-gray-300'"></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/beneficiaries/{{.ViewState.beneficiary}}">
-                <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 diagnostique</button>
-        </div>
-    </form>
-</div>
-{{end}}
\ No newline at end of file
diff --git a/web/layouts/beneficiaries/display.html b/web/layouts/beneficiaries/display.html
index d47130e..670188d 100644
--- a/web/layouts/beneficiaries/display.html
+++ b/web/layouts/beneficiaries/display.html
@@ -200,11 +200,6 @@
                                             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'">
                                             Gestionnaires </a>
-
-                                        <!--<a href="#" @click="tab = 'diags'"
-                                            class="whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm"
-                                            :class="tab == 'diags' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
-                                            Diagnostics </a>-->
                                     </nav>
                                 </div>
                             </div>
diff --git a/web/layouts/diags/_partials/diags-files.html b/web/layouts/diags/_partials/diags-files.html
deleted file mode 100644
index f3f2e5e..0000000
--- a/web/layouts/diags/_partials/diags-files.html
+++ /dev/null
@@ -1,132 +0,0 @@
-{{define "diags_files"}}
-<div class="px-4 py-6 sm:px-6"
-x-data="{
-    fields: {
-        name: null,
-        type: diagnostic,
-        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/diags/{{$.ViewState.diag.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}}
-    <h3 class="text-lg">Ajouter un document</h3>
-    <form method="POST" action="/app/diags/{{.ViewState.diag.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>
-</div>
-{{end}}
diff --git a/web/layouts/diags/delete-diag.html b/web/layouts/diags/delete-diag.html
deleted file mode 100644
index eba96c1..0000000
--- a/web/layouts/diags/delete-diag.html
+++ /dev/null
@@ -1,32 +0,0 @@
-{{define "content"}}
-<div>
-        <form method="POST" >
-
-            <div class="fixed inset-0 bg-gray-500 bg-opacity-75 transition-opacity"></div>
-        
-            <div class="fixed inset-0 z-10 overflow-y-auto">
-            <div class="flex min-h-full items-end justify-center p-4 text-center sm:items-center sm:p-0">
-
-                <div class="relative transform overflow-hidden rounded-lg bg-white px-4 pt-5 pb-4 text-left shadow-xl transition-all sm:my-8 sm:w-full max-w-lg sm:p-6">
-                <div>
-                    <div class="mx-auto flex h-12 w-12 items-center justify-center rounded-co bg-co-blue text-white">
-                    {{.IconSet.Icon "hero:outline/information-circle" "h-6 w-6"}}
-                    </div>
-                    <div class="mt-3 text-center sm:mt-5">
-                        <h3 class="text-lg font-medium leading-6 text-gray-900" id="modal-title">Confirmation de retrait</h3>
-                        <div class="mt-2">
-                            <p class="text-sm text-gray-500">Voulez-vous vraiment retirer ce dignostique ?</p>
-                        </div>
-                    </div>
-                </div>
-                <div class="mt-5 sm:mt-6 sm:grid sm:grid-flow-row-dense sm:grid-cols-2">
-                    <a href="/app/diags/{{.ViewState.diag.ID}}" class="mt-3 inline-flex w-full justify-center rounded-l-2xl border border-gray-300 bg-white px-4 py-2 text-base font-medium text-gray-700 shadow-sm hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 sm:col-start-1 sm:mt-0 sm:text-sm">Annuler</a>
-                    <button  type="submit" class="inline-flex w-full justify-center rounded-r-2xl border border-transparent bg-co-blue px-4 py-2 text-base font-medium text-white shadow-sm hover:bg-co-blue focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 sm:col-start-2 sm:text-sm">Confirmation</button>
-                </div>
-                </div>
-            </div>
-            </div>
-        </form>
-
- </div>
-{{end}}
\ No newline at end of file
diff --git a/web/layouts/diags/display-diag.html b/web/layouts/diags/display-diag.html
deleted file mode 100644
index cfc5718..0000000
--- a/web/layouts/diags/display-diag.html
+++ /dev/null
@@ -1,80 +0,0 @@
-{{ define "content" }}
-<main class="py-10">
-    <div class="max-w-3xl mx-auto px-4 sm:px-6 md:flex md:items-center md:justify-between md:space-x-5 lg:max-w-7xl lg:px-8">
-        <div class="flex items-center space-x-5">
-            <div>
-                <h1 class="text-2xl font-bold text-gray-900">{{.ViewState.diag.Name}}</h1>
-            </div>
-            {{$diag := .ViewState.diag.ID}}
-        </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 eq .ViewState.diag.Deleted false}}
-            <a href="/app/diags/{{$diag}}/update" class="inline-flex"><button type="button"
-                class="w-full px-4 py-2 border border-transparent text-sm font-medium rounded-2xl shadow-sm text-white bg-co-blue hover:bg-co-blue focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-co-blue">Modifier</button></a>
-            <a href="/app/diags/{{$diag}}/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>
-            {{end}}
-        </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="diag-information-title">
-                <div class="bg-white shadow sm:rounded-lg">
-                    <div class="px-4 py-5 sm:px-6">
-                        <h2 id="diag" class="text-lg leading-6 font-medium text-gray-900">Informations</h2>
-                        <p class="mt-1 max-w-2xl text-sm text-gray-500">Informations sur le diagnostic.</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">Date du diagnostic</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{(timeFrom .ViewState.diag.Diagdate).Format "02/01/2006"}}</dd>
-                            </div>
-                            {{if eq .ViewState.diag.Namespace "parcoursmob_beneficiaries"}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Type</dt>
-                                <dd class="mt-1 text-sm text-gray-900">Diagnostic personnelle</dd>
-                            </div>
-                            {{end}}
-                            {{if eq .ViewState.diag.Namespace "parcoursmob_vehicles"}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Type</dt>
-                                <dd class="mt-1 text-sm text-gray-900">Diagnostic automobile</dd>
-                            </div>
-                            {{end}}
-                            {{if eq .ViewState.diag.Namespace "parcoursmob_bookings"}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Type</dt>
-                                <dd class="mt-1 text-sm text-gray-900">Diagnostic véhicule réservé</dd>
-                            </div>
-                            {{end}}
-                            <!-- {{if .ViewState.diag.Json_schema}}
-                            <div class="sm:col-span-2">
-                                <dt class="text-sm font-medium text-gray-500">JSON_schema</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{.ViewState.diag.Json_schema}}</dd>
-                            </div>
-                            {{end}}
-                            {{if .ViewState.diag.Ui_schema}}
-                            <div class="sm:col-span-2">
-                                <dt class="text-sm font-medium text-gray-500">UI_schema</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{.ViewState.diag.Ui_schema}}</dd>
-                            </div>
-                            {{end}} -->
-                        </dl>
-                    </div>
-                </div>
-            </section>
-            <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 "diags_files" .}}</div>
-                            </div>
-                        </div>
-                    </section>
-                </div>
-            </div>
-{{ end }}
\ No newline at end of file
diff --git a/web/layouts/diags/history-diags.html b/web/layouts/diags/history-diags.html
deleted file mode 100644
index a295c3d..0000000
--- a/web/layouts/diags/history-diags.html
+++ /dev/null
@@ -1,73 +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">Diagnostics retirés</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">
-            <a href="/app/diags/">
-                <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">
-                    Retour
-                </button>
-            </a>
-        </div>
-    </div>
-</div>
-
-<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8">
-    <div class="mt-8 flex flex-col">
-        <div class="-my-2 -mx-4 overflow-x-auto sm:-mx-6 lg:-mx-8">
-            <div class="inline-block min-w-full py-2 align-middle md:px-6 lg:px-8">
-                <div class="overflow-hidden shadow ring-1 ring-black ring-opacity-5 md:rounded-lg">
-                    <table class="min-w-full divide-y divide-gray-300">
-                        <thead class="bg-gray-50">
-                            <tr>
-                                <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-                                    Nom du diagnostic
-                                </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="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.diags}}
-                                {{if eq .Deleted true}}
-                                <a href="/app/diags/{{.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>
-                                    </td>
-                                    <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-                                        {{if eq .Namespace "parcoursmob_beneficiaries"}}
-                                        <div class="text-gray-500">Diagnostic personnelle</div>
-                                        {{end}}
-                                        {{if eq .Namespace "parcoursmob_vehicles"}}
-                                        <div class="text-gray-500">Diagnostic automobile</div>
-                                        {{end}}
-                                        {{if eq .Namespace "parcoursmob_bookings"}}
-                                        <div class="text-gray-500">Diagnostic véhicule réservé</div>
-                                        {{end}}
-                                    </td>
-                                    <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-                                        <a href="/app/diags/{{.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}}
\ No newline at end of file
diff --git a/web/layouts/diags/home.html b/web/layouts/diags/home.html
deleted file mode 100644
index ae7a699..0000000
--- a/web/layouts/diags/home.html
+++ /dev/null
@@ -1,84 +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">Diagnostics effectués</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">
-            <a href="/app/diags/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>
-        </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">
-                                    Nom du diagnostic
-                                </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">
-                                    Date
-                                </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.diags}}
-                                <a href="/app/diags/{{.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>
-                                    </td>
-                                    <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-                                        {{if eq .Namespace "parcoursmob_beneficiaries"}}
-                                        <div class="text-gray-500">Diagnostic personnelle</div>
-                                        {{end}}
-                                        {{if eq .Namespace "parcoursmob_vehicles"}}
-                                        <div class="text-gray-500">Diagnostic automobile</div>
-                                        {{end}}
-                                        {{if eq .Namespace "parcoursmob_bookings"}}
-                                        <div class="text-gray-500">Diagnostic véhicule réservé</div>
-                                        {{end}}
-                                    </td>
-                                    <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-                                        <div class="font-medium text-gray-900">{{(timeFrom .Diagdate).Format "02/01/2006"}}</div>
-                                    </td>
-                                    <td class="whitespace nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-                                        {{if eq .Deleted true}}
-                                        <div 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">Diagnostic retiré</div>
-                                        {{end}}
-                                    </td>
-                                    <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-                                        <a href="/app/diags/{{.ID}}" 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 diagnostic</span></button>
-                                            </a>
-                                    </td>
-                                </tr>
-                                </a>
-                                {{end}}
-                            </tbody>
-                        </thead>
-                    </table>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-{{end}}
\ No newline at end of file
diff --git a/web/layouts/diags/update-diag.html b/web/layouts/diags/update-diag.html
deleted file mode 100644
index 1c53e9e..0000000
--- a/web/layouts/diags/update-diag.html
+++ /dev/null
@@ -1,117 +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">Éditer un diagnostique</h1>
-</div>
-
-<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8 mt-8"
-    x-data="{
-        fields: {
-            name: '{{.ViewState.diag.Name}}',
-            namespace: '{{.ViewState.diag.Namespace}}',
-            json_schema: '{{.ViewState.diag.Json_schema}}',
-            ui_schema: '{{.ViewState.diag.Ui_schema}}',
-        },
-        rules: {
-            name: ['required'],
-            namespace: ['required'],
-            json_schema: ['required'],
-            ui_schema: ['required']
-        },
-        formValidation: {
-            valid: false,
-            fields: {
-                name: {valid: null},
-                json_schema: {valid: null},
-                ui_schema: {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 obligatoires
-                        pour éditer un diagnostique dans PARCOURSMOB</p>
-                </div>
-                <div class="mt-5 md:mt-0 md:col-span-2">
-                    <div class="grid grid-cols-6 gap-6">
-                        <div class="col-span-6 sm:col-span-3">
-                            <label for="name" class="block text-sm font-medium text-gray-700">Nom</label>
-                            <input type="text" name="name" id="name" autocomplete="given-name"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-2xl"
-                                x-model="fields.name" @blur="validateField('name')"
-                                :class="formValidation.fields.name.valid == false ? 'border-co-red border-2' : 'border-gray-300'"
-                                value="{{.ViewState.diag.Name}}">
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <input type="hidden" name="namespace" value="{{.ViewState.diag.Namespace}}" />
-        <div class="bg-white shadow px-4 py-5 sm:rounded-lg sm:p-6 mt-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">Schéma JSON</h3>
-                    <p class="mt-1 text-sm text-gray-500">Schéma JSON pour le diagnostique</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="json_schema" class="block text-sm font-medium text-gray-700">Schéma JSON</label>
-                            <textarea name="json_schema" id="json_schema" autocomplete="json_schema"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-2xl"
-                                x-model="fields.json_schema" @blur="validateField('json_schema')"
-                                :class="formValidation.fields.json_schema.valid == false ? 'border-co-red border-2' : 'border-gray-300'"></textarea>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="bg-white shadow px-4 py-5 sm:rounded-lg sm:p-6 mt-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">Schéma UI</h3>
-                    <p class="mt-1 text-sm text-gray-500">Schéma UI pour le diagnostique</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="ui_schema" class="block text-sm font-medium text-gray-700">Schéma UI</label>
-                            <textarea name="ui_schema" id="ui_schema" autocomplete="ui_schema"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-2xl"
-                                x-model="fields.ui_schema" @blur="validateField('ui_schema')"
-                                :class="formValidation.fields.ui_schema.valid == false ? 'border-co-red border-2' : 'border-gray-300'"></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/diags/{{.ViewState.diag.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">Éditer le diagnostique</button>
-        </div>
-    </form>
-</div>
-{{end}}
\ No newline at end of file
diff --git a/web/layouts/vehicles/create-booking-diag.html b/web/layouts/vehicles/create-booking-diag.html
deleted file mode 100644
index 8fd6d26..0000000
--- a/web/layouts/vehicles/create-booking-diag.html
+++ /dev/null
@@ -1,110 +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">Ajouter un diagnostic</h1>
-</div>
-
-<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8 mt-8"
-    x-data="{
-        fields: {
-            name: null,
-            namespace: 'parcoursmob_bookings',
-        },
-        rules: {
-            name: ['required'],
-            namespace: ['required'],
-        },
-        formValidation: {
-            valid: false,
-            fields: {
-                name: {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 obligatoires
-                        pour créer un diagnostic dans PARCOURSMOB</p>
-                </div>
-                <div class="mt-5 md:mt-0 md:col-span-2">
-                    <div class="grid grid-cols-6 gap-6">
-                        <div class="col-span-6 sm:col-span-3">
-                            <label for="name" class="block text-sm font-medium text-gray-700">Nom</label>
-                            <input type="text" name="name" id="name" autocomplete="given-name"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-2xl"
-                                x-model="fields.name" @blur="validateField('name')"
-                                :class="formValidation.fields.name.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <input type="hidden" name="namespace" value="parcoursmob_bookings" />
-        <!-- <div class="bg-white shadow px-4 py-5 sm:rounded-lg sm:p-6 mt-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">Schéma JSON</h3>
-                    <p class="mt-1 text-sm text-gray-500">Schéma JSON pour le diagnostic</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="json_schema" class="block text-sm font-medium text-gray-700">Schéma JSON</label>
-                            <textarea name="json_schema" id="json_schema" autocomplete="json_schema"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-2xl"
-                                x-model="fields.json_schema" @blur="validateField('json_schema')"
-                                :class="formValidation.fields.json_schema.valid == false ? 'border-co-red border-2' : 'border-gray-300'"></textarea>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="bg-white shadow px-4 py-5 sm:rounded-lg sm:p-6 mt-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">Schéma UI</h3>
-                    <p class="mt-1 text-sm text-gray-500">Schéma UI pour le diagnostic</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="ui_schema" class="block text-sm font-medium text-gray-700">Schéma UI</label>
-                            <textarea name="ui_schema" id="ui_schema" autocomplete="ui_schema"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-2xl"
-                                x-model="fields.ui_schema" @blur="validateField('ui_schema')"
-                                :class="formValidation.fields.ui_schema.valid == false ? 'border-co-red border-2' : 'border-gray-300'"></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/vehicles/bookings/{{.ViewState.booking}}">
-                <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 diagnostique</button>
-        </div>
-    </form>
-</div>
-{{end}}
\ No newline at end of file
diff --git a/web/layouts/vehicles_management/_partials/booking-diags.html b/web/layouts/vehicles_management/_partials/booking-diags.html
deleted file mode 100644
index d330481..0000000
--- a/web/layouts/vehicles_management/_partials/booking-diags.html
+++ /dev/null
@@ -1,56 +0,0 @@
-{{define "booking_diags"}}
-{{ $calendarIcon := .IconSet.Icon "hero:outline/calendar" "h-6 w-6" }}
-{{ $carIcon := .IconSet.Icon "tabler-icons:car" "h-6 w-6"}}
-<div class="bg-white shadow sm:rounded-lg">
-    <div class="px-4 py-5 flex items-center space-x-5 sm:px-6">
-        <h2 id="timeline-title" class="text-lg font-medium text-gray-900">Diagnostics réalisés</h2>
-        <a href="{{.ViewState.booking.ID}}/create-diag">
-            <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"}}
-            Créer un diagnostic
-            </button>
-        </a>
-    </div>
-    <div class="border-t border-gray-200">
-        {{ $diagCount := len .ViewState.diags }}
-        <ul role="list" class="divide-y divide-gray-200 flex-1">
-            {{if eq $diagCount 0}}
-                <li class="py-2 px-4">
-                    <p class="py-5 mt-1 max-w-2xl text-sm text-gray-500">Aucun diagnostique effectué pour le moment.</p>
-                </li>
-            {{else}}
-                {{range .ViewState.diags}}
-                {{ $diags := .ID }}
-                {{if eq .Deleted false}}
-                    <li class="py-5 px-4 flex">
-                            <div class="flex-1 ml-3">
-                                <a href="/app/diags/{{$diags}}" class="mt-1 text-sm text-gray-900">{{.Name}}</a>
-                            </div>
-                            <div class="flex-1 ml-3">
-                                <p class="mt-1 text-sm text-gray-900">{{(timeFrom .Diagdate).Format "02/01/2006"}}</p>
-                            </div>
-                            <a href="/app/diags/{{$diags}}" 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 diagnostic</span></button>
-                            </a>
-                    </li>
-                {{end}}
-                {{if eq .Deleted true}}
-                    <li class="py-5 px-4 flex">
-                            <div class="flex-1 ml-3">
-                                <p class="mt-1 text-sm text-gray-900">{{.Name}}</p>
-                            </div>
-                            <div class="flex-1 ml-3">
-                                <p class="mt-1 text-sm text-gray-900">{{(timeFrom .Diagdate).Format "02/01/2006"}}</p>
-                            </div>
-                        <div class="flex-1 ml-3">
-                            <p class="mt-1 text-sm text-gray-900">Ce diagnostique a été retiré</p>
-                        </div>
-                    </li>
-                {{end}}
-                {{end}}
-            {{end}}
-        </ul>
-    </div>
-</div>
-{{end}}
\ No newline at end of file
diff --git a/web/layouts/vehicles_management/_partials/vehicle-diags.html b/web/layouts/vehicles_management/_partials/vehicle-diags.html
deleted file mode 100644
index 12beeaf..0000000
--- a/web/layouts/vehicles_management/_partials/vehicle-diags.html
+++ /dev/null
@@ -1,56 +0,0 @@
-{{define "vehicle_diags"}}
-{{ $calendarIcon := .IconSet.Icon "hero:outline/calendar" "h-6 w-6" }}
-{{ $carIcon := .IconSet.Icon "tabler-icons:car" "h-6 w-6"}}
-<div class="bg-white shadow sm:rounded-lg">
-    <div class="px-4 py-5 flex items-center space-x-5 sm:px-6">
-        <h2 id="timeline-title" class="text-lg font-medium text-gray-900">Diagnostics réalisés</h2>
-        <a href="{{.ViewState.vehicle.ID}}/create-diag">
-            <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"}}
-            Créer un diagnostic
-            </button>
-        </a>
-    </div>
-    <div class="border-t border-gray-200">
-        {{ $diagCount := len .ViewState.diags }}
-        <ul role="list" class="divide-y divide-gray-200 flex-1">
-            {{if eq $diagCount 0}}
-                <li class="py-2 px-4">
-                    <p class="py-5 mt-1 max-w-2xl text-sm text-gray-500">Aucun diagnostique effectué pour le moment.</p>
-                </li>
-            {{else}}
-                {{range .ViewState.diags}}
-                {{ $diags := .ID }}
-                {{if eq .Deleted false}}
-                    <li class="py-5 px-4 flex">
-                            <div class="flex-1 ml-3">
-                                <a href="app/diags/{{$diags}}" class="mt-1 text-sm text-gray-900">{{.Name}}</a>
-                                <div class="flex-1 ml-3">
-                                    <p class="mt-1 text-sm text-gray-900">{{(timeFrom .Diagdate).Format "02/01/2006"}}</p>
-                                </div>
-                            </div>
-                            <a href="/app/diags/{{$diags}}" 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 diagnostic</span></button>
-                            </a>
-                    </li>
-                {{end}}
-                {{if eq .Deleted true}}
-                    <li class="py-5 px-4 flex">
-                            <div class="flex-1 ml-3">
-                                <p class="mt-1 text-sm text-gray-900">{{.Name}}</p>
-                            </div>
-                            <div class="flex-1 ml-3">
-                                <p class="mt-1 text-sm text-gray-900">{{(timeFrom .Diagdate).Format "02/01/2006"}}</p>
-                            </div>
-                        <div class="flex-1 ml-3">
-                            <p class="mt-1 text-sm text-gray-900">Ce diagnostique a été retiré</p>
-                        </div>
-                    </li>
-                {{end}}
-                {{end}}
-            {{end}}
-        </ul>
-    </div>
-</div>
-{{end}}
\ No newline at end of file
diff --git a/web/layouts/vehicles_management/booking-display.html b/web/layouts/vehicles_management/booking-display.html
index 803fef9..29b7560 100644
--- a/web/layouts/vehicles_management/booking-display.html
+++ b/web/layouts/vehicles_management/booking-display.html
@@ -126,9 +126,6 @@
                     </div>
                 </div>
             </div>
-            <!--<div>
-                {{template "booking_diags" .}}
-            </div>-->
         </div>
         <div class="lg:col-start-2 lg:col-span-2">
             <div class="bg-white  shadow sm:rounded-2xl sm:px-6">
diff --git a/web/layouts/vehicles_management/create-booking-diag.html b/web/layouts/vehicles_management/create-booking-diag.html
deleted file mode 100644
index 8285297..0000000
--- a/web/layouts/vehicles_management/create-booking-diag.html
+++ /dev/null
@@ -1,116 +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">Ajouter un diagnostic</h1>
-</div>
-
-<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8 mt-8"
-    x-data="{
-        fields: {
-            name: null,
-            namespace: 'parcoursmob_bookings',
-            json_schema: null,
-            ui_schema: null,
-        },
-        rules: {
-            name: ['required']
-            namespace: ['required']
-            json_schema: ['required']
-            ui_schema: ['required']
-        },
-        formValidation: {
-            valid: false,
-            fields: {
-                name: {valid: null},
-                json_schema: {valid: null},
-                ui_schema: {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 obligatoires
-                        pour créer un diagnostic dans PARCOURSMOB</p>
-                </div>
-                <div class="mt-5 md:mt-0 md:col-span-2">
-                    <div class="grid grid-cols-6 gap-6">
-                        <div class="col-span-6 sm:col-span-3">
-                            <label for="name" class="block text-sm font-medium text-gray-700">Nom</label>
-                            <input type="text" name="name" id="name" autocomplete="given-name"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-2xl"
-                                x-model="fields.name" @blur="validateField('name')"
-                                :class="formValidation.fields.name.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <input type="hidden" name="namespace" value="parcoursmob_bookings" />
-        <div class="bg-white shadow px-4 py-5 sm:rounded-lg sm:p-6 mt-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">Schéma JSON</h3>
-                    <p class="mt-1 text-sm text-gray-500">Schéma JSON pour le diagnostic</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="json_schema" class="block text-sm font-medium text-gray-700">Schéma JSON</label>
-                            <textarea name="json_schema" id="json_schema" autocomplete="json_schema"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-2xl"
-                                x-model="fields.json_schema" @blur="validateField('json_schema')"
-                                :class="formValidation.fields.json_schema.valid == false ? 'border-co-red border-2' : 'border-gray-300'"></textarea>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="bg-white shadow px-4 py-5 sm:rounded-lg sm:p-6 mt-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">Schéma UI</h3>
-                    <p class="mt-1 text-sm text-gray-500">Schéma UI pour le diagnostic</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="ui_schema" class="block text-sm font-medium text-gray-700">Schéma UI</label>
-                            <textarea name="ui_schema" id="ui_schema" autocomplete="ui_schema"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-2xl"
-                                x-model="fields.ui_schema" @blur="validateField('ui_schema')"
-                                :class="formValidation.fields.ui_schema.valid == false ? 'border-co-red border-2' : 'border-gray-300'"></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/vehicles-management/bookings/{{.ViewState.booking}}">
-                <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 diagnostique</button>
-        </div>
-    </form>
-</div>
-{{end}}
\ No newline at end of file
diff --git a/web/layouts/vehicles_management/create-vehicle-diag.html b/web/layouts/vehicles_management/create-vehicle-diag.html
deleted file mode 100644
index dc234af..0000000
--- a/web/layouts/vehicles_management/create-vehicle-diag.html
+++ /dev/null
@@ -1,110 +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">Ajouter un diagnostic</h1>
-</div>
-
-<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8 mt-8"
-    x-data="{
-        fields: {
-            name: null,
-            namespace: 'parcoursmob_vehicles',
-        },
-        rules: {
-            name: ['required'],
-            namespace: ['required'],
-        },
-        formValidation: {
-            valid: false,
-            fields: {
-                name: {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 obligatoires
-                        pour créer un diagnostic dans PARCOURSMOB</p>
-                </div>
-                <div class="mt-5 md:mt-0 md:col-span-2">
-                    <div class="grid grid-cols-6 gap-6">
-                        <div class="col-span-6 sm:col-span-3">
-                            <label for="name" class="block text-sm font-medium text-gray-700">Nom</label>
-                            <input type="text" name="name" id="name" autocomplete="given-name"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-2xl"
-                                x-model="fields.name" @blur="validateField('name')"
-                                :class="formValidation.fields.name.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <input type="hidden" name="namespace" value="parcoursmob_vehicles" />
-        <!-- <div class="bg-white shadow px-4 py-5 sm:rounded-lg sm:p-6 mt-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">Schéma JSON</h3>
-                    <p class="mt-1 text-sm text-gray-500">Schéma JSON pour le diagnostic</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="json_schema" class="block text-sm font-medium text-gray-700">Schéma JSON</label>
-                            <textarea name="json_schema" id="json_schema" autocomplete="json_schema"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-2xl"
-                                x-model="fields.json_schema" @blur="validateField('json_schema')"
-                                :class="formValidation.fields.json_schema.valid == false ? 'border-co-red border-2' : 'border-gray-300'"></textarea>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="bg-white shadow px-4 py-5 sm:rounded-lg sm:p-6 mt-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">Schéma UI</h3>
-                    <p class="mt-1 text-sm text-gray-500">Schéma UI pour le diagnostic</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="ui_schema" class="block text-sm font-medium text-gray-700">Schéma UI</label>
-                            <textarea name="ui_schema" id="ui_schema" autocomplete="ui_schema"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-2xl"
-                                x-model="fields.ui_schema" @blur="validateField('ui_schema')"
-                                :class="formValidation.fields.ui_schema.valid == false ? 'border-co-red border-2' : 'border-gray-300'"></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/vehicles-management/fleet/{{.ViewState.vehicle}}">
-                <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 diagnostique</button>
-        </div>
-    </form>
-</div>
-{{end}}
\ No newline at end of file