diff --git a/mondumas/models/dossier.py b/mondumas/models/dossier.py
index eb13abf..db73403 100644
--- a/mondumas/models/dossier.py
+++ b/mondumas/models/dossier.py
@@ -95,7 +95,7 @@ def update_suivi(request, nodossier, nolig, new_values):
     no_id = nodossier[3:]
 
     new_values['societe'] = societe
-    new_values['NO_ID'] = no_id
+    new_values['no_id'] = no_id
     s = ''
     for param in new_values.keys():            
         if s:
@@ -236,3 +236,7 @@ def update_rapport(request, nodossier, date_inter, new_values):
     query = "UPDATE dem_rdf SET %s WHERE societe=:societe AND nochantier=:nochantier AND date_inter=:date_inter;" % s
     execute_query(request, query, new_values)
 
+def delete_rapport(request, no_id):
+    
+    query = "DELETE FROM dem_rdf WHERE  no_id = :no_id" 
+    execute_query(request, query, {'no_id': no_id})
diff --git a/mondumas/templates/agenda/agenda.pt b/mondumas/templates/agenda/agenda.pt
index 2a03dcc..46568ae 100644
--- a/mondumas/templates/agenda/agenda.pt
+++ b/mondumas/templates/agenda/agenda.pt
@@ -92,49 +92,53 @@
 	</div>
 
 </div>	
-<script>
-$(document).ready(function() {
-	var datePlan = '${datePlan}';
-
-	$('#calendar').fullCalendar({
-		schedulerLicenseKey: 'GPL-My-Project-Is-Open-Source',
-		locale: 'fr',
-		header: {
-			left: 'agendaDay agendaWeek month listMonth',
-			center: 'prev title next',
-			right: 'today'
-		},
-		allDaySlot: false,
-		defaultView: 'agendaWeek',
-		defaultDate: moment(datePlan),
-		weekends: false,
-		height: 'auto',
-		minTime: "07:00:00",
-		maxTime: "20:00:00",
-		events:${fullcalendar_events},
-		eventRender: function(event, element){ 
-			element.find('.fc-title').append("<br/>" + event.description); 
-		},
-		dayClick: function(date, jsEvent, view) {
-			$('#dateheureRDV').html(moment(date).format('dddd DD MMMM à HH:mm'));
-			$('#dateRDV').attr('value', moment(date).format('YYYY-MM-DD'));
-			$('#heureRDV').attr('value', moment(date).format('HH:mm'));
-			$("#confirmCreate").modal("show");
-			}
-	});
-	$('#create_rdv-form').formValidation({
-		framework: 'bootstrap',
-		excluded: ':disabled',
-		icon: {
-			valid: 'glyphicon glyphicon-ok',
-			invalid: 'glyphicon glyphicon-remove',
-			validating: 'glyphicon glyphicon-refresh'
-		},
-	});
-});
-</script>
-
 </div><!-- content -->
+<div metal:fill-slot="additional_scripts">
+	<script src="//cdnjs.cloudflare.com/ajax/libs/fullcalendar/3.9.0/fullcalendar.min.js"></script>
+	<script src="//cdnjs.cloudflare.com/ajax/libs/fullcalendar-scheduler/1.9.4/scheduler.min.js"></script>
+	<script src="//cdnjs.cloudflare.com/ajax/libs/fullcalendar/3.9.0/locale/fr.js"></script>
+	<script>
+	$(document).ready(function() {
+		var datePlan = '${datePlan}';
+	
+		$('#calendar').fullCalendar({
+			schedulerLicenseKey: 'GPL-My-Project-Is-Open-Source',
+			locale: 'fr',
+			header: {
+				left: 'agendaDay agendaWeek month listMonth',
+				center: 'prev title next',
+				right: 'today'
+			},
+			allDaySlot: false,
+			defaultView: 'agendaWeek',
+			defaultDate: moment(datePlan),
+			weekends: false,
+			height: 'auto',
+			minTime: "07:00:00",
+			maxTime: "20:00:00",
+			events:${calendar_events},
+			eventRender: function(event, element){ 
+				element.find('.fc-title').append("<br/>" + event.description); 
+			},
+			dayClick: function(date, jsEvent, view) {
+				$('#dateheureRDV').html(moment(date).format('dddd DD MMMM à HH:mm'));
+				$('#dateRDV').attr('value', moment(date).format('YYYY-MM-DD'));
+				$('#heureRDV').attr('value', moment(date).format('HH:mm'));
+				$("#confirmCreate").modal("show");
+				}
+		});
+		$('#create_rdv-form').formValidation({
+			framework: 'bootstrap',
+			excluded: ':disabled',
+			icon: {
+				valid: 'glyphicon glyphicon-ok',
+				invalid: 'glyphicon glyphicon-remove',
+				validating: 'glyphicon glyphicon-refresh'
+			},
+		});
+	});
+	</script>
+</div>
 </metal:block>
 
 
diff --git a/mondumas/templates/agenda/planning.pt b/mondumas/templates/agenda/planning.pt
index 6c706af..983ef1d 100644
--- a/mondumas/templates/agenda/planning.pt
+++ b/mondumas/templates/agenda/planning.pt
@@ -18,32 +18,37 @@
 	<br />
 </div>	
 
-<script>
-$(document).ready(function() {
-	$('#calendar').fullCalendar({
-		schedulerLicenseKey: 'GPL-My-Project-Is-Open-Source',
-		defaultView: 'timelineDay',
-		minTime: "07:00:00",
-		maxTime: "20:00:00",
-		height: 'auto',
-		locale: 'fr',
-		header: {
-			left: '',
-			center: 'prev title next',
-			right: 'timelineDay'
-		},
-		resourceAreaWidth: '20%',
-		resourceLabelText: 'Intervenants',
-		resources: ${fullcalendar_ressources},
-		events:${fullcalendar_events},
-		eventRender: function(event, element){ 
-			element.find('.fc-title').append("<br/>" + event.description); 
-		}
-	});
-});
-</script>
 
 </div><!-- content -->
+<div metal:fill-slot="additional_scripts">
+	<script src="//cdnjs.cloudflare.com/ajax/libs/fullcalendar/3.9.0/fullcalendar.min.js"></script>
+	<script src="//cdnjs.cloudflare.com/ajax/libs/fullcalendar-scheduler/1.9.4/scheduler.min.js"></script>
+	<script src="//cdnjs.cloudflare.com/ajax/libs/fullcalendar/3.9.0/locale/fr.js"></script>
+	<script>
+	$(document).ready(function() {
+		$('#calendar').fullCalendar({
+			schedulerLicenseKey: 'GPL-My-Project-Is-Open-Source',
+			defaultView: 'timelineDay',
+			minTime: "07:00:00",
+			maxTime: "20:00:00",
+			height: 'auto',
+			locale: 'fr',
+			header: {
+				left: '',
+				center: 'prev title next',
+				right: 'timelineDay'
+			},
+			resourceAreaWidth: '20%',
+			resourceLabelText: 'Intervenants',
+			resources: ${calendar_ressources},
+			events:${calendar_events},
+			eventRender: function(event, element){ 
+				element.find('.fc-title').append("<br/>" + event.description); 
+			}
+		});
+	});
+	</script>
+</div>
 </metal:block>
 
 
