Work on route form

1 files changed, 48 insertions, 43 deletions

diff --git a/static/saclay/js/interface.js b/static/saclay/js/interface.js
index 9c7dec9..686e66e 100644
--- a/static/saclay/js/interface.js
+++ b/static/saclay/js/interface.js
@@ -1,12 +1,16 @@
 $(function(){
-    var _frm_editmarker_initialized;
-    var _frm_editroute_initialized;
-    var _frm_editevent_initialized;
-
     var update_editmarker = function(){
+        $('#action-edit-event').removeClass('ui-state-active');
+        $('#action-edit-route').removeClass('ui-state-active');
+        $('#action-edit-marker').addClass('ui-state-active');
+        $('#frm-edit-route').hide();
+        $('#frm-edit-event').hide();
+        $('#frm-edit-marker').show();
         $.ajax({url: edit_url,
                 dataType: "html",
                 success: function (data) {
+                    $('#frm-edit-event').html('');
+                    $('#frm-edit-route').html('');
                     $('#frm-edit-marker').html(data);
                     $("#main-map").chimere('activateMarkerEdit');
                 },
@@ -18,9 +22,17 @@ $(function(){
     };
 
     var update_editevent = function(){
+        $('#action-edit-marker').removeClass('ui-state-active');
+        $('#action-edit-route').removeClass('ui-state-active');
+        $('#action-edit-event').addClass('ui-state-active');
+        $('#frm-edit-marker').hide();
+        $('#frm-edit-route').hide();
+        $('#frm-edit-event').show();
         $.ajax({url: edit_event_url,
                 dataType: "html",
                 success: function (data) {
+                    $('#frm-edit-marker').html('');
+                    $('#frm-edit-route').html('');
                     $('#frm-edit-event').html(data);
                     $("#main-map").chimere('activateMarkerEdit');
                 },
@@ -31,8 +43,36 @@ $(function(){
             });
     };
 
+    var update_editroute = function(){
+        $('#action-edit-marker').removeClass('ui-state-active');
+        $('#action-edit-event').removeClass('ui-state-active');
+        $('#action-edit-route').addClass('ui-state-active');
+        $('#frm-edit-marker').hide();
+        $('#frm-edit-event').hide();
+        $('#frm-edit-route').show();
+        $.ajax({url: edit_route_url,
+                dataType: "html",
+                success: function (data) {
+                    $('#frm-edit-marker').html('');
+                    $('#frm-edit-event').html('');
+                    $('#frm-edit-route').html(data);
+                    $("#main-map").chimere('activateRouteEdit');
+                },
+                error: function (data) {
+                    $('#frm-edit-route').html("<p class='warning'>"+
+                                        default_error_message+"</p>");
+                }
+            });
+    };
+
     $("#action-carte").click(function(){
         $("#main-map").chimere('activateContextMenu');
+        if($("#itinerary_field").html()){
+            $("#chimere_itinerary_form").appendTo("#chimere_itinerary_panel");
+            if($("#chimere_itinerary").css('display') != 'none'){
+                $("#chimere_itinerary_form").hide();
+            }
+        }
         $('#action-participate').removeClass('ui-state-active');
         $('#action-carte').addClass('ui-state-active');
         $('#edit-actions').hide();
@@ -48,45 +88,10 @@ $(function(){
         $('#edit-actions').show();
         $('#map-panel').hide();
         $('#edit-panel').show();
-        // if the default is initialized the other are not
-        if (!_frm_editmarker_initialized){
-            update_editmarker();
-            _frm_editmarker_initialized = true;
-        }
-    });
-
-    $("#action-edit-event").click(function(){
-        if (!_frm_editevent_initialized){
-            _frm_editevent_initialized = true;
-            update_editevent();
-        }
-        $('#action-edit-marker').removeClass('ui-state-active');
-        $('#action-edit-route').removeClass('ui-state-active');
-        $('#action-edit-event').addClass('ui-state-active');
-        $('#frm-edit-marker').hide();
-        $('#frm-edit-route').hide();
-        $('#frm-edit-event').show();
+        update_editmarker();
     });
 
-    $("#action-edit-marker").click(function(){
-        $('#action-edit-event').removeClass('ui-state-active');
-        $('#action-edit-route').removeClass('ui-state-active');
-        $('#action-edit-marker').addClass('ui-state-active');
-        $('#frm-edit-route').hide();
-        $('#frm-edit-event').hide();
-        $('#frm-edit-marker').show();
-    });
-
-    $("#action-edit-route").click(function(){
-        if (!_frm_editroute_initialized){
-            _frm_editroute_initialized = true;
-            update_editroute();
-        }
-        $('#action-edit-event').removeClass('ui-state-active');
-        $('#action-edit-marker').removeClass('ui-state-active');
-        $('#action-edit-route').addClass('ui-state-active');
-        $('#frm-edit-marker').hide();
-        $('#frm-edit-event').hide();
-        $('#frm-edit-route').show();
-    });
+    $("#action-edit-event").click(update_editevent);
+    $("#action-edit-marker").click(update_editmarker);
+    $("#action-edit-route").click(update_editroute);
 });