diff --git a/backend/gncitizen/core/sites/routes.py b/backend/gncitizen/core/sites/routes.py
index 133e1cb8..76d7c5e6 100644
--- a/backend/gncitizen/core/sites/routes.py
+++ b/backend/gncitizen/core/sites/routes.py
@@ -1,5 +1,6 @@
 import io
 import uuid
+import json
 
 import xlwt
 from flask import Blueprint, current_app, make_response, request
@@ -113,6 +114,8 @@ def get_site_photos(site_id):
             "url": "/media/{}".format(p.MediaModel.filename),
             "date": p.VisitModel.as_dict()["date"],
             "author": p.VisitModel.obs_txt,
+            "visit_id": p.VisitModel.id_visit,
+            "id_media": p.MediaModel.id_media
         }
         for p in photos
     ]
@@ -406,6 +409,44 @@ def post_visit(site_id):
         return {"error_message": str(e)}, 400
 
 
+@sites_api.route("/visits/<int:visit_id>", methods=["PATCH"])
+@json_resp
+@jwt_required()
+def update_visit(visit_id):
+    try:
+        current_user = get_user_if_exists()
+        update_data = dict(request.get_json())
+        visit = VisitModel.query.filter_by(id_visit=visit_id).first()
+        if current_user.id_user != visit.id_role:
+            return ("unauthorized"), 403
+        
+        try:
+            # Delete selected existing media
+            id_media_to_delete = json.loads(update_data.get("delete_media"))
+            if len(id_media_to_delete):
+                db.session.query(MediaOnVisitModel).filter(
+                    MediaOnVisitModel.id_media.in_(
+                        tuple(id_media_to_delete)
+                    ),
+                    MediaOnVisitModel.id_data_source
+                    == visit_id,
+                ).delete(synchronize_session="fetch")
+                db.session.query(MediaModel).filter(
+                    MediaModel.id_media.in_(tuple(id_media_to_delete))
+                ).delete(synchronize_session="fetch")
+        except Exception as e:
+            current_app.logger.warning("[update_visit] delete media ", e)
+            raise GeonatureApiError(e)
+
+        visit.date = update_data.get("date")
+        visit.json_data = update_data.get("data")
+        db.session.commit()
+        return ("Visit updated successfully"), 200
+    except Exception as e:
+        current_app.logger.critical("[update_visit] Error: %s", str(e))
+        return {"message": str(e)}, 400
+
+
 @sites_api.route(
     "/<int:site_id>/visits/<int:visit_id>/photos", methods=["POST"]
 )
@@ -442,7 +483,7 @@ def delete_site(site_id):
             .join(UserModel, SiteModel.id_role == UserModel.id_user, full=True)
             .first()
         )
-        if current_user.id_user == site.id_role:
+        if current_user.id_user == site.SiteModel.id_role:
             SiteModel.query.filter_by(id_site=site_id).delete()
             db.session.commit()
             return ("Site deleted successfully"), 200
@@ -452,6 +493,27 @@ def delete_site(site_id):
         return {"message": str(e)}, 500
 
 
+@sites_api.route("/visit/<int:visit_id>", methods=["DELETE"])
+@json_resp
+@jwt_required()
+def delete_visit(visit_id):
+    current_user = get_user_if_exists()
+    # try:
+    visit = (
+        db.session.query(VisitModel)
+        .filter(VisitModel.id_visit == visit_id)
+        .first()
+    )
+    if current_user.id_user == visit.id_role:
+        VisitModel.query.filter_by(id_visit=visit_id).delete()
+        db.session.commit()
+        return ("Site deleted successfully"), 200
+    else:
+        return ("delete unauthorized"), 403
+    # except Exception as e:
+    #     return {"message": str(e)}, 500
+
+
 @sites_api.route("/export/<int:user_id>", methods=["GET"])
 @jwt_required()
 def export_sites_xls(user_id):