diff --git a/mondumas/templates/agenda/rdv_edit.pt b/mondumas/templates/agenda/rdv_edit.pt
index 9fbc8c7..9a0d811 100644
--- a/mondumas/templates/agenda/rdv_edit.pt
+++ b/mondumas/templates/agenda/rdv_edit.pt
@@ -70,24 +70,27 @@
 	<br />
     </div> <!-- row -->
 
-<script>
-$(document).ready(function() {
-	$('#rdv_edit-form').formValidation();
-	$('#date_rdv_picker').datetimepicker({
-		format: 'DD-MM-YYYY HH:mm',
-		showClear: true,
-		allowInputToggle: true,
-		stepping: 15,
-	})
-	.on('changeDate', function(e) {
-		// Revalidate the date field
-		$('#rdv_edit-form').formValidation('revalidateField', 'date_rdv');
-	});
-	$('form input').on('keypress', function(e) {
-		return e.which !== 13;
-	});
-});
-</script>
-
+</div>
+<div metal:fill-slot="additional_scripts">
+	<!--    Bootstrap Datepicker plugin   -->
+	<script src="//cdnjs.cloudflare.com/ajax/libs/bootstrap-datetimepicker/4.17.47/js/bootstrap-datetimepicker.min.js"></script>
+	<script>
+		$(document).ready(function() {
+			$('#rdv_edit-form').formValidation();
+			$('#date_rdv_picker').datetimepicker({
+				format: 'DD-MM-YYYY HH:mm',
+				showClear: true,
+				allowInputToggle: true,
+				stepping: 15,
+			})
+			.on('changeDate', function(e) {
+				// Revalidate the date field
+				$('#rdv_edit-form').formValidation('revalidateField', 'date_rdv');
+			});
+			$('form input').on('keypress', function(e) {
+				return e.which !== 13;
+			});
+		});
+	</script>
 </div>
 </metal:block>
diff --git a/mondumas/templates/dossier/dossier_view.pt b/mondumas/templates/dossier/dossier_view.pt
index b07edad..07de919 100644
--- a/mondumas/templates/dossier/dossier_view.pt
+++ b/mondumas/templates/dossier/dossier_view.pt
@@ -178,7 +178,7 @@
                 <div class="panel-body">
                     <p>
                         <a class="btn btn-success" role="button" href="${request.route_url('rdf_edit', nodossier=nodossier, date_inter='new')}">
-                            <span class="glyphicon glyphicon-plus"></span> Nouvelle recherche</a>
+                            <span class="glyphicon glyphicon-plus"></span> Nouveau rapport</a>
                    </p>
                     <table class="table table-bordered table-condensed" tal:condition="rapports">
                         <tr>
diff --git a/mondumas/templates/dossier/rdf_edit.pt b/mondumas/templates/dossier/rdf_edit.pt
index 40b376e..ab4ed90 100644
--- a/mondumas/templates/dossier/rdf_edit.pt
+++ b/mondumas/templates/dossier/rdf_edit.pt
@@ -68,6 +68,7 @@
 
             <br />
             <h4 class="text-center text-primary">ANALYSE</h4>
+            <br />
             <div class="form-group">
                 <label class="control-label" for="equipement">Les dommages sont-ils causés par un bien d'équipement ?</label>
                 <select class="form-control" id="equipement" name="equipement">
@@ -125,7 +126,22 @@
                     </div>
                 </select>
             </div>
-             <div class="form-group">
+            <div class="form-group">
+                <label class="control-label" for="tierce_personne">Les dommages sont-ils causés par une tierce personne ?</label>
+                <select class="form-control" name="tierce_personne">
+                    <div tal:repeat="item tierce_personnes">
+                        <option value="${item.libelle}" tal:attributes="selected str(rapport.tierce_personne)==item.libelle and 'selected' or None">${item.libelle}</option>
+                    </div>
+                </select>
+            </div>
+            <div class="form-group">
+                <label class="control-label" for="tierce_coordonnees">Coordonnées de la tierce personne</label>
+                    <input class="form-control" type="text" name="tierce_coordonnees" value="${rapport.tierce_coordonnees}"
+                        data-fv-stringlength="true"
+                        data-fv-stringlength-max="150"
+                        data-fv-stringlength-message="150 caractères maximum" />
+            </div>
+            <div class="form-group">
                 <label class="control-label" for="voisin">Les dommages sont-ils causés par un bâtiment voisin ?&nbsp;&nbsp;&nbsp;</label>
                 <label class="radio-inline">
                     <input type="radio" name="voisin" value="NON" tal:attributes="checked rapport.voisin=='NON'">NON
@@ -151,6 +167,7 @@
 
             <br />
             <h4 class="text-center text-primary">RAPPORT</h4>
+            <br />
             <div class="form-group">
                 <label class="control-label" for="degats">Constatation des dégâts occasionnés</label>
                      <textarea class="form-control" rows="6" cols="40" id="degats" name="degats"
@@ -162,6 +179,7 @@
 
             <br />
             <h4 class="text-center text-primary">TRAVAUX relatifs à la DETECTION de la fuite</h4>
+            <br />
              <div class="form-group">
                 <label class="control-label" for="detection_fuite">Détection de la fuite :&nbsp;&nbsp;&nbsp;</label>
                 <label class="radio-inline">
@@ -223,6 +241,7 @@
 
             <br />
             <h4 class="text-center text-primary">TRAVAUX relatifs à la REPARATION de la fuite</h4>
+            <br />
              <div class="form-group">
                 <label class="control-label" for="visite1ere">La réparation est-elle réalisée dans le cadre de la 1ère visite ?&nbsp;&nbsp;&nbsp;</label>
                 <label class="radio-inline">
@@ -241,9 +260,9 @@
                     </textarea>
             </div>
 
-            <p class="text-center"><b>Constation de situation de blocage</b></p>
+            <p class="text-center"><b>Constatation de situation de blocage</b></p>
              <div class="form-group">
-                <label class="control-label" for="blocage_acces">Impossibilité d'accès dans le local où la recherche doi être réalisée&nbsp;&nbsp;&nbsp;</label>
+                <label class="control-label" for="blocage_acces">Impossibilité d'accès dans le local où la recherche doit être réalisée&nbsp;&nbsp;&nbsp;</label>
                 <label class="radio-inline">
                     <input type="radio" name="blocage_acces" value="NON" tal:attributes="checked rapport.blocage_acces=='NON'">NON
                 </label>
