From c60a0feeafe5719606bfd3d67c16ba90b9a69422 Mon Sep 17 00:00:00 2001 From: Alex Tselegidis Date: Tue, 1 Dec 2015 23:39:31 +0100 Subject: [PATCH] Added the dateFormat value to the GlobalVariables of every backend page. --- src/application/controllers/backend.php | 609 ++++++++++---------- src/application/views/backend/calendar.php | 1 + src/application/views/backend/customers.php | 9 +- src/application/views/backend/services.php | 11 +- src/application/views/backend/settings.php | 15 +- src/application/views/backend/users.php | 17 +- src/assets/js/backend_calendar.js | 31 +- 7 files changed, 362 insertions(+), 331 deletions(-) diff --git a/src/application/controllers/backend.php b/src/application/controllers/backend.php index b2d5fa3c..d1ae4d63 100644 --- a/src/application/controllers/backend.php +++ b/src/application/controllers/backend.php @@ -1,302 +1,307 @@ - - * @copyright Copyright (c) 2013 - 2015, Alex Tselegidis - * @license http://opensource.org/licenses/GPL-3.0 - GPLv3 - * @link http://easyappointments.org - * @since v1.0.0 - * ---------------------------------------------------------------------------- */ - -/** - * Backend Controller - * - * @package Controllers - */ -class Backend extends CI_Controller { - public function __construct() { - parent::__construct(); - $this->load->library('session'); - - // Set user's selected language. - if ($this->session->userdata('language')) { - $this->config->set_item('language', $this->session->userdata('language')); - $this->lang->load('translations', $this->session->userdata('language')); - } else { - $this->lang->load('translations', $this->config->item('language')); // default - } - } - - /** - * Display the main backend page. - * - * This method displays the main backend page. All users login permission can - * view this page which displays a calendar with the events of the selected - * provider or service. If a user has more priviledges he will see more menus - * at the top of the page. - * - * @param string $appointment_hash If given, the appointment edit dialog will - * appear when the page loads. - */ - public function index($appointment_hash = '') { - $this->session->set_userdata('dest_url', $this->config->item('base_url') . '/index.php/backend'); - if (!$this->has_privileges(PRIV_APPOINTMENTS)) return; - - $this->load->model('appointments_model'); - $this->load->model('providers_model'); - $this->load->model('services_model'); - $this->load->model('customers_model'); - $this->load->model('settings_model'); - $this->load->model('roles_model'); - $this->load->model('user_model'); - $this->load->model('secretaries_model'); - - $view['base_url'] = $this->config->item('base_url'); - $view['user_display_name'] = $this->user_model->get_user_display_name($this->session->userdata('user_id')); - $view['active_menu'] = PRIV_APPOINTMENTS; - $view['book_advance_timeout'] = $this->settings_model->get_setting('book_advance_timeout'); - $view['company_name'] = $this->settings_model->get_setting('company_name'); - $view['available_providers'] = $this->providers_model->get_available_providers(); - $view['available_services'] = $this->services_model->get_available_services(); - $view['customers'] = $this->customers_model->get_batch(); - $this->set_user_data($view); - - if ($this->session->userdata('role_slug') == DB_SLUG_SECRETARY) { - $secretary = $this->secretaries_model->get_row($this->session->userdata('user_id')); - $view['secretary_providers'] = $secretary['providers']; - } else { - $view['secretary_providers'] = array(); - } - - - $results = $this->appointments_model->get_batch(array('hash' => $appointment_hash)); - if ($appointment_hash != '' && count($results) > 0) { - $appointment = $results[0]; - $appointment['customer'] = $this->customers_model->get_row($appointment['id_users_customer']); - $view['edit_appointment'] = $appointment; // This will display the appointment edit dialog on page load. - } else { - $view['edit_appointment'] = NULL; - } - - $this->load->view('backend/header', $view); - $this->load->view('backend/calendar', $view); - $this->load->view('backend/footer', $view); - } - - /** - * Display the backend customers page. - * - * In this page the user can manage all the customer records of the system. - */ - public function customers() { - $this->session->set_userdata('dest_url', $this->config->item('base_url') . '/index.php/backend/customers'); - if (!$this->has_privileges(PRIV_CUSTOMERS)) return; - - $this->load->model('providers_model'); - $this->load->model('customers_model'); - $this->load->model('services_model'); - $this->load->model('settings_model'); - $this->load->model('user_model'); - - $view['base_url'] = $this->config->item('base_url'); - $view['user_display_name'] = $this->user_model->get_user_display_name($this->session->userdata('user_id')); - $view['active_menu'] = PRIV_CUSTOMERS; - $view['company_name'] = $this->settings_model->get_setting('company_name'); - $view['customers'] = $this->customers_model->get_batch(); - $view['available_providers'] = $this->providers_model->get_available_providers(); - $view['available_services'] = $this->services_model->get_available_services(); - $this->set_user_data($view); - - $this->load->view('backend/header', $view); - $this->load->view('backend/customers', $view); - $this->load->view('backend/footer', $view); - } - - /** - * Displays the backend services page. - * - * Here the admin user will be able to organize and create the services - * that the user will be able to book appointments in frontend. - * - * NOTICE: The services that each provider is able to service is managed - * from the backend services page. - */ - public function services() { - $this->session->set_userdata('dest_url', $this->config->item('base_url') . '/index.php/backend/services'); - if (!$this->has_privileges(PRIV_SERVICES)) return; - - $this->load->model('customers_model'); - $this->load->model('services_model'); - $this->load->model('settings_model'); - $this->load->model('user_model'); - - $view['base_url'] = $this->config->item('base_url'); - $view['user_display_name'] = $this->user_model->get_user_display_name($this->session->userdata('user_id')); - $view['active_menu'] = PRIV_SERVICES; - $view['company_name'] = $this->settings_model->get_setting('company_name'); - $view['services'] = $this->services_model->get_batch(); - $view['categories'] = $this->services_model->get_all_categories(); - $this->set_user_data($view); - - $this->load->view('backend/header', $view); - $this->load->view('backend/services', $view); - $this->load->view('backend/footer', $view); - } - - /** - * Display the backend users page. - * - * In this page the admin user will be able to manage the system users. - * By this, we mean the provider, secretary and admin users. This is also - * the page where the admin defines which service can each provider provide. - */ - public function users() { - $this->session->set_userdata('dest_url', $this->config->item('base_url') . '/index.php/backend/users'); - if (!$this->has_privileges(PRIV_USERS)) return; - - $this->load->model('providers_model'); - $this->load->model('secretaries_model'); - $this->load->model('admins_model'); - $this->load->model('services_model'); - $this->load->model('settings_model'); - $this->load->model('user_model'); - - $view['base_url'] = $this->config->item('base_url'); - $view['user_display_name'] = $this->user_model->get_user_display_name($this->session->userdata('user_id')); - $view['active_menu'] = PRIV_USERS; - $view['company_name'] = $this->settings_model->get_setting('company_name'); - $view['admins'] = $this->admins_model->get_batch(); - $view['providers'] = $this->providers_model->get_batch(); - $view['secretaries'] = $this->secretaries_model->get_batch(); - $view['services'] = $this->services_model->get_batch(); - $view['working_plan'] = $this->settings_model->get_setting('company_working_plan'); - $this->set_user_data($view); - - $this->load->view('backend/header', $view); - $this->load->view('backend/users', $view); - $this->load->view('backend/footer', $view); - } - - /** - * Display the user/system settings. - * - * This page will display the user settings (name, password etc). If current user is - * an administrator, then he will be able to make change to the current Easy!Appointment - * installation (core settings like company name, book timeout etc). - */ - public function settings() { - $this->session->set_userdata('dest_url', $this->config->item('base_url') . '/index.php/backend/settings'); - if (!$this->has_privileges(PRIV_SYSTEM_SETTINGS, FALSE) - && !$this->has_privileges(PRIV_USER_SETTINGS)) return; - - $this->load->model('settings_model'); - $this->load->model('user_model'); - - $this->load->library('session'); - $user_id = $this->session->userdata('user_id'); - - $view['base_url'] = $this->config->item('base_url'); - $view['user_display_name'] = $this->user_model->get_user_display_name($user_id); - $view['active_menu'] = PRIV_SYSTEM_SETTINGS; - $view['company_name'] = $this->settings_model->get_setting('company_name'); - $view['role_slug'] = $this->session->userdata('role_slug'); - $view['system_settings'] = $this->settings_model->get_settings(); - $view['user_settings'] = $this->user_model->get_settings($user_id); - $this->set_user_data($view); - - $this->load->view('backend/header', $view); - $this->load->view('backend/settings', $view); - $this->load->view('backend/footer', $view); - } - - /** - * Check whether current user is logged in and has the required privileges to - * view a page. - * - * The backend page requires different privileges from the users to display pages. Not all - * pages are avaiable to all users. For example secretaries should not be able to edit the - * system users. - * - * @see Constant Definition In application/config/constants.php - * - * @param string $page This argument must match the roles field names of each section - * (eg "appointments", "users" ...). - * @param bool $redirect (OPTIONAL - TRUE) If the user has not the required privileges - * (either not logged in or insufficient role privileges) then the user will be redirected - * to another page. Set this argument to FALSE when using ajax. - * @return bool Returns whether the user has the required privileges to view the page or - * not. If the user is not logged in then he will be prompted to log in. If he hasn't the - * required privileges then an info message will be displayed. - */ - private function has_privileges($page, $redirect = TRUE) { - // Check if user is logged in. - $user_id = $this->session->userdata('user_id'); - if ($user_id == FALSE) { // User not logged in, display the login view. - if ($redirect) { - header('Location: ' . $this->config->item('base_url') . '/index.php/user/login'); - } - return FALSE; - } - - // Check if the user has the required privileges for viewing the selected page. - $role_slug = $this->session->userdata('role_slug'); - $role_priv = $this->db->get_where('ea_roles', array('slug' => $role_slug))->row_array(); - if ($role_priv[$page] < PRIV_VIEW) { // User does not have the permission to view the page. - if ($redirect) { - header('Location: ' . $this->config->item('base_url') . '/index.php/user/no_privileges'); - } - return FALSE; - } - - return TRUE; - } - - /** - * Set the user data in order to be available at the view and js code. - * - * @param array $view Contains the view data. - */ - public function set_user_data(&$view) { - $this->load->model('roles_model'); - - // Get privileges - $view['user_id'] = $this->session->userdata('user_id'); - $view['user_email'] = $this->session->userdata('user_email'); - $view['role_slug'] = $this->session->userdata('role_slug'); - $view['privileges'] = $this->roles_model->get_privileges($this->session->userdata('role_slug')); - } - - /** - * This method will update the installation to the latest available - * version in the server. IMPORTANT: The code files must exist in the - * server, this method will not fetch any new files but will update - * the database schema. - * - * This method can be used either by loading the page in the browser - * or by an ajax request. But it will answer with json encoded data. - */ - public function update() { - try { - if (!$this->has_privileges(PRIV_SYSTEM_SETTINGS, TRUE)) - throw new Exception('You do not have the required privileges for this task!'); - - $this->load->library('migration'); - - if (!$this->migration->current()) - throw new Exception($this->migration->error_string()); - - echo json_encode(AJAX_SUCCESS); - - } catch(Exception $exc) { - echo json_encode(array( - 'exceptions' => array(exceptionToJavaScript($exc)) - )); - } - } -} - -/* End of file backend.php */ -/* Location: ./application/controllers/backend.php */ \ No newline at end of file + + * @copyright Copyright (c) 2013 - 2015, Alex Tselegidis + * @license http://opensource.org/licenses/GPL-3.0 - GPLv3 + * @link http://easyappointments.org + * @since v1.0.0 + * ---------------------------------------------------------------------------- */ + +/** + * Backend Controller + * + * @package Controllers + */ +class Backend extends CI_Controller { + public function __construct() { + parent::__construct(); + $this->load->library('session'); + + // Set user's selected language. + if ($this->session->userdata('language')) { + $this->config->set_item('language', $this->session->userdata('language')); + $this->lang->load('translations', $this->session->userdata('language')); + } else { + $this->lang->load('translations', $this->config->item('language')); // default + } + } + + /** + * Display the main backend page. + * + * This method displays the main backend page. All users login permission can + * view this page which displays a calendar with the events of the selected + * provider or service. If a user has more priviledges he will see more menus + * at the top of the page. + * + * @param string $appointment_hash If given, the appointment edit dialog will + * appear when the page loads. + */ + public function index($appointment_hash = '') { + $this->session->set_userdata('dest_url', $this->config->item('base_url') . '/index.php/backend'); + if (!$this->has_privileges(PRIV_APPOINTMENTS)) return; + + $this->load->model('appointments_model'); + $this->load->model('providers_model'); + $this->load->model('services_model'); + $this->load->model('customers_model'); + $this->load->model('settings_model'); + $this->load->model('roles_model'); + $this->load->model('user_model'); + $this->load->model('secretaries_model'); + + $view['base_url'] = $this->config->item('base_url'); + $view['user_display_name'] = $this->user_model->get_user_display_name($this->session->userdata('user_id')); + $view['active_menu'] = PRIV_APPOINTMENTS; + $view['book_advance_timeout'] = $this->settings_model->get_setting('book_advance_timeout'); + $view['date_format'] = $this->settings_model->get_setting('date_format'); + $view['company_name'] = $this->settings_model->get_setting('company_name'); + $view['available_providers'] = $this->providers_model->get_available_providers(); + $view['available_services'] = $this->services_model->get_available_services(); + $view['customers'] = $this->customers_model->get_batch(); + $this->set_user_data($view); + + if ($this->session->userdata('role_slug') == DB_SLUG_SECRETARY) { + $secretary = $this->secretaries_model->get_row($this->session->userdata('user_id')); + $view['secretary_providers'] = $secretary['providers']; + } else { + $view['secretary_providers'] = array(); + } + + + $results = $this->appointments_model->get_batch(array('hash' => $appointment_hash)); + if ($appointment_hash != '' && count($results) > 0) { + $appointment = $results[0]; + $appointment['customer'] = $this->customers_model->get_row($appointment['id_users_customer']); + $view['edit_appointment'] = $appointment; // This will display the appointment edit dialog on page load. + } else { + $view['edit_appointment'] = NULL; + } + + $this->load->view('backend/header', $view); + $this->load->view('backend/calendar', $view); + $this->load->view('backend/footer', $view); + } + + /** + * Display the backend customers page. + * + * In this page the user can manage all the customer records of the system. + */ + public function customers() { + $this->session->set_userdata('dest_url', $this->config->item('base_url') . '/index.php/backend/customers'); + if (!$this->has_privileges(PRIV_CUSTOMERS)) return; + + $this->load->model('providers_model'); + $this->load->model('customers_model'); + $this->load->model('services_model'); + $this->load->model('settings_model'); + $this->load->model('user_model'); + + $view['base_url'] = $this->config->item('base_url'); + $view['user_display_name'] = $this->user_model->get_user_display_name($this->session->userdata('user_id')); + $view['active_menu'] = PRIV_CUSTOMERS; + $view['company_name'] = $this->settings_model->get_setting('company_name'); + $view['date_format'] = $this->settings_model->get_setting('date_format'); + $view['customers'] = $this->customers_model->get_batch(); + $view['available_providers'] = $this->providers_model->get_available_providers(); + $view['available_services'] = $this->services_model->get_available_services(); + $this->set_user_data($view); + + $this->load->view('backend/header', $view); + $this->load->view('backend/customers', $view); + $this->load->view('backend/footer', $view); + } + + /** + * Displays the backend services page. + * + * Here the admin user will be able to organize and create the services + * that the user will be able to book appointments in frontend. + * + * NOTICE: The services that each provider is able to service is managed + * from the backend services page. + */ + public function services() { + $this->session->set_userdata('dest_url', $this->config->item('base_url') . '/index.php/backend/services'); + if (!$this->has_privileges(PRIV_SERVICES)) return; + + $this->load->model('customers_model'); + $this->load->model('services_model'); + $this->load->model('settings_model'); + $this->load->model('user_model'); + + $view['base_url'] = $this->config->item('base_url'); + $view['user_display_name'] = $this->user_model->get_user_display_name($this->session->userdata('user_id')); + $view['active_menu'] = PRIV_SERVICES; + $view['company_name'] = $this->settings_model->get_setting('company_name'); + $view['date_format'] = $this->settings_model->get_setting('date_format'); + $view['services'] = $this->services_model->get_batch(); + $view['categories'] = $this->services_model->get_all_categories(); + $this->set_user_data($view); + + $this->load->view('backend/header', $view); + $this->load->view('backend/services', $view); + $this->load->view('backend/footer', $view); + } + + /** + * Display the backend users page. + * + * In this page the admin user will be able to manage the system users. + * By this, we mean the provider, secretary and admin users. This is also + * the page where the admin defines which service can each provider provide. + */ + public function users() { + $this->session->set_userdata('dest_url', $this->config->item('base_url') . '/index.php/backend/users'); + if (!$this->has_privileges(PRIV_USERS)) return; + + $this->load->model('providers_model'); + $this->load->model('secretaries_model'); + $this->load->model('admins_model'); + $this->load->model('services_model'); + $this->load->model('settings_model'); + $this->load->model('user_model'); + + $view['base_url'] = $this->config->item('base_url'); + $view['user_display_name'] = $this->user_model->get_user_display_name($this->session->userdata('user_id')); + $view['active_menu'] = PRIV_USERS; + $view['company_name'] = $this->settings_model->get_setting('company_name'); + $view['date_format'] = $this->settings_model->get_setting('date_format'); + $view['admins'] = $this->admins_model->get_batch(); + $view['providers'] = $this->providers_model->get_batch(); + $view['secretaries'] = $this->secretaries_model->get_batch(); + $view['services'] = $this->services_model->get_batch(); + $view['working_plan'] = $this->settings_model->get_setting('company_working_plan'); + $this->set_user_data($view); + + $this->load->view('backend/header', $view); + $this->load->view('backend/users', $view); + $this->load->view('backend/footer', $view); + } + + /** + * Display the user/system settings. + * + * This page will display the user settings (name, password etc). If current user is + * an administrator, then he will be able to make change to the current Easy!Appointment + * installation (core settings like company name, book timeout etc). + */ + public function settings() { + $this->session->set_userdata('dest_url', $this->config->item('base_url') . '/index.php/backend/settings'); + if (!$this->has_privileges(PRIV_SYSTEM_SETTINGS, FALSE) + && !$this->has_privileges(PRIV_USER_SETTINGS)) return; + + $this->load->model('settings_model'); + $this->load->model('user_model'); + + $this->load->library('session'); + $user_id = $this->session->userdata('user_id'); + + $view['base_url'] = $this->config->item('base_url'); + $view['user_display_name'] = $this->user_model->get_user_display_name($user_id); + $view['active_menu'] = PRIV_SYSTEM_SETTINGS; + $view['company_name'] = $this->settings_model->get_setting('company_name'); + $view['date_format'] = $this->settings_model->get_setting('date_format'); + $view['role_slug'] = $this->session->userdata('role_slug'); + $view['system_settings'] = $this->settings_model->get_settings(); + $view['user_settings'] = $this->user_model->get_settings($user_id); + $this->set_user_data($view); + + $this->load->view('backend/header', $view); + $this->load->view('backend/settings', $view); + $this->load->view('backend/footer', $view); + } + + /** + * Check whether current user is logged in and has the required privileges to + * view a page. + * + * The backend page requires different privileges from the users to display pages. Not all + * pages are avaiable to all users. For example secretaries should not be able to edit the + * system users. + * + * @see Constant Definition In application/config/constants.php + * + * @param string $page This argument must match the roles field names of each section + * (eg "appointments", "users" ...). + * @param bool $redirect (OPTIONAL - TRUE) If the user has not the required privileges + * (either not logged in or insufficient role privileges) then the user will be redirected + * to another page. Set this argument to FALSE when using ajax. + * @return bool Returns whether the user has the required privileges to view the page or + * not. If the user is not logged in then he will be prompted to log in. If he hasn't the + * required privileges then an info message will be displayed. + */ + private function has_privileges($page, $redirect = TRUE) { + // Check if user is logged in. + $user_id = $this->session->userdata('user_id'); + if ($user_id == FALSE) { // User not logged in, display the login view. + if ($redirect) { + header('Location: ' . $this->config->item('base_url') . '/index.php/user/login'); + } + return FALSE; + } + + // Check if the user has the required privileges for viewing the selected page. + $role_slug = $this->session->userdata('role_slug'); + $role_priv = $this->db->get_where('ea_roles', array('slug' => $role_slug))->row_array(); + if ($role_priv[$page] < PRIV_VIEW) { // User does not have the permission to view the page. + if ($redirect) { + header('Location: ' . $this->config->item('base_url') . '/index.php/user/no_privileges'); + } + return FALSE; + } + + return TRUE; + } + + /** + * Set the user data in order to be available at the view and js code. + * + * @param array $view Contains the view data. + */ + public function set_user_data(&$view) { + $this->load->model('roles_model'); + + // Get privileges + $view['user_id'] = $this->session->userdata('user_id'); + $view['user_email'] = $this->session->userdata('user_email'); + $view['role_slug'] = $this->session->userdata('role_slug'); + $view['privileges'] = $this->roles_model->get_privileges($this->session->userdata('role_slug')); + } + + /** + * This method will update the installation to the latest available + * version in the server. IMPORTANT: The code files must exist in the + * server, this method will not fetch any new files but will update + * the database schema. + * + * This method can be used either by loading the page in the browser + * or by an ajax request. But it will answer with json encoded data. + */ + public function update() { + try { + if (!$this->has_privileges(PRIV_SYSTEM_SETTINGS, TRUE)) + throw new Exception('You do not have the required privileges for this task!'); + + $this->load->library('migration'); + + if (!$this->migration->current()) + throw new Exception($this->migration->error_string()); + + echo json_encode(AJAX_SUCCESS); + + } catch(Exception $exc) { + echo json_encode(array( + 'exceptions' => array(exceptionToJavaScript($exc)) + )); + } + } +} + +/* End of file backend.php */ +/* Location: ./application/controllers/backend.php */ diff --git a/src/application/views/backend/calendar.php b/src/application/views/backend/calendar.php index aa59c00b..15579b12 100644 --- a/src/application/views/backend/calendar.php +++ b/src/application/views/backend/calendar.php @@ -17,6 +17,7 @@ 'availableServices' : , 'baseUrl' : , 'bookAdvanceTimeout' : , + 'dateFormat' : , 'editAppointment' : , 'customers' : , 'secretaryProviders' : , diff --git a/src/application/views/backend/customers.php b/src/application/views/backend/customers.php index 5ce6edb6..f75883e0 100644 --- a/src/application/views/backend/customers.php +++ b/src/application/views/backend/customers.php @@ -8,10 +8,11 @@ var GlobalVariables = { 'csrfToken': security->get_csrf_hash()); ?>, 'availableProviders': , - 'availableServices': , - 'baseUrl': , - 'customers': , - 'user' : { + 'availableServices' : , + 'dateFormat' : , + 'baseUrl' : , + 'customers' : , + 'user' : { 'id' : , 'email' : , 'role_slug' : , diff --git a/src/application/views/backend/services.php b/src/application/views/backend/services.php index f5b0dfd9..b1cb0f6d 100644 --- a/src/application/views/backend/services.php +++ b/src/application/views/backend/services.php @@ -3,11 +3,12 @@