diff --git a/backend/requirements.txt b/backend/requirements.txt
index 4d3d73f0..99570476 100644
--- a/backend/requirements.txt
+++ b/backend/requirements.txt
@@ -43,7 +43,7 @@ sqlalchemy==1.4.15; (python_version >= "2.7" and python_full_version < "3.0.0")
 toml==0.10.2; (python_version >= "2.6" and python_full_version < "3.0.0") or (python_full_version >= "3.3.0")
 typing-extensions==3.10.0.0; python_version >= "3.6" and python_full_version < "3.0.0" and python_version < "3.8" or python_full_version >= "3.6.0" and python_version < "3.8" and python_version >= "3.6"
 urllib3==1.26.4; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version < "4"
-utils-flask-sqlalchemy @ git+https://github.com/hypsug0/Utils-Flask-SQLAlchemy@master
+utils-flask-sqlalchemy @ git+https://github.com/PnX-SI/Utils-Flask-SQLAlchemy@master
 utils-flask-sqlalchemy-geo @ git+https://github.com/PnX-SI/Utils-Flask-SQLAlchemy-Geo@0.2.1
 werkzeug==2.0.0; python_version >= "3.6" and python_full_version < "3.0.0" and python_version < "4" or python_full_version >= "3.5.0" and python_version >= "3.6" and python_version < "4"
 wtforms==2.3.3
diff --git a/frontend/src/app/auth/user-dashboard/user-dashboard.component.ts b/frontend/src/app/auth/user-dashboard/user-dashboard.component.ts
index ad27c0cb..6e7d477e 100644
--- a/frontend/src/app/auth/user-dashboard/user-dashboard.component.ts
+++ b/frontend/src/app/auth/user-dashboard/user-dashboard.component.ts
@@ -167,6 +167,9 @@ export class UserDashboardComponent implements OnInit {
                     // this.rowData(obs, coords);
                     // this.obsExport(obs);
                 });