@@ -252,7 +271,7 @@
                 </label>
             </div>
              <div class="form-group">
-                <label class="control-label" for="blocage_rdf_differente">Nécessité de faire une recherchede fuite destructive dans le local du responsable différent de la victime&nbsp;&nbsp;&nbsp;</label>
+                <label class="control-label" for="blocage_rdf_differente">Nécessité de faire une recherchede de fuite destructive dans le local du responsable différent de la victime&nbsp;&nbsp;&nbsp;</label>
                 <label class="radio-inline">
                     <input type="radio" name="blocage_rdf_differente"  value="NON" tal:attributes="checked rapport.blocage_rdf_differente=='NON'">NON
                 </label>
@@ -282,8 +301,8 @@
             </div>
 
             <br />
-
             <h4 class="text-center text-primary">CONCLUSIONS</h4>
+            <br />
                 <div class="form-group">
                     <label class="control-label" for="conclusions">Conclusions</label>
                         <textarea class="form-control" rows="6" cols="40" id="conclusions" name="conclusions"
@@ -337,22 +356,26 @@
     <br />
     <br />
     <br />
- <script type="text/javascript">
- $(document).ready(function() {
-    $sig = $("#signature").jSignature({color:"MidnightBlue","background-color":"LightYellow",width:350,height:150});
-   
-    $('#save').click(function() {
-        datapair = $sig.jSignature("getData","svg");
-        $('#signature_svg').val(datapair);
-    });
-
-    $('#clear').click(function() {
-        $sig.jSignature("clear");
-    }); 
-    //afficher signature
-    var dataString = 'data:' + '${rapport.signature_svg}'
-    $('#signature_img').append("<img class='imported' src='" + dataString + "'></img>"); });
- </script>
 
 </div>
+<div metal:fill-slot="additional_scripts">
+    <!--    JSignature plugin   -->
+    <script src="${request.static_url('mondumas:static/dist/jSignature/libs/jSignature.min.js')}"></script>
+    <script type="text/javascript">
+        $(document).ready(function() {
+            $sig = $("#signature").jSignature({color:"MidnightBlue","background-color":"LightYellow",width:350,height:150});
+           
+            $('#save').click(function() {
+                datapair = $sig.jSignature("getData","svg");
+                $('#signature_svg').val(datapair);
+            });
+        
+            $('#clear').click(function() {
+                $sig.jSignature("clear");
+            }); 
+            //afficher signature
+            var dataString = 'data:' + '${rapport.signature_svg}'
+            $('#signature_img').append("<img class='imported' src='" + dataString + "'></img>"); });
+     </script>
+</div>
 </metal:block>
