diff --git a/application/views/lehre/anrechnung/createAnrechnung.php b/application/views/lehre/anrechnung/createAnrechnung.php index 67665e8de..af7043c9c 100644 --- a/application/views/lehre/anrechnung/createAnrechnung.php +++ b/application/views/lehre/anrechnung/createAnrechnung.php @@ -157,7 +157,7 @@ $this->load->view(
-
diff --git a/public/js/lehre/anrechnung/createAnrechnung.js b/public/js/lehre/anrechnung/createAnrechnung.js index 61ad9003a..20bc91d1a 100644 --- a/public/js/lehre/anrechnung/createAnrechnung.js +++ b/public/js/lehre/anrechnung/createAnrechnung.js @@ -4,38 +4,33 @@ $(function () { createAnrechnung.disableFormFields(); // Create Anrechnung on form submit - $('#createAnrechnung-submit').click(function(e){ + $('#createAnrechnung-form').submit(function(e){ + + FHC_AjaxClient.ajaxCallPost( + FHC_JS_DATA_STORAGE_OBJECT.called_path + "/create", + new FormData(this), + { + successCallback: function (data, textStatus, jqXHR) + { + if (FHC_AjaxClient.isError(data)) + { + FHC_DialogLib.alertWarning(FHC_AjaxClient.getError(data)); + } + + if (FHC_AjaxClient.hasData(data)) + { + FHC_DialogLib.alertSuccess(FHC_AjaxClient.getData(data)); + } + }, + errorCallback: function (jqXHR, textStatus, errorThrown) + { + FHC_DialogLib.alertError(FHC_PhrasesLib.t("ui", "systemfehler")); + } + } + ); // Avoid form redirecting automatically - e.preventDefault(); - - // Get form data - let formData = new FormData($('#createAnrechnung-form')[0]); - - $.ajax({ - url : "CreateAnrechnung/create", - type: "POST", - data : formData, - processData: false, // needed to pass uploaded file with FormData - contentType: false, // needed to pass uploaded file with FormData - success:function(data, textStatus, jqXHR){ - - if (FHC_AjaxClient.isError(data)) - { - FHC_DialogLib.alertWarning(FHC_AjaxClient.getError(data)); - } - - if (FHC_AjaxClient.hasData(data)) - { - FHC_DialogLib.alertSuccess(FHC_AjaxClient.getData(data)); - } - }, - error: function(jqXHR, textStatus, errorThrown){ - - FHC_DialogLib.alertWarning(FHC_PhrasesLib.t("ui", "systemfehler")); - - } - }); + return false; }); }) diff --git a/public/js/lehre/anrechnung/requestAnrechnung.js b/public/js/lehre/anrechnung/requestAnrechnung.js index e7999f0e9..df9f000b8 100644 --- a/public/js/lehre/anrechnung/requestAnrechnung.js +++ b/public/js/lehre/anrechnung/requestAnrechnung.js @@ -32,33 +32,32 @@ $(function(){ return FHC_DialogLib.alertInfo(FHC_PhrasesLib.t("ui", "errorBestaetigungFehlt")); } - $.ajax({ - url : "RequestAnrechnung/apply", - type: "POST", - data : formdata, - processData: false, // needed to pass uploaded file with FormData - contentType: false, // needed to pass uploaded file with FormData - success:function(data, textStatus, jqXHR){ - if (data.error && data.retval != null) - { - FHC_DialogLib.alertWarning(data.retval); - } + FHC_AjaxClient.ajaxCallPost( + FHC_JS_DATA_STORAGE_OBJECT.called_path + "/apply", + formdata, + { + successCallback:function(data, textStatus, jqXHR){ + if (FHC_AjaxClient.isError(data)) + { + FHC_DialogLib.alertWarning(FHC_AjaxClient.getError(data)); + } - if (!data.error && data.retval != null) - { - requestAnrechnung.formatAnrechnungIsApplied( - data.retval.antragdatum, - data.retval.dms_id, - formdata.get('uploadfile').name - ); + if (FHC_AjaxClient.hasData(data)) + { + requestAnrechnung.formatAnrechnungIsApplied( + data.retval.antragdatum, + data.retval.dms_id, + formdata.get('uploadfile').name + ); - FHC_DialogLib.alertSuccess(FHC_PhrasesLib.t("global", "antragWurdeGestellt")); + FHC_DialogLib.alertSuccess(FHC_PhrasesLib.t("global", "antragWurdeGestellt")); + } + }, + errorCallback: function(jqXHR, textStatus, errorThrown){ + FHC_DialogLib.alertWarning(FHC_PhrasesLib.t("ui", "systemfehler")); } - }, - error: function(jqXHR, textStatus, errorThrown){ - FHC_DialogLib.alertWarning(FHC_PhrasesLib.t("ui", "systemfehler")); } - }); + ); }); })