+                if (this.observations.length === 0 && this.mysites.features.length > 0) {
+                    this.tab = 'sites'
+                }
             } else {
                 this.observations = data[0].features;
                 this.observations.forEach((obs) => {
diff --git a/frontend/src/app/auth/user-dashboard/user.service.service.ts b/frontend/src/app/auth/user-dashboard/user.service.service.ts
index 168aeef4..9bc65315 100644
--- a/frontend/src/app/auth/user-dashboard/user.service.service.ts
+++ b/frontend/src/app/auth/user-dashboard/user.service.service.ts
@@ -65,6 +65,12 @@ export class UserService {
         );
     }
 
+    deleteSiteVisit(idVisit: number) {
+        return this.http.delete<Object>(
+            `${AppConfig.API_ENDPOINT}/sites/visit/${idVisit}`
+        );
+    }
+
     ConvertToCSV(objArray, headerList) {
         let array =
             typeof objArray != 'object' ? JSON.parse(objArray) : objArray;
diff --git a/frontend/src/app/home/home.component.ts b/frontend/src/app/home/home.component.ts
index 430b4a63..994cb594 100644
--- a/frontend/src/app/home/home.component.ts
+++ b/frontend/src/app/home/home.component.ts
@@ -47,6 +47,14 @@ export class HomeComponent implements OnInit, AfterViewChecked {
             this.observationsService
                 .getStat()
                 .subscribe((stats) => (this.stats = stats));
+            if (this.programs.length === 1) {
+                const p = this.programs[0]
+                this.router.navigate([
+                    '/programs',
+                    p.id_program,
+                    p.module.name
+                ]);
+            }
         });
         this.route.fragment.subscribe((fragment) => {
             this.fragment = fragment;
diff --git a/frontend/src/app/programs/base/detail/detail.component.html b/frontend/src/app/programs/base/detail/detail.component.html
index e9ab192e..f5d71a18 100644
--- a/frontend/src/app/programs/base/detail/detail.component.html
+++ b/frontend/src/app/programs/base/detail/detail.component.html
@@ -121,10 +121,26 @@ <h2 class="mt-4 mb-4">Photos</h2>
             <div *ngIf="attributes.length > 0" class="row">
                 <h2 class="my-4">Description</h2>
             </div>
+            <!-- {{ attributes|json }} -->
+            <!-- <span *ngIf="site">{{ site.properties.visits|json }}</span> -->
             <div *ngFor="let a of attributes" class="row bg-light my-3">
                 <h5>
                     <i class="fa fa-calendar"></i>
                     {{ a.date | date: 'longDate' }} par {{ a.author }}
+                    <i
+                        class="fa fa-edit text-primary"
+                        ngbTooltip="Editer"
+                        (click)="editSiteVisit(a);"
+                        *ngIf="a.author === username"
+                    ></i>
+                    &nbsp;
+                    <!-- {{ a|json }} deleteSiteVisit(a.id)-->
+                    <i
+                        class="fa fa-trash text-danger"
+                        ngbTooltip="Supprimer"
+                        (click)="openDelVisitModal(a.id)"
+                        *ngIf="a.author === username"
+                    ></i>
                 </h5>
                 <table class="table table-striped table-sm table-hover">
                     <tbody>
@@ -196,3 +212,28 @@ <h5 class="modal-title" id="exampleModalLabel">
         </div>
     </div>
 </div>
+
+<ng-template #visitDeleteModal let-modal>
+    <div class="modal-delete-header">
+        <h5 class="modal-delete-title"><i class="fa fa-trash"></i></h5>
+    </div>
+    <div class="modal-delete-body">
+        Êtes-vous sûr de vouloir supprimer cette visite et toutes les informations
+        qui y sont rattachées ?
+        <br />
+        La suppression sera définitive
+    </div>
+    <div class="modal-delete-footer">
+        <button
+            type="button"
+            class="cancel-btn"
+            style="margin-right: 15px"
+            (click)="visitDeleteModalClose()"
+        >
+            ANNULER
+        </button>
+        <button type="button" class="green-btn" (click)="deleteSiteVisit(idVisitToDelete); visitDeleteModalClose();">
+            OUI
+        </button>
+    </div>
+</ng-template>
diff --git a/frontend/src/app/programs/base/detail/detail.component.ts b/frontend/src/app/programs/base/detail/detail.component.ts
index 1a912be5..0dbfbdd8 100644
--- a/frontend/src/app/programs/base/detail/detail.component.ts
+++ b/frontend/src/app/programs/base/detail/detail.component.ts
@@ -19,6 +19,7 @@ export abstract class BaseDetailComponent {
     obs: any;
     site_id: any;
     site: any;
+    username = null;
 
     showPhoto(photo) {
         console.log('opening photo:');
diff --git a/frontend/src/app/programs/observations/modalflow/modalflow.service.ts b/frontend/src/app/programs/observations/modalflow/modalflow.service.ts
index fe205758..ff806267 100644
--- a/frontend/src/app/programs/observations/modalflow/modalflow.service.ts
+++ b/frontend/src/app/programs/observations/modalflow/modalflow.service.ts
@@ -25,7 +25,7 @@ export const MODAL_DEFAULTS: NgbModalOptions = {
 })
 export class ModalFlowService extends FlowService {
     modalRef: NgbModalRef;
-    private modalCloseStatus: BehaviorSubject<string> = new BehaviorSubject(
+    public modalCloseStatus: BehaviorSubject<string> = new BehaviorSubject(
         null
     );
     display: boolean = false;
@@ -89,7 +89,7 @@ export class ModalFlowService extends FlowService {
         return this.modalCloseStatus.asObservable();
     }
 
-    setModalCloseSatus(type: 'updateObs' | 'newObs' | null) {
+    setModalCloseSatus(type: 'updateObs' | 'newObs' | 'visitPosted' | null) {
         this.modalCloseStatus.next(type);
     }
 
diff --git a/frontend/src/app/programs/sites/detail/detail.component.ts b/frontend/src/app/programs/sites/detail/detail.component.ts
index 49fd0907..894f2df2 100644
--- a/frontend/src/app/programs/sites/detail/detail.component.ts
+++ b/frontend/src/app/programs/sites/detail/detail.component.ts
@@ -1,4 +1,4 @@
-import { Component, AfterViewInit, ViewEncapsulation } from '@angular/core';
+import { Component, AfterViewInit, ViewEncapsulation, ViewChild } from '@angular/core';
 import { GncProgramsService } from '../../../api/gnc-programs.service';
 import { ActivatedRoute } from '@angular/router';
 import * as L from 'leaflet';
@@ -9,6 +9,9 @@ import {
     BaseDetailComponent,
     markerIcon,
 } from '../../base/detail/detail.component';
+import { UserService } from '../../../auth/user-dashboard/user.service.service';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { SiteService } from '../sites.service';
 
 @Component({
     selector: 'app-site-detail',
@@ -23,11 +26,17 @@ export class SiteDetailComponent
     extends BaseDetailComponent
     implements AfterViewInit
 {
+    idVisitToDelete = null;
+    modalDelVisitRef = null;
+    @ViewChild('visitDeleteModal', { static: true }) visitDeleteModal;
     constructor(
         private http: HttpClient,
         private route: ActivatedRoute,
         private programService: GncProgramsService,
-        public flowService: SiteModalFlowService
+        private userService: UserService,
+        private modalService: NgbModal,
+        public flowService: SiteModalFlowService,
+        public siteService: SiteService
     ) {
         super();
         this.route.params.subscribe((params) => {
@@ -35,55 +44,84 @@ export class SiteDetailComponent
             this.program_id = params['program_id'];
         });
         this.module = 'sites';
+        this.username = localStorage.getItem('username');
+        this.flowService.modalCloseStatus.subscribe( value => {
+            if (value === 'visitPosted') {
+                this.updateData();
+            }
+        });
+        this.siteService.siteEdited.subscribe(value => {
+            this.updateData();
+        });
     }
 
-    ngAfterViewInit() {
-        this.programService.getSiteDetails(this.site_id).subscribe((sites) => {
-            this.site = sites['features'][0];
-            this.photos = this.site.properties.photos;
-            this.photos.forEach((e, i) => {
-                this.photos[i]['url'] =
-                    AppConfig.API_ENDPOINT + this.photos[i]['url'];
-            });
-            // for (var i = 0; i < this.photos.length; i++) {
-            //     this.photos[i]['url'] =
-            //         AppConfig.API_ENDPOINT + this.photos[i]['url'];
-            // }
-
-            // setup map
-            const map = L.map('map');
-            L.tileLayer('//{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
-                attribution: 'OpenStreetMap',
-            }).addTo(map);
+    prepareSiteData() {
+        // setup map
+        const map = L.map('map');
+        L.tileLayer('//{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
+            attribution: 'OpenStreetMap',
+        }).addTo(map);
 
-            const coord = this.site.geometry.coordinates;
-            const latLng = L.latLng(coord[1], coord[0]);
-            map.setView(latLng, 13);
+        const coord = this.site.geometry.coordinates;
+        const latLng = L.latLng(coord[1], coord[0]);
+        map.setView(latLng, 13);
 
-            L.marker(latLng, { icon: markerIcon }).addTo(map);
+        L.marker(latLng, { icon: markerIcon }).addTo(map);
+    }
 
-            // prepare data
-            if (this.site.properties.visits) {
-                this.site.properties.visits.forEach((e) => {
-                    const data = e.json_data;
-                    const visitData = { date: e.date, author: e.author };
-                    this.loadJsonSchema().subscribe((jsonschema: any) => {
-                        const schema = jsonschema.schema.properties;
-                        const custom_data = [];
-                        for (const k in data) {
-                            const v = data[k];
-                            custom_data.push({
-                                name: schema[k].title,
-                                value: v.toString(),
-                            });
-                        }
-                        if (custom_data.length > 0) {
-                            visitData['data'] = custom_data;
-                        }
-                    });
-                    this.attributes.push(visitData);
+    prepareVisits() {
+        // photos 
+        this.photos = this.site.properties.photos;
+        this.photos.forEach((e, i) => {
+            this.photos[i]['url'] =
+                AppConfig.API_ENDPOINT + this.photos[i]['url'];
+        });
+        // data
+        this.attributes = []
+        if (this.site.properties.visits) {
+            this.site.properties.visits.forEach((e) => {
+                const data = e.json_data;
+                const visitData = {
+                    date: e.date,
+                    author: e.author,
+                    id: e.id_visit,
+                    json_data: e.json_data
+                };
+                this.loadJsonSchema().subscribe((jsonschema: any) => {
+                    const schema = jsonschema.schema.properties;
+                    const custom_data = [];
+                    for (const k in data) {
+                        const v = data[k];
+                        custom_data.push({
+                            name: schema[k].title,
+                            value: v.toString(),
+                        });
+                    }
+                    if (custom_data.length > 0) {
+                        visitData['data'] = custom_data;
+                    }
                 });
-            }
+                this.attributes.push(visitData);
+            });
+        }
+    }
+
+    getData() {
+        return this.programService.getSiteDetails(this.site_id);
+    }
+
+    updateData() {
+        this.getData().subscribe((sites) => {
+            this.site = sites['features'][0];
+            this.prepareVisits();
+        });
+    }
+
+    ngAfterViewInit() {
+        this.getData().subscribe((sites) => {
+            this.site = sites['features'][0];
+            this.prepareSiteData();
+            this.prepareVisits();
         });
     }
 
@@ -94,4 +132,27 @@ export class SiteDetailComponent
     addSiteVisit() {
         this.flowService.addSiteVisit(this.site_id);
     }
+
+    editSiteVisit(visit_data) {
+        visit_data.photos = this.photos.filter((p) => p.visit_id === visit_data.id)
+        this.flowService.editSiteVisit(this.site_id, visit_data.id, visit_data);
+    }
+
+    openDelVisitModal(idVisitToDelete) {
+        this.idVisitToDelete = idVisitToDelete;
+        this.modalDelVisitRef = this.modalService.open(this.visitDeleteModal, {
+            windowClass: 'delete-modal',
+            centered: true,
+        });
+    }
+
+    visitDeleteModalClose() {
+        this.modalDelVisitRef.close();
+    }
+
+    deleteSiteVisit(idVisitToDelete) {
+        this.userService.deleteSiteVisit(idVisitToDelete).subscribe(() => {
+            this.updateData();
+        });
+    }
 }
diff --git a/frontend/src/app/programs/sites/form/form.component.html b/frontend/src/app/programs/sites/form/form.component.html
index 9c5fdcbb..58dacab4 100644
--- a/frontend/src/app/programs/sites/form/form.component.html
+++ b/frontend/src/app/programs/sites/form/form.component.html
@@ -46,6 +46,24 @@ <h3>
                 </div>
             </div>
             <div class="col-md-8">
+                <div *ngIf="visit_data && visit_data.photos.length > 0" class="mb-3">
+                    <label i18n="Existing Photos@@existingPhotos"
+                        >Photos existantes (cocher pour supprimer)</label
+                    ><br />
+                    <span *ngFor="let p of visit_data.photos" class="mr-4">
+                        <input
+                            type="checkbox"
+                            name=""
+                            [(ngModel)]="p.checked"
+                            [ngModelOptions]="{ standalone: true }"
+                            class="mr-1"
+                        />
+                        <img
+                            src="{{ p.url }}"
+                            height="50"
+                        />
+                    </span>
+                </div>
                 <image-upload
                     buttonCaption="Ajouter une photo"
                     dropBoxMessage="Déposez vos photos ici !"
@@ -60,7 +78,7 @@ <h3>
     <json-schema-form
         [form]="formInputObject"
         [options]="formOptions"
-        (onChanges)="yourOnChangesFn($event)"
+        (onChanges)="onJsonFormChange($event)"
         [framework]="GNCBootstrap4Framework"
     >
     </json-schema-form>
diff --git a/frontend/src/app/programs/sites/form/form.component.ts b/frontend/src/app/programs/sites/form/form.component.ts
index a345efec..dd37e538 100644
--- a/frontend/src/app/programs/sites/form/form.component.ts
+++ b/frontend/src/app/programs/sites/form/form.component.ts
@@ -23,6 +23,7 @@ import { AppConfig } from '../../../../conf/app.config';
 import { GNCFrameworkComponent } from '../../base/jsonform/framework/framework.component';
 import { ngbDateMaxIsToday } from '../../observations/form/formValidators';
 import { SiteService } from '../sites.service';
+import { cpuUsage } from 'process';
 
 declare let $: any;
 
@@ -35,6 +36,8 @@ declare let $: any;
 export class SiteVisitFormComponent implements OnInit, AfterViewInit {
     private readonly URL = AppConfig.API_ENDPOINT;
     @Input() site_id: number;
+    @Input() visit_id: number;
+    @Input() visit_data: any;
     today = new Date();
     visitForm = new FormGroup({
         date: new FormControl(
@@ -45,7 +48,7 @@ export class SiteVisitFormComponent implements OnInit, AfterViewInit {
             },
             [Validators.required, ngbDateMaxIsToday()]
         ),
-        data: new FormControl(''),
+        data: new FormControl('')
     });
     currentStep = 1;
     partialLayout: any[] = [];
@@ -78,8 +81,40 @@ export class SiteVisitFormComponent implements OnInit, AfterViewInit {
         // const that = this;
         this.loadJsonSchema().subscribe((data: any) => {
             this.initForm(data);
+            if (this.visit_id) {
+                this.initJsonData(this.visit_data.json_data)
+                const visit_date = new Date(this.visit_data.date);
+                this.visitForm.controls.date.setValue({
+                    year: visit_date.getFullYear(),
+                    month: visit_date.getMonth() + 1,
+                    day: visit_date.getDate()
+                });
+            }
         });
     }
+    initJsonData(visit_json_data) {
+        // Visit edition json data initialisation
+        this.jsonData = {}
+        if (this.jsonSchema.steps) {
+            this.jsonSchema.steps.forEach((step, index)=> {
+                this.jsonData[index + 1] = {}
+                step.layout.forEach ((elt) => {
+                    if (elt.key && elt.key in visit_json_data) {
+                        this.jsonData[index + 1][elt.key] = visit_json_data[elt.key];
+                    } else if (elt.type === 'section') {
+                        elt.items.forEach((item) => {
+                            if (item.key in visit_json_data) {
+                                this.jsonData[index + 1][item.key] = visit_json_data[item.key]
+                            }
+                        });
+                    }
+                })
+            })
+        } else {
+            this.jsonData = visit_json_data // TODO is it correct ?
+        }
+        this.updateFormInput();
+    }
     initForm(json_schema) {
         this.jsonSchema = json_schema;
         this.updatePartialLayout();
@@ -130,7 +165,7 @@ export class SiteVisitFormComponent implements OnInit, AfterViewInit {
     invalidStep() {
         return this.currentStep === 1 && this.visitForm.get('date').invalid;
     }
-    yourOnChangesFn(e) {
+    onJsonFormChange(e) {
         this.jsonData[this.currentStep] = e;
     }
     getTotalJsonData() {
@@ -159,12 +194,13 @@ export class SiteVisitFormComponent implements OnInit, AfterViewInit {
         this.postSiteVisit().subscribe(
             (data) => {
                 console.debug(data);
-                const visitId = data['features'][0]['id_visit'];
+                const visitId = this.visit_id || data['features'][0]['id_visit'];
                 if (this.photos.length > 0) {
                     this.postVisitPhotos(visitId).subscribe(
                         (resp) => {
                             console.debug(resp);
                             this.siteService.newSiteCreated.emit(true);
+                            this.siteService.siteEdited.emit(true);
                         },
                         (err) => console.error(err),
                         () => console.log('photo upload done')
@@ -181,17 +217,28 @@ export class SiteVisitFormComponent implements OnInit, AfterViewInit {
         const httpOptions = {
             headers: new HttpHeaders({
                 Accept: 'application/json',
-            }),
+            })
         };
         const visitDate = NgbDate.from(this.visitForm.controls.date.value);
         this.visitForm.patchValue({
             data: this.getTotalJsonData(),
-            date: new Date(visitDate.year, visitDate.month, visitDate.day)
+            date: new Date(visitDate.year, visitDate.month - 1, visitDate.day)
                 .toISOString()
                 .match(/\d{4}-\d{2}-\d{2}/)[0],
         });
-        return this.http.post<any>(
-            `${this.URL}/sites/${this.site_id}/visits`,
+        let method = 'post';
+        let url = `${this.URL}/sites/${this.site_id}/visits`;
+        const formData = this.visitForm.value
+        if (this.visit_id) {
+            const id_media_to_delete = this.visit_data.photos
+                .filter((p) => p.checked)
+                .map((p) => p.id_media);
+            formData['delete_media'] = JSON.stringify(id_media_to_delete);
+            method = 'patch';
+            url = `${this.URL}/sites/visits/${this.visit_id}`
+        }
+        return this.http[method]<any>(
+            url,
             this.visitForm.value,
             httpOptions
         );
diff --git a/frontend/src/app/programs/sites/modalflow/modalflow.service.ts b/frontend/src/app/programs/sites/modalflow/modalflow.service.ts
index 67ebbbb2..a5741528 100644
--- a/frontend/src/app/programs/sites/modalflow/modalflow.service.ts
+++ b/frontend/src/app/programs/sites/modalflow/modalflow.service.ts
@@ -30,7 +30,7 @@ export class SiteModalFlowService extends ModalFlowService {
             );
         }
         if (!init_data.updateData) {
-            items.push(new FlowItem(VisitStepComponent));
+            items.push(new FlowItem(VisitStepComponent), { ...init_data, service: this });
         } // else user only edits the site and do not attach visit
         // items.push(new FlowItem(RewardComponent, {service: this}));
         return items;
@@ -41,6 +41,15 @@ export class SiteModalFlowService extends ModalFlowService {
         this.openFormModal(init_data);
     }
 
+    editSiteVisit (site_id, visit_id, visit_data) {
+        var init_data = {
+            site_id: site_id,
+            visit_id: visit_id,
+            visit_data: visit_data
+        };
+        this.openFormModal(init_data);
+    }
+
     openFormModal(init_data) {
         var flowitems = this.getFlowItems(init_data);
         var modalRef = this.open(FlowComponent);
diff --git a/frontend/src/app/programs/sites/modalflow/steps/visit/visit_step.component.html b/frontend/src/app/programs/sites/modalflow/steps/visit/visit_step.component.html
index 1456e7e1..5e425049 100644
--- a/frontend/src/app/programs/sites/modalflow/steps/visit/visit_step.component.html
+++ b/frontend/src/app/programs/sites/modalflow/steps/visit/visit_step.component.html
@@ -12,7 +12,11 @@ <h4 class="modal-title">AJOUTER UN RAPPORT DE VISITE</h4>
 </div>
 
 <div class="modal-body add-obs">
-    <app-site-visit-form [site_id]="data.site_id"></app-site-visit-form>
+    <app-site-visit-form
+        [site_id]="data.site_id"
+        [visit_id]="data.visit_id"
+        [visit_data]="data.visit_data">
+    </app-site-visit-form>
 </div>
 
 <div class="modal-footer" *ngIf="form.readyToDisplay">
diff --git a/frontend/src/app/programs/sites/modalflow/steps/visit/visit_step.component.ts b/frontend/src/app/programs/sites/modalflow/steps/visit/visit_step.component.ts
index f066fc33..7033199d 100644
--- a/frontend/src/app/programs/sites/modalflow/steps/visit/visit_step.component.ts
+++ b/frontend/src/app/programs/sites/modalflow/steps/visit/visit_step.component.ts
@@ -21,6 +21,7 @@ export class VisitStepComponent implements IFlowComponent {
         this.form.onFormSubmit();
         console.debug('committed action > data:', this.data);
         // this.data.next();
+        this.data.service.setModalCloseSatus('visitPosted');
         this.data.service.close(null);
     }