diff --git a/mondumas/templates/dossier/rdf_rapport.pt b/mondumas/templates/dossier/rdf_rapport.pt
deleted file mode 100644
index e15ffc1..0000000
--- a/mondumas/templates/dossier/rdf_rapport.pt
+++ /dev/null
@@ -1,300 +0,0 @@
-<metal:block use-macro="main_template">
-<div metal:fill-slot="content">
-    <!-- LOGO -->
-    <div class="row">
-        <img src="${request.static_url('mondumas:static/img/LogoVerSanit.jpg')}" width="100%" />
-    </div>
-    <br />
-    <br />
-    <h1 class="text-center">Rapport de recherche de fuite</h1>
-    <br />
-    <br />
-    <p>
-        <div class="form-group">
-            <label class="control-label">N° dossier</label> : ${nodossier}<br />
-            <label class="control-label">N° rapport</label> : ${norapport}<br />
-            <label class="control-label">Date d'intervention</label> : ${rapport.date_inter.strftime('%d-%m-%Y')}<br />
-           <label class="control-label" for="rapport">Compte-rendu :&nbsp;&nbsp;&nbsp;</label>
-           <label class="radio-inline">
-               <input type="radio" name="rapport" value="Définitif" disabled="disabled"
-                   tal:attributes="checked rapport.rapport=='Définitif'">Définitif
-           </label>
-           <label class="radio-inline">
-               <input type="radio" name="rapport" value="Provisoire" disabled="disabled"
-               tal:attributes="checked rapport.rapport=='Provisoire'">Provisoire
-           </label>
-       </div>
-    </p>
-            <h4 class="text-center text-primary">ADRESSE d'INTERVENTION</h4>
-        <table class="table table-condensed ">
-            <tr>
-                <td>
-                    <p>
-                        <h4>${rapport.C_QUALITE} ${rapport.C_NOM}</h4>
-                        ${rapport.C_ADR}<br />
-                        <span tal:condition="rapport.C_ADR2">${rapport.C_ADR2}<br /></span>
-                        ${rapport.C_CP} ${rapport.C_VILLE}<br />
-                   </p>
-                </td>
-                <td>
-                    <p>
-                        Assureur : <b>${rapport.NOMCLI}</b><br />
-                        No Sinistre : ${rapport.NOSIN}
-                        <br />
-                        Téléphone : ${rapport.C_TEL1}<br />
-                        Mobile:  ${rapport.C_TELP}<br />
-                    </p>
-                </td>
-            </tr>
-        </table>
-    
-           <div class="form-group">
-                <label class="control-label" for="statut_proprio">Statut :&nbsp;&nbsp;&nbsp;</label>
-                <label class="radio-inline">
-                    <input type="radio" name="statut_proprio" value="Propriétaire" disabled="disabled"
-                    tal:attributes="checked rapport.statut_proprio=='Propriétaire'">Propriétaire
-                </label>
-                <label class="radio-inline">
-                    <input type="radio" name="statut_proprio" value="Non propriétaire" disabled="disabled"
-                    tal:attributes="checked rapport.statut_proprio=='Non propriétaire'">Non propriétaire
-                </label>
-                <br />
-                <label class="control-label" for="comment">Caractéristique du risque sinistré :</label>
-                        &nbsp;&nbsp;&nbsp;${rapport.caracteristique}
-            </div>
-
-            <br />
-            <h4 class="text-center text-primary">ANALYSE</h4>
-    <div class="row">
-            <div class="form-group">
-                <label class="control-label" for="equipement">Les dommages sont-ils causés par un bien d'équipement ?</label>
-                        <br />&nbsp;&nbsp;&nbsp;${rapport.equipement}
-            </div>
-            <div class="form-group">
-                <label class="control-label" for="reseau_int">Les dommages sont-ils causés par un réseau intérieur au bâtiment ?</label>
-                        <br />&nbsp;&nbsp;&nbsp;${rapport.reseau_int}
-            </div>
-            <div class="form-group">
-                <label class="control-label" for="reseau_ext">Les dommages sont-ils causés par un réseau extérieur au bâtiment ?</label>
-                        <br />&nbsp;&nbsp;&nbsp;${rapport.reseau_ext}
-            </div>
-             <div class="form-group">
-                <label class="control-label" for="anti_retour">Le bien sinistré est-il protégé par un dispositif anti-retour ?&nbsp;&nbsp;&nbsp;</label>
-                <label class="radio-inline">
-                    <input type="radio" name="anti_retour" value="NON" disabled="disabled" 
-                        tal:attributes="checked rapport.anti_retour=='NON'">NON
-                </label>
-                <label class="radio-inline">
-                    <input type="radio" name="anti_retour" value="OUI" disabled="disabled"
-                        tal:attributes="checked rapport.anti_retour=='OUI'">OUI
-                </label>
-            </div>
-            <div class="form-group">
-                <label class="control-label" for="reseau_local">Localisation de ces réseaux intérieurs ou extérieurs</label>
-                        <br />&nbsp;&nbsp;&nbsp;${rapport.reseau_local}
-            </div>
-            <div class="form-group">
-                <label class="control-label" for="element_clos">Les dommages sont-ils causés par un élément de clos du bâtiment ?</label>
-                        <br />&nbsp;&nbsp;&nbsp;${rapport.element_clos}
-            </div>
-            <div class="form-group">
-                <label class="control-label" for="element_couvert">Les dommages sont-ils causés par un élément couvert du bâtiment ?</label>
-                        <br />&nbsp;&nbsp;&nbsp;${rapport.element_couvert}
-            </div>
-             <div class="form-group">
-                <label class="control-label" for="voisin">Les dommages sont-ils causés par un bâtiment voisin ?&nbsp;&nbsp;&nbsp;</label>
-                <label class="radio-inline">
-                    <input type="radio" name="voisin" value="NON" disabled="disabled"
-                        tal:attributes="checked rapport.voisin=='NON'">NON
-                </label>
-                <label class="radio-inline">
-                    <input type="radio" name="voisin" value="OUI" disabled="disabled"
-                        tal:attributes="checked rapport.voisin=='OUI'">OUI
-                </label>
-            </div>
-            <div class="form-group">
-                <label class="control-label" for="voisin_adresse">Adresse du bâtiment</label>
-                     <br />&nbsp;&nbsp;&nbsp;${rapport.voisin_adresse}
-            </div>
-            <div class="form-group">
-                <label class="control-label" for="voisin_coordonnees">Coordonnées propriétaire ou syndic</label>
-                     <br />&nbsp;&nbsp;&nbsp;${rapport.voisin_coordonnees}
-            </div>
-
-            <br />
-            <h4 class="text-center text-primary">RAPPORT</h4>
-            <div class="form-group">
-                <label class="control-label" for="degats">Constatation des dégâts occasionnés :</label>
-                     <br />&nbsp;&nbsp;&nbsp;${rapport.degats}
-            </div>
-
-            <br />
-            <h4 class="text-center text-primary">TRAVAUX relatifs à la DETECTION de la fuite</h4>
-             <div class="form-group">
-                <label class="control-label" for="detection_fuite">Détection de la fuite :&nbsp;&nbsp;&nbsp;</label>
-                <label class="radio-inline">
-                    <input type="radio" name="detection_fuite" value="Destructif" disabled="disabled"
-                        tal:attributes="checked rapport.detection_fuite=='Destructif'">Destructif
-                </label>
-                <label class="radio-inline">
-                    <input type="radio" name="detection_fuite" value="Non destructif" disabled="disabled"
-                        tal:attributes="checked rapport.detection_fuite=='Non destructif'">Non destructif
-                </label>
-            </div>
-            <div class="form-group">
-                <label class="control-label">Mesures d'humidité :&nbsp;&nbsp;&nbsp;</label>
-                <label class="checkbox-inline" disabled><input type="checkbox" name="sonde_capa" value="${rapport.sonde_capa}"  disabled
-                    tal:attributes="checked rapport.sonde_capa != 0 and 'checked' or None">Sonde capacitive</label>
-                <label class="checkbox-inline"  disabled><input type="checkbox" name="sonde_cond" value="${rapport.sonde_cond}"  disabled
-                    tal:attributes="checked rapport.sonde_cond != 0 and 'checked' or None">Sonde à conductivité électrique</label>
-             </div>
-            <div class="form-group">
-                <label class="control-label">Test de réseaux :&nbsp;&nbsp;&nbsp;</label>
-                <label class="checkbox-inline" disabled><input type="checkbox" name="test_mano" value="${rapport.test_mano}" disabled
-                    tal:attributes="checked rapport.test_mano != 0 and 'checked' or None">Système manométrique</label>
-                <label class="checkbox-inline" disabled><input type="checkbox" name="test_gaz" value="${rapport.test_gaz}" disabled
-                    tal:attributes="checked rapport.test_gaz != 0 and 'checked' or None">Gaz traceur</label>
-            </div>
-            <div class="form-group">
-                <label class="control-label">Visualisation :&nbsp;&nbsp;&nbsp;</label>
-                <label class="checkbox-inline" disabled><input type="checkbox" name="visu_camera" value="${rapport.visu_camera}" disabled
-                    tal:attributes="checked rapport.visu_camera != 0 and 'checked' or None">Caméra infrarouge</label>
-                <label class="checkbox-inline" disabled><input type="checkbox" name="visu_endoscope" value="${rapport.visu_endoscope}" disabled
-                    tal:attributes="checked rapport.visu_endoscope != 0 and 'checked' or None">Endoscope à fibre optique</label>
-                <label class="checkbox-inline" disabled><input type="checkbox" name="visu_tele" value="${rapport.visu_tele}" disabled
-                    tal:attributes="checked rapport.visu_tele != 0 and 'checked' or None">Endoscope à fibre optique</label>
-           </div>
-            <div class="form-group">
-                <label class="control-label">Recherche de réseaux :&nbsp;&nbsp;&nbsp;</label>
-                <label class="checkbox-inline" disabled><input type="checkbox" name="rech_magnetique" value="${rapport.rech_magnetique}" disabled
-                    tal:attributes="checked rapport.rech_magnetique != 0 and 'checked' or None">Système électro magnétique</label>
-                <label class="checkbox-inline" disabled><input type="checkbox" name="rech_accoustique" value="${rapport.rech_accoustique}" disabled
-                    tal:attributes="checked rapport.rech_accoustique != 0 and 'checked' or None">Système électro accoustique</label>
-            </div>
-            <div class="form-group">
-                <label class="control-label">Tests d'étanchéité :&nbsp;&nbsp;&nbsp;</label>
-                <label class="checkbox-inline" disabled><input type="checkbox" name="test_accoustique" value="${rapport.test_accoustique}" disabled
-                    tal:attributes="checked rapport.test_accoustique != 0 and 'checked' or None">Ecoute électro accoustique</label>
-                <label class="checkbox-inline" disabled><input type="checkbox" name="test_mise_en_eau" value="${rapport.test_mise_en_eau}" disabled
-                    tal:attributes="checked rapport.test_mise_en_eau != 0 and 'checked' or None">Mise en eau</label>
-                <label class="checkbox-inline" disabled><input type="checkbox" name="test_fumigenes" value="${rapport.test_fumigenes}" disabled
-                    tal:attributes="checked rapport.test_fumigenes != 0 and 'checked' or None">Fumigènes</label>
-           </div>
-           <div class="form-group">
-                <label class="control-label" for="descr_detect">Descriptif de la détection</label>
-                     <br />&nbsp;&nbsp;&nbsp;${rapport.descr_detect}
-            </div>
-
-            <br />
-            <h4 class="text-center text-primary">TRAVAUX relatifs à la REPARATION de la fuite</h4>
-             <div class="form-group">
-                <label class="control-label" for="visite1ere">La réparation est-elle réalisée dans le cadre de la 1ère visite ?&nbsp;&nbsp;&nbsp;</label>
-                <label class="radio-inline">
-                    <input type="radio" name="visite1ere" value="NON" disabled="disabled"
-                        tal:attributes="checked rapport.visite1ere=='NON'">NON
-                </label>
-                <label class="radio-inline">
-                    <input type="radio" name="visite1ere" value="OUI" disabled="disabled"
-                        tal:attributes="checked rapport.visite1ere=='OUI'">OUI
-                </label>
-            </div>
-            <div class="form-group">
-                <label class="control-label" for="descr_repar">Descriptif de la solution de réparation</label>
-                    <br />&nbsp;&nbsp;&nbsp;${rapport.descr_repar}
-            </div>
-
-            <p class="text-center"><b>Constation de situation de blocage</b></p>
-             <div class="form-group">
-                <label class="control-label" for="blocage_acces">Impossibilité d'accès dans le local où la recherche doi être réalisée&nbsp;&nbsp;&nbsp;</label>
-                <label class="radio-inline">
-                    <input type="radio" name="blocage_acces" value="NON" disabled="disabled"
-                        tal:attributes="checked rapport.blocage_acces=='NON'">NON
-                </label>
-                <label class="radio-inline">
-                    <input type="radio" name="blocage_acces" value="OUI" disabled="disabled"
-                        tal:attributes="checked rapport.blocage_acces=='OUI'">OUI
-                </label>
-            </div>
-             <div class="form-group">
-                <label class="control-label" for="blocage_rdf_differente">Nécessité de faire une recherchede fuite destructive dans le local du responsable différent de la victime&nbsp;&nbsp;&nbsp;</label>
-                <label class="radio-inline">
-                    <input type="radio" name="blocage_rdf_differente"  value="NON" disabled="disabled"
-                        tal:attributes="checked rapport.blocage_rdf_differente=='NON'">NON
-                </label>
-                <label class="radio-inline">
-                    <input type="radio" name="blocage_rdf_differente"  value="OUI" disabled="disabled"
-                        tal:attributes="checked rapport.blocage_rdf_differente=='OUI'">OUI
-                </label>
-            </div>
-             <div class="form-group">
-                <label class="control-label" for="blocage_rdf_infructueuse">Recherche de fuite infructueuse&nbsp;&nbsp;&nbsp;</label>
-                <label class="radio-inline">
-                    <input type="radio" name="blocage_rdf_infructueuse"  value="NON" disabled="disabled"
-                        tal:attributes="checked rapport.blocage_rdf_infructueuse=='NON'">NON
-                </label>
-                <label class="radio-inline">
-                    <input type="radio" name="blocage_rdf_infructueuse"  value="OUI" disabled="disabled"
-                        tal:attributes="checked rapport.blocage_rdf_infructueuse=='OUI'">OUI
-                </label>
-            </div>
-             <div class="form-group">
-                <label class="control-label" for="blocage_pluralite">Pluralité de locaux sinistrés autre que le local à l'origine de la fuite&nbsp;&nbsp;&nbsp;</label>
-                <label class="radio-inline">
-                    <input type="radio" name="blocage_pluralite" value="NON" disabled="disabled"
-                        tal:attributes="checked rapport.blocage_pluralite=='NON'">NON
-                </label>
-                <label class="radio-inline">
-                    <input type="radio" name="blocage_pluralite" value="OUI" disabled="disabled"
-                        tal:attributes="checked rapport.blocage_pluralite=='OUI'">OUI
-                </label>
-            </div>
-
-            <br />
-            <h4 class="text-center text-primary">PHOTOS</h4>
-            <br />
-            <p tal:repeat="detail photos">
-                <img src="${docs_url}${detail.nomrep}/${detail.societe}/${nochantier}/${norapport}/${detail.nomfichier}" 
-                    width="800" align="center" />
-            </p>
-            <br />
-            <h4 class="text-center text-primary">CONCLUSIONS</h4>
-                <div class="form-group">
-                    <br />&nbsp;&nbsp;&nbsp;${rapport.conclusions}
-                </div>
-    <br />
-    <br/>
-    <br/>
-
-    </div> <!-- row -->
-    <table class="table table-condensed ">
-        <tr>
-            <td width="40%">
-                <p>
-                    <label>Date du rapport :</label>
-                        <br />${date_rapport}
-                    <br />
-                    <br />
-                    <label>Etabli par :</label>
-                        <br />${rapport.auteur_nom}
-                </p>
-            </td>
-            <td width="60%">
-                <label>Signature du client :</label>
-                <div tal:condition="rapport.signature_svg">
-                    <p>
-                    <div id="signature_img"></div>
-                    </p>
-                </div>
-            </td>
-        </tr>
-    </table>
-    <br />
-
- <script type="text/javascript">
- $(document).ready(function() {
-    //afficher signature
-    var dataString = 'data:' + '${rapport.signature_svg}'
-    $('#signature_img').append("<img class='imported' src='" + dataString + "'></img>"); });
- </script>
-</div>
-</metal:block>
diff --git a/mondumas/templates/dossier/rdf_view.pt b/mondumas/templates/dossier/rdf_view.pt
index 11b1e9d..ad66085 100644
--- a/mondumas/templates/dossier/rdf_view.pt
+++ b/mondumas/templates/dossier/rdf_view.pt
@@ -1,34 +1,60 @@
 <metal:block use-macro="main_template">
 <div metal:fill-slot="content">
