ER:ICS feeds (new variable in config.php).

ER:Enter timezone of employees (new variable in config.php).

README.md

@@ -59,8 +59,7 @@ Use bbalet / bbalet for login / password. Be nice and don't screw up the data of
 ## Contribute
 
 * Suggest ideas, declare bugs with Github's issue tracking system.
-* Translate the software in your language.
-* Code enhancement requests declared in Github's issue tracking system.
+* Help me to translate the software in your language https://www.transifex.com/projects/p/jorani
 
 ## Credits
 
@@ -75,7 +74,7 @@ We thank the following open source projects for the components used by Jorani:
 
 #### Backend
 
-* CodeIgniter MVC framework http://ellislab.com/codeigniter
+* CodeIgniter MVC framework http://www.codeigniter.com/
 * BCRYPT password hasher https://github.com/dwightwatson/codeigniter-bcrypt
 * RSA Encryption in pure PHP https://github.com/phpseclib/phpseclib
 * Excel import/export https://github.com/PHPOffice/PHPExcel
@@ -89,5 +88,6 @@ We thank the following open source projects for the components used by Jorani:
 * Datatable https://datatables.net/
 * RSA implementation https://github.com/travist/jsencrypt
 * Moment (JS dates lib) http://momentjs.com/
+* Selectize https://github.com/brianreavis/selectize.js
 
 Background image of login page by Kevin Dooley - https://www.flickr.com/photos/pagedooley/ / License: Creative Commons (Attribution 3.0 Unported)

application/config/autoload.php

@@ -64,7 +64,7 @@
 |	$autoload['helper'] = array('url', 'file');
 */
 
-$autoload['helper'] = array('url', 'tools');
+$autoload['helper'] = array('url', 'tools', 'language');
 
 
 /*

application/config/config.php

@@ -408,10 +408,12 @@
 $config['ldap_host'] = '127.0.0.1';
 $config['ldap_port'] = 389;
 $config['ldap_basedn'] = 'uid=%s,ou=people,dc=company,dc=com';
-$config['ldap_basedn_db'] = FALSE;
+$config['ldap_basedn_db'] = TRUE;
+
+//Enable public ICS feeds
+$config['ics_enabled'] = TRUE;
+$config['default_timezone'] = 'Europe/Paris';
 
-//Enable public ICS feeds - Will be added in v0.4.0 (need a db patch)
-$config['ics_enabled'] = FALSE;
 
 /* End of file config.php */
 /* Location: ./application/config/config.php */

application/config/routes.php

@@ -223,7 +223,7 @@
 
 //ICS Feeds
 $route['ics/individual/(:num)'] = 'ics/individual/$1';
-$route['ics/dayoffs/(:num)'] = 'ics/dayoffs/$1';
+$route['ics/dayoffs/(:num)/(:num)'] = 'ics/dayoffs/$1/$2';
 $route['ics/ical/(:num)'] = 'ics/ical/$1';
 
 //Session management

application/controllers/calendar.php

@@ -40,7 +40,6 @@ public function __construct() {
         $this->user_id = $this->session->userdata('id');
         $this->language = $this->session->userdata('language');
         $this->language_code = $this->session->userdata('language_code');
-        $this->load->helper('language');
         $this->lang->load('calendar', $this->language);
     }
 

application/controllers/contracts.php

@@ -42,7 +42,6 @@ public function __construct() {
         $this->user_id = $this->session->userdata('id');
         $this->language = $this->session->userdata('language');
         $this->language_code = $this->session->userdata('language_code');
-        $this->load->helper('language');
         $this->lang->load('contract', $this->language);
         $this->load->model('contracts_model');
     }

application/controllers/database.php

@@ -42,7 +42,6 @@ public function __construct() {
         $this->user_id = $this->session->userdata('id');
         $this->language = $this->session->userdata('language');
         $this->language_code = $this->session->userdata('language_code');
-        $this->load->helper('language');
         $this->lang->load('database', $this->language);
     }
 

application/controllers/entitleddays.php

