maket/MaketRandevu
1
1
Fork 0
Code Issues 15 Pull requests Projects Releases 4 Packages Wiki Activity

Refactored the installation.js file.

Browse source
This commit is contained in:
Alex Tselegidis 2016-04-24 19:13:39 +02:00
parent c85d89c5ee
commit edc97e771e
1 changed files with 28 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
src/assets/js/installation.js
View file

@ -10,9 +10,11 @@
* ---------------------------------------------------------------------------- */
$(document).ready(function() {
var MIN_PASSWORD_LENGTH = 7;
var AJAX_SUCCESS = 'SUCCESS';
var AJAX_FAILURE = 'FAILURE';
'use strict';
var MIN_PASSWORD_LENGTH = 7,
AJAX_SUCCESS = 'SUCCESS',
AJAX_FAILURE = 'FAILURE';
$(document).ajaxStart(function() {
$('#loading').show();
@ -26,14 +28,16 @@ $(document).ready(function() {
* Event: Install Easy!Appointments Button "Click"
*/
$('#install').click(function() {
if (!validate()) return;
if (!validate()) {
return;
}
var postUrl = GlobalVariables.baseUrl + '/index.php/installation/ajax_install';
var postData = {
'csrfToken': GlobalVariables.csrfToken,
'admin': JSON.stringify(getAdminData()),
'company': JSON.stringify(getCompanyData())
};
var postUrl = GlobalVariables.baseUrl + '/index.php/installation/ajax_install',
postData = {
csrfToken: GlobalVariables.csrfToken,
admin: JSON.stringify(getAdminData()),
company: JSON.stringify(getCompanyData())
};
$.ajax({
url: postUrl,
@ -41,11 +45,9 @@ $(document).ready(function() {
data: postData,
datatype: 'json',
success: function(response) {
//////////////////////////////////////////////////////
console.log('Ajax Install E!A Response:', response);
//////////////////////////////////////////////////////
if (!GeneralFunctions.handleAjaxExceptions(response)) return;
if (!GeneralFunctions.handleAjaxExceptions(response)) {
return;
}
$('.alert').text('Easy!Appointments has been successfully installed!');
$('.alert').addClass('alert-success');
@ -90,8 +92,9 @@ $(document).ready(function() {
}
});
if (missingRequired)
if (missingRequired) {
throw 'All the page fields are required.';
}
// Validate Passwords
if ($('#password').val() != $('#retype-password').val()) {
@ -132,12 +135,12 @@ $(document).ready(function() {
*/
function getAdminData() {
var admin = {
'first_name': $('#first-name').val(),
'last_name': $('#last-name').val(),
'email': $('#email').val(),
'phone_number': $('#phone-number').val(),
'username': $('#username').val(),
'password': $('#password').val()
first_name: $('#first-name').val(),
last_name: $('#last-name').val(),
email: $('#email').val(),
phone_number: $('#phone-number').val(),
username: $('#username').val(),
password: $('#password').val()
};
return admin;
@ -150,9 +153,9 @@ $(document).ready(function() {
*/
function getCompanyData() {
var company = {
'company_name': $('#company-name').val(),
'company_email': $('#company-email').val(),
'company_link': $('#company-link').val()
company_name: $('#company-name').val(),
company_email: $('#company-email').val(),
company_link: $('#company-link').val()
};
return company;