-    <br />
+    <div tal:condition="pt_name=='rdf_view'">
+        <br />
+    </div>
     <!-- ENTETE -->
-    <div class="row">
-        <h4>ADRESSE d'INTERVENTION</h4>
-        <table class="table table-condensed ">
-            <tr>
-                <td>
-                    <p>
-                        <h4>${rapport.C_QUALITE} ${rapport.C_NOM}</h4>
-                        ${rapport.C_ADR}<br />
-                        <span tal:condition="rapport.C_ADR2">${rapport.C_ADR2}<br /></span>
-                        ${rapport.C_CP} ${rapport.C_VILLE}<br />
-                   </p>
-                </td>
-                <td>
-                    <p>
-                        Assureur : <b>${rapport.NOMCLI}</b><br />
-                        No Sinistre : ${rapport.NOSIN}
-                        <br />
-                        Téléphone : ${rapport.C_TEL1}<br />
-                        Mobile:  ${rapport.C_TELP}<br />
-                    </p>
-                </td>
-            </tr>
-        </table>
-    </div> <!-- row -->
+     <div tal:condition="pt_name=='rdf_rapport'">
+        <!-- LOGO -->
+        <img src="${request.static_url('mondumas:static/img/LogoVerSanit.jpg')}" width="100%" />
+        <br />
+        <br />
+        <h1 class="text-center">Rapport de recherche de fuite</h1>
+        <br />
+        <br />
+    </div>
+
+    <div class="form-group">
+        <label class="control-label">N° dossier</label> : ${nodossier}<br />
+        <label class="control-label">N° rapport</label> : ${norapport}<br />
+        <label class="control-label">Date d'intervention</label> : ${rapport.date_inter.strftime('%d-%m-%Y')}<br />
+        <label class="control-label" for="rapport">Compte-rendu :&nbsp;&nbsp;&nbsp;</label>
+        <label class="radio-inline">
+           <input type="radio" name="rapport" value="Définitif" disabled="disabled"
+               tal:attributes="checked rapport.rapport=='Définitif'">Définitif
+        </label>
+        <label class="radio-inline">
+            <input type="radio" name="rapport" value="Provisoire" disabled="disabled"
+            tal:attributes="checked rapport.rapport=='Provisoire'">Provisoire
+        </label>
+    </div>
+
+    <br />
+    <h4 class="text-center text-primary">ADRESSE d'INTERVENTION</h4>
+    <br />
+    <table class="table table-condensed ">
+        <tr>
+            <td>
+                <p>
+                    <h4>${rapport.C_QUALITE} ${rapport.C_NOM}</h4>
+                    ${rapport.C_ADR}<br />
+                    <span tal:condition="rapport.C_ADR2">${rapport.C_ADR2}<br /></span>
+                    ${rapport.C_CP} ${rapport.C_VILLE}<br />
+               </p>
+            </td>
+            <td>
+                <p>
+                    Assureur : <b>${rapport.NOMCLI}</b><br />
+                    No Sinistre : ${rapport.NOSIN}
+                    <br />
+                    Téléphone : ${rapport.C_TEL1}<br />
+                    Mobile:  ${rapport.C_TELP}<br />
+                </p>
+            </td>
+        </tr>
+    </table>
     