@@ -41,7 +41,6 @@ public function __construct() {
         $this->user_id = $this->session->userdata('id');
         $this->language = $this->session->userdata('language');
         $this->language_code = $this->session->userdata('language_code');
-        $this->load->helper('language');
         $this->lang->load('entitleddays', $this->language);
     }
 

application/controllers/extra.php

@@ -40,7 +40,6 @@ public function __construct() {
         $this->user_id = $this->session->userdata('id');
         $this->language = $this->session->userdata('language');
         $this->language_code = $this->session->userdata('language_code');
-        $this->load->helper('language');
         $this->lang->load('extra', $this->language);
         $this->lang->load('global', $this->language);
     }

application/controllers/hr.php

@@ -43,7 +43,6 @@ public function __construct() {
         $this->user_id = $this->session->userdata('id');
         $this->language = $this->session->userdata('language');
         $this->language_code = $this->session->userdata('language_code');
-        $this->load->helper('language');
         $this->lang->load('hr', $this->language);
         $this->lang->load('global', $this->language);
     }

application/controllers/ics.php

@@ -31,26 +31,41 @@ class Ics extends CI_Controller {
      */
     public function __construct() {
         parent::__construct();
-        $this->load->helper('language');
-        $this->lang->load('global', $this->config->item('language'));
+        //$this->load->helper('language');
+        //$this->lang->load('global', $this->config->item('language'));
+        $this->load->library('polyglot');
         require_once(APPPATH . 'third_party/VObjects/vendor/autoload.php');
     }
 
     /**
      * Get the list of dayoffs for a given contract identifier
-     * @param int $id identifier of a contract
+     * @param int $user identifier of the user wanting to view the list (mind timezone)
+     * @param int $contract identifier of a contract
      * @author Benjamin BALET <[email protected]>
      */
-    public function dayoffs($id) {
+    public function dayoffs($user, $contract) {
         expires_now();
         if ($this->config->item('ics_enabled') == FALSE) {
             $this->output->set_header("HTTP/1.0 403 Forbidden");
         } else {
+            //Get timezone and language of the user
+            $this->load->model('users_model');
+            $employee = $this->users_model->get_users($user);
+            if (!is_null($employee['timezone'])) {
+                $tzdef = $employee['timezone'];
+            } else {
+                $tzdef = $this->config->item('default_timezone');
+                if ($tzdef == FALSE) $tzdef = 'Europe/Paris';
+            }
+            $this->lang->load('global', $this->polyglot->code2language($employee['language']));
+            //Load the list of day off associated to the contract
             $this->load->model('dayoffs_model');
-            $result = $this->dayoffs_model->get_all_dayoffs($id);
+            $result = $this->dayoffs_model->get_all_dayoffs($contract);
             if (empty($result)) {
                 echo "";
             } else {
+                $tzold = date_default_timezone_get();
+                date_default_timezone_set($tzdef);
                 $vcalendar = new VObject\Component\VCalendar();
                 foreach ($result as $event) {
                     $startdate = new \DateTime($event->date);
@@ -77,6 +92,7 @@ public function dayoffs($id) {
                     ]);    
                 }
                 echo $vcalendar->serialize();
+                date_default_timezone_set($tzold);
             }
         }
     }
@@ -96,6 +112,19 @@ public function individual($id) {
             if (empty($result)) {
                 echo "";
             } else {
+                //Get timezone and language of the user
+                $this->load->model('users_model');
+                $employee = $this->users_model->get_users($id);
+                if (!is_null($employee['timezone'])) {
+                    $tzdef = $employee['timezone'];
+                } else {
+                    $tzdef = $this->config->item('default_timezone');
+                    if ($tzdef == FALSE) $tzdef = 'Europe/Paris';
+                }
+                $this->lang->load('global', $this->polyglot->code2language($employee['language']));
+                $tzold = date_default_timezone_get();
+                date_default_timezone_set($tzdef);
+
                 $vcalendar = new VObject\Component\VCalendar();
                 foreach ($result as $event) {
                     $startdate = new \DateTime($event['startdate']);
@@ -115,6 +144,7 @@ public function individual($id) {
                     ]);    
                 }
                 echo $vcalendar->serialize();
+                date_default_timezone_set($tzold);
             }
         }
     }