-    <div class="row">
-        <form id="rdv_edit-form" action="${url}" method="post"
+    <form id="rdv_edit-form" action="${url}" method="post"
             data-fv-framework="bootstrap"
             data-fv-icon-valid="glyphicon glyphicon-ok"
             data-fv-icon-invalid="glyphicon glyphicon-remove"
@@ -63,6 +89,7 @@
 
             <br />
             <h4 class="text-center text-primary">ANALYSE</h4>
+            <br />
             <div class="form-group">
                 <label class="control-label" for="equipement">Les dommages sont-ils causés par un bien d'équipement ?</label>
                         <br />&nbsp;&nbsp;&nbsp;${rapport.equipement}
@@ -97,6 +124,14 @@
             <div class="form-group">
                 <label class="control-label" for="element_couvert">Les dommages sont-ils causés par un élément couvert du bâtiment ?</label>
                         <br />&nbsp;&nbsp;&nbsp;${rapport.element_couvert}
+            </div>
+            <div class="form-group">
+                <label class="control-label" for="tierce_personne">Les dommages sont-ils causés par une tierce personne ?</label>
+                        <br />&nbsp;&nbsp;&nbsp;${rapport.tierce_personne}
+            </div>
+            <div class="form-group">
+                <label class="control-label" for="tierce_coordonnees">Coordonnées de la tierce personne</label>
+                    <br />&nbsp;&nbsp;&nbsp;${rapport.tierce_coordonnees}
             </div>
              <div class="form-group">
                 <label class="control-label" for="voisin">Les dommages sont-ils causés par un bâtiment voisin ?&nbsp;&nbsp;&nbsp;</label>
@@ -120,6 +155,7 @@
 
             <br />
             <h4 class="text-center text-primary">RAPPORT</h4>
+            <br />
             <div class="form-group">
                 <label class="control-label" for="degats">Constatation des dégâts occasionnés :</label>
                      <br />&nbsp;&nbsp;&nbsp;${rapport.degats}
@@ -127,6 +163,7 @@
 
             <br />
             <h4 class="text-center text-primary">TRAVAUX relatifs à la DETECTION de la fuite</h4>
+            <br />
              <div class="form-group">
                 <label class="control-label" for="detection_fuite">Détection de la fuite :&nbsp;&nbsp;&nbsp;</label>
                 <label class="radio-inline">
@@ -184,6 +221,7 @@
 
             <br />
             <h4 class="text-center text-primary">TRAVAUX relatifs à la REPARATION de la fuite</h4>
+            <br />
              <div class="form-group">
                 <label class="control-label" for="visite1ere">La réparation est-elle réalisée dans le cadre de la 1ère visite ?&nbsp;&nbsp;&nbsp;</label>
                 <label class="radio-inline">
@@ -248,54 +286,56 @@
 
             <br />
             <h4 class="text-center text-primary">PHOTOS</h4>
+            <br />
+            <div tal:condition="pt_name=='rdf_view'">
                     <p>
                         <a href="${request.application_url}/upload_img/${norapport}" class="btn btn-success" role="button">
                             <span class="glyphicon glyphicon-cloud-upload"></span>&nbsp;Ajouter une photo</a>
                     </p>
                     <br />
+            </div>
                     <p tal:repeat="detail photos">
                         <img src="${docs_url}${detail.nomrep}/${detail.societe}/${nochantier}/${norapport}/${detail.nomfichier}" 
                             width="800" align="center" />
                     </p>
             <br />
             <h4 class="text-center text-primary">CONCLUSIONS</h4>
-                <div class="form-group">
-                    <br />&nbsp;&nbsp;&nbsp;${rapport.conclusions}
-                </div>
+            <div class="form-group">
+                <br />&nbsp;&nbsp;&nbsp;${rapport.conclusions}
+            </div>
+            <br />
+            <br />
+
+            <table class="table table-condensed ">
+                <tr>
+                    <td>
+                        <label>Date du rapport :</label>&nbsp;&nbsp;${date_rapport}
+                        <br />
+                        <br />
+                        <label>Etabli par le technicien :</label>
+                            <br />${rapport.auteur_nom}
+                        <br />
+                        <br />
+                        <label>Relu par le superviseur :</label>
+                            <br />Jean-Marc PENEL
+                    </td>
+                    <td>
+                        <label>Signature du client :</label>
+                        <div tal:condition="rapport.signature_svg">
+                            <div id="signature_img"></div>
+                    </td>
+                </tr>
+           </table>
 
-        <div class="col-sm-5">
-                <p>
-                    <label>Date du rapport :</label>
-                        <br />${date_rapport}
-                    <br />
-                    <br />
-                    <label>Etabli par :</label>
-                        <br />${rapport.auteur_nom}
-                </p>
-        </div>
-        <div class="col-sm-7">
-            <label>Signature du client :</label>
-            <div tal:condition="not rapport.signature_svg">
-                <div id="signature"></div>
-            </div>
-            <div tal:condition="rapport.signature_svg">
-                <p>
-                <br />
-                <div id="signature_img"></div>
-                <br/>
-                </p>
-            </div>
-       </div>
             <br/>
-            <br/>
-            <br/>
-            <br/>
-            <div class="form-group"> 
+            <div class="form-group" tal:condition="pt_name=='rdf_view'"> 
                 <div class="form-group">					
                     <a class="btn btn-default" href="${request.route_url('dossier_view', nodossier=nodossier)}">
                         <span class="glyphicon glyphicon-arrow-left"></span> Retour Dossier</a>
                     <a class="btn btn-primary" href="/rdf_edit/${nodossier}/${rapport.date_inter.strftime('%Y-%m-%d')}">
                         <span class="glyphicon glyphicon-pencil"></span> Modifier</a>
+                    <button class="btn btn-danger" type="submit" name="form.delete" tal:condition="not rapport.signature_svg and date_rapport==''">
+                        <span class="glyphicon glyphicon-remove"></span> Supprimer</button>
                     <a class="btn btn-default" href="/rdf_rapport/${rapport.no_id}">
                         <span class="glyphicon glyphicon-file"></span> Aperçu PDF</a>
                     <button class="btn btn-warning" type="submit" name="form.generate">
@@ -303,27 +343,30 @@
                 </div>
             </div>
 
-         </form>
-    </div> <!-- row -->
+        </form>
     <br />
     <br />
     <br />
- <script type="text/javascript">
- $(document).ready(function() {
-    $sig = $("#signature").jSignature({color:"MidnightBlue","background-color":"LightYellow",width:350,height:150});
-   
-    $('#save').click(function() {
-        datapair = $sig.jSignature("getData","svg");
-        $('#signature_svg').val(datapair);
-    });
-
-    $('#clear').click(function() {
-        $sig.jSignature("clear");
-    }); 
-    //afficher signature
-    var dataString = 'data:' + '${rapport.signature_svg}'
-    $('#signature_img').append("<img class='imported' src='" + dataString + "'></img>"); });
- </script>
 
 </div>
+<div metal:fill-slot="additional_scripts">
+    <!--    JSignature plugin   -->
+    <script src="${request.static_url('mondumas:static/dist/jSignature/libs/jSignature.min.js')}"></script>
+    <script type="text/javascript">
+    $(document).ready(function() {
+        $sig = $("#signature").jSignature({color:"MidnightBlue","background-color":"LightYellow",width:350,height:150});
+       
+        $('#save').click(function() {
+            datapair = $sig.jSignature("getData","svg");
+            $('#signature_svg').val(datapair);
+        });
+    
+        $('#clear').click(function() {
+            $sig.jSignature("clear");
+        }); 
+        //afficher signature
+        var dataString = 'data:' + '${rapport.signature_svg}'
+        $('#signature_img').append("<img class='imported' src='" + dataString + "'></img>"); });
+    </script>
+</div>
 </metal:block>
diff --git a/mondumas/templates/dossier/suivi_edit.pt b/mondumas/templates/dossier/suivi_edit.pt
index a795ca9..87e752d 100644
--- a/mondumas/templates/dossier/suivi_edit.pt
+++ b/mondumas/templates/dossier/suivi_edit.pt
@@ -49,24 +49,16 @@
 	<br />
     </div> <!-- row -->
 
-<script>
-$(document).ready(function() {
-	$('#rdv_edit-form').formValidation();
-	$('#date_rdv_picker').datetimepicker({
-		format: 'DD-MM-YYYY HH:mm',
-		showClear: true,
-		allowInputToggle: true,
-		stepping: 15,
-	})
-	.on('changeDate', function(e) {
-		// Revalidate the date field
-		$('#rdv_edit-form').formValidation('revalidateField', 'date_rdv');
-	});
-	$('form input').on('keypress', function(e) {
-		return e.which !== 13;
-	});
-});
-</script>
 
+</div>
+<div metal:fill-slot="additional_scripts">
+	<script>
+		$(document).ready(function() {
+			$('#rdv_edit-form').formValidation();
+			$('form input').on('keypress', function(e) {
+				return e.which !== 13;
+			});
+		});
+	</script>
 </div>
 </metal:block>
diff --git a/mondumas/templates/layouts/global_layout.pt b/mondumas/templates/layouts/global_layout.pt
index 402564e..30cc256 100644
--- a/mondumas/templates/layouts/global_layout.pt
+++ b/mondumas/templates/layouts/global_layout.pt
@@ -14,7 +14,6 @@
 	<link href="//cdnjs.cloudflare.com/ajax/libs/fullcalendar-scheduler/1.9.4/scheduler.min.css" rel="stylesheet">
 	<link href="//cdnjs.cloudflare.com/ajax/libs/bootstrap-datetimepicker/4.17.47/css/bootstrap-datetimepicker.min.css" rel="stylesheet">
 	<link href="//cdnjs.cloudflare.com/ajax/libs/datatables/1.10.18/css/dataTables.bootstrap.min.css" rel="stylesheet" media="all">
-	<link href="//gyrocode.github.io/jquery-datatables-checkboxes/1.2.11/css/dataTables.checkboxes.css" rel="stylesheet" />
 	<link href="${request.static_url('mondumas:static/dist/formvalidation/css/formValidation.min.css')}" rel="stylesheet">
 	<!--    Custom CSS    -->
     <link href="${request.static_url('mondumas:static/css/style.less')}" type="text/css" rel="stylesheet/less">
@@ -23,26 +22,17 @@
     <script src="//ajax.googleapis.com/ajax/libs/jquery/2.2.2/jquery.min.js"></script>
 	<script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js"></script>
 
-	<!--    Bootstrap Fullcalendar plugin   -->
+	<!--    Bootstrap moment plugin   -->
 	<script src="//cdnjs.cloudflare.com/ajax/libs/moment.js/2.17.1/moment.min.js"></script>
 	<script src="//cdnjs.cloudflare.com/ajax/libs/moment.js/2.17.1/locale/fr.js"></script>