@@ -130,6 +160,19 @@ public function ical($id) {
         header('Content-Disposition: attachment; filename=leave.ics');
         $this->load->model('leaves_model');
         $leave = $this->leaves_model->get_leaves($id);
+        //Get timezone and language of the user
+        $this->load->model('users_model');
+        $employee = $this->users_model->get_users($leave['employee']);
+        if (!is_null($employee['timezone'])) {
+            $tzdef = $employee['timezone'];
+        } else {
+            $tzdef = $this->config->item('default_timezone');
+            if ($tzdef == FALSE) $tzdef = 'Europe/Paris';
+        }
+        $this->lang->load('global', $this->polyglot->code2language($employee['language']));
+        $tzold = date_default_timezone_get();
+        date_default_timezone_set($tzdef);
+
         $vcalendar = new VObject\Component\VCalendar();
 
         $vcalendar->add('VEVENT', [

application/controllers/leaves.php

@@ -40,7 +40,6 @@ public function __construct() {
         $this->user_id = $this->session->userdata('id');
         $this->language = $this->session->userdata('language');
         $this->language_code = $this->session->userdata('language_code');
-        $this->load->helper('language');
         $this->lang->load('leaves', $this->language);
         $this->lang->load('global', $this->language);
     }

application/controllers/leavetypes.php

@@ -41,7 +41,6 @@ public function __construct() {
         $this->user_id = $this->session->userdata('id');
         $this->language = $this->session->userdata('language');
         $this->language_code = $this->session->userdata('language_code');
-        $this->load->helper('language');
         $this->lang->load('leavetypes', $this->language);
     }
 

application/controllers/organization.php

@@ -40,7 +40,6 @@ public function __construct() {
         $this->user_id = $this->session->userdata('id');
         $this->language = $this->session->userdata('language');
         $this->language_code = $this->session->userdata('language_code');
-        $this->load->helper('language');
         $this->lang->load('organization', $this->language);
     }
 

application/controllers/overtime.php

@@ -42,7 +42,6 @@ public function __construct() {
         $this->user_id = $this->session->userdata('id');
         $this->language = $this->session->userdata('language');
         $this->language_code = $this->session->userdata('language_code');
-        $this->load->helper('language');
         $this->lang->load('overtime', $this->language);
         $this->lang->load('global', $this->language);
     }

application/controllers/positions.php

@@ -41,7 +41,6 @@ public function __construct() {
         $this->user_id = $this->session->userdata('id');
         $this->language = $this->session->userdata('language');
         $this->language_code = $this->session->userdata('language_code');
-        $this->load->helper('language');
         $this->lang->load('positions', $this->language);
     }
 

application/controllers/reports.php

@@ -41,7 +41,6 @@ public function __construct() {
         $this->user_id = $this->session->userdata('id');
         $this->language = $this->session->userdata('language');
         $this->language_code = $this->session->userdata('language_code');
-        $this->load->helper('language');
         $this->lang->load('reports', $this->language);
         $this->lang->load('global', $this->language);
     }

application/controllers/requests.php

@@ -42,7 +42,6 @@ public function __construct() {
         $this->user_id = $this->session->userdata('id');
         $this->language = $this->session->userdata('language');
         $this->language_code = $this->session->userdata('language_code');
-        $this->load->helper('language');
         $this->lang->load('requests', $this->language);
         $this->lang->load('global', $this->language);
     }

application/controllers/session.php

@@ -36,7 +36,6 @@ public function __construct() {
             $this->session->set_userdata('language', $this->config->item('language'));
             $this->session->set_userdata('language_code', $this->polyglot->language2code($this->config->item('language')));
         }
-        $this->load->helper('language');
         $this->lang->load('session', $this->session->userdata('language'));
     }
 

application/controllers/users.php

@@ -39,7 +39,6 @@ public function __construct() {
         $this->user_id = $this->session->userdata('id');
         $this->language = $this->session->userdata('language');
         $this->language_code = $this->session->userdata('language_code');
-        $this->load->helper('language');
         $this->lang->load('users', $this->language);
     }
 
@@ -171,6 +170,7 @@ public function edit($id) {
         $this->form_validation->set_rules('datehired', lang('users_edit_field_hired'), 'xss_clean');
         $this->form_validation->set_rules('identifier', lang('users_edit_field_identifier'), 'xss_clean');
         $this->form_validation->set_rules('language', lang('users_edit_field_language'), 'xss_clean');
+        $this->form_validation->set_rules('timezone', lang('users_edit_field_timezone'), 'xss_clean');
         if ($this->config->item('ldap_basedn_db')) $this->form_validation->set_rules('ldap_path', lang('users_edit_field_ldap_path'), 'xss_clean');
 
         $data['users_item'] = $this->users_model->get_users($id);
@@ -327,6 +327,7 @@ public function create() {
         $this->form_validation->set_rules('datehired', lang('users_create_field_hired'), 'xss_clean');
         $this->form_validation->set_rules('identifier', lang('users_create_field_identifier'), 'xss_clean');
         $this->form_validation->set_rules('language', lang('users_create_field_language'), 'xss_clean');
+        $this->form_validation->set_rules('timezone', lang('users_create_field_timezone'), 'xss_clean');
         if ($this->config->item('ldap_basedn_db')) $this->form_validation->set_rules('ldap_path', lang('users_create_field_ldap_path'), 'xss_clean');
 
         if ($this->form_validation->run() === FALSE) {
@@ -383,6 +384,7 @@ public function create() {
      * Form validation callback : prevent from login duplication
      * @param type $login
      * @return boolean true if the field is valid, false otherwise
+     * @author Benjamin BALET <[email protected]>
      */
     public function login_check($login) {
         if (!$this->users_model->is_login_available($login)) {

application/language/english/users_lang.php

@@ -57,6 +57,8 @@
 $lang['users_view_field_position'] = 'Position';
 $lang['users_view_field_entity'] = 'Entity';
 $lang['users_view_field_hired'] = 'Date hired/started';
+$lang['users_view_field_timezone'] = 'Timezone';
+$lang['users_view_field_ldap_path'] = 'LDAP Path';
 $lang['users_view_field_identifier'] = 'Internal/Company Identifier';
 $lang['users_view_field_language'] = 'Language';
 $lang['users_view_button_edit'] = 'Edit';
@@ -89,6 +91,7 @@
 $lang['users_edit_field_position'] = 'Position';
 $lang['users_edit_field_entity'] = 'Entity';
 $lang['users_edit_field_hired'] = 'Date hired/started';
+$lang['users_edit_field_timezone'] = 'Timezone';
 $lang['users_edit_field_ldap_path'] = 'LDAP Path';
 $lang['users_edit_field_identifier'] = 'Internal/Company Identifier';
 $lang['users_edit_field_language'] = 'Language';
@@ -123,6 +126,7 @@
 $lang['users_create_field_position'] = 'Position';
 $lang['users_create_field_entity'] = 'Entity';
 $lang['users_create_field_hired'] = 'Date hired/started';
+$lang['users_create_field_timezone'] = 'Timezone';
 $lang['users_create_field_ldap_path'] = 'LDAP Path';
 $lang['users_create_field_identifier'] = 'Internal/Company Identifier';
 $lang['users_create_field_language'] = 'Language';

application/language/french/users_lang.php

@@ -56,6 +56,8 @@
 $lang['users_view_field_position'] = 'Poste';
 $lang['users_view_field_entity'] = 'Entité';
 $lang['users_view_field_hired'] = 'Date d\'embauche/démarrage';
+$lang['users_view_field_timezone'] = 'Fuseau horaire';
+$lang['users_view_field_ldap_path'] = 'Chemin LDAP';
 $lang['users_view_field_identifier'] = 'Identifiant interne';
 $lang['users_view_field_language'] = 'Langage';
 $lang['users_view_button_edit'] = 'Modifier';
@@ -88,6 +90,7 @@
 $lang['users_edit_field_position'] = 'Poste';
 $lang['users_edit_field_entity'] = 'Entité';
 $lang['users_edit_field_hired'] = 'Date d\'embauche/démarrage';
+$lang['users_edit_field_timezone'] = 'Fuseau horaire';
 $lang['users_edit_field_ldap_path'] = 'Chemin LDAP';
 $lang['users_edit_field_identifier'] = 'Identifiant interne';
 $lang['users_edit_field_language'] = 'Langage';
@@ -123,6 +126,7 @@
 $lang['users_create_field_position'] = 'Poste';
 $lang['users_create_field_entity'] = 'Entité';
 $lang['users_create_field_hired'] = 'Date d\'embauche/démarrage';
+$lang['users_create_field_timezone'] = 'Fuseau horaire';
 $lang['users_create_field_ldap_path'] = 'Chemin LDAP';
 $lang['users_create_field_identifier'] = 'Identifiant interne';
 $lang['users_create_field_language'] = 'Langage';

application/language/khmer/users_lang.php

@@ -57,6 +57,8 @@
 $lang['users_view_field_position'] = 'តំណែង';
 $lang['users_view_field_entity'] = 'អង្គភាព';
 $lang['users_view_field_hired'] = 'កាលបរិច្ឆេទជួល / បានចាប់ផ្តើ';
+$lang['users_view_field_timezone'] = 'Timezone';
+$lang['users_view_field_ldap_path'] = 'LDAP Path';
 $lang['users_view_field_identifier'] = 'អ្នកកំណត់អត្តសញ្ញាណ';
 $lang['users_view_field_language'] = 'ភាសា';
 $lang['users_view_button_edit'] = 'កែសម្រួល';
@@ -89,6 +91,7 @@
 $lang['users_edit_field_position'] = 'តំណែង';
 $lang['users_edit_field_entity'] = 'អង្គភាព';
 $lang['users_edit_field_hired'] = 'កាលបរិច្ឆេទជួល / បានចាប់ផ្តើ';
+$lang['users_edit_field_timezone'] = 'Timezone';
 $lang['users_edit_field_ldap_path'] = 'LDAP Path';
 $lang['users_edit_field_identifier'] = 'អ្នកកំណត់អត្តសញ្ញាណ';
 $lang['users_edit_field_language'] = 'ភាសា';
@@ -123,6 +126,7 @@
 $lang['users_create_field_position'] = 'តំណែង';
 $lang['users_create_field_entity'] = 'អង្គភាព';
 $lang['users_create_field_hired'] = 'កាលបរិច្ឆេទជួល / បានចាប់ផ្តើ';
+$lang['users_create_field_timezone'] = 'Timezone';
 $lang['users_create_field_ldap_path'] = 'LDAP Path';
 $lang['users_create_field_identifier'] = 'អ្នកកំណត់អត្តសញ្ញាណ';
 $lang['users_create_field_language'] = 'ភាសា';

application/models/dayoffs_model.php

@@ -186,9 +186,7 @@ public function adddayoff($contract, $timestamp, $type, $title) {
      * @author Benjamin BALET <[email protected]>
      */
     public function userDayoffs($user_id, $start = "", $end = "") {
-        $this->load->helper('language');
         $this->lang->load('calendar', $this->session->userdata('language'));
-
         $this->db->select('dayoffs.*');
         $this->db->join('dayoffs', 'users.contract = dayoffs.contract');
         $this->db->where('users.id', $user_id);
@@ -241,7 +239,6 @@ public function userDayoffs($user_id, $start = "", $end = "") {
      * @author Benjamin BALET <[email protected]>
      */
     public function allDayoffs($start, $end, $entity_id, $children) {
-        $this->load->helper('language');
         $this->lang->load('calendar', $this->session->userdata('language'));
 
         $this->db->select('dayoffs.*, contracts.name');