-	<script src="//cdnjs.cloudflare.com/ajax/libs/fullcalendar/3.9.0/fullcalendar.min.js"></script>
-	<script src="//cdnjs.cloudflare.com/ajax/libs/fullcalendar-scheduler/1.9.4/scheduler.min.js"></script>
-	<script src="//cdnjs.cloudflare.com/ajax/libs/fullcalendar/3.9.0/locale/fr.js"></script>
-	<!--    Bootstrap Datepicker plugin   -->
-	<script src="//cdnjs.cloudflare.com/ajax/libs/bootstrap-datetimepicker/4.17.47/js/bootstrap-datetimepicker.min.js"></script>
 	<!--    Datatable  -->   
 	<script src="//cdn.datatables.net/1.10.18/js/jquery.dataTables.min.js"></script>
 	<script src="//cdn.datatables.net/1.10.18/js/dataTables.bootstrap.min.js"></script>
-	<script src="//gyrocode.github.io/jquery-datatables-checkboxes/1.2.11/js/dataTables.checkboxes.min.js"></script>
 	<script src="//cdn.datatables.net/plug-ins/1.10.19/sorting/datetime-moment.js"></script>
 	<!--    FormValidation plugin   -->
 	<script src="${request.static_url('mondumas:static/dist/formvalidation/js/formValidation.min.js')}"></script>
 	<script src="${request.static_url('mondumas:static/dist/formvalidation/js/framework/bootstrap.min.js')}"></script>
-	<script src="${request.static_url('mondumas:static/dist/formvalidation/js/language/fr_FR.js')}" type="text/javascript"></script>
-	<!--    JSignature plugin   -->
-	<script src="${request.static_url('mondumas:static/dist/jSignature/libs/jSignature.min.js')}"></script>
-	
+	<script src="${request.static_url('mondumas:static/dist/formvalidation/js/language/fr_FR.js')}" type="text/javascript"></script>	
     <!--    Less -->
     <script src="//cdnjs.cloudflare.com/ajax/libs/less.js/2.5.3/less.min.js" type="text/javascript"></script>
 </head>
diff --git a/mondumas/templates/parametres/user_edit.pt b/mondumas/templates/parametres/user_edit.pt
index 60dd21f..ddf946e 100644
--- a/mondumas/templates/parametres/user_edit.pt
+++ b/mondumas/templates/parametres/user_edit.pt
@@ -72,7 +72,7 @@
 					</label>
 				</div>
 			</div>
-			<div class="form-group">
+			<div class="form-group" tal:condition="individu.CD_UTI != '0'">
 				<label class="control-label col-sm-3" for="access">Dernière modif.</label>
 				<div class="col-sm-9">
 					<p class="form-control-static">${individu.modif_le.strftime('%d/%m/%Y - %H:%M')}</p>
diff --git a/mondumas/views/agenda.py b/mondumas/views/agenda.py
index 6f819d2..e052652 100644
--- a/mondumas/views/agenda.py
+++ b/mondumas/views/agenda.py
@@ -167,7 +167,7 @@ def agenda(request):
     
     return {
         'page_title': 'Agenda de %s' % agenda,
-        'fullcalendar_events': json.dumps(events),
+        'calendar_events': json.dumps(events),
         'agendas': agendas,
         'agenda': agenda,
         'isCommercial': isCommercial,
@@ -230,7 +230,7 @@ def planning(request):
     
     return {
         'page_title': 'Planning',
-        'fullcalendar_events': json.dumps(events),
-        'fullcalendar_ressources': json.dumps(ressources),        
+        'calendar_events': json.dumps(events),
+        'calendar_ressources': json.dumps(ressources),        
     }
 
diff --git a/mondumas/views/dossier.py b/mondumas/views/dossier.py
index 18c2299..cf4f958 100644
--- a/mondumas/views/dossier.py
+++ b/mondumas/views/dossier.py
@@ -427,6 +427,7 @@ def rdf_edit(request):
     elements_clos = get_rdf_causes(request, 'C05')
     elements_couvert = get_rdf_causes(request, 'C06')
     voisins = get_rdf_causes(request, 'C07')
+    tierce_personnes = get_rdf_causes(request, 'C08')
     
     if 'form.submitted' in request.params:
         new_values = {}
@@ -502,6 +503,7 @@ def rdf_edit(request):
         'elements_clos': elements_clos,
         'elements_couvert': elements_couvert,
         'voisins':voisins,
+        'tierce_personnes': tierce_personnes,
     }
 
 @view_config(route_name='rdf_list', renderer='../templates/dossier/rdf_list.pt', permission='view')
@@ -560,10 +562,11 @@ def rdf_view(request):
         dest = "mondumas/static/DEVFAC/DOCS_ATTACHES/PL/%s/%s" % (str(rapport.nochantier), filename)
         origin = request.route_url('rdf_rapport', no_id=norapport)
         config = pdfkit.configuration(wkhtmltopdf="C:\\Program Files\\wkhtmltopdf\\bin\\wkhtmltopdf.exe") 
+        # import pdb;pdb.set_trace()
         try:
             pdfkit.from_url(origin, dest, configuration=config, options=options)
         except:
-            request.session.flash(u"Une erreur est survenue pendant la génération du PDF.", 'danger')
+            request.session.flash(u"Erreur de génération du PDF. Pensez à créer le lien static/DEVFAC", 'danger')
             return HTTPFound(location=request.route_url('rdf_view', no_id=norapport))
         else:
             insert_dossier_attaches(request, nodossier, 0, filename, '160 Ko', logged_in)
@@ -575,9 +578,15 @@ def rdf_view(request):
             request.session.flash(u"Le rapport a été génré avec succès.", 'success')
             return HTTPFound(location=request.route_url('dossier_view', nodossier=nodossier))
 
+    if 'form.delete' in request.params:
+        delete_rapport(request, norapport)
+        request.session.flash(u"Le rapporta été supprimé avec succès.", 'success')
+        return HTTPFound(location=request.route_url('dossier_view', nodossier=nodossier))
+
     return {
-        'page_title': "Dossier %s : Rapport no %s du %s" % (nodossier, norapport, rapport.date_inter.strftime('%d-%m-%Y')),
+        'page_title': "Rapport no %s du %s" % (norapport, rapport.date_inter.strftime('%d-%m-%Y')),
         'url': url,
+        'pt_name': 'rdf_view',
         'logged_in': logged_in,
         'rapport': rapport,
         'nodossier': nodossier,
@@ -588,7 +597,7 @@ def rdf_view(request):
         'docs_url': request.static_url(request.registry.settings['mondumas.devfac_url']),
     }
 
-@view_config(route_name='rdf_rapport', renderer='../templates/dossier/rdf_rapport.pt')
+@view_config(route_name='rdf_rapport', renderer='../templates/dossier/rdf_view.pt')
 def rdf_rapport(request):
     norapport = request.matchdict['no_id']
 
@@ -605,6 +614,8 @@ def rdf_rapport(request):
         
     return {
         'page_title': '',
+        'url': '',        
+        'pt_name': 'rdf_rapport',        
         'rapport': rapport,
         'nodossier': nodossier,
         'nochantier': rapport.nochantier,