Merge branch 'master' into v19.x

* Updates from pro v19

* Update travis

* Update db script

* Update docs

* change build script

.gitignore

@@ -1,4 +1,8 @@
 /.settings
 /.buildpath
 /.project
-/.idea
+/.idea/
+/build
+/deployment/clients/dev/data/
+/deployment/clients/test/data/
+/.vagrant

.travis.yml

@@ -0,0 +1,13 @@
+services:
+  - mysql
+before_script:
+  - echo "USE mysql;\nUPDATE user SET password=PASSWORD('dev') WHERE user='root';\nFLUSH PRIVILEGES;\n" | mysql -u root
+install:
+  - ant buildlocal
+language: php
+php:
+  - '5.5'
+  - '5.6'
+  - '7.0'
+  - nightly
+#after_failure: "cat /tmp/icehrm.test.log"

Vagrantfile

@@ -0,0 +1,29 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+Vagrant.configure(2) do |config|
+  config.vm.box = "thilinah/jessie64_isotope"
+  config.vm.box_version = "0.0.1"
+  config.vm.network "private_network", ip: "192.168.40.40"
+  config.vm.synced_folder ".", "/vagrant", type: "nfs"
+
+  config.vm.provider "virtualbox" do |vb|
+    vb.memory = "1024"
+    vb.cpus = "2"
+    vb.name = "app.dev"
+  end
+
+
+  config.vm.provision "shell", inline: <<-SHELL
+    sudo apt-get update
+  SHELL
+
+  config.vm.hostname = "app.dev"
+
+  config.hostsupdater.aliases = [
+    "app.dev",
+    "app.app.dev",
+    "clients.app.dev"
+  ]
+
+end

build.xml

@@ -3,20 +3,30 @@
  <!-- By default, we assume all tools to be on the $PATH -->
  <property name="toolsdir" value=""/>
  <property name="destination" value="${basedir}/build/app"/>
+ <property name="testdir" value="${basedir}/build/test"/>
  <property name="origin" value="${basedir}/src"/>
  <property environment="env"/>
  <property name="env.appname" value="icehrm"/>
  <property name="env.Version" value="dev"/>
  <property name="installpath" value="/var/www/apps.gamonoid.com/icehrm-open-core"/>
+<property name="installLocalpath" value="/Applications/XAMPP/xamppfiles/htdocs/icehrm-open-core"/>
 
 	
- <target name="build"
+<target name="build"
-         depends="prepare,lint,phpunit,copyapp,release,install"
+     depends="prepare,lint,copyapp,phpunit,release,install"
-         description=""/>
+     description=""/>
-	
+
 <target name="buildlocal"
-         depends="prepare,copyapp"
+     depends="prepare,copyapp"
-         description=""/>
+     description=""/>
+
+<target name="releaseapp"
+        depends="prepare,lint,copyapp,phpunit,release"
+        description=""/>
+
+<target name="ice"
+        depends="copyapp_quick"
+        description=""/>
 
  <target name="clean"
          unless="clean.done"
@@ -37,6 +47,7 @@
          depends="clean"
          description="Prepare for build">
   <mkdir dir="${basedir}/build/api"/>
+  <mkdir dir="${basedir}/build/api"/>
   <mkdir dir="${basedir}/build/coverage"/>
   <mkdir dir="${basedir}/build/logs"/>
   <mkdir dir="${basedir}/build/pdepend"/>
@@ -47,48 +58,26 @@
   <mkdir dir="${basedir}/build/release/data/${env.appname}_${env.Version}"/>
   <mkdir dir="${basedir}/src/lib"/>
  	
- 	<copy todir="${basedir}/src/lib" overwrite="true">
-	  <fileset dir="${basedir}/lib">
-	    <include name="**/*"/>
-	  </fileset>
-	</copy>
- 	
- 	<copy todir="${basedir}/src" overwrite="true">
-	  <fileset dir="${basedir}/core-ext">
-	    <include name="**/*"/>
-	  </fileset>
-	</copy>
- 	
- 	<copy todir="${basedir}/src">
-	  <fileset dir="${basedir}/ext">
-	    <include name="**/*"/>
-	  </fileset>
-	</copy>
- 	
- 	<copy todir="${basedir}/src">
-	  <fileset dir="${basedir}/tp">
-	    <include name="**/*"/>
-	  </fileset>
-	</copy>
  	
   <property name="prepare.done" value="true"/>
  </target>
 
- <target name="lint" description="Perform syntax check of sourcecode files">
+    <target name="lint" description="Perform syntax check of sourcecode files">
-  <apply executable="php" failonerror="true">
+        <apply executable="php" failonerror="true">
-   <arg value="-l" />
+            <arg value="-l" />
 
-   <fileset dir="${basedir}/src">
+            <fileset dir="${basedir}/src">
-    <include name="**/*.php" />
+                <include name="**/*.php" />
-    <modified />
+                <exclude name="composer/**"/>
-   </fileset>
+                <modified />
+            </fileset>
 
-   <fileset dir="${basedir}/test">
+            <fileset dir="${basedir}/test">
-    <include name="**/*.php" />
+                <include name="**/*.php" />
-    <modified />
+                <modified />
-   </fileset>
+            </fileset>
-  </apply>
+        </apply>
- </target>
+    </target>
 
  <target name="phploc"
          description="Measure project size using PHPLOC and print human readable output. Intended for usage on the command line.">
@@ -200,25 +189,80 @@
          description="Generate project documentation using phpDox">
   <exec executable="${toolsdir}phpdox"/>
  </target>
-	
 
+    <target name="copyapp_quick"
+            description="Copy generated files to QA app">
+
+        <copy todir="${destination}" overwrite="true">
+            <fileset dir="${origin}">
+                <include name="**/*"/>
+                <exclude name="composer/**"/>
+                <exclude name="themecss/**"/>
+                <exclude name="themejs/**"/>
+                <exclude name="robo/**"/>
+                <exclude name="images/**"/>
+            </fileset>
+        </copy>
+
+        <copy todir="${destination}" overwrite="true">
+            <fileset dir="${basedir}/core-ext">
+                <include name="**/*"/>
+            </fileset>
+        </copy>
+
+        <copy todir="${destination}" overwrite="true">
+            <fileset dir="${basedir}/ext">
+                <include name="**/*"/>
+            </fileset>
+        </copy>
+
+        <copy todir="${testdir}" overwrite="true">
+            <fileset dir="${basedir}/test">
+                <include name="**/*"/>
+            </fileset>
+        </copy>
+
+    </target>
 
 <target name="copyapp"
-     depends=""
+        description="Copy generated files to QA app">
-     description="Copy generated files to QA app">
+
-	
+    <delete includeemptydirs="true">
-	<delete includeemptydirs="true">
+        <fileset dir="${destination}">
-	    <fileset dir="${destination}">
+            <include name="**/*"/>
-	        <include name="**/*"/>
+        </fileset>
-	    </fileset>
+    </delete>
-	</delete>
+
-	
+    <copy todir="${destination}" overwrite="true">
-	<copy todir="${destination}">
+        <fileset dir="${origin}">
-	  <fileset dir="${origin}">
+            <include name="**/*"/>
-	    <include name="**/*"/>
+        </fileset>
-	  </fileset>
+    </copy>
-	</copy>
+
-	
+    <copy todir="${destination}/lib" overwrite="true">
+        <fileset dir="${basedir}/lib">
+            <include name="**/*"/>
+        </fileset>
+    </copy>
+
+    <copy todir="${destination}" overwrite="true">
+        <fileset dir="${basedir}/core-ext">
+            <include name="**/*"/>
+        </fileset>
+    </copy>
+
+    <copy todir="${destination}" overwrite="true">
+        <fileset dir="${basedir}/ext">
+            <include name="**/*"/>
+        </fileset>
+    </copy>
+
+    <copy todir="${testdir}" overwrite="true">
+        <fileset dir="${basedir}/test">
+            <include name="**/*"/>
+        </fileset>
+    </copy>
+
 </target>
 	
 <target name="install"
@@ -233,8 +277,8 @@
 	
 	<mkdir dir="${installpath}"/>
 
-	<copy todir="${installpath}">
+	<copy todir="${installpath}" overwrite="true">
-	  <fileset dir="${origin}">
+	  <fileset dir="${destination}">
 	    <include name="**/*"/>
 	  </fileset>
 	</copy>
@@ -245,6 +289,25 @@
 	    </fileset>
 	</delete>
 </target>
+
+<target name="installLocal"
+        depends="copyapp"
+        description="">
+
+    <delete includeemptydirs="true" failonerror="false">
+        <fileset dir="${installLocalpath}">
+            <include name="**/*"/>
+        </fileset>
+    </delete>
+
+    <mkdir dir="${installLocalpath}"/>
+
+    <copy todir="${installLocalpath}">
+        <fileset dir="${destination}">
+            <include name="**/*"/>
+        </fileset>
+    </copy>
+</target>
 	
 <target name="release"
      depends="copyapp"

core-ext/admin/dashboard/index.php

@@ -0,0 +1,90 @@
+<?php
+/*
+This file is part of iCE Hrm.
+
+iCE Hrm is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+iCE Hrm is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with iCE Hrm. If not, see <http://www.gnu.org/licenses/>.
+
+------------------------------------------------------------------
+
+Original work Copyright (c) 2012 [Gamonoid Media Pvt. Ltd]
+Developer: Thilina Hasantha (thilina.hasantha[at]gmail.com / facebook.com/thilinah)
+ */
+
+$moduleName = 'dashboard';
+define('MODULE_PATH',dirname(__FILE__));
+include APP_BASE_PATH.'header.php';
+include APP_BASE_PATH.'modulejslibs.inc.php';
+
+?><div class="span9">
+    <div class="row">
+        <?php
+        $moduleManagers = BaseService::getInstance()->getModuleManagers();
+        $dashBoardList = array();
+        foreach($moduleManagers as $moduleManagerObj){
+
+            //Check if this is not an admin module
+            if($moduleManagerObj->getModuleType() != 'admin'){
+                continue;
+            }
+
+            $allowed = BaseService::getInstance()->isModuleAllowedForUser($moduleManagerObj);
+
+            if(!$allowed){
+                continue;
+            }
+
+            $item = $moduleManagerObj->getDashboardItem();
+            if(!empty($item)) {
+                $index = $moduleManagerObj->getDashboardItemIndex();
+                $dashBoardList[$index] = $item;
+            }
+        }
+
+        ksort($dashBoardList);
+
+        foreach($dashBoardList as $k=>$v){
+            echo LanguageManager::translateTnrText($v);
+        }
+        ?>
+    </div>
+    <?php 
+    if(class_exists("ProVersion")) {
+        $proVersion = new ProVersion();
+        if (strtotime($proVersion->licenseExpire) < time()) {
+        ?>
+        <div class="callout callout-danger lead" style="font-size: 14px;">
+            <h4>Your IceHrm Pro License is Expired</h4>
+            <p style="font-weight: bold;">
+                Your IceHrm Pro license is expired. Even though you can continue to use the software you won't receive
+                software upgrades or security patches. Please renew your license.
+                <br/>
+                <br/>
+                <a href="https://icehrm.com/renew_icehrmpro.php" class="btn btn-success btm-xs"><i
+                        class="fa fa-checkout"></i> Renew License</a>
+            </p>
+        </div>
+        <?php
+        }
+    }
+    ?>
+</div>
+<script>
+    var modJsList = new Array();
+
+    modJsList['tabDashboard'] = new DashboardAdapter('Dashboard','Dashboard');
+
+    var modJs = modJsList['tabDashboard'];
+
+</script>
+<?php include APP_BASE_PATH.'footer.php';?>

core-ext/app/data/icehrm.log

@@ -0,0 +1 @@
+init log

core-ext/common.cron.tasks.ext.php

@@ -1 +1,3 @@
-<?php
+<?php
+//Nothing here
+?>

core-ext/config.base.php

@@ -5,13 +5,16 @@ if(!defined('APP_NAME')){define('APP_NAME','ICE Hrm');}
 if(!defined('FB_URL')){define('FB_URL', 'https://www.facebook.com/icehrm');};
 if(!defined('TWITTER_URL')){define('TWITTER_URL', 'https://twitter.com/icehrmapp');};
 
-define('HOME_LINK_ADMIN', CLIENT_BASE_URL."?g=admin&n=dashboard&m=admin_Admin");
+if(defined('CLIENT_BASE_URL')) {
-define('HOME_LINK_OTHERS', CLIENT_BASE_URL."?g=modules&n=dashboard&m=module_Personal_Information");
+    define('HOME_LINK_ADMIN', CLIENT_BASE_URL . "?g=admin&n=dashboard&m=admin_Admin");
+    define('HOME_LINK_OTHERS', CLIENT_BASE_URL . "?g=modules&n=dashboard&m=module_Personal_Information");
+}
 
 //Version
-define('VERSION', '16.0.OS');
+define('VERSION', '19.0.OS');
-define('CACHE_VALUE', '16.0.OS');
+define('CACHE_VALUE', '19.0.OS');
-define('VERSION_DATE', '14/04/2016');
+define('VERSION_NUMBER', '190');
+define('VERSION_DATE', '19/11/2016');
 
 if(!defined('CONTACT_EMAIL')){define('CONTACT_EMAIL','icehrm@gamonoid.com');}
 if(!defined('KEY_PREFIX')){define('KEY_PREFIX','IceHrm');}
@@ -19,3 +22,14 @@ if(!defined('APP_SEC')){define('APP_SEC','dbcs234d2s111');}
 
 define('UI_SHOW_SWITCH_PROFILE', true);
 define('CRON_LOG', '/var/log/nginx/icehrmcron.log');
+
+define('MEMCACHE_HOST', '127.0.0.1');
+define('MEMCACHE_PORT', '11211');
+
+if(!defined('WK_HTML_PATH')){
+    define('WK_HTML_PATH', '/usr/bin/wkhtmltopdf');
+}
+
+define('ALL_CLIENT_BASE_PATH', '/vagrant/deployment/clients/');
+
+define('CHECK_UPDATE_URL', 'https://icehrm.com/a.php?a=checkUpdate&');

core-ext/db_upgrade/upgrade_v15.2.OS_to_v16.0.OS.sql

@@ -1,187 +0,0 @@
-ALTER TABLE `Users` ADD COLUMN `login_hash` varchar(64) default null;
-ALTER TABLE `Users` ADD INDEX login_hash_index (`login_hash`);
-
-INSERT INTO `ImmigrationStatus` VALUES
-  (1,'Citizen'),
-  (2,'Permanent Resident'),
-  (3,'Work Permit Holder'),
-  (4,'Dependant Pass Holder');
-
-INSERT INTO `Ethnicity` VALUES
-  (1,'White American'),
-  (2,'Black or African American'),
-  (3,'Native American'),
-  (4,'Alaska Native'),
-  (5,'Asian American'),
-  (6,'Native Hawaiian'),
-  (7,'Pacific Islander');
-
-REPLACE INTO `Settings` (`name`, `value`, `description`, `meta`) VALUES
-  ('Attendance: Overtime Calculation Class', 'BasicOvertimeCalculator', 'Set the method used to calculate overtime','["value", {"label":"Value","type":"select","source":[["BasicOvertimeCalculator","BasicOvertimeCalculator"],["CaliforniaOvertimeCalculator","CaliforniaOvertimeCalculator"]]}]');
-
-REPLACE INTO `Settings` (`name`, `value`, `description`, `meta`) VALUES
-  ('Attendance: Work Week Start Day', '0', 'Set the starting day of the work week','["value", {"label":"Value","type":"select","source":[["0","Sunday"],["1","Monday"],["2","Tuesday"],["3","Wednesday"],["4","Thursday"],["5","Friday"],["6","Saturday"]]}]');
-
-REPLACE INTO `Settings` (`name`, `value`, `description`, `meta`) VALUES
-  ('System: Reset Module Names', '1', 'Select this to reset module names in Database','["value", {"label":"Value","type":"select","source":[["1","Yes"],["0","No"]]}]');
-
-REPLACE INTO `Settings` (`name`, `value`, `description`, `meta`) VALUES
-('Attendance: Overtime Start Hour', '8', 'Overtime calculation will start after an employee work this number of hours per day, 0 to indicate no overtime', ''),
-('Attendance: Double time Start Hour', '12', 'Double time calculation will start after an employee work this number of hours per day, 0 to indicate no double time', ''),
-('Api: REST Api Enabled', '1',  '','["value", {"label":"Value","type":"select","source":[["0","No"],["1","Yes"]]}]'),
-('Api: REST Api Token', 'Click on edit icon',  '','["value", {"label":"Value","type":"placeholder"}]');
-
-REPLACE INTO `Settings` (`name`, `value`, `description`, `meta`) VALUES
-  ('System: Allowed Countries', '0', 'Only these countries will be allowed in select boxes','["value", {"label":"Value","type":"select2multi","remote-source":["Country","id","name"]}]');
-
-REPLACE INTO `Settings` (`name`, `value`, `description`, `meta`) VALUES
-  ('System: Allowed Currencies', '0', 'Only these currencies will be allowed in select boxes','["value", {"label":"Value","type":"select2multi","remote-source":["CurrencyType","id","code+name"]}]');
-
-INSERT INTO `Settings` (`name`, `value`, `description`, `meta`) VALUES
-  ('System: Allowed Nationality', '', 'Only these nationalities will be allowed in select boxes','["value", {"label":"Value","type":"select2multi","remote-source":["Nationality","id","name"]}]');
-
-
-REPLACE INTO `Reports` (`name`, `details`, `parameters`, `query`, `paramOrder`, `type`,`report_group`) VALUES
-('Overtime Report', 'This report list all employee attendance entries by employee with overtime calculations', '[\r\n[ "employee", {"label":"Employee","type":"select2multi","allow-null":true,"null-label":"All Employees","remote-source":["Employee","id","first_name+last_name"]}],\r\n[ "date_start", {"label":"Start Date","type":"date"}],\r\n[ "date_end", {"label":"End Date","type":"date"}]\r\n]', 'OvertimeReport', '["employee","date_start","date_end"]', 'Class','Time Management');
-
-REPLACE INTO `Reports` (`name`, `details`, `parameters`, `query`, `paramOrder`, `type`,`report_group`) VALUES
-('Overtime Summary Report', 'This report list all employee attendance entries by employee with overtime calculation summary', '[\r\n[ "employee", {"label":"Employee","type":"select2multi","allow-null":true,"null-label":"All Employees","remote-source":["Employee","id","first_name+last_name"]}],\r\n[ "date_start", {"label":"Start Date","type":"date"}],\r\n[ "date_end", {"label":"End Date","type":"date"}]\r\n]', 'OvertimeSummaryReport', '["employee","date_start","date_end"]', 'Class','Time Management');
-
-create table `EmployeeDataHistory` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `type` varchar(100) not null,
-  `employee` bigint(20) NOT NULL,
-  `field` varchar(100) not null,
-  `old_value` varchar(500) default null,
-  `new_value` varchar(500) default null,
-  `description` varchar(800) default null,
-  `user` bigint(20) NULL,
-  `updated` timestamp default '0000-00-00 00:00:00',
-  `created` timestamp default '0000-00-00 00:00:00',
-  CONSTRAINT `Fk_EmployeeDataHistory_Employee` FOREIGN KEY (`employee`) REFERENCES `Employees` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
-  CONSTRAINT `Fk_EmployeeDataHistory_Users` FOREIGN KEY (`user`) REFERENCES `Users` (`id`) ON DELETE SET NULL ON UPDATE CASCADE,
-  primary key  (`id`)
-) engine=innodb default charset=utf8;
-
-
-
-REPLACE INTO `FieldNameMappings` (`type`, `name`, `textOrig`, `textMapped`, `display`) VALUES
-  ('Employee', 'indirect_supervisors', 'Indirect Supervisors', 'Indirect Supervisors', 'Form');
-
-Update Crons set time = (FLOOR( 1 + RAND( ) *58 )), type = 'Hourly' where name = 'Document Expire Alert';
-
-CREATE TABLE `PayFrequency` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `name` varchar(200) NOT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB default charset=utf8;
-
-INSERT INTO `PayFrequency` VALUES
-  (1,'Bi Weekly'),
-  (2,'Weekly'),
-  (3,'Semi Monthly'),
-  (4,'Monthly'),
-  (5,'Yearly');
-
-
-CREATE TABLE `PayrollColumnTemplates` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `name` varchar(50) DEFAULT NULL,
-  `columns` varchar(500) DEFAULT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB default charset=utf8;
-
-create table `Payroll` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `name` varchar(200) NULL,
-  `pay_period` bigint(20) NOT NULL,
-  `department` bigint(20) NOT NULL,
-  `column_template` bigint(20) NOT NULL,
-  `columns` varchar(500) DEFAULT NULL,
-  `date_start` DATE NULL default '0000-00-00',
-  `date_end` DATE NULL default '0000-00-00',
-  `status` enum('Draft','Completed','Processing') default 'Draft',
-  primary key  (`id`)
-) engine=innodb default charset=utf8;
-
-
-CREATE TABLE `PayrollData` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `payroll` bigint(20) NOT NULL,
-  `employee` bigint(20) NOT NULL,
-  `payroll_item` int(11) NOT NULL,
-  `amount` varchar(25) DEFAULT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `PayrollDataUniqueKey` (`payroll`,`employee`,`payroll_item`),
-  CONSTRAINT `Fk_PayrollData_Payroll` FOREIGN KEY (`payroll`) REFERENCES `Payroll` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB default charset=utf8;
-
-
-CREATE TABLE `PayrollColumns` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `name` varchar(50) DEFAULT NULL,
-  `calculation_hook` varchar(200) DEFAULT NULL,
-  `salary_components` varchar(500) DEFAULT NULL,
-  `deductions` varchar(500) DEFAULT NULL,
-  `add_columns` varchar(500) DEFAULT NULL,
-  `sub_columns` varchar(500) DEFAULT NULL,
-  `colorder` int(11) DEFAULT NULL,
-  `editable` enum('Yes','No') default 'Yes',
-  `enabled` enum('Yes','No') default 'Yes',
-  `default_value` varchar(25) DEFAULT NULL,
-  `calculation_columns` varchar(500) DEFAULT NULL,
-  `calculation_function` varchar(100) DEFAULT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB default charset=utf8;
-
-
-
-
-INSERT INTO `PayrollColumns` (`id`,`name`,`calculation_hook`,`salary_components`,`deductions`,`add_columns`,`sub_columns`,`editable`) VALUES
-  (1,'Total Hours','AttendanceUtil_getTimeWorkedHours','','','','','No'),
-  (2,'Regular Hours','AttendanceUtil_getRegularWorkedHours','','','','','No'),
-  (3,'Overtime Hours','AttendanceUtil_getOverTimeWorkedHours','','','','','No'),
-  (4,'Leave Hours','LeaveUtil_getLeaveHours','','','','','No');
-
-create table `PayrollEmployees` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `employee` bigint(20) NOT NULL,
-  `pay_frequency` int(11) default null,
-  `currency` bigint(20) NULL,
-  `deduction_exemptions` varchar(250) default null,
-  `deduction_allowed` varchar(250) default null,
-  CONSTRAINT `Fk_PayrollEmployee_Employee` FOREIGN KEY (`employee`) REFERENCES `Employees` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
-  primary key  (`id`),
-  unique key `PayrollEmployees_employee` (`employee`)
-) engine=innodb default charset=utf8;
-
-create table `DeductionGroup` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `name` varchar(100) NOT NULL,
-  `description` varchar(100) NOT NULL,
-  primary key  (`id`)
-) engine=innodb default charset=utf8;
-
-drop table `DeductionRules`;
-drop table `Deductions`;
-
-create table `Deductions` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `name` varchar(100) NOT NULL,
-  `componentType` varchar(250) NULL,
-  `component` varchar(250) NULL,
-  `payrollColumn` int(11) DEFAULT NULL,
-  `rangeAmounts` text default null,
-  `deduction_group` bigint(20) NULL,
-  CONSTRAINT `Fk_Deductions_DeductionGroup` FOREIGN KEY (`deduction_group`) REFERENCES `DeductionGroup` (`id`) ON DELETE SET NULL ON UPDATE CASCADE,
-  primary key  (`id`)
-) engine=innodb default charset=utf8;
-
-
-
-
-
-Update Reports set parameters = '[\r\n[ "department", {"label":"Department (Company)","type":"select2","remote-source":["CompanyStructure","id","title"],"allow-null":true}],\r\n[ "employee", {"label":"Employee","type":"select2multi","allow-null":true,"null-label":"All Employees","remote-source":["Employee","id","first_name+last_name"]}],\r\n[ "date_start", {"label":"Start Date","type":"date"}],\r\n[ "date_end", {"label":"End Date","type":"date"}],\r\n[ "status", {"label":"Leave Status","type":"select","source":[["NULL","All Statuses"],["Approved","Approved"],["Pending","Pending"],["Rejected","Rejected"],["Cancellation Requested","Cancellation Requested"],["Cancelled","Cancelled"]]}]\r\n]' where name = "Employee Leaves Report";
-
-
-Delete from `Settings` where name = 'System: Default Country';

core-ext/doc/ldap-config.txt

@@ -1,27 +0,0 @@
-Before using please install php5-ldap module
-sudo apt-get install php5-ldap
-
-For using php ldap on windows please refer
-http://stackoverflow.com/questions/16864306/fatal-error-call-to-undefined-function-ldap-connect
-
-
-The user "admin" will always login with local db username and password (even LDAP is enabled)
-
-Use following config to test LDAP connection with following test LDAP server
-http://www.forumsys.com/tutorials/integration-how-to/ldap/online-ldap-test-server/
-
-Change configs as follows under System->Settings
-
-LDAP: Enabled = Yes
-LDAP: Server = ldap.forumsys.com
-LDAP: Port = 389
-LDAP: Root DN = dc=example,dc=com
-LDAP: Manager DN = cn=read-only-admin,dc=example,dc=com
-LDAP: Manager Password = password
-LDAP: Version 3 = Yes
-LDAP: User Filter = uid={}
-
-Then create a user with username "riemann" under System->Users
-
-Logout and try login with riemann/password
-

core-ext/lang/de-ext.po

@@ -0,0 +1,10 @@
+msgid ""
+msgstr ""
+"Content-Transfer-Encoding: 8bit\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Language: English\n"
+"Language-Team: IceHrm\n"
+"Last-Translator: Thilina Hasantha\n"
+"MIME-Version: 1.0\n"
+"Project-Id-Version: 18.0\n"
+"Report-Msgid-Bugs-To: https://icehrm.com\n"

core-ext/lang/en-ext.po

@@ -0,0 +1,10 @@
+msgid ""
+msgstr ""
+"Content-Transfer-Encoding: 8bit\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Language: English\n"
+"Language-Team: IceHrm\n"
+"Last-Translator: Thilina Hasantha\n"
+"MIME-Version: 1.0\n"
+"Project-Id-Version: 18.0\n"
+"Report-Msgid-Bugs-To: https://icehrm.com\n"

core-ext/login.php

@@ -1,410 +0,0 @@
-<?php
-define('CLIENT_PATH',dirname(__FILE__));
-include ("config.base.php");
-include ("include.common.php");
-include("server.includes.inc.php");
-
-error_log(print_r($_REQUEST,true));
-
-if(empty($user)){
-
-    if(!isset($_REQUEST['f']) && isset($_COOKIE['icehrmLF']) && $_REQUEST['login'] != 'no' && !isset($_REQUEST['username'])){
-        $tempUser = new User();
-        $tempUser->Load("login_hash = ?",array($_COOKIE['icehrmLF']));
-
-        if(!empty($tempUser->id) &&
-            sha1($tempUser->email."_".$tempUser->password) == $_COOKIE['icehrmLF']){
-
-            $_REQUEST['username'] = $tempUser->username;
-            $_REQUEST['password'] = $tempUser->password;
-            $_REQUEST['hashedPwd'] = $tempUser->password;
-        }
-    }
-
-    if(!empty($_REQUEST['username']) && !empty($_REQUEST['password'])){
-
-        $suser = null;
-        $ssoUserLoaded = false;
-
-        if($_REQUEST['username'] != "admin") {
-            LogManager::getInstance()->debug("LDAP: Enabled :" . SettingsManager::getInstance()->getSetting("LDAP: Enabled"));
-            if (SettingsManager::getInstance()->getSetting("LDAP: Enabled") == "1") {
-                $ldapResp = LDAPManager::getInstance()->checkLDAPLogin($_REQUEST['username'], $_REQUEST['password']);
-                LogManager::getInstance()->debug("LDAP Response :" . json_encode($ldapResp));
-                if ($ldapResp->getStatus() == IceResponse::ERROR) {
-                    header("Location:" . CLIENT_BASE_URL . "login.php?f=1");
-                    exit();
-                } else {
-                    $suser = new User();
-                    $suser->Load("username = ?", array($_REQUEST['username']));
-
-                    if (empty($suser)) {
-                        header("Location:" . CLIENT_BASE_URL . "login.php?f=1");
-                        exit();
-                    }
-
-                    $ssoUserLoaded = true;
-                }
-            }
-        }
-
-
-        if(!isset($_REQUEST['hashedPwd'])){
-            $_REQUEST['hashedPwd'] = md5($_REQUEST['password']);
-        }
-        $suser = null;
-        $ssoUserLoaded = false;
-
-        include 'login.com.inc.php';
-
-        if(empty($suser)){
-            $suser = new User();
-            $suser->Load("(username = ? or email = ?) and password = ?",array($_REQUEST['username'],$_REQUEST['username'],$_REQUEST['hashedPwd']));
-        }
-
-        if($suser->password == $_REQUEST['hashedPwd'] || $ssoUserLoaded){
-            $user = $suser;
-            SessionUtils::saveSessionObject('user', $user);
-            $suser->last_login = date("Y-m-d H:i:s");
-            $suser->Save();
-
-            if(!$ssoUserLoaded && !empty(BaseService::getInstance()->auditManager)){
-                BaseService::getInstance()->auditManager->user = $user;
-                BaseService::getInstance()->audit(IceConstants::AUDIT_AUTHENTICATION, "User Login");
-            }
-
-            if(!$ssoUserLoaded && isset($_REQUEST['remember'])){
-                //Add cookie
-                $suser->login_hash = sha1($suser->email."_".$suser->password);
-                $suser->Save();
-
-                setcookie('icehrmLF',$suser->login_hash);
-            }
-
-            if(!isset($_REQUEST['remember'])){
-                setcookie('icehrmLF');
-            }
-
-            $redirectUrl = SessionUtils::getSessionObject('loginRedirect');
-            if(!empty($redirectUrl)){
-                header("Location:".$redirectUrl);
-            }else{
-                if($user->user_level == "Admin"){
-                    if(SessionUtils::getSessionObject('account_locked') == "1"){
-                        header("Location:".CLIENT_BASE_URL."?g=admin&n=billing&m=admin_System");
-                    }else{
-                        header("Location:".HOME_LINK_ADMIN);
-                    }
-
-                }else{
-                    if(empty($user->default_module)){
-                        header("Location:".HOME_LINK_OTHERS);
-                    }else{
-                        $defaultModule = new Module();
-                        $defaultModule->Load("id = ?",array($user->default_module));
-                        if($defaultModule->mod_group == "user"){
-                            $defaultModule->mod_group = "modules";
-                        }
-                        $homeLink = CLIENT_BASE_URL."?g=".$defaultModule->mod_group."&&n=".$defaultModule->name.
-                            "&m=".$defaultModule->mod_group."_".str_replace(" ","_",$defaultModule->menu);
-                        header("Location:".$homeLink);
-                    }
-                }
-            }
-
-        }else{
-            header("Location:".CLIENT_BASE_URL."login.php?f=1");
-        }
-    }
-}else{
-    if($user->user_level == "Admin"){
-        header("Location:".HOME_LINK_ADMIN);
-    }else{
-        if(empty($user->default_module)){
-            header("Location:".HOME_LINK_OTHERS);
-        }else{
-            $defaultModule = new Module();
-            $defaultModule->Load("id = ?",array($user->default_module));
-            if($defaultModule->mod_group == "user"){
-                $defaultModule->mod_group = "modules";
-            }
-            $homeLink = CLIENT_BASE_URL."?g=".$defaultModule->mod_group."&n=".$defaultModule->name.
-                "&m=".$defaultModule->mod_group."_".str_replace(" ","_",$defaultModule->menu);
-            header("Location:".$homeLink);
-        }
-    }
-
-}
-
-$tuser = SessionUtils::getSessionObject('user');
-$logoFileUrl = UIManager::getInstance()->getCompanyLogoUrl();
-
-?><!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="utf-8">
-    <title><?=APP_NAME?> Login</title>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta name="description" content="">
-    <meta name="author" content="">
-
-    <!-- Le styles -->
-    <link href="<?=BASE_URL?>bootstrap/css/bootstrap.css" rel="stylesheet">
-
-    <script type="text/javascript" src="<?=BASE_URL?>js/jquery-1.8.1.js"></script>
-    <script src="<?=BASE_URL?>bootstrap/js/bootstrap.js"></script>
-    <script src="<?=BASE_URL?>js/jquery.placeholder.js"></script>
-    <script src="<?=BASE_URL?>js/jquery.dataTables.js"></script>
-    <script src="<?=BASE_URL?>js/bootstrap-datepicker.js"></script>
-    <link href="<?=BASE_URL?>bootstrap/css/bootstrap-responsive.css" rel="stylesheet">
-    <link href="<?=BASE_URL?>css/DT_bootstrap.css?v=0.4" rel="stylesheet">
-    <link href="<?=BASE_URL?>css/datepicker.css" rel="stylesheet">
-    <link href="<?=BASE_URL?>css/style.css?v=<?=$cssVersion?>" rel="stylesheet">
-
-    <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
-    <!--[if lt IE 9]>
-    <script src="<?=BASE_URL?>js/html5.js"></script>
-    <![endif]-->
-
-    <style type="text/css">
-        /* Override some defaults */
-        html, body {
-            background-color: #829AA8;
-        }
-        body {
-            padding-top: 40px;
-        }
-        .container {
-            width: 300px;
-        }
-
-        /* The white background content wrapper */
-        .container > .content {
-            min-height: 0px !important;
-            background-color: #fff;
-            padding: 20px;
-            margin: 0 -20px;
-            -webkit-border-radius:0px;
-            -moz-border-radius:0px;
-            border-radius: 0px;
-            -webkit-box-shadow: 0 1px 2px rgba(0,0,0,.15);
-            -moz-box-shadow: 0 1px 2px rgba(0,0,0,.15);
-            box-shadow: 0 1px 2px rgba(0,0,0,.15);
-        }
-
-        .login-form {
-            margin-left: 65px;
-        }
-
-        legend {
-            margin-right: -50px;
-            font-weight: bold;
-            color: #404040;
-        }
-
-        .add-on{
-            -webkit-border-radius:0px;
-            -moz-border-radius:0px;
-            border-radius: 0px;
-        }
-
-        input{
-            -webkit-border-radius:0px;
-            -moz-border-radius:0px;
-            border-radius: 0px;
-        }
-
-    </style>
-
-
-</head>
-
-<body>
-
-<script>
-    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-            (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-        m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-
-    ga('create', '<?=BaseService::getInstance()->getGAKey()?>', 'gamonoid.com');
-    ga('send', 'pageview');
-
-</script>
-
-<script type="text/javascript">
-    var key = "";
-    <?php if(isset($_REQUEST['key'])){?>
-    key = '<?=$_REQUEST['key']?>';
-    key = key.replace(/ /g,"+");
-    <?php }?>
-
-    $(document).ready(function() {
-        $(window).keydown(function(event){
-            if(event.keyCode == 13) {
-                event.preventDefault();
-                return false;
-            }
-        });
-
-        $("#password").keydown(function(event){
-            if(event.keyCode == 13) {
-                submitLogin();
-                return false;
-            }
-        });
-    });
-
-    function showForgotPassword(){
-        $("#loginForm").hide();
-        $("#requestPasswordChangeForm").show();
-    }
-
-    function requestPasswordChange(){
-        $("#requestPasswordChangeFormAlert").hide();
-        var id = $("#usernameChange").val();
-        $.post("service.php", {'a':'rpc','id':id}, function(data) {
-            if(data.status == "SUCCESS"){
-                $("#requestPasswordChangeFormAlert").show();
-                $("#requestPasswordChangeFormAlert").html(data.message);
-            }else{
-                $("#requestPasswordChangeFormAlert").show();
-                $("#requestPasswordChangeFormAlert").html(data.message);
-            }
-        },"json");
-    }
-
-    function changePassword(){
-        $("#newPasswordFormAlert").hide();
-        var password = $("#password").val();
-
-        var passwordValidation =  function (str) {
-            var val = /^[a-zA-Z0-9]\w{6,}$/;
-            return str != null && val.test(str);
-        };
-
-
-        if(!passwordValidation(password)){
-            $("#newPasswordFormAlert").show();
-            $("#newPasswordFormAlert").html("Password may contain only letters, numbers and should be longer than 6 characters");
-            return;
-        }
-
-
-        $.post("service.php", {'a':'rsp','key':key,'pwd':password,"now":"1"}, function(data) {
-            if(data.status == "SUCCESS"){
-                top.location.href = "login.php?c=1";
-            }else{
-                $("#newPasswordFormAlert").show();
-                $("#newPasswordFormAlert").html(data.message);
-            }
-        },"json");
-    }
-
-    function submitLogin(){
-        try{
-            localStorage.clear();
-        }catch(e){}
-        $("#loginForm").submit();
-    }
-
-</script>
-<div class="container">
-    <?php if(defined('DEMO_MODE')){?>
-        <div class="content" style="top: 30px;
-			position: absolute;
-			left: 50px;
-			width: 380px;
-			height: 100px;">
-
-            <ul class="list-group" style="font-size:12px;">
-                <li style="padding-bottom:3px;" class="list-group-item">Admin: (Username = admin/ Password = admin)</li>
-                <li style="padding-bottom:3px;" class="list-group-item">Manager: (Username = manager/ Password = demouserpwd)</li>
-                <li style="padding-bottom:3px;" class="list-group-item">User: (Username = user1/ Password = demouserpwd)</li>
-                <li style="padding-bottom:3px;" class="list-group-item">User: (Username = user2/ Password = demouserpwd)</li>
-            </ul>
-        </div>
-    <?php }?>
-    <div class="content" style="margin-top:100px;">
-        <div class="row">
-            <div class="login-form">
-                <h2><img src="<?=$logoFileUrl?>"/></h2>
-                <?php if(!isset($_REQUEST['cp'])){?>
-                    <form id="loginForm" action="login.php" method="POST">
-                        <fieldset>
-                            <div class="clearfix">
-                                <div class="input-prepend">
-                                    <span class="add-on"><i class="icon-user"></i></span>
-                                    <input class="span2" type="text" id="username" name="username" placeholder="Username">
-                                </div>
-                            </div>
-                            <div class="clearfix">
-                                <div class="input-prepend">
-                                    <span class="add-on"><i class="icon-lock"></i></span>
-                                    <input class="span2" type="password" id="password" name="password" placeholder="Password">
-                                </div>
-                            </div>
-                            <div class="clearfix">
-                                <div class="checkbox">
-                                    <label><input id="remember" name="remember" type="checkbox" value="remember" checked>Remember me</label>
-                                </div>
-                            </div>
-                            <?php if(isset($_REQUEST['f'])){?>
-                                <div class="clearfix alert alert-error" style="font-size:11px;width:147px;margin-bottom: 5px;">
-                                    Login failed
-                                    <?php if(isset($_REQUEST['fm'])){
-                                        echo $_REQUEST['fm'];
-                                    }?>
-                                </div>
-                            <?php } ?>
-                            <?php if(isset($_REQUEST['c'])){?>
-                                <div class="clearfix alert alert-info" style="font-size:11px;width:147px;margin-bottom: 5px;">
-                                    Password changed successfully
-                                </div>
-                            <?php } ?>
-                            <button class="btn" style="margin-top: 5px;" type="button" onclick="submitLogin();return false;">Sign in&nbsp;&nbsp;<span class="icon-arrow-right"></span></button>
-                        </fieldset>
-                        <div class="clearfix">
-                            <a href="" onclick="showForgotPassword();return false;" style="float:left;margin-top: 10px;">Forgot password</a>
-                            <!--
-                            <a href="<?=TWITTER_URL?>" target="_blank" style="float:right;"><img src="<?=BASE_URL?>images/32x32-Circle-53-TW.png"/></a>
-							<a href="<?=FB_URL?>" target="_blank" style="float:right;margin-right: 7px;"><img src="<?=BASE_URL?>images/32x32-Circle-54-FB.png"/></a>
-						    -->
-                        </div>
-                    </form>
-                    <form id="requestPasswordChangeForm" style="display:none;" action="">
-                        <fieldset>
-                            <div class="clearfix">
-                                <div class="input-prepend">
-                                    <span class="add-on"><i class="icon-user"></i></span>
-                                    <input class="span2" type="text" id="usernameChange" name="usernameChange" placeholder="Username or Email">
-                                </div>
-                            </div>
-                            <div id="requestPasswordChangeFormAlert" class="clearfix alert alert-info" style="font-size:11px;width:147px;margin-bottom: 5px;display:none;">
-
-                            </div>
-                            <button class="btn" style="margin-top: 5px;" type="button" onclick="requestPasswordChange();return false;">Request Password Change&nbsp;&nbsp;<span class="icon-arrow-right"></span></button>
-                        </fieldset>
-                    </form>
-                <?php }else{?>
-                    <form id="newPasswordForm" action="">
-                        <fieldset>
-                            <div class="clearfix">
-                                <div class="input-prepend">
-                                    <span class="add-on"><i class="icon-lock"></i></span>
-                                    <input class="span2" type="password" id="password" name="password" placeholder="New Password">
-                                </div>
-                            </div>
-                            <div id="newPasswordFormAlert" class="clearfix alert alert-error" style="font-size:11px;width:147px;margin-bottom: 5px;display:none;">
-
-                            </div>
-                            <button class="btn" style="margin-top: 5px;" type="button" onclick="changePassword();return false;">Change Password&nbsp;&nbsp;<span class="icon-arrow-right"></span></button>
-                        </fieldset>
-                    </form>
-                <?php }?>
-            </div>
-        </div>
-    </div>
-</div> <!-- /container -->
-</body>
-</html>

core-ext/model/models.base.php

@@ -1,13 +1,26 @@
 <?php
 class ICEHRM_Record extends ADOdb_Active_Record{
 
+	var $keysToIgnore = array(
+		"_table",
+		"_dbat",
+		"_tableat",
+		"_where",
+		"_saved",
+		"_lasterr",
+		"_original",
+		"foreignName",
+		"a",
+		"t"
+	);
+
 	public function getAdminAccess(){
 		return array("get","element","save","delete");
 	}
 
-	public function getOtherAccess(){
+    public function getOtherAccess(){
-		return array("get","element","save","delete");
+        return array("get","element","save","delete");
-	}
+    }
 
 	public function getManagerAccess(){
 		return array("get","element");
@@ -16,7 +29,7 @@ class ICEHRM_Record extends ADOdb_Active_Record{
 	public function getUserAccess(){
 		return array("get","element");
 	}
-
+	
 	public function getEmployeeAccess(){
 		return $this->getUserAccess();
 	}
@@ -57,24 +70,69 @@ class ICEHRM_Record extends ADOdb_Active_Record{
 
 	}
 
-	public function postProcessGetData($obj){
+    public function postProcessGetData($obj){
-		return $obj;
+        return $obj;
-	}
+    }
 
 	public function postProcessGetElement($obj){
 		return $obj;
 	}
 
-	public function getDefaultAccessLevel(){
+    public function getDefaultAccessLevel(){
-		return array("get","element","save","delete");
+        return array("get","element","save","delete");
+    }
+
+    public function getVirtualFields(){
+        return array(
+        );
+    }
+
+    public function allowIndirectMapping(){
+        return false;
+    }
+
+	public function getDisplayName() {
+		return get_called_class();
 	}
 
-	public function getVirtualFields(){
+	public function getObjectKeys(){
-		return array(
+		$keys = array();
-		);
+
+		foreach($this as $k=>$v){
+			if(in_array($k,$this->keysToIgnore )){
+				continue;
+			}
+
+			if(is_array($v) || is_object($v)){
+				continue;
+			}
+
+			$keys[$k] = $k;
+		}
+
+		return $keys;
 	}
 
-	public function allowIndirectMapping(){
+	public function getCustomFields($obj){
-		return false;
+		$keys = array();
+		$objKeys = $this->getObjectKeys();
+		foreach($obj as $k=>$v){
+			if(isset($objKeys[$k])){
+				continue;
+			}
+
+			if(is_array($v) || is_object($v)){
+				continue;
+			}
+
+			if(in_array($k,$this->keysToIgnore )){
+				continue;
+			}
+
+			$keys[$k] = $k;
+		}
+
+		return $keys;
+
 	}
-}
+}

core-ext/popups.php

@@ -1,54 +1,54 @@
 <!-- Delete Modal -->
 <div class="modal fade" id="deleteModel" tabindex="-1" role="dialog" aria-labelledby="deleteModelLabel" aria-hidden="true">
-    <div class="modal-dialog">
+<div class="modal-dialog">
-        <div class="modal-content">
+<div class="modal-content">	
-            <div class="modal-header">
+	<div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><li class="fa fa-times"/></button>
+		<button type="button" class="close" data-dismiss="modal" aria-hidden="true"><li class="fa fa-times"/></button>
-                <h3 id="deleteModelLabel" style="font-size: 17px;"></h3>
+		<h3 id="deleteModelLabel" style="font-size: 17px;"></h3>
-            </div>
+	</div>
-            <div class="modal-body">
+	<div class="modal-body">
-                <p id="deleteModelBody"></p>
+		<p id="deleteModelBody"></p>
-            </div>
+	</div>
-            <div class="modal-footer">
+	<div class="modal-footer">
-                <button class="btn" onclick="modJs.cancelDelete();">Cancel</button>
+ 		<button class="btn" onclick="modJs.cancelDelete();">Cancel</button>
-                <button class="btn btn-primary" onclick="modJs.confirmDelete();">Delete</button>
+		<button class="btn btn-primary" onclick="modJs.confirmDelete();">Delete</button>
-            </div>
+	</div>
-        </div>
+</div>
-    </div>
+</div>
 </div>
 <!-- Delete Modal -->
 
 <!-- Message Modal -->
 <div class="modal fade" id="messageModel" tabindex="-1" role="dialog" aria-labelledby="messageModelLabel" aria-hidden="true">
-    <div class="modal-dialog">
+<div class="modal-dialog">
-        <div class="modal-content">
+<div class="modal-content">	
-            <div class="modal-header">
+	<div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><li class="fa fa-times"/></button>
+		<button type="button" class="close" data-dismiss="modal" aria-hidden="true"><li class="fa fa-times"/></button>
-                <h3 id="messageModelLabel" style="font-size: 17px;"></h3>
+		<h3 id="messageModelLabel" style="font-size: 17px;"></h3>
-            </div>
+	</div>
-            <div class="modal-body">
+	<div class="modal-body">
-                <p id="messageModelBody"></p>
+		<p id="messageModelBody"></p>
-            </div>
+	</div>
-            <div class="modal-footer">
+	<div class="modal-footer">
-                <button class="btn" onclick="modJs.closeMessage();">Ok</button>
+ 		<button class="btn" onclick="modJs.closeMessage();">Ok</button>
-            </div>
+	</div>
-        </div>
+</div>
-    </div>
+</div>
 </div>
 <!-- Message Modal -->
 
 <!-- Plain Message Modal -->
 <div class="modal fade" id="plainMessageModel" tabindex="-1" role="dialog" aria-labelledby="plainMessageModelLabel" aria-hidden="true">
-    <div class="modal-dialog">
+<div class="modal-dialog">
-        <div class="modal-content">
+<div class="modal-content">	
-            <div class="modal-header" style="border-bottom:none;/*background-color: #3c8dbc;*/">
+	<div class="modal-header" style="border-bottom:none;/*background-color: #3c8dbc;*/">
-                <button type="button" class="close" data-dismiss="modal" aria-hidden="true" style="margin-top:-10px;"><li class="fa fa-times"/></button>
+		<button type="button" class="close" data-dismiss="modal" aria-hidden="true" style="margin-top:-10px;"><li class="fa fa-times"/></button>
-            </div>
+	</div>
-            <div class="modal-body">
+	<div class="modal-body">
-                <p id="plainMessageModelBody"></p>
+		<p id="plainMessageModelBody"></p>
-            </div>
+	</div>
-        </div>
+</div>
-    </div>
+</div>
 </div>
 <!-- Plain Message Modal -->
 
@@ -89,98 +89,134 @@
 
 <!-- Upload Modal -->
 <div class="modal fade" id="uploadModel" tabindex="-1" role="dialog" aria-hidden="true">
-    <div class="modal-dialog">
+<div class="modal-dialog">
-        <div class="modal-content">
+<div class="modal-content">
-            <div class="modal-header">
+	<div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><li class="fa fa-times"/></button>
+		<button type="button" class="close" data-dismiss="modal" aria-hidden="true"><li class="fa fa-times"/></button>
-                <h3 id="uploadModelLabel" style="font-size: 17px;"></h3>
+		<h3 id="uploadModelLabel" style="font-size: 17px;"></h3>
-            </div>
+	</div>
-            <div class="modal-body">
+	<div class="modal-body">
-                <p id="uploadModelBody"></p>
+		<p id="uploadModelBody"></p>
-            </div>
+	</div>
-            <div class="modal-footer">
+	<div class="modal-footer">
-                <button class="btn" onclick="$('#uploadModel').modal('hide');">Cancel</button>
+ 		<button class="btn" onclick="$('#uploadModel').modal('hide');">Cancel</button>
-            </div>
+	</div>
-        </div>
+</div>
-    </div>
+</div>
 </div>
 <!-- Upload Modal -->
 
 <!-- Message Modal -->
 <div class="modal fade" id="verifyModel" tabindex="-1" role="dialog" aria-labelledby="verifyModelLabel" aria-hidden="true">
-    <div class="modal-dialog">
+<div class="modal-dialog">
-        <div class="modal-content">
+<div class="modal-content">	
-            <div class="modal-header">
+	<div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><li class="fa fa-times"/></button>
+		<button type="button" class="close" data-dismiss="modal" aria-hidden="true"><li class="fa fa-times"/></button>
-                <h3 id="verifyModelLabel" style="font-size: 17px;"></h3>
+		<h3 id="verifyModelLabel" style="font-size: 17px;"></h3>
-            </div>
+	</div>
-            <div class="modal-body">
+	<div class="modal-body">
-                <p id="verifyModelBody">
+		<p id="verifyModelBody">
-                    <b>Step 1:</b><br/>
+			<b>Step 1:</b><br/>
-                    Please get your Instance Key from here:<br/>
+			Please get your Instance Key from here:<br/> 
-                    <a target="_blank" href="http://icehrm.com/generateInstanceKey.php?id=<?=$baseService->getInstanceId()?>">
+			<a target="_blank" href="https://icehrm.com/generateInstanceKey.php?id=<?=$baseService->getInstanceId()?>">
-                        http://icehrm.com/generateInstanceKey.php?id=<?=$baseService->getInstanceId()?>
+			https://icehrm.com/generateInstanceKey.php?id=<?=$baseService->getInstanceId()?>
-                    </a>
+			</a>
-
+			
-                    <br/><b>Step 2:</b><br/>
+			<br/><b>Step 2:</b><br/>
-                    Enter the key you generated in step 1 here and click "Verify"<br/>
+			Enter the key you generated in step 1 here and click "Verify"<br/>
-                <form role="form">
+			<form role="form">
-                    <div class="row">
+			<div class="row">
-                        <label class="col-sm-12 control-label" for="verificationKey">Verification Key</label>
+				<label class="col-sm-12 control-label" for="verificationKey">Verification Key</label>
-                        <div class="controls col-sm-12">
+				<div class="controls col-sm-12">
-                            <input class="form-control" type="text" id="verificationKey" name="verificationKey" value=""/>
+					<input class="form-control" type="text" id="verificationKey" name="verificationKey" value=""/>
-                        </div>
+				</div>
-                    </div>
+			</div>
-                    <br/><br/>
+			<br/><br/>
-                    <div class="control-group row">
+			<div class="control-group row">
-                        <div class="controls col-sm-12">
+		    	<div class="controls col-sm-12">
-                            <button onclick="try{verifyInstance($('#verificationKey').val());}catch(e){};return false;" class="saveBtn btn btn-primary pull-right"><i class="fa fa-save"></i> Verify</button>
+		      		<button onclick="try{verifyInstance($('#verificationKey').val());}catch(e){};return false;" class="saveBtn btn btn-primary pull-right"><i class="fa fa-save"></i> Verify</button>
-                            <button onclick="$('#verifyModel').modal('hide');return false;" class="cancelBtn btn pull-right" style="margin-right:5px;"><i class="fa fa-times-circle-o"></i> Cancel</button>
+		      		<button onclick="$('#verifyModel').modal('hide');return false;" class="cancelBtn btn pull-right" style="margin-right:5px;"><i class="fa fa-times-circle-o"></i> Cancel</button>
-                        </div>
+		    	</div>
-                        <div class="controls col-sm-3">
+		    	<div class="controls col-sm-3">
-                        </div>
+		    	</div>
-                    </div>
+		  	</div>
-            </div>
+		</div>
-            </form>
+	</form>
-            </p>
+		</p>
-        </div>
+	</div>
-    </div>
+</div>
 </div>
 </div>
 <!-- Message Modal -->
 
 
 <?php if($user->user_level == 'Admin'){?>
-    <!-- Modal -->
+	<!-- Modal -->
-    <div class="modal fade" id="profileSwitchModal" tabindex="-1" role="dialog" aria-hidden="true">
+	<div class="modal fade" id="profileSwitchModal" tabindex="-1" role="dialog" aria-hidden="true">
-        <div class="modal-dialog">
+	<div class="modal-dialog">
-            <div class="modal-content">
+		<div class="modal-content">
-                <div class="modal-header">
+		  <div class="modal-header">
-                    <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><li class="fa fa-times"/></button>
+			<button type="button" class="close" data-dismiss="modal" aria-hidden="true"><li class="fa fa-times"/></button>
-                    <h3 id="myModalLabel">Switch Employee</h3>
+			<h3 id="myModalLabel"><?=LanguageManager::tran('Switch Employee')?></h3>
-                </div>
+		  </div>
-                <div class="modal-body">
+		  <div class="modal-body">
-                    <p>Select the employee to Edit</p>
+			<p><?=LanguageManager::tran('Select The Employee to Switch Into')?></p>
-                    <div style="border: solid 1px #EEE;">
+			<div style="border: solid 1px #EEE;">
-                        <select id="switch_emp" style="width:100%;">
+			<select id="switch_emp" style="width:100%;">
-                            <!--
+			<!--
-                            <option value="-1">No Employee</option>
+			<option value="-1">No Employee</option>
-                            -->
+			-->
-                            <?php
+			<?php
-                            $employees = $baseService->get('Employee');
+			$employees = $baseService->get('Employee');
-                            foreach($employees as $empTemp){
+			foreach($employees as $empTemp){
-                                ?>
+			?>
-                                <option value="<?=$empTemp->id?>"><?=$empTemp->first_name." ".$empTemp->last_name?></option>
+			<option value="<?=$empTemp->id?>"><?=$empTemp->first_name." ".$empTemp->last_name?></option>
-                            <?php }?>
+			<?php }?>
-                        </select>
+			</select>
-                    </div>
+			</div>
-                </div>
+		  </div>
-                <div class="modal-footer">
+		  <div class="modal-footer">
-                    <button class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
+			<button class="btn" data-dismiss="modal" aria-hidden="true"><?=LanguageManager::tran('Close')?></button>
-                    <button class="btn btn-primary" onclick="modJs.setAdminProfile($('#switch_emp').val());return false;">Switch</button>
+			<button class="btn btn-primary" onclick="modJs.setAdminProfile($('#switch_emp').val());return false;"><?=LanguageManager::tran('Switch')?></button>
-                </div>
+		  </div>
-            </div>
+		</div>
-        </div>
+	</div>
-    </div>
+	</div>
-    <!-- Modal -->
+	<!-- Modal -->
-<?php }?>
+<?php }?>
+
+
+<?php if(isset($itemNameLower)){?>
+	<div class="modal" id="<?=$itemNameLower?>StatusModel" tabindex="-1" role="dialog" aria-labelledby="messageModelLabel" aria-hidden="true">
+		<div class="modal-dialog">
+			<div class="modal-content">
+				<div class="modal-header">
+					<button type="button" class="close" data-dismiss="modal" aria-hidden="true"><li class="fa fa-times"/></button>
+					<h3 style="font-size: 17px;">Change <?=$itemName?> Status</h3>
+				</div>
+				<div class="modal-body">
+					<form id="expenseStatusForm">
+						<div class="control-group">
+							<label class="control-label" for="expense_status"><?=$itemName?> Status</label>
+							<div class="controls">
+								<select type="text" id="<?=$itemNameLower?>_status" class="form-control" name="<?=$itemNameLower?>_status" value="">
+									
+								</select>
+							</div>
+						</div>
+						<div class="control-group">
+							<label class="control-label" for="expense_status">Status Change Note</label>
+							<div class="controls">
+								<textarea id="<?=$itemNameLower?>_reason" class="form-control" name="<?=$itemNameLower?>_reason" maxlength="500"></textarea>
+							</div>
+						</div>
+					</form>
+				</div>
+				<div class="modal-footer">
+					<button class="btn btn-primary" onclick="modJs.changeStatus();">Change <?=$itemName?> Status</button>
+					<button class="btn" onclick="modJs.closeDialog();">Not Now</button>
+				</div>
+			</div>
+		</div>
+	</div>
+<?php } ?>

core-ext/raml/api.raml

@@ -0,0 +1,61 @@
+#%RAML 0.8
+---
+title: IceHrm
+baseUri: http://icehrm-hosted.gamonoid.com/api
+version: 1
+documentation:
+  - title: Authentication
+    content: !include documentation/authentication.md
+  - title: Responses
+    content: !include documentation/responses.md
+
+/employee:
+  displayName: Employee
+  /list:
+      get:
+        is: [ paginated ]
+        description: Get a list of employees
+        responses:
+          200:
+            body:
+              application/json:
+                schema: !include schemas/employees.json
+                example: !include examples/employees.json
+  /{id}:
+    get:
+      description: Get an employee by id
+      responses:
+        200:
+          body:
+            application/json:
+              schema: !include schemas/employee.json
+              example: !include examples/employee.json
+        404:
+          description: Employee does not exist
+          body:
+            application/json:
+              schema: !include schemas/error.json
+    uriParameters:
+      id:
+        description: Employee id
+        type: integer
+/candidate:
+  displayName: Candidate
+  /{id}:
+    get:
+      description: Get an employee by id
+      responses:
+        200:
+          body:
+            application/json:
+              schema: !include schemas/candidate.json
+              example: !include examples/candidate.json
+        404:
+          description: Candidate does not exist
+          body:
+            application/json:
+              schema: !include schemas/error.json
+    uriParameters:
+      id:
+        description: Candidate id
+        type: integer

core-ext/raml/documentation/authentication.md

@@ -0,0 +1 @@
+Admin users of icehrm can find the access token under System->Settings

core-ext/raml/documentation/responses.md

@@ -0,0 +1,9 @@
+| Code | Description        |
+|------|--------------------|
+| 200  | Ok                 |
+| 201  | Created            |
+| 400  | Bad request        |
+| 401  | Not authorized     |
+| 403  | Forbidden          |
+| 404  | Resource not found |
+| 500  | Server error       |

core-ext/raml/examples/candidate.json

@@ -0,0 +1,53 @@
+{
+  "id": "1",
+  "first_name": "Jhon",
+  "last_name": "Doe",
+  "nationality": "4",
+  "birthday": null,
+  "gender": "Male",
+  "marital_status": null,
+  "address1": null,
+  "address2": null,
+  "city": "New York",
+  "country": "US",
+  "province": null,
+  "postal_code": null,
+  "email": "icehrm+jhon@web-stalk.com",
+  "home_phone": "+1 455565656",
+  "mobile_phone": null,
+  "cv_title": "Software Engineer",
+  "cv": "cv_rYwHphV7xD5dOe1444302569136",
+  "cvtext": null,
+  "industry": null,
+  "profileImage": null,
+  "head_line": "",
+  "objective": "",
+  "work_history": "",
+  "education": "",
+  "skills": "",
+  "referees": "",
+  "linkedInUrl": null,
+  "linkedInData": null,
+  "totalYearsOfExperience": null,
+  "totalMonthsOfExperience": null,
+  "generatedCVFile": null,
+  "created": "2015-10-08 16:59:20",
+  "updated": "2015-10-08 16:59:20",
+  "expectedSalary": "0",
+  "preferedPositions": null,
+  "preferedJobtype": null,
+  "preferedCountries": null,
+  "tags": null,
+  "notes": null,
+  "calls": null,
+  "age": null,
+  "hash": "663fd20d1859344585f678a0f87b23522b8f9fce8c67c5290a609ce342b81442",
+  "linkedInProfileLink": null,
+  "linkedInProfileId": null,
+  "facebookProfileLink": null,
+  "facebookProfileId": null,
+  "twitterProfileLink": null,
+  "twitterProfileId": null,
+  "googleProfileLink": null,
+  "googleProfileId": null
+}

core-ext/raml/examples/employee.json

@@ -0,0 +1,75 @@
+{
+  "id": "2",
+  "employee_id": "EMP002",
+  "first_name": "Lala",
+  "middle_name": "Nadila ",
+  "last_name": "Lamees",
+  "nationality": "175",
+  "birthday": "1984-03-12",
+  "gender": "Female",
+  "marital_status": "Single",
+  "ssn_num": "",
+  "nic_num": "4594567WE3",
+  "other_id": "4595567WE3",
+  "driving_license": "349-066-YUO",
+  "driving_license_exp_date": "2012-03-01",
+  "employment_status": "1",
+  "job_title": "8",
+  "pay_grade": "2",
+  "work_station_id": "W001",
+  "address1": "Green War Rd, 00123",
+  "address2": "",
+  "city": "Istanbul",
+  "country": "TR",
+  "province": null,
+  "postal_code": "909066",
+  "home_phone": "+960112345",
+  "mobile_phone": "+960112345",
+  "work_phone": "+960112345",
+  "work_email": "icehrm+manager@web-stalk.com",
+  "private_email": "icehrm+manager@web-stalk.com",
+  "joined_date": "2011-03-07",
+  "confirmation_date": "2012-02-14",
+  "supervisor": "1",
+  "indirect_supervisors": "[3,4]",
+  "department": "2",
+  "custom1": null,
+  "custom2": null,
+  "custom3": null,
+  "custom4": null,
+  "custom5": null,
+  "custom6": null,
+  "custom7": null,
+  "custom8": null,
+  "custom9": null,
+  "custom10": null,
+  "termination_date": "0000-00-00",
+  "notes": null,
+  "status": "Active",
+  "ethnicity": null,
+  "immigration_status": null,
+  "approver1": "5",
+  "approver2": "6",
+  "approver3": null,
+  "nationality_Name_id": [],
+  "nationality_Name": "Tajik",
+  "ethnicity_Name_id": [],
+  "ethnicity_Name": null,
+  "immigration_status_Name_id": [],
+  "immigration_status_Name": null,
+  "employment_status_Name_id": [],
+  "employment_status_Name": "Full Time Contract",
+  "job_title_Name_id": [],
+  "job_title_Name": "Pre-Sales Executive",
+  "pay_grade_Name_id": [],
+  "pay_grade_Name": "Executive",
+  "country_Name_id": [],
+  "country_Name": "Turkey",
+  "province_Name_id": [],
+  "province_Name": null,
+  "department_Name_id": [],
+  "department_Name": "Head Office",
+  "supervisor_Name_id": [],
+  "supervisor_Name": "IceHrm Employee",
+  "image": "http:\/\/app.app.dev\/images\/user_female.png"
+}

core-ext/raml/examples/employees.json

@@ -0,0 +1,23 @@
+[
+  {
+    "id": "1",
+    "employee_id": "EMP001",
+    "first_name": "IceHrm",
+    "middle_name": "Sample",
+    "last_name": "Employee"
+  },
+  {
+    "id": "2",
+    "employee_id": "EMP002",
+    "first_name": "Lala",
+    "middle_name": "Nadila ",
+    "last_name": "Lamees"
+  },
+  {
+    "id": "3",
+    "employee_id": "EMP003",
+    "first_name": "Sofia",
+    "middle_name": "",
+    "last_name": "O'Sullivan"
+  }
+]

core-ext/raml/schemas/candidate.json

@@ -0,0 +1,27 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "type": "object",
+  "properties": {
+    "id": {
+      "type": "integer"
+    },
+    "email": {
+      "type": "string"
+    },
+    "first_name": {
+      "type": "string"
+    },
+    "last_name": {
+      "type": "string"
+    },
+    "cv_title": {
+      "type": "string"
+    }
+  },
+  "required": [
+    "id",
+    "employee_id",
+    "first_name",
+    "last_name"
+  ]
+}

core-ext/raml/schemas/employee.json

@@ -0,0 +1,27 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "type": "object",
+  "properties": {
+    "id": {
+      "type": "integer"
+    },
+    "employee_id": {
+      "type": "string"
+    },
+    "first_name": {
+      "type": "string"
+    },
+    "middle_name": {
+      "type": "string"
+    },
+    "last_name": {
+      "type": "string"
+    }
+  },
+  "required": [
+    "id",
+    "employee_id",
+    "first_name",
+    "last_name"
+  ]
+}

core-ext/raml/schemas/employees.json

@@ -0,0 +1,30 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "type": "array",
+  "items": {
+    "type": "object",
+    "properties": {
+      "id": {
+        "type": "integer"
+      },
+      "employee_id": {
+        "type": "string"
+      },
+      "first_name": {
+        "type": "string"
+      },
+      "middle_name": {
+        "type": "string"
+      },
+      "last_name": {
+        "type": "string"
+      }
+    },
+    "required": [
+      "id",
+      "employee_id",
+      "first_name",
+      "last_name"
+    ]
+  }
+}

core-ext/raml/schemas/error.json

@@ -0,0 +1,39 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "type": "object",
+  "properties": {
+    "error": {
+      "type": "object",
+      "properties": {
+        "messages": {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "properties": {
+              "code": {
+                "type": "string"
+              },
+              "message": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "code",
+              "message"
+            ]
+          }
+        },
+        "description": {
+          "type": "string"
+        }
+      },
+      "required": [
+        "messages",
+        "description"
+      ]
+    }
+  },
+  "required": [
+    "error"
+  ]
+}

core-ext/scripts/icehrm_master_data.sql

@@ -791,58 +791,45 @@ INSERT INTO `WorkDays` (`id`, `name`, `status`, `country`) VALUES
   (7, 'Sunday', 'Non-working Day',NULL);
 
 
-INSERT INTO `Reports` (`id`, `name`, `details`, `parameters`, `query`, `paramOrder`, `type`,`report_group`) VALUES
+REPLACE INTO `Reports` (`name`, `details`, `parameters`, `query`, `paramOrder`, `type`,`report_group`,`output`) VALUES
-  (1, 'Employee Details Report', 'This report list all employee details and you can filter employees by department, employment status or job title', '[\r\n[ "department", {"label":"Department","type":"select2","remote-source":["CompanyStructure","id","title"],"allow-null":true}],\r\n[ "employment_status", {"label":"Employment Status","type":"select2","remote-source":["EmploymentStatus","id","name"],"allow-null":true}],\r\n[ "job_title", {"label":"Job Title","type":"select2","remote-source":["JobTitle","id","name"],"allow-null":true}]\r\n]', 'Select id, employee_id as ''Employee ID'',\r\nconcat(`first_name`,'' '',`middle_name`,'' '', `last_name`) as ''Name'',\r\n(SELECT name from Nationality where id = nationality) as ''Nationality'',\r\nbirthday as ''Birthday'',\r\ngender as ''Gender'',\r\nmarital_status as ''Marital Status'',\r\nssn_num as ''SSN Number'',\r\nnic_num as ''NIC Number'',\r\nother_id as ''Other IDs'',\r\ndriving_license as ''Driving License Number'',\r\n(SELECT name from EmploymentStatus where id = employment_status) as ''Employment Status'',\r\n(SELECT name from JobTitles where id = job_title) as ''Job Title'',\r\n(SELECT name from PayGrades where id = pay_grade) as ''Pay Grade'',\r\nwork_station_id as ''Work Station ID'',\r\naddress1 as ''Address 1'',\r\naddress2 as ''Address 2'',\r\ncity as ''City'',\r\n(SELECT name from Country where code = country) as ''Country'',\r\n(SELECT name from Province where id = province) as ''Province'',\r\npostal_code as ''Postal Code'',\r\nhome_phone as ''Home Phone'',\r\nmobile_phone as ''Mobile Phone'',\r\nwork_phone as ''Work Phone'',\r\nwork_email as ''Work Email'',\r\nprivate_email as ''Private Email'',\r\njoined_date as ''Joined Date'',\r\nconfirmation_date as ''Confirmation Date'',\r\n(SELECT title from CompanyStructures where id = department) as ''Department'',\r\n(SELECT concat(`first_name`,'' '',`middle_name`,'' '', `last_name`,'' [Employee ID:'',`employee_id`,'']'') from Employees e1 where e1.id = e.supervisor) as ''Supervisor'' \r\nFROM Employees e _where_', '["department","employment_status","job_title"]', 'Query', 'Employee Information'),
+  ('Employee Details Report', 'This report list all employee details and you can filter employees by department, employment status or job title', '[\r\n[ "department", {"label":"Department","type":"select2","remote-source":["CompanyStructure","id","title"],"allow-null":true}],\r\n[ "employment_status", {"label":"Employment Status","type":"select2","remote-source":["EmploymentStatus","id","name"],"allow-null":true}],\r\n[ "job_title", {"label":"Job Title","type":"select2","remote-source":["JobTitle","id","name"],"allow-null":true}]\r\n]', 'Select id, employee_id as ''Employee ID'',\r\nconcat(`first_name`,'' '',`middle_name`,'' '', `last_name`) as ''Name'',\r\n(SELECT name from Nationality where id = nationality) as ''Nationality'',\r\nbirthday as ''Birthday'',\r\ngender as ''Gender'',\r\nmarital_status as ''Marital Status'',\r\nssn_num as ''SSN Number'',\r\nnic_num as ''NIC Number'',\r\nother_id as ''Other IDs'',\r\ndriving_license as ''Driving License Number'',\r\n(SELECT name from EmploymentStatus where id = employment_status) as ''Employment Status'',\r\n(SELECT name from JobTitles where id = job_title) as ''Job Title'',\r\n(SELECT name from PayGrades where id = pay_grade) as ''Pay Grade'',\r\nwork_station_id as ''Work Station ID'',\r\naddress1 as ''Address 1'',\r\naddress2 as ''Address 2'',\r\ncity as ''City'',\r\n(SELECT name from Country where code = country) as ''Country'',\r\n(SELECT name from Province where id = province) as ''Province'',\r\npostal_code as ''Postal Code'',\r\nhome_phone as ''Home Phone'',\r\nmobile_phone as ''Mobile Phone'',\r\nwork_phone as ''Work Phone'',\r\nwork_email as ''Work Email'',\r\nprivate_email as ''Private Email'',\r\njoined_date as ''Joined Date'',\r\nconfirmation_date as ''Confirmation Date'',\r\n(SELECT title from CompanyStructures where id = department) as ''Department'',\r\n(SELECT concat(`first_name`,'' '',`middle_name`,'' '', `last_name`,'' [Employee ID:'',`employee_id`,'']'') from Employees e1 where e1.id = e.supervisor) as ''Supervisor'' \r\nFROM Employees e _where_', '["department","employment_status","job_title"]', 'Query', 'Employee Information','CSV'),
-  (2, 'Employee Leaves Report', 'This report list all employee leaves by employee, date range and leave status', '[\r\n[ "employee", {"label":"Employee","type":"select2multi","allow-null":true,"null-label":"All Employees","remote-source":["Employee","id","first_name+last_name"]}],\r\n[ "date_start", {"label":"Start Date","type":"date"}],\r\n[ "date_end", {"label":"End Date","type":"date"}],\r\n[ "status", {"label":"Leave Status","type":"select","source":[["NULL","All Statuses"],["Approved","Approved"],["Pending","Pending"],["Rejected","Rejected"],["Cancellation Requested","Cancellation Requested"],["Cancelled","Cancelled"]]}]\r\n]', 'EmployeeLeavesReport', '["employee","date_start","date_end","status"]', 'Class','Leave Management'),
+  ('Employee Attendance Report', 'This report list all employee attendance entries by employee and date range', '[\r\n[ "employee", {"label":"Employee","type":"select2multi","allow-null":true,"null-label":"All Employees","remote-source":["Employee","id","first_name+last_name"]}],\r\n[ "date_start", {"label":"Start Date","type":"date"}],\r\n[ "date_end", {"label":"End Date","type":"date"}]\r\n]', 'EmployeeAttendanceReport', '["employee","date_start","date_end"]', 'Class','Time Management','CSV'),
-  (3, 'Employee Time Entry Report', 'This report list all employee time entries by employee, date range and project', '[\r\n[ "employee", {"label":"Employee","type":"select2multi","allow-null":true,"null-label":"All Employees","remote-source":["Employee","id","first_name+last_name"]}],\r\n[ "project", {"label":"Project","type":"select","allow-null":true,"remote-source":["Project","id","name"]}],\r\n[ "date_start", {"label":"Start Date","type":"date"}],\r\n[ "date_end", {"label":"End Date","type":"date"}]\r\n]', 'EmployeeTimesheetReport', '["employee","date_start","date_end","status"]', 'Class','Time Management'),
+  ('Employee Time Tracking Report', 'This report list employee working hours and attendance details for each day for a given period ', '[\r\n[ "employee", {"label":"Employee","type":"select2","allow-null":false,"remote-source":["Employee","id","first_name+last_name"]}],\r\n[ "date_start", {"label":"Start Date","type":"date"}],\r\n[ "date_end", {"label":"End Date","type":"date"}]\r\n]', 'EmployeeTimeTrackReport', '["employee","date_start","date_end"]', 'Class','Time Management','CSV');
-  (4, 'Employee Attendance Report', 'This report list all employee attendance entries by employee and date range', '[\r\n[ "employee", {"label":"Employee","type":"select2multi","allow-null":true,"null-label":"All Employees","remote-source":["Employee","id","first_name+last_name"]}],\r\n[ "date_start", {"label":"Start Date","type":"date"}],\r\n[ "date_end", {"label":"End Date","type":"date"}]\r\n]', 'EmployeeAttendanceReport', '["employee","date_start","date_end"]', 'Class','Time Management'),
-  (5, 'Employee Time Tracking Report', 'This report list employee working hours and attendance details for each day for a given period ', '[\r\n[ "employee", {"label":"Employee","type":"select2","allow-null":false,"remote-source":["Employee","id","first_name+last_name"]}],\r\n[ "date_start", {"label":"Start Date","type":"date"}],\r\n[ "date_end", {"label":"End Date","type":"date"}]\r\n]', 'EmployeeTimeTrackReport', '["employee","date_start","date_end"]', 'Class','Time Management');
 
-INSERT INTO `Reports` (`name`, `details`, `parameters`, `query`, `paramOrder`, `type`,`report_group`) VALUES
+
+REPLACE INTO `Reports` (`name`, `details`, `parameters`, `query`, `paramOrder`, `type`,`report_group`,`output`) VALUES
+  ('Employee Time Entry Report', 'View employee time entries by date range and project',
+   '[\r\n[ "employee", {"label":"Employee","type":"select2multi","allow-null":true,"null-label":"All Employees","remote-source":["Employee","id","first_name+last_name"]}],\r\n[ "client", {"label":"Select Client","type":"select","allow-null":true,"null-label":"Not Selected","remote-source":["Client","id","name"]}],\r\n[ "project", {"label":"Or Project","type":"select","allow-null":true,"null-label":"All Projects","remote-source":["Project","id","name","getAllProjects"]}],\r\n[ "date_start", {"label":"Start Date","type":"date"}],\r\n[ "date_end", {"label":"End Date","type":"date"}]\r\n]',
+   'EmployeeTimesheetReport', '["employee","client","project","date_start","date_end","status"]', 'Class','Time Management','CSV');
+
+
+REPLACE INTO `Reports` (`name`, `details`, `parameters`, `query`, `paramOrder`, `type`,`report_group`,`output`) VALUES
   ('Active Employee Report', 'This report list employees who are currently active based on joined date and termination date ',
    '[\r\n[ "department", {"label":"Department","type":"select2","remote-source":["CompanyStructure","id","title"],"allow-null":true}]\r\n]',
    'ActiveEmployeeReport',
-   '["department"]', 'Class','Employee Information');
+   '["department"]', 'Class','Employee Information','CSV');
 
-INSERT INTO `Reports` (`name`, `details`, `parameters`, `query`, `paramOrder`, `type`, `report_group`) VALUES
+REPLACE INTO `Reports` (`name`, `details`, `parameters`, `query`, `paramOrder`, `type`, `report_group`,`output`) VALUES
   ('New Hires Employee Report', 'This report list employees who are joined between given two dates ',
    '[[ "department", {"label":"Department","type":"select2","remote-source":["CompanyStructure","id","title"],"allow-null":true}],\r\n[ "date_start", {"label":"Start Date","type":"date"}],\r\n[ "date_end", {"label":"End Date","type":"date"}]\r\n]',
    'NewHiresEmployeeReport',
-   '["department","date_start","date_end"]', 'Class','Employee Information');
+   '["department","date_start","date_end"]', 'Class','Employee Information','CSV');
 
-INSERT INTO `Reports` (`name`, `details`, `parameters`, `query`, `paramOrder`, `type`, `report_group`) VALUES
+REPLACE INTO `Reports` (`name`, `details`, `parameters`, `query`, `paramOrder`, `type`, `report_group`,`output`) VALUES
   ('Terminated Employee Report', 'This report list employees who are terminated between given two dates ',
    '[[ "department", {"label":"Department","type":"select2","remote-source":["CompanyStructure","id","title"],"allow-null":true}],\r\n[ "date_start", {"label":"Start Date","type":"date"}],\r\n[ "date_end", {"label":"End Date","type":"date"}]\r\n]',
    'TerminatedEmployeeReport',
-   '["department","date_start","date_end"]', 'Class','Employee Information');
+   '["department","date_start","date_end"]', 'Class','Employee Information','CSV');
 
-INSERT INTO `Reports` (`name`, `details`, `parameters`, `query`, `paramOrder`, `type`,`report_group`) VALUES
+REPLACE INTO `Reports` (`name`, `details`, `parameters`, `query`, `paramOrder`, `type`,`report_group`,`output`) VALUES
-  ('Employee Leave Entitlement', 'This report list employees leave entitlement for current leave period by department or by employee ',
-   '[[ "department", {"label":"Department","type":"select2","remote-source":["CompanyStructure","id","title"],"allow-null":true,"validation":"none"}],\r\n[ "employee", {"label":"Employee","type":"select2","allow-null":true,"validation":"none","remote-source":["Employee","id","first_name+last_name"]}]]',
-   'EmployeeLeaveEntitlementReport',
-   '["department","employee"]', 'Class','Leave Management');
-
-REPLACE INTO `Reports` (`name`, `details`, `parameters`, `query`, `paramOrder`, `type`,`report_group`) VALUES
   ('Travel Request Report', 'This report list employees travel requests for a specified period',
    '[\r\n[ "employee", {"label":"Employee","type":"select2multi","allow-null":true,"null-label":"All Employees","remote-source":["Employee","id","first_name+last_name"]}],\r\n[ "date_start", {"label":"Start Date","type":"date"}],\r\n[ "date_end", {"label":"End Date","type":"date"}],\r\n[ "status", {"label":"Status","type":"select","source":[["NULL","All Statuses"],["Approved","Approved"],["Pending","Pending"],["Rejected","Rejected"],["Cancellation Requested","Cancellation Requested"],["Cancelled","Cancelled"]]}]\r\n]',
    'TravelRequestReport',
-   '["employee","date_start","date_end","status"]', 'Class', 'Travel and Expense Management');
+   '["employee","date_start","date_end","status"]', 'Class', 'Travel and Expense Management','CSV');
-
-REPLACE INTO `Reports` (`name`, `details`, `parameters`, `query`, `paramOrder`, `type`,`report_group`) VALUES
-  ('Expense Report', 'This report list employees expenses for a specified period',
-   '[\r\n[ "employee", {"label":"Employee","type":"select2multi","allow-null":true,"null-label":"All Employees","remote-source":["Employee","id","first_name+last_name"]}],\r\n[ "date_start", {"label":"Start Date","type":"date"}],\r\n[ "date_end", {"label":"End Date","type":"date"}],\r\n[ "status", {"label":"Status","type":"select","source":[["NULL","All Statuses"],["Approved","Approved"],["Pending","Pending"],["Rejected","Rejected"],["Cancellation Requested","Cancellation Requested"],["Cancelled","Cancelled"]]}]\r\n]',
-   'ExpenseReport',
-   '["employee","date_start","date_end","status"]', 'Class','Travel and Expense Management');
-
-INSERT INTO `Reports` (`name`, `details`, `parameters`, `query`, `paramOrder`, `type`,`report_group`) VALUES
-  ('Employee Time Sheet Report', 'This report list all employee time sheets by employee and date range', '[\r\n[ "employee", {"label":"Employee","type":"select2multi","allow-null":true,"null-label":"All Employees","remote-source":["Employee","id","first_name+last_name"]}],\r\n[ "date_start", {"label":"Start Date","type":"date"}],\r\n[ "date_end", {"label":"End Date","type":"date"}],\r\n[ "status", {"label":"Status","allow-null":true,"null-label":"All Status","type":"select","source":[["Approved","Approved"],["Pending","Pending"],["Rejected","Rejected"]]}]\r\n]', 'EmployeeTimeSheetData', '["employee","date_start","date_end","status"]', 'Class','Time Management');
 
 
-INSERT INTO `Reports` (`name`, `details`, `parameters`, `query`, `paramOrder`, `type`,`report_group`) VALUES
+REPLACE INTO `Reports` (`name`, `details`, `parameters`, `query`, `paramOrder`, `type`,`report_group`,`output`) VALUES
-('Overtime Report', 'This report list all employee attendance entries by employee with overtime calculations', '[\r\n[ "employee", {"label":"Employee","type":"select2multi","allow-null":true,"null-label":"All Employees","remote-source":["Employee","id","first_name+last_name"]}],\r\n[ "date_start", {"label":"Start Date","type":"date"}],\r\n[ "date_end", {"label":"End Date","type":"date"}]\r\n]', 'OvertimeReport', '["employee","date_start","date_end"]', 'Class','Time Management');
+  ('Employee Time Sheet Report', 'This report list all employee time sheets by employee and date range', '[\r\n[ "employee", {"label":"Employee","type":"select2multi","allow-null":true,"null-label":"All Employees","remote-source":["Employee","id","first_name+last_name"]}],\r\n[ "date_start", {"label":"Start Date","type":"date"}],\r\n[ "date_end", {"label":"End Date","type":"date"}],\r\n[ "status", {"label":"Status","allow-null":true,"null-label":"All Status","type":"select","source":[["Approved","Approved"],["Pending","Pending"],["Rejected","Rejected"]]}]\r\n]', 'EmployeeTimeSheetData', '["employee","date_start","date_end","status"]', 'Class','Time Management','CSV');
-
-INSERT INTO `Reports` (`name`, `details`, `parameters`, `query`, `paramOrder`, `type`,`report_group`) VALUES
-  ('Overtime Summary Report', 'This report list all employee attendance entries by employee with overtime calculation summary', '[\r\n[ "employee", {"label":"Employee","type":"select2multi","allow-null":true,"null-label":"All Employees","remote-source":["Employee","id","first_name+last_name"]}],\r\n[ "date_start", {"label":"Start Date","type":"date"}],\r\n[ "date_end", {"label":"End Date","type":"date"}]\r\n]', 'OvertimeSummaryReport', '["employee","date_start","date_end"]', 'Class','Time Management');
 
 
 
@@ -883,7 +870,7 @@ REPLACE INTO `Settings` (`name`, `value`, `description`, `meta`) VALUES
   ('LDAP: Version 3', '1',  'Are you using LDAP v3','["value", {"label":"Value","type":"select","source":[["1","Yes"],["0","No"]]}]'),
   ('LDAP: User Filter', '',  'e.g: uid={}, we will replace {} with actual username provided by the user at the time of login','');
 
-REPLACE INTO `Settings` (`name`, `value`, `description`, `meta`) VALUES
+INSERT INTO `Settings` (`name`, `value`, `description`, `meta`) VALUES
   ('Recruitment: Show Quick Apply', '1', 'Show quick apply button when candidates are applying for jobs. Quick apply allow candidates to apply with minimum amount of information','["value", {"label":"Value","type":"select","source":[["1","Yes"],["0","No"]]}]'),
   ('Recruitment: Show Apply', '1', 'Show apply button when candidates are applying for jobs','["value", {"label":"Value","type":"select","source":[["1","Yes"],["0","No"]]}]');
 
@@ -897,36 +884,34 @@ INSERT INTO `Settings` (`name`, `value`, `description`, `meta`) VALUES
   ('Attendance: Use Department Time Zone', '0', '','["value", {"label":"Value","type":"select","source":[["1","Yes"],["0","No"]]}]');
 
 INSERT INTO `Settings` (`name`, `value`, `description`, `meta`) VALUES
-  ('Leave: Allow Indirect Admins to Approve', '0', 'Allow indirect admins to approve leave requests','["value", {"label":"Value","type":"select","source":[["1","Yes"],["0","No"]]}]');
+    ('Travel: Allow Indirect Admins to Approve', '0', 'Allow indirect admins to approve travel requests','["value", {"label":"Value","type":"select","source":[["1","Yes"],["0","No"]]}]');
+
 
 INSERT INTO `Settings` (`name`, `value`, `description`, `meta`) VALUES
   ('Attendance: Overtime Calculation Class', 'BasicOvertimeCalculator', 'Set the method used to calculate overtime','["value", {"label":"Value","type":"select","source":[["BasicOvertimeCalculator","BasicOvertimeCalculator"],["CaliforniaOvertimeCalculator","CaliforniaOvertimeCalculator"]]}]');
 
+REPLACE INTO `Settings` (`name`, `value`, `description`, `meta`) VALUES
+  ('Attendance: Overtime Calculation Period', 'Daily', 'Set the period for overtime calculation. (Affects attendance sheets)','["value", {"label":"Value","type":"select","source":[["Daily","Daily"],["Weekly","Weekly"]]}]');
 
 
-INSERT INTO `Settings` (`name`, `value`, `description`, `meta`) VALUES
+REPLACE INTO `Settings` (`name`, `value`, `description`, `meta`) VALUES
   ('Attendance: Overtime Start Hour', '8', 'Overtime calculation will start after an employee work this number of hours per day, 0 to indicate no overtime', ''),
   ('Attendance: Double time Start Hour', '12', 'Double time calculation will start after an employee work this number of hours per day, 0 to indicate no double time', '');
 
-INSERT INTO `Settings` (`name`, `value`, `description`, `meta`) VALUES
+REPLACE INTO `Settings` (`name`, `value`, `description`, `meta`) VALUES
   ('Attendance: Work Week Start Day', '0', 'Set the starting day of the work week','["value", {"label":"Value","type":"select","source":[["0","Sunday"],["1","Monday"],["2","Tuesday"],["3","Wednesday"],["4","Thursday"],["5","Friday"],["6","Saturday"]]}]');
 
-INSERT INTO `Settings` (`name`, `value`, `description`, `meta`) VALUES
+REPLACE INTO `Settings` (`name`, `value`, `description`, `meta`) VALUES
     ('System: Allowed Countries', '', 'Only these countries will be allowed in select boxes','["value", {"label":"Value","type":"select2multi","remote-source":["Country","id","name"]}]');
 
-INSERT INTO `Settings` (`name`, `value`, `description`, `meta`) VALUES
+REPLACE INTO `Settings` (`name`, `value`, `description`, `meta`) VALUES
     ('System: Allowed Currencies', '', 'Only these currencies will be allowed in select boxes','["value", {"label":"Value","type":"select2multi","remote-source":["CurrencyType","id","code+name"]}]');
 
-INSERT INTO `Settings` (`name`, `value`, `description`, `meta`) VALUES
+REPLACE INTO `Settings` (`name`, `value`, `description`, `meta`) VALUES
     ('System: Allowed Nationality', '', 'Only these nationalities will be allowed in select boxes','["value", {"label":"Value","type":"select2multi","remote-source":["Nationality","id","name"]}]');
 
-
+REPLACE INTO `Settings` (`name`, `value`, `description`, `meta`) VALUES
-INSERT INTO `Settings` (`name`, `value`, `description`, `meta`) VALUES
+    ('System: Language', 'en', 'Current Language','["value", {"label":"Value","type":"select2","allow-null":false,"remote-source":["SupportedLanguage","name","description"]}]');
-  ('Files: Upload Files to S3', '0', '','["value", {"label":"Value","type":"select","source":[["1","Yes"],["0","No"]]}]'),
-  ('Files: Amazon S3 Key for File Upload', '', 'Please provide S3 Key for uploading files',''),
-  ('Files: Amazone S3 Secret for File Upload', '',  'Please provide S3 Secret for uploading files',''),
-  ('Files: S3 Bucket', '',  'Please provide S3 Bucket name for uploading files',''),
-  ('Files: S3 Web Url', '',  'Please provide Url to the s3 bucket','');
 
 
 INSERT INTO `Certifications` (`id`, `name`, `description`) VALUES
@@ -1006,12 +991,204 @@ INSERT INTO `JobTitles` (`id`, `code`, `name`, `description`, `specification`) V
 
 
 INSERT INTO `Languages` (`id`, `name`, `description`) VALUES
-  (1, 'English', 'English'),
+    (1, 'en', 'English'),
-  (2, 'French', 'French'),
+    (2, 'fr', 'French'),
-  (3, 'German', 'German'),
+    (3, 'de', 'German'),
-  (4, 'Chinese', 'Chinese');
+    (4, 'zh', 'Chinese'),
+    (5, 'aa', 'Afar'),
+    (6, 'ab', 'Abkhaz'),
+    (7, 'ae', 'Avestan'),
+    (8, 'af', 'Afrikaans'),
+    (9, 'ak', 'Akan'),
+    (10, 'am', 'Amharic'),
+    (11, 'an', 'Aragonese'),
+    (12, 'ar', 'Arabic'),
+    (13, 'as', 'Assamese'),
+    (14, 'av', 'Avaric'),
+    (15, 'ay', 'Aymara'),
+    (16, 'az', 'Azerbaijani'),
+    (17, 'ba', 'Bashkir'),
+    (18, 'be', 'Belarusian'),
+    (19, 'bg', 'Bulgarian'),
+    (20, 'bh', 'Bihari'),
+    (21, 'bi', 'Bislama'),
+    (22, 'bm', 'Bambara'),
+    (23, 'bn', 'Bengali'),
+    (24, 'bo', 'Tibetan Standard, Tibetan, Central'),
+    (25, 'br', 'Breton'),
+    (26, 'bs', 'Bosnian'),
+    (27, 'ca', 'Catalan; Valencian'),
+    (28, 'ce', 'Chechen'),
+    (29, 'ch', 'Chamorro'),
+    (30, 'co', 'Corsican'),
+    (31, 'cr', 'Cree'),
+    (32, 'cs', 'Czech'),
+    (33, 'cu', 'Old Church Slavonic, Church Slavic, Church Slavonic, Old Bulgarian, Old Slavonic'),
+    (34, 'cv', 'Chuvash'),
+    (35, 'cy', 'Welsh'),
+    (36, 'da', 'Danish'),
+    (37, 'dv', 'Divehi; Dhivehi; Maldivian;'),
+    (38, 'dz', 'Dzongkha'),
+    (39, 'ee', 'Ewe'),
+    (40, 'el', 'Greek, Modern'),
+    (41, 'eo', 'Esperanto'),
+    (42, 'es', 'Spanish; Castilian'),
+    (43, 'et', 'Estonian'),
+    (44, 'eu', 'Basque'),
+    (45, 'fa', 'Persian'),
+    (46, 'ff', 'Fula; Fulah; Pulaar; Pular'),
+    (47, 'fi', 'Finnish'),
+    (48, 'fj', 'Fijian'),
+    (49, 'fo', 'Faroese'),
+    (50, 'fy', 'Western Frisian'),
+    (51, 'ga', 'Irish'),
+    (52, 'gd', 'Scottish Gaelic; Gaelic'),
+    (53, 'gl', 'Galician'),
+    (54, 'gn', 'Guaraní'),
+    (55, 'gu', 'Gujarati'),
+    (56, 'gv', 'Manx'),
+    (57, 'ha', 'Hausa'),
+    (58, 'he', 'Hebrew (modern)'),
+    (59, 'hi', 'Hindi'),
+    (60, 'ho', 'Hiri Motu'),
+    (61, 'hr', 'Croatian'),
+    (62, 'ht', 'Haitian; Haitian Creole'),
+    (63, 'hu', 'Hungarian'),
+    (64, 'hy', 'Armenian'),
+    (65, 'hz', 'Herero'),
+    (66, 'ia', 'Interlingua'),
+    (67, 'id', 'Indonesian'),
+    (68, 'ie', 'Interlingue'),
+    (69, 'ig', 'Igbo'),
+    (70, 'ii', 'Nuosu'),
+    (71, 'ik', 'Inupiaq'),
+    (72, 'io', 'Ido'),
+    (73, 'is', 'Icelandic'),
+    (74, 'it', 'Italian'),
+    (75, 'iu', 'Inuktitut'),
+    (76, 'ja', 'Japanese (ja)'),
+    (77, 'jv', 'Javanese (jv)'),
+    (78, 'ka', 'Georgian'),
+    (79, 'kg', 'Kongo'),
+    (80, 'ki', 'Kikuyu, Gikuyu'),
+    (81, 'kj', 'Kwanyama, Kuanyama'),
+    (82, 'kk', 'Kazakh'),
+    (83, 'kl', 'Kalaallisut, Greenlandic'),
+    (84, 'km', 'Khmer'),
+    (85, 'kn', 'Kannada'),
+    (86, 'ko', 'Korean'),
+    (87, 'kr', 'Kanuri'),
+    (88, 'ks', 'Kashmiri'),
+    (89, 'ku', 'Kurdish'),
+    (90, 'kv', 'Komi'),
+    (91, 'kw', 'Cornish'),
+    (92, 'ky', 'Kirghiz, Kyrgyz'),
+    (93, 'la', 'Latin'),
+    (94, 'lb', 'Luxembourgish, Letzeburgesch'),
+    (95, 'lg', 'Luganda'),
+    (96, 'li', 'Limburgish, Limburgan, Limburger'),
+    (97, 'ln', 'Lingala'),
+    (98, 'lo', 'Lao'),
+    (99, 'lt', 'Lithuanian'),
+    (100, 'lu', 'Luba-Katanga'),
+    (101, 'lv', 'Latvian'),
+    (102, 'mg', 'Malagasy'),
+    (103, 'mh', 'Marshallese'),
+    (104, 'mi', 'Maori'),
+    (105, 'mk', 'Macedonian'),
+    (106, 'ml', 'Malayalam'),
+    (107, 'mn', 'Mongolian'),
+    (108, 'mr', 'Marathi (Mara?hi)'),
+    (109, 'ms', 'Malay'),
+    (110, 'mt', 'Maltese'),
+    (111, 'my', 'Burmese'),
+    (112, 'na', 'Nauru'),
+    (113, 'nb', 'Norwegian Bokmål'),
+    (114, 'nd', 'North Ndebele'),
+    (115, 'ne', 'Nepali'),
+    (116, 'ng', 'Ndonga'),
+    (117, 'nl', 'Dutch'),
+    (118, 'nn', 'Norwegian Nynorsk'),
+    (119, 'no', 'Norwegian'),
+    (120, 'nr', 'South Ndebele'),
+    (121, 'nv', 'Navajo, Navaho'),
+    (122, 'ny', 'Chichewa; Chewa; Nyanja'),
+    (123, 'oc', 'Occitan'),
+    (124, 'oj', 'Ojibwe, Ojibwa'),
+    (125, 'om', 'Oromo'),
+    (126, 'or', 'Oriya'),
+    (127, 'os', 'Ossetian, Ossetic'),
+    (128, 'pa', 'Panjabi, Punjabi'),
+    (129, 'pi', 'Pali'),
+    (130, 'pl', 'Polish'),
+    (131, 'ps', 'Pashto, Pushto'),
+    (132, 'pt', 'Portuguese'),
+    (133, 'qu', 'Quechua'),
+    (134, 'rm', 'Romansh'),
+    (135, 'rn', 'Kirundi'),
+    (136, 'ro', 'Romanian, Moldavian, Moldovan'),
+    (137, 'ru', 'Russian'),
+    (138, 'rw', 'Kinyarwanda'),
+    (139, 'sa', 'Sanskrit (Sa?sk?ta)'),
+    (140, 'sc', 'Sardinian'),
+    (141, 'sd', 'Sindhi'),
+    (142, 'se', 'Northern Sami'),
+    (143, 'sg', 'Sango'),
+    (144, 'si', 'Sinhala, Sinhalese'),
+    (145, 'sk', 'Slovak'),
+    (146, 'sl', 'Slovene'),
+    (147, 'sm', 'Samoan'),
+    (148, 'sn', 'Shona'),
+    (149, 'so', 'Somali'),
+    (150, 'sq', 'Albanian'),
+    (151, 'sr', 'Serbian'),
+    (152, 'ss', 'Swati'),
+    (153, 'st', 'Southern Sotho'),
+    (154, 'su', 'Sundanese'),
+    (155, 'sv', 'Swedish'),
+    (156, 'sw', 'Swahili'),
+    (157, 'ta', 'Tamil'),
+    (158, 'te', 'Telugu'),
+    (159, 'tg', 'Tajik'),
+    (160, 'th', 'Thai'),
+    (161, 'ti', 'Tigrinya'),
+    (162, 'tk', 'Turkmen'),
+    (163, 'tl', 'Tagalog'),
+    (164, 'tn', 'Tswana'),
+    (165, 'to', 'Tonga (Tonga Islands)'),
+    (166, 'tr', 'Turkish'),
+    (167, 'ts', 'Tsonga'),
+    (168, 'tt', 'Tatar'),
+    (169, 'tw', 'Twi'),
+    (170, 'ty', 'Tahitian'),
+    (171, 'ug', 'Uighur, Uyghur'),
+    (172, 'uk', 'Ukrainian'),
+    (173, 'ur', 'Urdu'),
+    (174, 'uz', 'Uzbek'),
+    (175, 've', 'Venda'),
+    (176, 'vi', 'Vietnamese'),
+    (177, 'vo', 'Volapük'),
+    (178, 'wa', 'Walloon'),
+    (179, 'wo', 'Wolof'),
+    (180, 'xh', 'Xhosa'),
+    (181, 'yi', 'Yiddish'),
+    (182, 'yo', 'Yoruba'),
+    (183, 'za', 'Zhuang, Chuang'),
+    (184, 'zu', 'Zulu');
 
 
+INSERT INTO `SupportedLanguages` (`name`, `description`) VALUES
+    ('en', 'English'),
+    ('de', 'German'),
+    ('fr', 'French'),
+    ('pl', 'Polish'),
+    ('it', 'Italian'),
+    ('si', 'Sinhala'),
+    ('zh', 'Chinese'),
+    ('ja', 'Japanese'),
+    ('hi', 'Hindi'),
+    ('es', 'Spanish');
+
 INSERT INTO `LeavePeriods` (`id`, `name`, `date_start`, `date_end`, `status`) VALUES
   (3, 'Year 2015', '2015-01-01', '2015-12-31', 'Active'),
   (4, 'Year 2016', '2016-01-01', '2016-12-31', 'Active'),
@@ -1137,7 +1314,7 @@ INSERT INTO `UserRoles` VALUES
 
 
 INSERT INTO `Users` VALUES 
-(1,'admin','icehrm+admin@web-stalk.com','21232f297a57a5a743894a0e4a801fc3',1,NULL,'Admin','',NULL,NULL,NULL,NULL);
+(1,'admin','icehrm+admin@web-stalk.com','21232f297a57a5a743894a0e4a801fc3',1,NULL,'Admin','',NULL,NULL,NULL,NULL,NULL);
 
 
 INSERT INTO `SalaryComponentType` (`id`,`code`, `name`) VALUES
@@ -1272,14 +1449,133 @@ INSERT INTO `ExpensesCategories` (`name`) VALUES
 ('Utility');
 
 
-INSERT INTO `PayrollColumns` (`id`,`name`,`calculation_hook`,`salary_components`,`deductions`,`add_columns`,`sub_columns`,`editable`) VALUES
+INSERT INTO `PayrollColumns` (`id`,`name`,`calculation_hook`,`salary_components`,`deductions`,`add_columns`,`sub_columns`,`editable`,`enabled`,`default_value`,`calculation_columns`,`calculation_function`) VALUES
-    (1,'Total Hours','AttendanceUtil_getTimeWorkedHours','','','','','No'),
+    (1,'Total Hours','AttendanceUtil_getTimeWorkedHours','','','','','No','Yes','0.00',NULL,NULL),
-    (2,'Regular Hours','AttendanceUtil_getRegularWorkedHours','','','','','No'),
+    (2,'Regular Hours','AttendanceUtil_getRegularWorkedHours','','','','','No','Yes','0.00',NULL,NULL),
-    (3,'Overtime Hours','AttendanceUtil_getOverTimeWorkedHours','','','','','No'),
+    (3,'Overtime Hours','AttendanceUtil_getOverTimeWorkedHours','','','','','No','Yes','0.00',NULL,NULL),
-    (4,'Leave Hours','LeaveUtil_getLeaveHours','','','','','No');
+    (4,'Leave Hours','LeaveUtil_getLeaveHours','','','','','No','Yes','0.00',NULL,NULL);
 
 
 INSERT INTO `PayrollColumnTemplates` (`name`,`columns`) VALUES
-  ('All Columns','[\"1\",\"2\",\"3\",\"4\"]'),
+    ('All Columns','[\"1\",\"2\",\"3\",\"4\"]'),
-  ('All Time Management Columns','[\"1\",\"2\",\"3\"]');
+    ('All Time Management Columns','[\"1\",\"2\",\"3\"]');
+
+
+
+INSERT INTO `DataImport` (`name`, `dataType`, `details`, `columns`, `updated`, `created`) VALUES
+    ('Employee Data Import', 'EmployeeDataImporter', '', '[{"name":"employee_id","title":"","type":"Normal","dependOn":"NULL","dependOnField":"","isKeyField":"No","idField":"Yes","id":"columns_7"},{"name":"first_name","title":"","type":"Normal","dependOn":"NULL","dependOnField":"","isKeyField":"No","idField":"No","id":"columns_3"},{"name":"middle_name","title":"","type":"Normal","dependOn":"NULL","dependOnField":"","isKeyField":"No","idField":"No","id":"columns_5"},{"name":"last_name","title":"","type":"Normal","dependOn":"NULL","dependOnField":"","isKeyField":"No","idField":"No","id":"columns_6"},{"name":"address1","title":"Address1","type":"Normal","dependOn":"NULL","dependOnField":"","isKeyField":"No","idField":"No","id":"columns_8"},{"name":"address2","title":"Address2","type":"Normal","dependOn":"NULL","dependOnField":"","isKeyField":"No","idField":"No","id":"columns_9"},{"name":"home_phone","title":"","type":"Normal","dependOn":"NULL","dependOnField":"","isKeyField":"No","idField":"No","id":"columns_14"},{"name":"mobile_phone","title":"","type":"Normal","dependOn":"NULL","dependOnField":"","isKeyField":"No","idField":"No","id":"columns_15"},{"name":"work_email","title":"","type":"Normal","dependOn":"NULL","dependOnField":"","isKeyField":"No","idField":"No","id":"columns_16"},{"name":"gender","title":"","type":"Normal","dependOn":"NULL","dependOnField":"","isKeyField":"No","idField":"No","id":"columns_17"},{"name":"marital_status","title":"","type":"Normal","dependOn":"NULL","dependOnField":"","isKeyField":"No","idField":"No","id":"columns_18"},{"name":"birthday","title":"","type":"Normal","dependOn":"NULL","dependOnField":"","isKeyField":"No","idField":"No","id":"columns_20"},{"name":"nationality","title":"Nationality","type":"Reference","dependOn":"Nationality","dependOnField":"name","isKeyField":"Yes","idField":"No","id":"columns_22"},{"name":"ethnicity","title":"Ethnicity","type":"Normal","dependOn":"Ethnicity","dependOnField":"name","isKeyField":"Yes","idField":"No","id":"columns_23"},{"name":"EmergencyContact/name","title":"","type":"Attached","dependOn":"EmergencyContact","dependOnField":"name","isKeyField":"Yes","idField":"No","id":"columns_24"},{"name":"EmergencyContact/relationship","title":"","type":"Attached","dependOn":"EmergencyContact","dependOnField":"relationship","isKeyField":"No","idField":"No","id":"columns_25"},{"name":"EmergencyContact/home_phone","title":"","type":"Attached","dependOn":"EmergencyContact","dependOnField":"home_phone","isKeyField":"No","idField":"No","id":"columns_26"},{"name":"ssn_num","title":"","type":"Normal","dependOn":"NULL","dependOnField":"","isKeyField":"No","idField":"No","id":"columns_31"},{"name":"job_title","title":"","type":"Reference","dependOn":"JobTitle","dependOnField":"name","isKeyField":"Yes","idField":"No","id":"columns_32"},{"name":"employment_status","title":"","type":"Reference","dependOn":"EmploymentStatus","dependOnField":"name","isKeyField":"Yes","idField":"No","id":"columns_33"},{"name":"joined_date","title":"","type":"Normal","dependOn":"NULL","dependOnField":"","isKeyField":"No","idField":"No","id":"columns_36"},{"name":"department","title":"","type":"Reference","dependOn":"CompanyStructure","dependOnField":"title","isKeyField":"Yes","idField":"No","id":"columns_38"}]', '2016-06-02 18:56:32', '2016-06-02 18:56:32'),
+    ('Attendance Data Import', 'AttendanceDataImporter', '', '[{"name":"employee","title":"","type":"Reference","dependOn":"Employee","dependOnField":"employee_id","isKeyField":"Yes","idField":"No","id":"columns_1"},{"name":"in_time","title":"","type":"Normal","dependOn":"NULL","dependOnField":"","isKeyField":"No","idField":"No","id":"columns_2"},{"name":"out_time","title":"","type":"Normal","dependOn":"NULL","dependOnField":"","isKeyField":"No","idField":"No","id":"columns_3"},{"name":"note","title":"","type":"Normal","dependOn":"NULL","dependOnField":"","isKeyField":"No","idField":"No","id":"columns_4"}]', '2016-08-14 02:51:56', '2016-08-14 02:51:56');
+
+
+
+
+REPLACE INTO `UserReports` (`name`, `details`, `parameters`, `query`, `paramOrder`, `type`,`report_group`,`output`) VALUES
+  ('Time Entry Report', 'View your time entries by date range and project',
+   '[\r\n[ "client", {"label":"Select Client","type":"select","allow-null":true,"null-label":"Not Selected","remote-source":["Client","id","name"]}],\r\n[ "project", {"label":"Or Project","type":"select","allow-null":true,"null-label":"All Projects","remote-source":["Project","id","name","getAllProjects"]}],\r\n[ "date_start", {"label":"Start Date","type":"date"}],\r\n[ "date_end", {"label":"End Date","type":"date"}]\r\n]',
+   'EmployeeTimesheetReport', '["client","project","date_start","date_end","status"]', 'Class','Time Management','CSV');
+
+REPLACE INTO `UserReports` (`name`, `details`, `parameters`, `query`, `paramOrder`, `type`,`report_group`,`output`) VALUES
+  ('Attendance Report', 'View your attendance entries by date range', '[\r\n[ "date_start", {"label":"Start Date","type":"date"}],\r\n[ "date_end", {"label":"End Date","type":"date"}]\r\n]', 'EmployeeAttendanceReport', '["date_start","date_end"]', 'Class','Time Management','CSV');
+
+REPLACE INTO `UserReports` (`name`, `details`, `parameters`, `query`, `paramOrder`, `type`,`report_group`,`output`) VALUES
+  ('Time Tracking Report', 'View your working hours and attendance details for each day for a given period ', '[\r\n[ "date_start", {"label":"Start Date","type":"date"}],\r\n[ "date_end", {"label":"End Date","type":"date"}]\r\n]', 'EmployeeTimeTrackReport', '["date_start","date_end"]', 'Class','Time Management','CSV');
+
+
+REPLACE INTO `UserReports` (`name`, `details`, `parameters`, `query`, `paramOrder`, `type`,`report_group`,`output`) VALUES
+  ('Travel Request Report', 'View travel requests for a specified period',
+   '[\r\n[ "date_start", {"label":"Start Date","type":"date"}],\r\n[ "date_end", {"label":"End Date","type":"date"}],\r\n[ "status", {"label":"Status","type":"select","source":[["NULL","All Statuses"],["Approved","Approved"],["Pending","Pending"],["Rejected","Rejected"],["Cancellation Requested","Cancellation Requested"],["Cancelled","Cancelled"]]}]\r\n]',
+   'TravelRequestReport',
+   '["date_start","date_end","status"]', 'Class', 'Travel and Expense Management','CSV');
+
+
+REPLACE INTO `UserReports` (`name`, `details`, `parameters`, `query`, `paramOrder`, `type`,`report_group`,`output`) VALUES
+  ('Time Sheet Report', 'This report list all employee time sheets by employee and date range',
+   '[\r\n[ "date_start", {"label":"Start Date","type":"date"}],\r\n[ "date_end", {"label":"End Date","type":"date"}],\r\n[ "status", {"label":"Status","allow-null":true,"null-label":"All Status","type":"select","source":[["Approved","Approved"],["Pending","Pending"],["Rejected","Rejected"]]}]\r\n]',
+   'EmployeeTimeSheetData',
+   '["date_start","date_end","status"]', 'Class','Time Management','CSV');
+
+
+REPLACE INTO `UserReports` (`name`, `details`, `parameters`, `query`, `paramOrder`, `type`,`report_group`,`output`) VALUES
+  ('Client Project Time Report', 'View your time entries for projects under a given client',
+   '[\r\n[ "client", {"label":"Select Client","type":"select","allow-null":false,"remote-source":["Client","id","name"]}],\r\n[ "date_start", {"label":"Start Date","type":"date"}],\r\n[ "date_end", {"label":"End Date","type":"date"}]\r\n]',
+   'ClientProjectTimeReport', '["client","date_start","date_end","status"]', 'Class','Time Management','PDF');
+
+REPLACE INTO `UserReports` (`name`, `details`, `parameters`, `query`, `paramOrder`, `type`,`report_group`,`output`) VALUES
+    ('Download Payslips', 'Download your payslips',
+     '[\r\n[ "payroll", {"label":"Select Payroll","type":"select","allow-null":false,"remote-source":["Payroll","id","name","getEmployeePayrolls"]}]]',
+     'PayslipReport', '["payroll"]', 'Class','Finance','PDF');
+
+
+
+
+
+INSERT INTO `DeductionGroup` VALUES
+    (1,'Sri Lanka Payroll Calculation','');
+
+
+INSERT INTO `PayslipTemplates` (`id`, `name`, `data`, `status`, `created`, `updated`) VALUES
+    (1, 'Sri Lanka - Default Payslip', '[{"type":"Company Logo","payrollColumn":"NULL","label":"","text":"","fontSize":"Normal","fontStyle":"Normal","fontColor":"#000000","status":"Show","id":"data_1"},{"type":"Company Name","payrollColumn":"NULL","label":"","text":"","fontSize":"Normal","fontStyle":"Normal","fontColor":"","status":"Show","id":"data_2"},{"type":"Separators","payrollColumn":"NULL","label":"","text":"","fontSize":"Normal","fontStyle":"Normal","fontColor":"","status":"Show","id":"data_8"},{"type":"Payroll Column","payrollColumn":"5","label":"Basic Salary","text":"","status":"Show","id":"data_3"},{"type":"Payroll Column","payrollColumn":"6","label":"Fixed Allowance","text":"","status":"Show","id":"data_4"},{"type":"Payroll Column","payrollColumn":"7","label":"Gross Pay","text":"","status":"Show","id":"data_11"},{"type":"Separators","payrollColumn":"NULL","label":"","text":"","fontSize":"Normal","fontStyle":"Normal","fontColor":"","status":"Show","id":"data_9"},{"type":"Text","payrollColumn":"NULL","label":"","text":"Deductions","status":"Show","id":"data_13"},{"type":"Payroll Column","payrollColumn":"8","label":"EPF Employee Contribution","text":"","status":"Show","id":"data_6"},{"type":"Payroll Column","payrollColumn":"13","label":"PAYE Tax","text":"","status":"Show","id":"data_14"},{"type":"Payroll Column","payrollColumn":"14","label":"Stamp Duty","text":"","status":"Show","id":"data_15"},{"type":"Payroll Column","payrollColumn":"15","label":"Total Deductions","text":"","status":"Show","id":"data_16"},{"type":"Separators","payrollColumn":"NULL","label":"","text":"","status":"Show","id":"data_17"},{"type":"Text","payrollColumn":"NULL","label":"","text":"Employer Contributions","status":"Show","id":"data_18"},{"type":"Payroll Column","payrollColumn":"9","label":"EPF Employer Contribution","text":"","status":"Show","id":"data_19"},{"type":"Payroll Column","payrollColumn":"7","label":"ETF Employer Contribution","text":"","status":"Show","id":"data_20"},{"type":"Separators","payrollColumn":"7","label":"","text":"","status":"Show","id":"data_21"},{"type":"Text","payrollColumn":"7","label":"","text":"Totals","status":"Show","id":"data_22"},{"type":"Payroll Column","payrollColumn":"11","label":"Total EPF 20%","text":"","status":"Show","id":"data_23"},{"type":"Payroll Column","payrollColumn":"12","label":"Total for PAYE","text":"","status":"Show","id":"data_24"},{"type":"Payroll Column","payrollColumn":"16","label":"Net Salary","text":"","status":"Show","id":"data_25"}]', NULL, '2016-06-29 22:07:12', '2016-06-29 22:07:12');
+
+INSERT INTO `Payroll` VALUES
+    (1,'Sri Lanka Payroll Sample',4,1,NULL,'[\"5\",\"8\",\"9\",\"10\",\"6\",\"7\",\"11\",\"12\",\"13\",\"14\",\"15\",\"16\"]','2016-03-01','2016-03-31','Draft', 1);
+
+INSERT INTO `PayrollColumns` VALUES
+    (5,'LK - Basic Salary',NULL,'[\"1\"]','[]','[]','[]',5,'No','Yes','0.00',NULL,NULL),
+    (6,'LK - Fixed Allowance',NULL,'[\"2\"]','[]','[]','[]',6,'No','Yes','0.00',NULL,NULL),
+    (7,'LK - Gross Pay',NULL,'[]','[]','[\"5\",\"6\"]','[]',7,'No','Yes','0.00',NULL,NULL),
+    (8,'LK - EPF Employee Contribution',NULL,'[]','[\"1\"]','[]','[]',8,'No','Yes','0.00',NULL,NULL),
+    (9,'LK - EPF Employer Contribution',NULL,'[]','[\"2\"]','[]','[]',9,'No','Yes','0.00',NULL,NULL),
+    (10,'LK - ETF Employer Contribution',NULL,'[]','[\"3\"]','[]','[]',10,'No','Yes','0.00',NULL,NULL),
+    (11,'LK - Total EPF 20%',NULL,'[]','[]','[\"8\",\"9\"]','[]',11,'No','Yes','0.00',NULL,NULL),
+    (12,'LK - Total for PAYE',NULL,'[]','[]','[\"7\"]','[]',12,'No','Yes','0.00',NULL,NULL),
+    (13,'LK - PAYE Tax',NULL,'[]','[\"4\"]','[]','[]',13,'No','Yes','0.00',NULL,NULL),
+    (14,'LK - Stamp Duty',NULL,'[]','[\"5\"]','[]','[]',14,'No','Yes','0.00',NULL,NULL),
+    (15,'LK - Total Deductions',NULL,'[]','[]','[\"8\",\"13\",\"14\"]','[]',15,'No','Yes','0.00',NULL,NULL),
+    (16,'LK - Salary to Bank',NULL,'[]','[]','[\"7\"]','[\"15\"]',16,'No','Yes','0.00',NULL,NULL);
+
+INSERT INTO `Deductions` VALUES
+    (1,'EPF Employee Contribution','[]','[]',7,'[{\"lowerCondition\":\"No Lower Limit\",\"lowerLimit\":\"0\",\"upperCondition\":\"No Upper Limit\",\"upperLimit\":\"0\",\"amount\":\"X*0.08\",\"id\":\"rangeAmounts_1\"}]',1),
+    (2,'EPF Employer Contribution','[]','[]',7,'[{\"lowerCondition\":\"No Lower Limit\",\"lowerLimit\":\"0\",\"upperCondition\":\"No Upper Limit\",\"upperLimit\":\"0\",\"amount\":\"X*0.12\",\"id\":\"rangeAmounts_1\"}]',1),
+    (3,'ETF Employer Contribution','[]','[]',7,'[{\"lowerCondition\":\"No Lower Limit\",\"lowerLimit\":\"0\",\"upperCondition\":\"No Upper Limit\",\"upperLimit\":\"0\",\"amount\":\"X*0.03\",\"id\":\"rangeAmounts_1\"}]',1),
+    (4,'PAYE Tax','[]','[]',12,'[{\"lowerCondition\":\"No Lower Limit\",\"lowerLimit\":\"0\",\"upperCondition\":\"lte\",\"upperLimit\":\"62500\",\"amount\":\"0\",\"id\":\"rangeAmounts_1\"},{\"lowerCondition\":\"gt\",\"lowerLimit\":\"62500\",\"upperCondition\":\"lte\",\"upperLimit\":\"104167\",\"amount\":\"X*0.04 - 2500\",\"id\":\"rangeAmounts_2\"},{\"lowerCondition\":\"gt\",\"lowerLimit\":\"104167\",\"upperCondition\":\"lte\",\"upperLimit\":\"145833\",\"amount\":\"X*0.08 - 6667\",\"id\":\"rangeAmounts_3\"},{\"lowerCondition\":\"gt\",\"lowerLimit\":\"145833\",\"upperCondition\":\"lte\",\"upperLimit\":\"187500\",\"amount\":\"X*0.12-12500\",\"id\":\"rangeAmounts_4\"},{\"lowerCondition\":\"gt\",\"lowerLimit\":\"187500\",\"upperCondition\":\"No Upper Limit\",\"upperLimit\":\"0\",\"amount\":\"X*0.16 - 20000\",\"id\":\"rangeAmounts_5\"}]',1),
+    (5,'Stamp Duty','[]','[]',12,'[{\"lowerCondition\":\"No Lower Limit\",\"lowerLimit\":\"0\",\"upperCondition\":\"lte\",\"upperLimit\":\"25000\",\"amount\":\"0\",\"id\":\"rangeAmounts_1\"},{\"lowerCondition\":\"gt\",\"lowerLimit\":\"25000\",\"upperCondition\":\"No Upper Limit\",\"upperLimit\":\"0\",\"amount\":\"25\",\"id\":\"rangeAmounts_2\"}]',1);
+
+
+INSERT INTO `DeductionGroup` VALUES
+    (2,'Ghana Payroll Calculation','');
+
+INSERT INTO `PayslipTemplates` VALUES
+    (2,'Ghana Default','[{\"type\":\"Company Name\",\"payrollColumn\":\"NULL\",\"label\":\"\",\"text\":\"\",\"status\":\"Show\",\"id\":\"data_1\"},{\"type\":\"Separators\",\"payrollColumn\":\"NULL\",\"label\":\"\",\"text\":\"\",\"status\":\"Show\",\"id\":\"data_3\"},{\"type\":\"Payroll Column\",\"payrollColumn\":\"105\",\"label\":\"\",\"text\":\"\",\"status\":\"Show\",\"id\":\"data_4\"},{\"type\":\"Payroll Column\",\"payrollColumn\":\"106\",\"label\":\"\",\"text\":\"\",\"status\":\"Show\",\"id\":\"data_5\"},{\"type\":\"Payroll Column\",\"payrollColumn\":\"107\",\"label\":\"\",\"text\":\"\",\"status\":\"Show\",\"id\":\"data_6\"},{\"type\":\"Payroll Column\",\"payrollColumn\":\"112\",\"label\":\"Total\",\"text\":\"\",\"status\":\"Show\",\"id\":\"data_7\"},{\"type\":\"Separators\",\"payrollColumn\":\"NULL\",\"label\":\"\",\"text\":\"\",\"status\":\"Show\",\"id\":\"data_8\"},{\"type\":\"Text\",\"payrollColumn\":\"NULL\",\"label\":\"\",\"text\":\"Deductions \",\"status\":\"Show\",\"id\":\"data_9\"},{\"type\":\"Payroll Column\",\"payrollColumn\":\"109\",\"label\":\"SSNIT (5.5%)\",\"text\":\"\",\"status\":\"Show\",\"id\":\"data_10\"},{\"type\":\"Payroll Column\",\"payrollColumn\":\"113\",\"label\":\"Tax (1st Level 5%)\",\"text\":\"\",\"status\":\"Show\",\"id\":\"data_11\"},{\"type\":\"Payroll Column\",\"payrollColumn\":\"114\",\"label\":\"Tax (2nd Level 10%)\",\"text\":\"\",\"status\":\"Show\",\"id\":\"data_12\"},{\"type\":\"Payroll Column\",\"payrollColumn\":\"115\",\"label\":\"Tax (3rd Level 17.5%)\",\"text\":\"\",\"status\":\"Show\",\"id\":\"data_13\"},{\"type\":\"Payroll Column\",\"payrollColumn\":\"120\",\"label\":\"Tax (4th Level 25%)\",\"text\":\"\",\"status\":\"Show\",\"id\":\"data_14\"},{\"type\":\"Payroll Column\",\"payrollColumn\":\"121\",\"label\":\"Overtime Allow. Tax (5%)\",\"text\":\"\",\"status\":\"Show\",\"id\":\"data_15\"},{\"type\":\"Payroll Column\",\"payrollColumn\":\"122\",\"label\":\"Total (PAYE Tax)\",\"text\":\"\",\"status\":\"Show\",\"id\":\"data_16\"},{\"type\":\"Separators\",\"payrollColumn\":\"NULL\",\"label\":\"\",\"text\":\"\",\"status\":\"Show\",\"id\":\"data_17\"},{\"type\":\"Payroll Column\",\"payrollColumn\":\"123\",\"label\":\"Sub Total\",\"text\":\"\",\"status\":\"Show\",\"id\":\"data_18\"},{\"type\":\"Separators\",\"payrollColumn\":\"NULL\",\"label\":\"\",\"text\":\"\",\"status\":\"Show\",\"id\":\"data_19\"},{\"type\":\"Payroll Column\",\"payrollColumn\":\"125\",\"label\":\"Netto Monthly Salary\",\"text\":\"\",\"status\":\"Show\",\"id\":\"data_20\"}]',NULL,'2016-08-30 21:53:13','2016-08-30 21:53:13');
+
+
+INSERT INTO `Payroll` VALUES
+    (6,'Ghana Payroll Sample',4,1,NULL,'[\"123\",\"125\",\"106\",\"124\",\"113\",\"114\",\"115\",\"121\",\"107\",\"120\",\"109\",\"105\",\"112\",\"108\",\"122\"]','2016-08-01','2016-08-31','Draft',2);
+
+
+INSERT INTO `PayrollColumns` VALUES
+    (105,'GH - Salary (Basic)',NULL,'[\"1\"]','[]','[]','[]',1,'No','Yes','0.00','',''),
+    (106,'GH - Housing Allowance',NULL,'[]','[\"101\"]','[]','[]',2,'No','Yes','0.00','',''),
+    (107,'GH - Overtime Allowance',NULL,'[]','[\"102\"]','[]','[]',3,'No','Yes','0.00','',''),
+    (108,'GH - Total',NULL,'[]','[]','[\"106\",\"107\",\"105\"]','[]',4,'No','Yes','0.00','',''),
+    (109,'GH - SSNIT',NULL,'[]','[\"103\"]','[]','[]',5,'No','Yes','0.00','',''),
+    (112,'GH - Taxable Income',NULL,'[]','[]','[\"106\",\"105\"]','[\"109\"]',7,'No','Yes','0.00','',''),
+    (113,'GH - Next 108 GHC',NULL,'[]','[\"106\"]','[]','[]',9,'No','Yes','0.00','',''),
+    (114,'GH - Next 151 GHC',NULL,'[]','[\"107\"]','[]','[]',10,'No','Yes','0.00','',''),
+    (115,'GH - Next 2765 GHC',NULL,'[]','[\"108\"]','[]','[]',11,'No','Yes','0.00','',''),
+    (120,'GH - Remaining after 3240 GHC',NULL,'[]','[\"111\"]','[]','[]',12,'No','Yes','0.00','',''),
+    (121,'GH - Overtime Allow. Tax',NULL,'[]','[]','[]','[]',13,'No','Yes','0.00','[{\"name\":\"O\",\"column\":\"107\",\"id\":\"calculation_columns_1\"}]','O*0.05'),
+    (122,'GH - Total (PAYE Tax)',NULL,'[]','[]','[\"113\",\"114\",\"115\",\"120\",\"121\"]','[]',14,'No','Yes','0.00','',''),
+    (123,'GH - Deductions - Sub Total',NULL,'[]','[]','[\"109\",\"122\"]','[]',15,'No','Yes','0.00','',''),
+    (125,'GH - Final Total',NULL,'[]','[]','[\"108\"]','[\"123\"]',16,'No','Yes','0.00','','');
+
+
+INSERT INTO `Deductions` VALUES
+    (101,'Housing Allowance (10%)','[]','[\"1\"]',NULL,'[{\"lowerCondition\":\"No Lower Limit\",\"lowerLimit\":0,\"upperCondition\":\"No Upper Limit\",\"upperLimit\":0,\"amount\":\"X*0.1\",\"id\":\"rangeAmounts_1\"}]',2),
+    (102,'Overtime Allowance (10%)','[]','[\"1\"]',NULL,'[{\"lowerCondition\":\"No Lower Limit\",\"lowerLimit\":0,\"upperCondition\":\"No Upper Limit\",\"upperLimit\":0,\"amount\":\"X*0.1\",\"id\":\"rangeAmounts_1\"}]',2),
+    (103,'SSNIT','[]','[\"1\"]',NULL,'[{\"lowerCondition\":\"No Lower Limit\",\"lowerLimit\":0,\"upperCondition\":\"No Upper Limit\",\"upperLimit\":0,\"amount\":\"X*0.055\",\"id\":\"rangeAmounts_1\"}]',2),
+    (104,'Tax - Ghana','[]','[]',NULL,'',2),
+    (106,'Next 108 GHC','[]','[]',112,'[{\"lowerCondition\":\"gte\",\"lowerLimit\":\"216\",\"upperCondition\":\"lt\",\"upperLimit\":\"324\",\"amount\":\"X*0.05\",\"id\":\"rangeAmounts_1\"},{\"lowerCondition\":\"gte\",\"lowerLimit\":\"324\",\"upperCondition\":\"No Upper Limit\",\"upperLimit\":0,\"amount\":\"5.4\",\"id\":\"rangeAmounts_2\"}]',2),
+    (107,'Next 151 GHC','[]','[]',112,'[{\"lowerCondition\":\"gte\",\"lowerLimit\":\"324\",\"upperCondition\":\"lt\",\"upperLimit\":\"475\",\"amount\":\"(X-324) * 0.1\",\"id\":\"rangeAmounts_1\"},{\"lowerCondition\":\"gte\",\"lowerLimit\":\"259\",\"upperCondition\":\"No Upper Limit\",\"upperLimit\":0,\"amount\":\"15.10\",\"id\":\"rangeAmounts_2\"}]',2),
+    (108,'Next 2765 GHC','[]','[]',112,'[{\"lowerCondition\":\"gte\",\"lowerLimit\":\"475\",\"upperCondition\":\"lt\",\"upperLimit\":\"3240\",\"amount\":\"(X - 475) * 0.175\",\"id\":\"rangeAmounts_1\"},{\"lowerCondition\":\"gte\",\"lowerLimit\":\"3240\",\"upperCondition\":\"No Upper Limit\",\"upperLimit\":0,\"amount\":\"483.88\",\"id\":\"rangeAmounts_2\"}]',2),
+    (111,'Remaining after 3240 GHC','[]','[]',112,'[{\"lowerCondition\":\"gte\",\"lowerLimit\":\"3240\",\"upperCondition\":\"No Upper Limit\",\"upperLimit\":0,\"amount\":\"(X-3240)*0.25\",\"id\":\"rangeAmounts_1\"}]',2);
 

core-ext/scripts/icehrm_sample_data.sql

@@ -40,9 +40,32 @@ INSERT INTO `Employees` (`id`, `employee_id`, `first_name`, `middle_name`, `last
   (12, CONCAT('EMP', RAND()), generate_fname(), '', generate_fname(), 10, '1979-07-15 18:30:00', 'Female', 'Single', '158-06-2292', '158-06-2292', '', '', NULL, 1, 5, 2, '', '1164', 'Walnut Avenue', 'Rochelle Park', 'US', 35, '7662', '201-474-8048', '201-474-8048', '201-474-8048', 'icehrm+user2@web-stalk.com', 'icehrm+user2@web-stalk.com', '2006-07-12 18:30:00', '0000-00-00 00:00:00', 2, 2, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
   (13, CONCAT('EMP', RAND()), generate_fname(), '', generate_fname(), 10, '1979-07-15 18:30:00', 'Female', 'Single', '158-06-2292', '158-06-2292', '', '', NULL, 1, 5, 2, '', '1164', 'Walnut Avenue', 'Rochelle Park', 'US', 35, '7662', '201-474-8048', '201-474-8048', '201-474-8048', 'icehrm+user2@web-stalk.com', 'icehrm+user2@web-stalk.com', '2006-07-12 18:30:00', '0000-00-00 00:00:00', 2, 2, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
   (14, CONCAT('EMP', RAND()), generate_fname(), '', generate_fname(), 10, '1979-07-15 18:30:00', 'Female', 'Single', '158-06-2292', '158-06-2292', '', '', NULL, 1, 5, 2, '', '1164', 'Walnut Avenue', 'Rochelle Park', 'US', 35, '7662', '201-474-8048', '201-474-8048', '201-474-8048', 'icehrm+user2@web-stalk.com', 'icehrm+user2@web-stalk.com', '2006-07-12 18:30:00', '0000-00-00 00:00:00', 2, 2, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
-  (15, CONCAT('EMP', RAND()), generate_fname(), '', generate_fname(), 10, '1979-07-15 18:30:00', 'Female', 'Single', '158-06-2292', '158-06-2292', '', '', NULL, 1, 5, 2, '', '1164', 'Walnut Avenue', 'Rochelle Park', 'US', 35, '7662', '201-474-8048', '201-474-8048', '201-474-8048', 'icehrm+user2@web-stalk.com', 'icehrm+user2@web-stalk.com', '2006-07-12 18:30:00', '0000-00-00 00:00:00', 2, 2, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+  (15, CONCAT('EMP', RAND()), generate_fname(), '', generate_fname(), 10, '1979-07-15 18:30:00', 'Female', 'Single', '158-06-2292', '158-06-2292', '', '', NULL, 1, 5, 2, '', '1164', 'Walnut Avenue', 'Rochelle Park', 'US', 35, '7662', '201-474-8048', '201-474-8048', '201-474-8048', 'icehrm+user2@web-stalk.com', 'icehrm+user2@web-stalk.com', '2006-07-12 18:30:00', '0000-00-00 00:00:00', 2, 2, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+  (16, CONCAT('EMP', RAND()), generate_fname(), '', generate_fname(), 10, '1979-07-15 18:30:00', 'Female', 'Single', '158-06-2292', '158-06-2292', '', '', NULL, 1, 5, 2, '', '1164', 'Walnut Avenue', 'Rochelle Park', 'US', 35, '7662', '201-474-8048', '201-474-8048', '201-474-8048', 'icehrm+user2@web-stalk.com', 'icehrm+user2@web-stalk.com', '2006-07-12 18:30:00', '0000-00-00 00:00:00', 2, 2, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+  (17, CONCAT('EMP', RAND()), generate_fname(), '', generate_fname(), 10, '1979-07-15 18:30:00', 'Female', 'Single', '158-06-2292', '158-06-2292', '', '', NULL, 1, 5, 2, '', '1164', 'Walnut Avenue', 'Rochelle Park', 'US', 35, '7662', '201-474-8048', '201-474-8048', '201-474-8048', 'icehrm+user2@web-stalk.com', 'icehrm+user2@web-stalk.com', '2006-07-12 18:30:00', '0000-00-00 00:00:00', 2, 2, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+  (18, CONCAT('EMP', RAND()), generate_fname(), '', generate_fname(), 10, '1979-07-15 18:30:00', 'Female', 'Single', '158-06-2292', '158-06-2292', '', '', NULL, 1, 5, 2, '', '1164', 'Walnut Avenue', 'Rochelle Park', 'US', 35, '7662', '201-474-8048', '201-474-8048', '201-474-8048', 'icehrm+user2@web-stalk.com', 'icehrm+user2@web-stalk.com', '2006-07-12 18:30:00', '0000-00-00 00:00:00', 2, 2, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+  (19, CONCAT('EMP', RAND()), generate_fname(), '', generate_fname(), 10, '1979-07-15 18:30:00', 'Female', 'Single', '158-06-2292', '158-06-2292', '', '', NULL, 1, 5, 2, '', '1164', 'Walnut Avenue', 'Rochelle Park', 'US', 35, '7662', '201-474-8048', '201-474-8048', '201-474-8048', 'icehrm+user2@web-stalk.com', 'icehrm+user2@web-stalk.com', '2006-07-12 18:30:00', '0000-00-00 00:00:00', 2, 2, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+  (20, CONCAT('EMP', RAND()), generate_fname(), '', generate_fname(), 10, '1979-07-15 18:30:00', 'Female', 'Single', '158-06-2292', '158-06-2292', '', '', NULL, 1, 5, 2, '', '1164', 'Walnut Avenue', 'Rochelle Park', 'US', 35, '7662', '201-474-8048', '201-474-8048', '201-474-8048', 'icehrm+user2@web-stalk.com', 'icehrm+user2@web-stalk.com', '2006-07-12 18:30:00', '0000-00-00 00:00:00', 2, 2, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+  (21, CONCAT('EMP', RAND()), generate_fname(), '', generate_fname(), 10, '1979-07-15 18:30:00', 'Female', 'Single', '158-06-2292', '158-06-2292', '', '', NULL, 1, 5, 2, '', '1164', 'Walnut Avenue', 'Rochelle Park', 'US', 35, '7662', '201-474-8048', '201-474-8048', '201-474-8048', 'icehrm+user2@web-stalk.com', 'icehrm+user2@web-stalk.com', '2006-07-12 18:30:00', '0000-00-00 00:00:00', 2, 2, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+  (22, CONCAT('EMP', RAND()), generate_fname(), '', generate_fname(), 10, '1979-07-15 18:30:00', 'Female', 'Single', '158-06-2292', '158-06-2292', '', '', NULL, 1, 5, 2, '', '1164', 'Walnut Avenue', 'Rochelle Park', 'US', 35, '7662', '201-474-8048', '201-474-8048', '201-474-8048', 'icehrm+user2@web-stalk.com', 'icehrm+user2@web-stalk.com', '2006-07-12 18:30:00', '0000-00-00 00:00:00', 2, 2, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+  (23, CONCAT('EMP', RAND()), generate_fname(), '', generate_fname(), 10, '1979-07-15 18:30:00', 'Female', 'Single', '158-06-2292', '158-06-2292', '', '', NULL, 1, 5, 2, '', '1164', 'Walnut Avenue', 'Rochelle Park', 'US', 35, '7662', '201-474-8048', '201-474-8048', '201-474-8048', 'icehrm+user2@web-stalk.com', 'icehrm+user2@web-stalk.com', '2006-07-12 18:30:00', '0000-00-00 00:00:00', 2, 2, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+  (24, CONCAT('EMP', RAND()), generate_fname(), '', generate_fname(), 10, '1979-07-15 18:30:00', 'Female', 'Single', '158-06-2292', '158-06-2292', '', '', NULL, 1, 5, 2, '', '1164', 'Walnut Avenue', 'Rochelle Park', 'US', 35, '7662', '201-474-8048', '201-474-8048', '201-474-8048', 'icehrm+user2@web-stalk.com', 'icehrm+user2@web-stalk.com', '2006-07-12 18:30:00', '0000-00-00 00:00:00', 2, 2, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+  (25, CONCAT('EMP', RAND()), generate_fname(), '', generate_fname(), 10, '1979-07-15 18:30:00', 'Female', 'Single', '158-06-2292', '158-06-2292', '', '', NULL, 1, 5, 2, '', '1164', 'Walnut Avenue', 'Rochelle Park', 'US', 35, '7662', '201-474-8048', '201-474-8048', '201-474-8048', 'icehrm+user2@web-stalk.com', 'icehrm+user2@web-stalk.com', '2006-07-12 18:30:00', '0000-00-00 00:00:00', 2, 2, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+  (26, CONCAT('EMP', RAND()), generate_fname(), '', generate_fname(), 10, '1979-07-15 18:30:00', 'Female', 'Single', '158-06-2292', '158-06-2292', '', '', NULL, 1, 5, 2, '', '1164', 'Walnut Avenue', 'Rochelle Park', 'US', 35, '7662', '201-474-8048', '201-474-8048', '201-474-8048', 'icehrm+user2@web-stalk.com', 'icehrm+user2@web-stalk.com', '2006-07-12 18:30:00', '0000-00-00 00:00:00', 2, 2, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+  (27, CONCAT('EMP', RAND()), generate_fname(), '', generate_fname(), 10, '1979-07-15 18:30:00', 'Female', 'Single', '158-06-2292', '158-06-2292', '', '', NULL, 1, 5, 2, '', '1164', 'Walnut Avenue', 'Rochelle Park', 'US', 35, '7662', '201-474-8048', '201-474-8048', '201-474-8048', 'icehrm+user2@web-stalk.com', 'icehrm+user2@web-stalk.com', '2006-07-12 18:30:00', '0000-00-00 00:00:00', 2, 2, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+  (28, CONCAT('EMP', RAND()), generate_fname(), '', generate_fname(), 10, '1979-07-15 18:30:00', 'Female', 'Single', '158-06-2292', '158-06-2292', '', '', NULL, 1, 5, 2, '', '1164', 'Walnut Avenue', 'Rochelle Park', 'US', 35, '7662', '201-474-8048', '201-474-8048', '201-474-8048', 'icehrm+user2@web-stalk.com', 'icehrm+user2@web-stalk.com', '2006-07-12 18:30:00', '0000-00-00 00:00:00', 2, 2, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+  (29, CONCAT('EMP', RAND()), generate_fname(), '', generate_fname(), 10, '1979-07-15 18:30:00', 'Female', 'Single', '158-06-2292', '158-06-2292', '', '', NULL, 1, 5, 2, '', '1164', 'Walnut Avenue', 'Rochelle Park', 'US', 35, '7662', '201-474-8048', '201-474-8048', '201-474-8048', 'icehrm+user2@web-stalk.com', 'icehrm+user2@web-stalk.com', '2006-07-12 18:30:00', '0000-00-00 00:00:00', 2, 2, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+  (30, CONCAT('EMP', RAND()), generate_fname(), '', generate_fname(), 10, '1979-07-15 18:30:00', 'Female', 'Single', '158-06-2292', '158-06-2292', '', '', NULL, 1, 5, 2, '', '1164', 'Walnut Avenue', 'Rochelle Park', 'US', 35, '7662', '201-474-8048', '201-474-8048', '201-474-8048', 'icehrm+user2@web-stalk.com', 'icehrm+user2@web-stalk.com', '2006-07-12 18:30:00', '0000-00-00 00:00:00', 2, 2, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+  (31, CONCAT('EMP', RAND()), generate_fname(), '', generate_fname(), 10, '1979-07-15 18:30:00', 'Female', 'Single', '158-06-2292', '158-06-2292', '', '', NULL, 1, 5, 2, '', '1164', 'Walnut Avenue', 'Rochelle Park', 'US', 35, '7662', '201-474-8048', '201-474-8048', '201-474-8048', 'icehrm+user2@web-stalk.com', 'icehrm+user2@web-stalk.com', '2006-07-12 18:30:00', '0000-00-00 00:00:00', 2, 2, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+  (32, CONCAT('EMP', RAND()), generate_fname(), '', generate_fname(), 10, '1979-07-15 18:30:00', 'Female', 'Single', '158-06-2292', '158-06-2292', '', '', NULL, 1, 5, 2, '', '1164', 'Walnut Avenue', 'Rochelle Park', 'US', 35, '7662', '201-474-8048', '201-474-8048', '201-474-8048', 'icehrm+user2@web-stalk.com', 'icehrm+user2@web-stalk.com', '2006-07-12 18:30:00', '0000-00-00 00:00:00', 2, 2, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+  (33, CONCAT('EMP', RAND()), generate_fname(), '', generate_fname(), 10, '1979-07-15 18:30:00', 'Female', 'Single', '158-06-2292', '158-06-2292', '', '', NULL, 1, 5, 2, '', '1164', 'Walnut Avenue', 'Rochelle Park', 'US', 35, '7662', '201-474-8048', '201-474-8048', '201-474-8048', 'icehrm+user2@web-stalk.com', 'icehrm+user2@web-stalk.com', '2006-07-12 18:30:00', '0000-00-00 00:00:00', 2, 2, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+  (34, CONCAT('EMP', RAND()), generate_fname(), '', generate_fname(), 10, '1979-07-15 18:30:00', 'Female', 'Single', '158-06-2292', '158-06-2292', '', '', NULL, 1, 5, 2, '', '1164', 'Walnut Avenue', 'Rochelle Park', 'US', 35, '7662', '201-474-8048', '201-474-8048', '201-474-8048', 'icehrm+user2@web-stalk.com', 'icehrm+user2@web-stalk.com', '2006-07-12 18:30:00', '0000-00-00 00:00:00', 2, 2, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 
 
+UPDATE `Employees` set supervisor = 2, indirect_supervisors = '[3,4]', approver1 = 5, approver2 = 6, approver3 = 7 where id = 1;
+UPDATE `Employees` set supervisor = 1, indirect_supervisors = '[3,4]', approver1 = 5, approver2 = 6 where id = 2;
+UPDATE `Employees` set supervisor = 2, indirect_supervisors = '[1,4]', approver1 = 5 where id = 3;
+
 INSERT INTO `EmergencyContacts` (`id`, `employee`, `name`, `relationship`, `home_phone`, `work_phone`, `mobile_phone`) VALUES
 (1, 1, 'Emma Owns', 'Mother', '+874463422', '+874463422', '+874463422'),
 (2, 2, 'Casey Watson', 'Sister', '231-453-876', '231-453-876', '231-453-876');
@@ -129,7 +152,13 @@ INSERT INTO `Users` (`id`, `username`, `email`, `password`, `employee`,`default_
 (2, 'manager', 'icehrm+manager@web-stalk.com', '4048bb914a704a0728549a26b92d8550', 2,NULL, 'Manager','', '2013-01-03 02:47:37', '2013-01-03 02:47:37', '2013-01-03 02:47:37'),
 (3, 'user1', 'icehrm+user1@web-stalk.com', '4048bb914a704a0728549a26b92d8550', 3,NULL, 'Employee','', '2013-01-03 02:48:32', '2013-01-03 02:48:32', '2013-01-03 02:48:32'),
 (4, 'user2', 'icehrm+user2@web-stalk.com', '4048bb914a704a0728549a26b92d8550', 4,NULL, 'Employee','', '2013-01-03 02:58:55', '2013-01-03 02:58:55', '2013-01-03 02:58:55'),
-(5, 'user3', 'icehrm+user3@web-stalk.com', '4048bb914a704a0728549a26b92d8550', NULL,NULL, 'Other','["1"]', '2013-01-03 02:58:55', '2013-01-03 02:58:55', '2013-01-03 02:58:55');
+(5, 'user3', 'icehrm+user3@web-stalk.com', '4048bb914a704a0728549a26b92d8550', NULL,NULL, 'Other','["1"]', '2013-01-03 02:58:55', '2013-01-03 02:58:55', '2013-01-03 02:58:55'),
+(6, 'user4', 'icehrm+user4@web-stalk.com', '4048bb914a704a0728549a26b92d8550', 5,NULL, 'Manager','', '2013-01-03 02:58:55', '2013-01-03 02:58:55', '2013-01-03 02:58:55'),
+(7, 'user5', 'icehrm+user5@web-stalk.com', '4048bb914a704a0728549a26b92d8550', 6,NULL, 'Employee','', '2013-01-03 02:58:55', '2013-01-03 02:58:55', '2013-01-03 02:58:55'),
+(8, 'user6', 'icehrm+user6@web-stalk.com', '4048bb914a704a0728549a26b92d8550', 7,NULL, 'Employee','', '2013-01-03 02:58:55', '2013-01-03 02:58:55', '2013-01-03 02:58:55'),
+(9, 'user7', 'icehrm+user7@web-stalk.com', '4048bb914a704a0728549a26b92d8550', 8,NULL, 'Employee','', '2013-01-03 02:58:55', '2013-01-03 02:58:55', '2013-01-03 02:58:55'),
+(10, 'user8', 'icehrm+user8@web-stalk.com', '4048bb914a704a0728549a26b92d8550', 9,NULL, 'Employee','', '2013-01-03 02:58:55', '2013-01-03 02:58:55', '2013-01-03 02:58:55'),
+(11, 'user9', 'icehrm+user9@web-stalk.com', '4048bb914a704a0728549a26b92d8550', 10,NULL, 'Employee','', '2013-01-03 02:58:55', '2013-01-03 02:58:55', '2013-01-03 02:58:55');
 
 INSERT INTO `Job` VALUES
   (1,'Software Engineer','More than 375,000 users world-wide rely on our software for their daily business as it makes creating graphical presentations so much easier, faster and more enjoyable. Among our customers are many renowned consulting companies and large international corporations.','More than 375,000 users world-wide rely on our software for their daily business as it makes creating graphical presentations so much easier, faster and more enjoyable. Among our customers are many renowned consulting companies and large international corporations.\n\nWe follow our own strategy and do not have to make compromises with regard to code quality and beauty, because think-cell is profitable and has no outside investors. We are flourishing without program managers, meetings, and marketing-driven deadlines. Our code quality is extraordinarily high because we only release software when it is ready. We are willing to do the leg work of developing sophisticated algorithms and refining our user interface, which makes working with think-cell’s software so satisfying.','Challenging C++ coding with high personal responsibility\nWork with a competent and creative team in a modern loft office in Berlin\nFamily-friendly working hours, no deadlines\nAbove-average salary (we offer our developers EUR 120,000 annually after one year of employment)\nFree supply of drinks, fruits, sweets and snacks\nFlat hierarchies and plenty of room for your ideas\nA full-time company nanny who is available for free when children are sick, or when you just feel like spending an evening out','[\"Health plan\",\"Paid vacations\"]',226,2,NULL,'JC001',1,NULL,7,14,9,151,'Yes',3500,5500,'job, engineer','Active','0000-00-00 00:00:00',NULL,'Text Only',1),
@@ -140,7 +169,7 @@ INSERT INTO `Candidates` VALUES
   (1,'Jhon','Doe',4,NULL,'Male',NULL,NULL,NULL,'New York','US',NULL,NULL,'icehrm+jhon@web-stalk.com','+1 455565656',NULL,'Software Engineer','cv_rYwHphV7xD5dOe1444302569136',NULL,NULL,NULL,'','','','','','',NULL,NULL,NULL,NULL,NULL,NULL,'2015-10-08 16:59:20','2015-10-08 16:59:20',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'663fd20d1859344585f678a0f87b23522b8f9fce8c67c5290a609ce342b81442',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 
 INSERT INTO `Files` VALUES
-  (6,'attachment_BI5XQCYFxZO12W1447383181684','attachment_BI5XQCYFxZO12W1447383181684.png',1,'Job');
+  (6,'attachment_BI5XQCYFxZO12W1447383181684','attachment_BI5XQCYFxZO12W1447383181684.png',1,'Job',2000,'2MB');
 
 
 INSERT INTO `EmployeeDocuments` (`id`,`employee`, `document`, `date_added`, `valid_until`, `status`, `details`, `attachment`, `expire_notification_last`) VALUES
@@ -192,35 +221,7 @@ INSERT INTO `Attendance` (`employee`,`in_time`,`out_time`,`note`) VALUES
 (3, FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 22 DAY))) + FLOOR(28800 + (RAND() * 3600)),'%Y-%m-%d %T'), FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 22 DAY))) + FLOOR(57600 + (RAND() * 21600)),'%Y-%m-%d %T'), '');
 
 
-INSERT INTO `Payroll` VALUES
-  (1,'2016-03',4,1,1,'[\"5\",\"8\",\"9\",\"10\",\"6\",\"7\",\"4\",\"3\",\"2\",\"1\",\"11\",\"12\",\"13\",\"14\",\"15\",\"16\"]','2016-03-01','2016-03-31','Draft'),
-  (2,'2016-03-Weekly',2,1,2,'[\"1\",\"2\",\"3\"]','2016-03-01','2016-03-31','Draft');
 
-INSERT INTO `PayrollColumns` VALUES
-  (5,'Basic Salary',NULL,'[\"1\"]','[]','[]','[]',5,'No','Yes','0.00',NULL,NULL),
-  (6,'Fixed Allowance',NULL,'[\"2\"]','[]','[]','[]',6,'No','Yes','0.00',NULL,NULL),
-  (7,'Gross Pay',NULL,'[]','[]','[\"5\",\"6\"]','[]',7,'No','Yes','0.00',NULL,NULL),
-  (8,'EPF Employee Contribution',NULL,'[]','[\"1\"]','[]','[]',8,'No','Yes','0.00',NULL,NULL),
-  (9,'EPF Employer Contribution',NULL,'[]','[\"2\"]','[]','[]',9,'No','Yes','0.00',NULL,NULL),
-  (10,'ETF Employee Contribution',NULL,'[]','[\"3\"]','[]','[]',10,'No','Yes','0.00',NULL,NULL),
-  (11,'Total EPF 20%',NULL,'[]','[]','[\"8\",\"9\"]','[]',11,'No','Yes','0.00',NULL,NULL),
-  (12,'Total for PAYE',NULL,'[]','[]','[\"7\"]','[]',12,'No','Yes','0.00',NULL,NULL),
-  (13,'PAYE Tax',NULL,'[]','[\"4\"]','[]','[]',13,'No','Yes','0.00',NULL,NULL),
-  (14,'Stamp Duty',NULL,'[]','[\"5\"]','[]','[]',14,'No','Yes','0.00',NULL,NULL),
-  (15,'Total Deductions',NULL,'[]','[]','[\"8\",\"13\",\"14\"]','[]',15,'No','Yes','0.00',NULL,NULL),
-  (16,'Salary to Bank',NULL,'[]','[]','[\"7\"]','[\"15\"]',16,'No','Yes','0.00',NULL,NULL);
-
-
-INSERT INTO `DeductionGroup` VALUES
-  (1,'Sri Lanka Payroll Calculation',''),
-  (2,'Singapore Payroll Calculation','');
-
-INSERT INTO `Deductions` VALUES
-  (1,'EPF Employee Contribution','[]','[]',7,'[{\"lowerCondition\":\"No Lower Limit\",\"lowerLimit\":\"0\",\"upperCondition\":\"No Upper Limit\",\"upperLimit\":\"0\",\"amount\":\"X*0.08\",\"id\":\"rangeAmounts_1\"}]',1),
-  (2,'EPF Employer Contribution','[]','[]',7,'[{\"lowerCondition\":\"No Lower Limit\",\"lowerLimit\":\"0\",\"upperCondition\":\"No Upper Limit\",\"upperLimit\":\"0\",\"amount\":\"X*0.12\",\"id\":\"rangeAmounts_1\"}]',1),
-  (3,'ETF Employee Contribution','[]','[]',7,'[{\"lowerCondition\":\"No Lower Limit\",\"lowerLimit\":\"0\",\"upperCondition\":\"No Upper Limit\",\"upperLimit\":\"0\",\"amount\":\"X*0.03\",\"id\":\"rangeAmounts_1\"}]',1),
-  (4,'PAYE Tax','[]','[]',12,'[{\"lowerCondition\":\"No Lower Limit\",\"lowerLimit\":\"0\",\"upperCondition\":\"lte\",\"upperLimit\":\"62500\",\"amount\":\"0\",\"id\":\"rangeAmounts_1\"},{\"lowerCondition\":\"gt\",\"lowerLimit\":\"62500\",\"upperCondition\":\"lte\",\"upperLimit\":\"104167\",\"amount\":\"X*0.04 - 2500\",\"id\":\"rangeAmounts_2\"},{\"lowerCondition\":\"gt\",\"lowerLimit\":\"104167\",\"upperCondition\":\"lte\",\"upperLimit\":\"145833\",\"amount\":\"X*0.08 - 6667\",\"id\":\"rangeAmounts_3\"},{\"lowerCondition\":\"gt\",\"lowerLimit\":\"145833\",\"upperCondition\":\"lte\",\"upperLimit\":\"187500\",\"amount\":\"X*0.12-12500\",\"id\":\"rangeAmounts_4\"},{\"lowerCondition\":\"gt\",\"lowerLimit\":\"187500\",\"upperCondition\":\"No Upper Limit\",\"upperLimit\":\"0\",\"amount\":\"X*0.16 - 20000\",\"id\":\"rangeAmounts_5\"}]',1),
-  (5,'Stamp Duty','[]','[]',12,'[{\"lowerCondition\":\"No Lower Limit\",\"lowerLimit\":\"0\",\"upperCondition\":\"lte\",\"upperLimit\":\"25000\",\"amount\":\"0\",\"id\":\"rangeAmounts_1\"},{\"lowerCondition\":\"gt\",\"lowerLimit\":\"25000\",\"upperCondition\":\"No Upper Limit\",\"upperLimit\":\"0\",\"amount\":\"25\",\"id\":\"rangeAmounts_2\"}]',1);
 
 INSERT INTO `PayrollEmployees` VALUES
   (1,1,4,151,'[]','[]',1),
@@ -276,6 +277,9 @@ INSERT INTO `EmployeeLeaveDays` VALUES
   (17,3,FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 21 DAY))),'%Y-%m-%d'),'Full Day'),
   (18,3,FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 22 DAY))),'%Y-%m-%d'),'Full Day');
 
+INSERT INTO `Settings` (`name`, `value`, `description`, `meta`) VALUES
+  ('Instance : ID', '0847429146712c108e23c435e8f93b4d', '',''),
+  ('Instance: Key', 'UQHEYBx9H1eNR66nhNCNCz1WCDDhkjtx1OuJbO3ZQMt+8tfSGvuOH/YEHntRajY=', '','');
 
 
 /*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;

core-ext/scripts/upgrade_v15.2.OS_to_v16.0.OS.sql

@@ -0,0 +1,839 @@
+REPLACE INTO `Reports` (`name`, `details`, `parameters`, `query`, `paramOrder`, `type`,`report_group`) VALUES
+  ('Employee Details Report', 'This report list all employee details and you can filter employees by department, employment status or job title', '[\r\n[ "department", {"label":"Department","type":"select2","remote-source":["CompanyStructure","id","title"],"allow-null":true}],\r\n[ "employment_status", {"label":"Employment Status","type":"select2","remote-source":["EmploymentStatus","id","name"],"allow-null":true}],\r\n[ "job_title", {"label":"Job Title","type":"select2","remote-source":["JobTitle","id","name"],"allow-null":true}]\r\n]', 'Select id, employee_id as ''Employee ID'',\r\nconcat(`first_name`,'' '',`middle_name`,'' '', `last_name`) as ''Name'',\r\n(SELECT name from Nationality where id = nationality) as ''Nationality'',\r\nbirthday as ''Birthday'',\r\ngender as ''Gender'',\r\nmarital_status as ''Marital Status'',\r\nssn_num as ''SSN Number'',\r\nnic_num as ''NIC Number'',\r\nother_id as ''Other IDs'',\r\ndriving_license as ''Driving License Number'',\r\n(SELECT name from EmploymentStatus where id = employment_status) as ''Employment Status'',\r\n(SELECT name from JobTitles where id = job_title) as ''Job Title'',\r\n(SELECT name from PayGrades where id = pay_grade) as ''Pay Grade'',\r\nwork_station_id as ''Work Station ID'',\r\naddress1 as ''Address 1'',\r\naddress2 as ''Address 2'',\r\ncity as ''City'',\r\n(SELECT name from Country where code = country) as ''Country'',\r\n(SELECT name from Province where id = province) as ''Province'',\r\npostal_code as ''Postal Code'',\r\nhome_phone as ''Home Phone'',\r\nmobile_phone as ''Mobile Phone'',\r\nwork_phone as ''Work Phone'',\r\nwork_email as ''Work Email'',\r\nprivate_email as ''Private Email'',\r\njoined_date as ''Joined Date'',\r\nconfirmation_date as ''Confirmation Date'',\r\n(SELECT title from CompanyStructures where id = department) as ''Department'',\r\n(SELECT concat(`first_name`,'' '',`middle_name`,'' '', `last_name`,'' [Employee ID:'',`employee_id`,'']'') from Employees e1 where e1.id = e.supervisor) as ''Supervisor'' \r\nFROM Employees e _where_', '["department","employment_status","job_title"]', 'Query', 'Employee Information'),
+  ('Employee Time Entry Report', 'This report list all employee time entries by employee, date range and project', '[\r\n[ "employee", {"label":"Employee","type":"select2multi","allow-null":true,"null-label":"All Employees","remote-source":["Employee","id","first_name+last_name"]}],\r\n[ "project", {"label":"Project","type":"select","allow-null":true,"remote-source":["Project","id","name"]}],\r\n[ "date_start", {"label":"Start Date","type":"date"}],\r\n[ "date_end", {"label":"End Date","type":"date"}]\r\n]', 'EmployeeTimesheetReport', '["employee","date_start","date_end","status"]', 'Class','Time Management'),
+  ('Employee Attendance Report', 'This report list all employee attendance entries by employee and date range', '[\r\n[ "employee", {"label":"Employee","type":"select2multi","allow-null":true,"null-label":"All Employees","remote-source":["Employee","id","first_name+last_name"]}],\r\n[ "date_start", {"label":"Start Date","type":"date"}],\r\n[ "date_end", {"label":"End Date","type":"date"}]\r\n]', 'EmployeeAttendanceReport', '["employee","date_start","date_end"]', 'Class','Time Management'),
+  ('Employee Time Tracking Report', 'This report list employee working hours and attendance details for each day for a given period ', '[\r\n[ "employee", {"label":"Employee","type":"select2","allow-null":false,"remote-source":["Employee","id","first_name+last_name"]}],\r\n[ "date_start", {"label":"Start Date","type":"date"}],\r\n[ "date_end", {"label":"End Date","type":"date"}]\r\n]', 'EmployeeTimeTrackReport', '["employee","date_start","date_end"]', 'Class','Time Management');
+
+REPLACE INTO `Reports` (`name`, `details`, `parameters`, `query`, `paramOrder`, `type`,`report_group`) VALUES
+  ('Active Employee Report', 'This report list employees who are currently active based on joined date and termination date ',
+   '[\r\n[ "department", {"label":"Department","type":"select2","remote-source":["CompanyStructure","id","title"],"allow-null":true}]\r\n]',
+   'ActiveEmployeeReport',
+   '["department"]', 'Class','Employee Information');
+
+REPLACE INTO `Reports` (`name`, `details`, `parameters`, `query`, `paramOrder`, `type`, `report_group`) VALUES
+  ('New Hires Employee Report', 'This report list employees who are joined between given two dates ',
+   '[[ "department", {"label":"Department","type":"select2","remote-source":["CompanyStructure","id","title"],"allow-null":true}],\r\n[ "date_start", {"label":"Start Date","type":"date"}],\r\n[ "date_end", {"label":"End Date","type":"date"}]\r\n]',
+   'NewHiresEmployeeReport',
+   '["department","date_start","date_end"]', 'Class','Employee Information');
+
+REPLACE INTO `Reports` (`name`, `details`, `parameters`, `query`, `paramOrder`, `type`, `report_group`) VALUES
+  ('Terminated Employee Report', 'This report list employees who are terminated between given two dates ',
+   '[[ "department", {"label":"Department","type":"select2","remote-source":["CompanyStructure","id","title"],"allow-null":true}],\r\n[ "date_start", {"label":"Start Date","type":"date"}],\r\n[ "date_end", {"label":"End Date","type":"date"}]\r\n]',
+   'TerminatedEmployeeReport',
+   '["department","date_start","date_end"]', 'Class','Employee Information');
+
+
+
+
+REPLACE INTO `Reports` (`name`, `details`, `parameters`, `query`, `paramOrder`, `type`,`report_group`) VALUES
+  ('Employee Time Sheet Report', 'This report list all employee time sheets by employee and date range', '[\r\n[ "employee", {"label":"Employee","type":"select2multi","allow-null":true,"null-label":"All Employees","remote-source":["Employee","id","first_name+last_name"]}],\r\n[ "date_start", {"label":"Start Date","type":"date"}],\r\n[ "date_end", {"label":"End Date","type":"date"}],\r\n[ "status", {"label":"Status","allow-null":true,"null-label":"All Status","type":"select","source":[["Approved","Approved"],["Pending","Pending"],["Rejected","Rejected"]]}]\r\n]', 'EmployeeTimeSheetData', '["employee","date_start","date_end","status"]', 'Class','Time Management');
+
+
+REPLACE INTO `Settings` (`name`, `value`, `description`, `meta`) VALUES
+  ('LDAP: Enabled', '0',  '','["value", {"label":"Value","type":"select","source":[["0","No"],["1","Yes"]]}]'),
+  ('LDAP: Server', '',  'LDAP Server IP or DNS',''),
+  ('LDAP: Port', '389',  'LDAP Server Port',''),
+  ('LDAP: Root DN', '',  'e.g: dc=mycompany,dc=net',''),
+  ('LDAP: Manager DN', '',  'e.g: cn=admin,dc=mycompany,dc=net',''),
+  ('LDAP: Manager Password', '',  'Password of the manager user',''),
+  ('LDAP: Version 3', '1',  'Are you using LDAP v3','["value", {"label":"Value","type":"select","source":[["1","Yes"],["0","No"]]}]'),
+  ('LDAP: User Filter', '',  'e.g: uid={}, we will replace {} with actual username provided by the user at the time of login','');
+
+
+
+
+/* v15.0.PRO to v16.0.PRO */
+
+ALTER TABLE `Users` ADD COLUMN `login_hash` varchar(64) default null;
+ALTER TABLE `Users` ADD INDEX login_hash_index (`login_hash`);
+
+INSERT INTO `ImmigrationStatus` VALUES
+  (1,'Citizen'),
+  (2,'Permanent Resident'),
+  (3,'Work Permit Holder'),
+  (4,'Dependant Pass Holder');
+
+INSERT INTO `Ethnicity` VALUES
+  (1,'White American'),
+  (2,'Black or African American'),
+  (3,'Native American'),
+  (4,'Alaska Native'),
+  (5,'Asian American'),
+  (6,'Native Hawaiian'),
+  (7,'Pacific Islander');
+
+REPLACE INTO `Settings` (`name`, `value`, `description`, `meta`) VALUES
+  ('Attendance: Overtime Calculation Class', 'BasicOvertimeCalculator', 'Set the method used to calculate overtime','["value", {"label":"Value","type":"select","source":[["BasicOvertimeCalculator","BasicOvertimeCalculator"],["CaliforniaOvertimeCalculator","CaliforniaOvertimeCalculator"]]}]');
+
+REPLACE INTO `Settings` (`name`, `value`, `description`, `meta`) VALUES
+  ('Attendance: Work Week Start Day', '0', 'Set the starting day of the work week','["value", {"label":"Value","type":"select","source":[["0","Sunday"],["1","Monday"],["2","Tuesday"],["3","Wednesday"],["4","Thursday"],["5","Friday"],["6","Saturday"]]}]');
+
+REPLACE INTO `Settings` (`name`, `value`, `description`, `meta`) VALUES
+  ('System: Reset Module Names', '1', 'Select this to reset module names in Database','["value", {"label":"Value","type":"select","source":[["1","Yes"],["0","No"]]}]');
+
+REPLACE INTO `Settings` (`name`, `value`, `description`, `meta`) VALUES
+('Attendance: Overtime Start Hour', '8', 'Overtime calculation will start after an employee work this number of hours per day, 0 to indicate no overtime', ''),
+('Attendance: Double time Start Hour', '12', 'Double time calculation will start after an employee work this number of hours per day, 0 to indicate no double time', ''),
+('Api: REST Api Enabled', '1',  '','["value", {"label":"Value","type":"select","source":[["0","No"],["1","Yes"]]}]'),
+('Api: REST Api Token', 'Click on edit icon',  '','["value", {"label":"Value","type":"placeholder"}]');
+
+REPLACE INTO `Settings` (`name`, `value`, `description`, `meta`) VALUES
+  ('System: Allowed Countries', '0', 'Only these countries will be allowed in select boxes','["value", {"label":"Value","type":"select2multi","remote-source":["Country","id","name"]}]');
+
+REPLACE INTO `Settings` (`name`, `value`, `description`, `meta`) VALUES
+  ('System: Allowed Currencies', '0', 'Only these currencies will be allowed in select boxes','["value", {"label":"Value","type":"select2multi","remote-source":["CurrencyType","id","code+name"]}]');
+
+REPLACE INTO `Settings` (`name`, `value`, `description`, `meta`) VALUES
+  ('System: Allowed Nationality', '', 'Only these nationalities will be allowed in select boxes','["value", {"label":"Value","type":"select2multi","remote-source":["Nationality","id","name"]}]');
+
+
+REPLACE INTO `Reports` (`name`, `details`, `parameters`, `query`, `paramOrder`, `type`,`report_group`) VALUES
+('Overtime Report', 'This report list all employee attendance entries by employee with overtime calculations', '[\r\n[ "employee", {"label":"Employee","type":"select2multi","allow-null":true,"null-label":"All Employees","remote-source":["Employee","id","first_name+last_name"]}],\r\n[ "date_start", {"label":"Start Date","type":"date"}],\r\n[ "date_end", {"label":"End Date","type":"date"}]\r\n]', 'OvertimeReport', '["employee","date_start","date_end"]', 'Class','Time Management');
+
+REPLACE INTO `Reports` (`name`, `details`, `parameters`, `query`, `paramOrder`, `type`,`report_group`) VALUES
+('Overtime Summary Report', 'This report list all employee attendance entries by employee with overtime calculation summary', '[\r\n[ "employee", {"label":"Employee","type":"select2multi","allow-null":true,"null-label":"All Employees","remote-source":["Employee","id","first_name+last_name"]}],\r\n[ "date_start", {"label":"Start Date","type":"date"}],\r\n[ "date_end", {"label":"End Date","type":"date"}]\r\n]', 'OvertimeSummaryReport', '["employee","date_start","date_end"]', 'Class','Time Management');
+
+create table `EmployeeDataHistory` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `type` varchar(100) not null,
+  `employee` bigint(20) NOT NULL,
+  `field` varchar(100) not null,
+  `old_value` varchar(500) default null,
+  `new_value` varchar(500) default null,
+  `description` varchar(800) default null,
+  `user` bigint(20) NULL,
+  `updated` timestamp default '0000-00-00 00:00:00',
+  `created` timestamp default '0000-00-00 00:00:00',
+  CONSTRAINT `Fk_EmployeeDataHistory_Employee` FOREIGN KEY (`employee`) REFERENCES `Employees` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT `Fk_EmployeeDataHistory_Users` FOREIGN KEY (`user`) REFERENCES `Users` (`id`) ON DELETE SET NULL ON UPDATE CASCADE,
+  primary key  (`id`)
+) engine=innodb default charset=utf8;
+
+Alter table `Employees` modify column `joined_date` date default '0000-00-00';
+Alter table `Employees` modify column `confirmation_date` date default '0000-00-00';
+Alter table `Employees` modify column `termination_date` date default '0000-00-00';
+Alter table `Employees` modify column `birthday` date default '0000-00-00';
+
+
+REPLACE INTO `FieldNameMappings` (`type`, `name`, `textOrig`, `textMapped`, `display`) VALUES
+  ('Employee', 'indirect_supervisors', 'Indirect Supervisors', 'Indirect Supervisors', 'Form');
+
+Update Crons set time = (FLOOR( 1 + RAND( ) *58 )), type = 'Hourly' where name = 'Document Expire Alert';
+
+CREATE TABLE `PayFrequency` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `name` varchar(200) NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB default charset=utf8;
+
+INSERT INTO `PayFrequency` VALUES
+  (1,'Bi Weekly'),
+  (2,'Weekly'),
+  (3,'Semi Monthly'),
+  (4,'Monthly'),
+  (5,'Yearly');
+
+
+CREATE TABLE `PayrollColumnTemplates` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `name` varchar(50) DEFAULT NULL,
+  `columns` varchar(500) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB default charset=utf8;
+
+create table `Payroll` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `name` varchar(200) NULL,
+  `pay_period` bigint(20) NOT NULL,
+  `department` bigint(20) NOT NULL,
+  `column_template` bigint(20) NOT NULL,
+  `columns` varchar(500) DEFAULT NULL,
+  `date_start` DATE NULL default '0000-00-00',
+  `date_end` DATE NULL default '0000-00-00',
+  `status` enum('Draft','Completed','Processing') default 'Draft',
+  primary key  (`id`)
+) engine=innodb default charset=utf8;
+
+
+CREATE TABLE `PayrollData` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `payroll` bigint(20) NOT NULL,
+  `employee` bigint(20) NOT NULL,
+  `payroll_item` int(11) NOT NULL,
+  `amount` varchar(25) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `PayrollDataUniqueKey` (`payroll`,`employee`,`payroll_item`),
+  CONSTRAINT `Fk_PayrollData_Payroll` FOREIGN KEY (`payroll`) REFERENCES `Payroll` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB default charset=utf8;
+
+
+CREATE TABLE `PayrollColumns` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `name` varchar(50) DEFAULT NULL,
+  `calculation_hook` varchar(200) DEFAULT NULL,
+  `salary_components` varchar(500) DEFAULT NULL,
+  `deductions` varchar(500) DEFAULT NULL,
+  `add_columns` varchar(500) DEFAULT NULL,
+  `sub_columns` varchar(500) DEFAULT NULL,
+  `colorder` int(11) DEFAULT NULL,
+  `editable` enum('Yes','No') default 'Yes',
+  `enabled` enum('Yes','No') default 'Yes',
+  `default_value` varchar(25) DEFAULT NULL,
+  `calculation_columns` varchar(500) DEFAULT NULL,
+  `calculation_function` varchar(100) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB default charset=utf8;
+
+
+
+
+INSERT INTO `PayrollColumns` (`id`,`name`,`calculation_hook`,`salary_components`,`deductions`,`add_columns`,`sub_columns`,`editable`) VALUES
+  (1,'Total Hours','AttendanceUtil_getTimeWorkedHours','','','','','No'),
+  (2,'Regular Hours','AttendanceUtil_getRegularWorkedHours','','','','','No'),
+  (3,'Overtime Hours','AttendanceUtil_getOverTimeWorkedHours','','','','','No'),
+  (4,'Leave Hours','LeaveUtil_getLeaveHours','','','','','No');
+
+create table `PayrollEmployees` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `employee` bigint(20) NOT NULL,
+  `pay_frequency` int(11) default null,
+  `currency` bigint(20) NULL,
+  `deduction_exemptions` varchar(250) default null,
+  `deduction_allowed` varchar(250) default null,
+  CONSTRAINT `Fk_PayrollEmployee_Employee` FOREIGN KEY (`employee`) REFERENCES `Employees` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  primary key  (`id`),
+  unique key `PayrollEmployees_employee` (`employee`)
+) engine=innodb default charset=utf8;
+
+create table `DeductionGroup` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `name` varchar(100) NOT NULL,
+  `description` varchar(100) NOT NULL,
+  primary key  (`id`)
+) engine=innodb default charset=utf8;
+
+drop table `DeductionRules`;
+drop table `Deductions`;
+
+create table `Deductions` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `name` varchar(100) NOT NULL,
+  `componentType` varchar(250) NULL,
+  `component` varchar(250) NULL,
+  `payrollColumn` int(11) DEFAULT NULL,
+  `rangeAmounts` text default null,
+  `deduction_group` bigint(20) NULL,
+  CONSTRAINT `Fk_Deductions_DeductionGroup` FOREIGN KEY (`deduction_group`) REFERENCES `DeductionGroup` (`id`) ON DELETE SET NULL ON UPDATE CASCADE,
+  primary key  (`id`)
+) engine=innodb default charset=utf8;
+
+
+
+
+
+Update Reports set parameters = '[\r\n[ "department", {"label":"Department (Company)","type":"select2","remote-source":["CompanyStructure","id","title"],"allow-null":true}],\r\n[ "employee", {"label":"Employee","type":"select2multi","allow-null":true,"null-label":"All Employees","remote-source":["Employee","id","first_name+last_name"]}],\r\n[ "date_start", {"label":"Start Date","type":"date"}],\r\n[ "date_end", {"label":"End Date","type":"date"}],\r\n[ "status", {"label":"Leave Status","type":"select","source":[["NULL","All Statuses"],["Approved","Approved"],["Pending","Pending"],["Rejected","Rejected"],["Cancellation Requested","Cancellation Requested"],["Cancelled","Cancelled"]]}]\r\n]' where name = "Employee Leaves Report";
+
+
+Delete from `Settings` where name = 'System: Default Country';
+
+
+
+
+
+
+
+create table `LeaveTypes` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `name` varchar(100) NOT NULL,
+  `supervisor_leave_assign` enum('Yes','No') default 'Yes',
+  `employee_can_apply` enum('Yes','No') default 'Yes',
+  `apply_beyond_current` enum('Yes','No') default 'Yes',
+  `leave_accrue` enum('No','Yes') default 'No',
+  `carried_forward` enum('No','Yes') default 'No',
+  `default_per_year` decimal(10,3) NOT NULL,
+  `carried_forward_percentage` int(11) NULL default 0,
+  `carried_forward_leave_availability` int(11) NULL default 365,
+  `propotionate_on_joined_date` enum('No','Yes') default 'No',
+  `send_notification_emails` enum('Yes','No') default 'Yes',
+  `leave_group` bigint(20) NULL,
+  `leave_color` varchar(10) NULL,
+  `max_carried_forward_amount` int(11) NULL default 0,
+  primary key  (`id`),
+  unique key (`name`)
+) engine=innodb default charset=utf8;
+
+create table `LeaveRules` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `leave_type` bigint(20) NOT NULL,
+  `job_title` bigint(20) NULL,
+  `employment_status` bigint(20) NULL,
+  `employee` bigint(20) NULL,
+  `supervisor_leave_assign` enum('Yes','No') default 'Yes',
+  `employee_can_apply` enum('Yes','No') default 'Yes',
+  `apply_beyond_current` enum('Yes','No') default 'Yes',
+  `leave_accrue` enum('No','Yes') default 'No',
+  `carried_forward` enum('No','Yes') default 'No',
+  `default_per_year` decimal(10,3) NOT NULL,
+  `carried_forward_percentage` int(11) NULL default 0,
+  `carried_forward_leave_availability` int(11) NULL default 365,
+  `propotionate_on_joined_date` enum('No','Yes') default 'No',
+  `leave_group` bigint(20) NULL,
+  `max_carried_forward_amount` int(11) NULL default 0,
+  primary key  (`id`)
+) engine=innodb default charset=utf8;
+
+
+create table `LeaveGroups` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `name` varchar(100) NOT NULL,
+  `details` text default null,
+  `created` timestamp NULL default '0000-00-00 00:00:00',
+  `updated` timestamp NULL default '0000-00-00 00:00:00',
+  primary key  (`id`)
+) engine=innodb default charset=utf8;
+
+create table `LeaveGroupEmployees` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `employee` bigint(20) NOT NULL,
+  `leave_group` bigint(20) NOT NULL,
+  `created` timestamp NULL default '0000-00-00 00:00:00',
+  `updated` timestamp NULL default '0000-00-00 00:00:00',
+  CONSTRAINT `Fk_LeaveGroupEmployees_Employee` FOREIGN KEY (`employee`) REFERENCES `Employees` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT `Fk_LeaveGroupEmployees_LeaveGroups` FOREIGN KEY (`leave_group`) REFERENCES `LeaveGroups` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  primary key  (`id`),
+  unique key `LeaveGroupEmployees_employee` (`employee`)
+) engine=innodb default charset=utf8;
+
+create table `LeavePeriods` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `name` varchar(100) NOT NULL,
+  `date_start` date default '0000-00-00',
+  `date_end` date default '0000-00-00',
+  `status` enum('Active','Inactive') default 'Inactive',
+  primary key  (`id`)
+) engine=innodb default charset=utf8;
+
+create table `WorkDays` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `name` varchar(100) NOT NULL,
+  `status` enum('Full Day','Half Day','Non-working Day') default 'Full Day',
+  `country` bigint(20) DEFAULT NULL,
+  primary key  (`id`),
+  unique key `workdays_name_country` (`name`,`country`)
+) engine=innodb default charset=utf8;
+
+create table `HoliDays` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `name` varchar(100) NOT NULL,
+  `dateh` date default '0000-00-00',
+  `status` enum('Full Day','Half Day') default 'Full Day',
+  `country` bigint(20) DEFAULT NULL,
+  primary key  (`id`),
+  unique key `holidays_dateh_country` (`dateh`,`country`)
+) engine=innodb default charset=utf8;
+
+create table `EmployeeLeaves` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `employee` bigint(20) NOT NULL,
+  `leave_type` bigint(20) NOT NULL,
+  `leave_period` bigint(20) NOT NULL,
+  `date_start` date default '0000-00-00',
+  `date_end` date default '0000-00-00',
+  `details` text default null,
+  `status` enum('Approved','Pending','Rejected','Cancellation Requested','Cancelled') default 'Pending',
+  `attachment` varchar(100) NULL,
+  CONSTRAINT `Fk_EmployeeLeaves_Employee` FOREIGN KEY (`employee`) REFERENCES `Employees` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT `Fk_EmployeeLeaves_LeaveTypes` FOREIGN KEY (`leave_type`) REFERENCES `LeaveTypes` (`id`),
+  CONSTRAINT `Fk_EmployeeLeaves_LeavePeriods` FOREIGN KEY (`leave_period`) REFERENCES `LeavePeriods` (`id`),
+  primary key  (`id`)
+) engine=innodb default charset=utf8;
+
+create table `EmployeeLeaveLog` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `employee_leave` bigint(20) NOT NULL,
+  `user_id` bigint(20) NULL,
+  `data` varchar(500) NOT NULL,
+  `status_from` enum('Approved','Pending','Rejected','Cancellation Requested','Cancelled') default 'Pending',
+  `status_to` enum('Approved','Pending','Rejected','Cancellation Requested','Cancelled') default 'Pending',
+  `created` timestamp default '0000-00-00 00:00:00',
+  CONSTRAINT `Fk_EmployeeLeaveLog_EmployeeLeaves` FOREIGN KEY (`employee_leave`) REFERENCES `EmployeeLeaves` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT `Fk_EmployeeLeaveLog_Users` FOREIGN KEY (`user_id`) REFERENCES `Users` (`id`) ON DELETE SET NULL ON UPDATE CASCADE,
+  primary key  (`id`)
+) engine=innodb default charset=utf8;
+
+create table `EmployeeLeaveDays` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `employee_leave` bigint(20) NOT NULL,
+  `leave_date` date default '0000-00-00',
+  `leave_type` enum('Full Day','Half Day - Morning','Half Day - Afternoon','1 Hour - Morning','2 Hours - Morning','3 Hours - Morning','1 Hour - Afternoon','2 Hours - Afternoon','3 Hours - Afternoon') NOT NULL,
+  CONSTRAINT `Fk_EmployeeLeaveDays_EmployeeLeaves` FOREIGN KEY (`employee_leave`) REFERENCES `EmployeeLeaves` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  primary key  (`id`)
+) engine=innodb default charset=utf8;
+
+
+create table `Documents` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `name` varchar(100) NOT NULL,
+  `details` text default null,
+  `expire_notification` enum('Yes','No') default 'Yes',
+  `expire_notification_month` enum('Yes','No') default 'Yes',
+  `expire_notification_week` enum('Yes','No') default 'Yes',
+  `expire_notification_day` enum('Yes','No') default 'Yes',
+  `sign` enum('Yes','No') default 'Yes',
+  `sign_label` VARCHAR(500) default null,
+  `created` DATETIME default '0000-00-00 00:00:00',
+  `updated` DATETIME default '0000-00-00 00:00:00',
+  primary key  (`id`)
+) engine=innodb default charset=utf8;
+
+
+create table `EmployeeDocuments` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `employee` bigint(20) NOT NULL,
+  `document` bigint(20) NULL,
+  `date_added` date NOT NULL,
+  `valid_until` date NOT NULL,
+  `status` enum('Active','Inactive','Draft') default 'Active',
+  `details` text default null,
+  `attachment` varchar(100) NULL,
+  `signature` text default null,
+  `expire_notification_last` int(4) NULL,
+  CONSTRAINT `Fk_EmployeeDocuments_Documents` FOREIGN KEY (`document`) REFERENCES `Documents` (`id`) ON DELETE SET NULL ON UPDATE CASCADE,
+  CONSTRAINT `Fk_EmployeeDocuments_Employee` FOREIGN KEY (`employee`) REFERENCES `Employees` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  primary key  (`id`),
+  KEY `KEY_EmployeeDocuments_valid_until` (`valid_until`),
+  KEY `KEY_EmployeeDocuments_valid_until_status` (`valid_until`,`status`,`expire_notification_last`)
+) engine=innodb default charset=utf8;
+
+
+create table `CompanyDocuments` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `name` varchar(100) NOT NULL,
+  `details` text default null,
+  `valid_until` date NOT NULL,
+  `status` enum('Active','Inactive','Draft') default 'Active',
+  `notify_employees` enum('Yes','No') default 'Yes',
+  `attachment` varchar(100) NULL,
+  primary key  (`id`)
+) engine=innodb default charset=utf8;
+
+
+create table `Courses` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `code` varchar(300) NOT NULL,
+  `name` varchar(300) NOT NULL,
+  `description` text default null,
+  `coordinator` bigint(20) NULL,
+  `trainer` varchar(300) NULL,
+  `trainer_info` text default null,
+  `paymentType` enum('Company Sponsored','Paid by Employee') default 'Company Sponsored',
+  `currency` varchar(3) null,
+  `cost` decimal(12,2) DEFAULT 0.00,
+  `status` enum('Active','Inactive') default 'Active',
+  `created` datetime default '0000-00-00 00:00:00',
+  `updated` datetime default '0000-00-00 00:00:00',
+  CONSTRAINT `Fk_Courses_Employees` FOREIGN KEY (`coordinator`) REFERENCES `Employees` (`id`) ON DELETE SET NULL ON UPDATE CASCADE,
+  primary key  (`id`)
+) engine=innodb default charset=utf8;
+
+create table `TrainingSessions` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `name` varchar(300) NOT NULL,
+  `course` bigint(20) NOT NULL,
+  `description` text default null,
+  `scheduled` datetime default '0000-00-00 00:00:00',
+  `dueDate` datetime default '0000-00-00 00:00:00',
+  `deliveryMethod` enum('Classroom','Self Study','Online') default 'Classroom',
+  `deliveryLocation` varchar(500) NULL,
+  `status` enum('Pending','Approved','Completed','Cancelled') default 'Pending',
+  `attendanceType` enum('Sign Up','Assign') default 'Sign Up',
+  `attachment` varchar(300) NULL,
+  `created` datetime default '0000-00-00 00:00:00',
+  `updated` datetime default '0000-00-00 00:00:00',
+  `requireProof` enum('Yes','No') default 'Yes',
+  CONSTRAINT `Fk_TrainingSessions_Courses` FOREIGN KEY (`course`) REFERENCES `Courses` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  primary key  (`id`)
+) engine=innodb default charset=utf8;
+
+
+create table `EmployeeTrainingSessions` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `employee` bigint(20) NOT NULL,
+  `trainingSession` bigint(20) NULL,
+  `feedBack` varchar(1500) NULL,
+  `status` enum('Scheduled','Attended','Not-Attended','Completed') default 'Scheduled',
+  `proof` varchar(300) NULL,
+  CONSTRAINT `Fk_EmployeeTrainingSessions_TrainingSessions` FOREIGN KEY (`trainingSession`) REFERENCES `TrainingSessions` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT `Fk_EmployeeTrainingSessions_Employee` FOREIGN KEY (`employee`) REFERENCES `Employees` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  primary key  (`id`)
+) engine=innodb default charset=utf8;
+
+
+
+create table `LeaveStartingBalance` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `leave_type` bigint(20) NOT NULL,
+  `employee` bigint(20) NULL,
+  `leave_period` bigint(20) NOT NULL,
+  `amount` decimal(10,3) NOT NULL,
+  `note` text DEFAULT NULL,
+  `created` datetime default '0000-00-00 00:00:00',
+  `updated` datetime default '0000-00-00 00:00:00',
+  primary key  (`id`)
+) engine=innodb default charset=utf8;
+
+
+
+/* Sync with Default Schema */
+
+create table `EmployementType` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `name` varchar(250) not null default '',
+  primary key  (`id`)
+) engine=innodb default charset=utf8;
+
+create table `Industry` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `name` varchar(250) not null default '',
+  primary key  (`id`)
+) engine=innodb default charset=utf8;
+
+create table `ExperienceLevel` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `name` varchar(250) not null default '',
+  primary key  (`id`)
+) engine=innodb default charset=utf8;
+
+create table `JobFunction` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `name` varchar(250) not null default '',
+  primary key  (`id`)
+) engine=innodb default charset=utf8;
+
+create table `EducationLevel` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `name` varchar(250) not null default '',
+  primary key  (`id`)
+) engine=innodb default charset=utf8;
+
+create table `Benifits` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `name` varchar(250) not null default '',
+  primary key  (`id`)
+) engine=innodb default charset=utf8;
+
+create table `Tags` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `name` varchar(250) not null default '',
+  primary key  (`id`)
+) engine=innodb default charset=utf8;
+
+create table `Job` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `title` varchar(200) NOT NULL,
+  `shortDescription` text DEFAULT NULL,
+  `description` text DEFAULT NULL,
+  `requirements` text DEFAULT NULL,
+  `benefits` text DEFAULT NULL,
+  `country` bigint(20) DEFAULT NULL,
+  `company` bigint(20) DEFAULT NULL,
+  `department` VARCHAR(100) NULL,
+  `code` VARCHAR(20) NULL,
+  `employementType` bigint(20) DEFAULT NULL,
+  `industry` bigint(20) DEFAULT NULL,
+  `experienceLevel` bigint(20) DEFAULT NULL,
+  `jobFunction` bigint(20) DEFAULT NULL,
+  `educationLevel` bigint(20) DEFAULT NULL,
+  `currency` bigint(20) DEFAULT NULL,
+  `showSalary` enum('Yes','No') default NULL,
+  `salaryMin` bigint(20) DEFAULT NULL,
+  `salaryMax` bigint(20) DEFAULT NULL,
+  `keywords` text DEFAULT NULL,
+  `status` enum('Active','On hold','Closed') default NULL,
+  `closingDate` DATETIME default '0000-00-00 00:00:00',
+  `attachment` varchar(100) NULL,
+  `display` varchar(200) NOT NULL,
+  `postedBy` bigint(20) DEFAULT NULL,
+  INDEX `Job_status` (`status`),
+  primary key  (`id`)
+) engine=innodb default charset=utf8;
+
+
+create table `Candidates` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `first_name` varchar(100) default '' not null,
+  `last_name` varchar(100) default '' not null,
+  `nationality` bigint(20) default null,
+  `birthday` DATETIME default '0000-00-00 00:00:00',
+  `gender` enum('Male','Female') default NULL,
+  `marital_status` enum('Married','Single','Divorced','Widowed','Other') default NULL,
+  `address1` varchar(100) default '',
+  `address2` varchar(100) default '',
+  `city` varchar(150) default '',
+  `country` char(2) default null,
+  `province` bigint(20) default null,
+  `postal_code` varchar(20) default null,
+  `email` varchar(200) default null,
+  `home_phone` varchar(50) default null,
+  `mobile_phone` varchar(50) default null,
+  `cv_title` varchar(200) default '' not null,
+  `cv` varchar(150) NULL,
+  `cvtext` text NULL,
+  `industry` text DEFAULT NULL,
+  `profileImage` varchar(150) NULL,
+  `head_line` text DEFAULT NULL,
+  `objective` text DEFAULT NULL,
+  `work_history` text DEFAULT NULL,
+  `education` text DEFAULT NULL,
+  `skills` text DEFAULT NULL,
+  `referees` text DEFAULT NULL,
+  `linkedInUrl` varchar(500) DEFAULT NULL,
+  `linkedInData` text DEFAULT NULL,
+  `totalYearsOfExperience` int(11) default null,
+  `totalMonthsOfExperience` int(11) default null,
+  `htmlCVData` longtext DEFAULT NULL,
+  `generatedCVFile` varchar(150) DEFAULT NULL,
+  `created` DATETIME default '0000-00-00 00:00:00',
+  `updated` DATETIME default '0000-00-00 00:00:00',
+  `expectedSalary` int(11) default null,
+  `preferedPositions` text default null,
+  `preferedJobtype` varchar(60) default null,
+  `preferedCountries` text default null,
+  `tags` text default null,
+  `notes` text default null,
+  `calls` text default null,
+  `age` int(11) default null,
+  `hash` varchar(100) DEFAULT NULL,
+  `linkedInProfileLink` varchar(250) DEFAULT NULL,
+  `linkedInProfileId` varchar(50) DEFAULT NULL,
+  `facebookProfileLink` varchar(250) DEFAULT NULL,
+  `facebookProfileId` varchar(50) DEFAULT NULL,
+  `twitterProfileLink` varchar(250) DEFAULT NULL,
+  `twitterProfileId` varchar(50) DEFAULT NULL,
+  `googleProfileLink` varchar(250) DEFAULT NULL,
+  `googleProfileId` varchar(50) DEFAULT NULL,
+  primary key  (`id`)
+
+) engine=innodb default charset=utf8;
+
+
+create table `Applications` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `job` bigint(20) NOT NULL,
+  `candidate` bigint(20) DEFAULT NULL,
+  `created` DATETIME default '0000-00-00 00:00:00',
+  `referredByEmail` varchar(200) DEFAULT NULL,
+  `notes` text DEFAULT NULL,
+  primary key  (`id`),
+  unique key  (`job`,`candidate`),
+  CONSTRAINT `Fk_Applications_Job` FOREIGN KEY (`job`) REFERENCES `Job` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT `Fk_Applications_Candidates` FOREIGN KEY (`candidate`) REFERENCES `Candidates` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) engine=innodb default charset=utf8;
+
+create table `Interviews` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `job` bigint(20) NOT NULL,
+  `candidate` bigint(20) DEFAULT NULL,
+  `level` varchar(100) DEFAULT NULL,
+  `created` DATETIME default '0000-00-00 00:00:00',
+  `updated` DATETIME default '0000-00-00 00:00:00',
+  `scheduled` DATETIME default '0000-00-00 00:00:00',
+  `location` varchar(500) DEFAULT NULL,
+  `mapId` bigint(20) NULL,
+  `status` varchar(100) default null,
+  `notes` text DEFAULT NULL,
+  primary key  (`id`),
+  CONSTRAINT `Fk_Interviews_Job` FOREIGN KEY (`job`) REFERENCES `Job` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT `Fk_Interviews_Candidates` FOREIGN KEY (`candidate`) REFERENCES `Candidates` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) engine=innodb default charset=utf8;
+
+
+create table `Calls` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `job` bigint(20) NOT NULL,
+  `candidate` bigint(20) DEFAULT NULL,
+  `phone` varchar(20) default null,
+  `created` DATETIME default '0000-00-00 00:00:00',
+  `updated` DATETIME default '0000-00-00 00:00:00',
+  `status` varchar(100) default null,
+  `notes` text DEFAULT NULL,
+  primary key  (`id`),
+  CONSTRAINT `Fk_Calls_Job` FOREIGN KEY (`job`) REFERENCES `Job` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT `Fk_Calls_Candidates` FOREIGN KEY (`candidate`) REFERENCES `Candidates` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) engine=innodb default charset=utf8;
+
+
+
+
+
+
+/* Add Missing Master Data */
+
+INSERT INTO `WorkDays` (`id`, `name`, `status`, `country`) VALUES
+  (1, 'Monday', 'Full Day',NULL),
+  (2, 'Tuesday', 'Full Day',NULL),
+  (3, 'Wednesday', 'Full Day',NULL),
+  (4, 'Thursday', 'Full Day',NULL),
+  (5, 'Friday', 'Full Day',NULL),
+  (6, 'Saturday', 'Non-working Day',NULL),
+  (7, 'Sunday', 'Non-working Day',NULL);
+
+
+
+
+REPLACE INTO `Settings` (`name`, `value`, `description`, `meta`) VALUES
+('System: Reset Module Names', '1', 'Select this to reset module names in Database','["value", {"label":"Value","type":"select","source":[["1","Yes"],["0","No"]]}]'),
+('Leave: Share Calendar to Whole Company', '1', '','["value", {"label":"Value","type":"select","source":[["1","Yes"],["0","No"]]}]'),
+('Leave: CC Emails', '',  'Every email sent though leave module will be CC to these comma seperated list of emails addresses',''),
+('Leave: BCC Emails', '',  'Every email sent though leave module will be BCC to these comma seperated list of emails addresses',''),
+('Api: REST Api Enabled', '1',  '','["value", {"label":"Value","type":"select","source":[["0","No"],["1","Yes"]]}]'),
+('Api: REST Api Token', 'Click on edit icon',  '','["value", {"label":"Value","type":"placeholder"}]');
+
+
+REPLACE INTO `Settings` (`name`, `value`, `description`, `meta`) VALUES
+  ('LDAP: Enabled', '0',  '','["value", {"label":"Value","type":"select","source":[["0","No"],["1","Yes"]]}]'),
+  ('LDAP: Server', '',  'LDAP Server IP or DNS',''),
+  ('LDAP: Port', '389',  'LDAP Server Port',''),
+  ('LDAP: Root DN', '',  'e.g: dc=mycompany,dc=net',''),
+  ('LDAP: Manager DN', '',  'e.g: cn=admin,dc=mycompany,dc=net',''),
+  ('LDAP: Manager Password', '',  'Password of the manager user',''),
+  ('LDAP: Version 3', '1',  'Are you using LDAP v3','["value", {"label":"Value","type":"select","source":[["1","Yes"],["0","No"]]}]'),
+  ('LDAP: User Filter', '',  'e.g: uid={}, we will replace {} with actual username provided by the user at the time of login','');
+
+REPLACE INTO `Settings` (`name`, `value`, `description`, `meta`) VALUES
+  ('Leave: Allow Indirect Admins to Approve', '0', 'Allow indirect admins to approve leave requests','["value", {"label":"Value","type":"select","source":[["1","Yes"],["0","No"]]}]');
+
+
+REPLACE INTO `Documents` (`id`, `name`, `details`, `expire_notification`, `expire_notification_month`, `expire_notification_week`, `expire_notification_day`,`sign`,`created`, `updated`) VALUES
+  (1, 'ID Copy', 'Your ID copy','Yes','Yes','Yes','Yes','No',NOW(), NOW()),
+  (2, 'Degree Certificate', 'Degree Certificate','Yes','Yes','Yes','Yes','Yes',NOW(), NOW()),
+  (3, 'Driving License', 'Driving License','Yes','Yes','Yes','Yes','Yes',NOW(), NOW());
+
+REPLACE INTO `HoliDays` (`id`, `name`, `dateh`, `status`) VALUES
+  (1, 'New Year''s Day', '2015-01-01', 'Full Day'),
+  (2, 'Christmas Day', '2015-12-25', 'Full Day');
+
+REPLACE INTO `LeavePeriods` (`id`, `name`, `date_start`, `date_end`, `status`) VALUES
+  (3, 'Year 2015', '2015-01-01', '2015-12-31', 'Active'),
+  (4, 'Year 2016', '2016-01-01', '2016-12-31', 'Active'),
+  (5, 'Year 2017', '2017-01-01', '2017-12-31', 'Active');
+
+REPLACE INTO `LeaveTypes` (`id`, `name`, `supervisor_leave_assign`, `employee_can_apply`, `apply_beyond_current`, `leave_accrue`, `carried_forward`, `default_per_year`) VALUES
+  (1, 'Annual leave', 'No', 'Yes', 'No', 'No', 'No', 14),
+  (2, 'Casual leave', 'Yes', 'Yes', 'No', 'No', 'No', 7),
+  (3, 'Medical leave', 'Yes', 'Yes', 'Yes', 'No', 'No', 7);
+
+REPLACE INTO `Courses` (`id`,`code`, `name`, `description`, `coordinator`, `trainer`, `trainer_info`, `paymentType`, `currency`, `cost`, `status`, `created`, `updated`) VALUES
+  (1,'C0001', 'Info Marketing', 'Learn how to Create and Outsource Info Marketing Products', 1, 'Tim Jhon', 'Tim Jhon has a background in business management and has been working with small business to establish their online presence','Company Sponsored','USD','55','Active',now(), now()),
+  (2,'C0002', 'People Management', 'Learn how to Manage People', 1, 'Tim Jhon', 'Tim Jhon has a background in business management and has been working with small business to establish their online presence','Company Sponsored','USD','59','Active',now(), now());
+
+REPLACE INTO `EmployementType` (`name`) VALUES
+  ('Full-time'),
+  ('Part-time'),
+  ('Contract'),
+  ('Temporary'),
+  ('Other');
+
+REPLACE INTO `Benifits` (`name`) VALUES
+  ('Retirement plan'),
+  ('Health plan'),
+  ('Life insurance'),
+  ('Paid vacations');
+
+
+
+REPLACE INTO `ExperienceLevel` (`name`) VALUES
+  ('Not Applicable'),
+  ('Internship'),
+  ('Entry level'),
+  ('Associate'),
+  ('Mid-Senior level'),
+  ('Director'),
+  ('Executive');
+
+REPLACE INTO `JobFunction` (`name`) VALUES
+  ('Accounting/Auditing'),
+  ('Administrative'),
+  ('Advertising'),
+  ('Business Analyst'),
+  ('Financial Analyst'),
+  ('Data Analyst'),
+  ('Art/Creative'),
+  ('Business Development'),
+  ('Consulting'),
+  ('Customer Service'),
+  ('Distribution'),
+  ('Design'),
+  ('Education'),
+  ('Engineering'),
+  ('Finance'),
+  ('General Business'),
+  ('Health Care Provider'),
+  ('Human Resources'),
+  ('Information Technology'),
+  ('Legal'),
+  ('Management'),
+  ('Manufacturing'),
+  ('Marketing'),
+  ('Other'),
+  ('Public Relations'),
+  ('Purchasing'),
+  ('Product Management'),
+  ('Project Management'),
+  ('Production'),
+  ('Quality Assurance'),
+  ('Research'),
+  ('Sales'),
+  ('Science'),
+  ('Strategy/Planning'),
+  ('Supply Chain'),
+  ('Training'),
+  ('Writing/Editing');
+
+
+REPLACE INTO `EducationLevel` (`name`) VALUES
+  ('Unspecified'),
+  ('High School or equivalent'),
+  ('Certification'),
+  ('Vocational'),
+  ('Associate Degree'),
+  ('Bachelor\'s Degree'),
+  ('Master\'s Degree'),
+  ('Doctorate'),
+  ('Professional'),
+  ('Some College Coursework Completed'),
+  ('Vocational - HS Diploma'),
+  ('Vocational - Degree'),
+  ('Some High School Coursework');
+
+
+REPLACE INTO `Crons` (`name`,`class`, `lastrun`, `frequency`, `time`, `type`, `status`) VALUES
+  ('Email Sender Task', 'EmailSenderTask', NULL, 1, 1, 'Minutely', 'Enabled'),
+  ('Document Expire Alert', 'DocumentExpiryNotificationTask', NULL, 1, (FLOOR( 1 + RAND( ) *58 )), 'Hourly', 'Enabled');
+
+
+REPLACE INTO `ExpensesPaymentMethods` (`name`) VALUES
+  ('Cash'),
+  ('Check'),
+  ('Credit Card'),
+  ('Debit Card');
+
+
+REPLACE INTO `ExpensesCategories` (`name`) VALUES
+  ('Auto - Gas'),
+  ('Auto - Insurance'),
+  ('Auto - Maintenance'),
+  ('Auto - Payment'),
+  ('Transportation'),
+  ('Bank Fees'),
+  ('Dining Out'),
+  ('Entertainment'),
+  ('Hotel / Motel'),
+  ('Insurance'),
+  ('Interest Charges'),
+  ('Loan Payment'),
+  ('Medical'),
+  ('Mileage'),
+  ('Rent'),
+  ('Rental Car'),
+  ('Utility');

core-ext/scripts/upgrade_v18.0.OS_v19.0.OS.sql

@@ -0,0 +1,194 @@
+REPLACE INTO `Reports` (`name`, `details`, `parameters`, `query`, `paramOrder`, `type`,`report_group`,`output`) VALUES
+    ('Overtime Report', 'This report list all employee attendance entries by employee with overtime calculations', '[\r\n[ "employee", {"label":"Employee","type":"select2multi","allow-null":true,"null-label":"All Employees","remote-source":["Employee","id","first_name+last_name"]}],\r\n[ "date_start", {"label":"Start Date","type":"date"}],\r\n[ "date_end", {"label":"End Date","type":"date"}]\r\n]', 'OvertimeReport', '["employee","date_start","date_end"]', 'Class','Time Management','CSV');
+
+REPLACE INTO `Reports` (`name`, `details`, `parameters`, `query`, `paramOrder`, `type`,`report_group`,`output`) VALUES
+    ('Overtime Summary Report', 'This report list all employee attendance entries by employee with overtime calculation summary', '[\r\n[ "employee", {"label":"Employee","type":"select2multi","allow-null":true,"null-label":"All Employees","remote-source":["Employee","id","first_name+last_name"]}],\r\n[ "date_start", {"label":"Start Date","type":"date"}],\r\n[ "date_end", {"label":"End Date","type":"date"}]\r\n]', 'OvertimeSummaryReport', '["employee","date_start","date_end"]', 'Class','Time Management','CSV');
+
+REPLACE INTO `Reports` (`name`, `details`, `parameters`, `query`, `paramOrder`, `type`,`report_group`,`output`) VALUES
+    ('Overtime Request Report',
+     'This report list employee overtime requests by employee, date range, overtime category and project',
+     '[[ "employee", {"label":"Employee","type":"select2multi","allow-null":true,"null-label":"All Employees","remote-source":["Employee","id","first_name+last_name"]}],[ "date_start", {"label":"Start Date","type":"date"}],[ "date_end", {"label":"End Date","type":"date"}],[ "category", {"label":"Category","type":"select2","allow-null":true,"remote-source":["OvertimeCategory","id","name"]}],[ "project", {"label":"Project","type":"select2","allow-null":true,"remote-source":["Project","id","name"]}],[ "status", {"label":"Status","type":"select","source":[["NULL","All Statuses"],["Approved","Approved"],["Pending","Pending"],["Rejected","Rejected"],["Cancellation Requested","Cancellation Requested"],["Cancelled","Cancelled"],["Processing","Processing"]]}]]', 'OvertimeRequestReport', '["employee","date_start","date_end","category","project"]', 'Class','Time Management','CSV');
+
+
+
+REPLACE INTO `Settings` (`name`, `value`, `description`, `meta`) VALUES
+    ('Overtime: Allow Indirect Admins to Approve', '0', 'Allow indirect admins to approve overtime requests','["value", {"label":"Value","type":"select","source":[["1","Yes"],["0","No"]]}]');
+
+REPLACE INTO `Settings` (`name`, `value`, `description`, `meta`) VALUES
+    ('Travel: Enable Multi Level Approvals', '0', 'Allow multi level approvals in travel module','["value", {"label":"Value","type":"select","source":[["1","Yes"],["0","No"]]}]');
+
+REPLACE INTO `Settings` (`name`, `value`, `description`, `meta`) VALUES
+    ('Overtime: Enable Multi Level Approvals', '0', 'Allow multi level approvals in overtime module','["value", {"label":"Value","type":"select","source":[["1","Yes"],["0","No"]]}]');
+
+REPLACE INTO `Settings` (`name`, `value`, `description`, `meta`) VALUES
+    ('System: Company Structure Managers Enabled', '0', 'Allow Managers to View Employees in Their Company Structure, if They are Assigned as a Head of the Company Structure',
+     '["value", {"label":"Value","type":"select","source":[["1","Yes"],["0","No"]]}]');
+
+
+REPLACE INTO `Settings` (`name`, `value`, `description`, `meta`) VALUES
+    ('System: Child Company Structure Managers Enabled', '0', 'Allow Managers to View Employees in Their Company Structure and all Child Company Structures, if They are Assigned as a Head of the Company Structure',
+     '["value", {"label":"Value","type":"select","source":[["1","Yes"],["0","No"]]}]');
+
+
+
+delete from PayrollColumns;
+
+
+INSERT INTO `PayrollColumns` (`id`,`name`,`calculation_hook`,`salary_components`,`deductions`,`add_columns`,`sub_columns`,`editable`,`enabled`,`default_value`,`calculation_columns`,`calculation_function`) VALUES
+    (1,'Total Hours','AttendanceUtil_getTimeWorkedHours','','','','','No','Yes','0.00',NULL,NULL),
+    (2,'Regular Hours','AttendanceUtil_getRegularWorkedHours','','','','','No','Yes','0.00',NULL,NULL),
+    (3,'Overtime Hours','AttendanceUtil_getOverTimeWorkedHours','','','','','No','Yes','0.00',NULL,NULL),
+    (4,'Leave Hours','LeaveUtil_getLeaveHours','','','','','No','Yes','0.00',NULL,NULL);
+
+
+delete from DataImport where name = 'Sage50 Import - Employee Data';
+
+INSERT INTO `DataImport` (`name`, `dataType`, `details`, `columns`, `updated`, `created`) VALUES
+    ('Employee Data Import', 'EmployeeDataImporter', '', '[{"name":"employee_id","title":"","type":"Normal","dependOn":"NULL","dependOnField":"","isKeyField":"No","idField":"Yes","id":"columns_7"},{"name":"first_name","title":"","type":"Normal","dependOn":"NULL","dependOnField":"","isKeyField":"No","idField":"No","id":"columns_3"},{"name":"middle_name","title":"","type":"Normal","dependOn":"NULL","dependOnField":"","isKeyField":"No","idField":"No","id":"columns_5"},{"name":"last_name","title":"","type":"Normal","dependOn":"NULL","dependOnField":"","isKeyField":"No","idField":"No","id":"columns_6"},{"name":"address1","title":"Address1","type":"Normal","dependOn":"NULL","dependOnField":"","isKeyField":"No","idField":"No","id":"columns_8"},{"name":"address2","title":"Address2","type":"Normal","dependOn":"NULL","dependOnField":"","isKeyField":"No","idField":"No","id":"columns_9"},{"name":"home_phone","title":"","type":"Normal","dependOn":"NULL","dependOnField":"","isKeyField":"No","idField":"No","id":"columns_14"},{"name":"mobile_phone","title":"","type":"Normal","dependOn":"NULL","dependOnField":"","isKeyField":"No","idField":"No","id":"columns_15"},{"name":"work_email","title":"","type":"Normal","dependOn":"NULL","dependOnField":"","isKeyField":"No","idField":"No","id":"columns_16"},{"name":"gender","title":"","type":"Normal","dependOn":"NULL","dependOnField":"","isKeyField":"No","idField":"No","id":"columns_17"},{"name":"marital_status","title":"","type":"Normal","dependOn":"NULL","dependOnField":"","isKeyField":"No","idField":"No","id":"columns_18"},{"name":"birthday","title":"","type":"Normal","dependOn":"NULL","dependOnField":"","isKeyField":"No","idField":"No","id":"columns_20"},{"name":"nationality","title":"Nationality","type":"Reference","dependOn":"Nationality","dependOnField":"name","isKeyField":"Yes","idField":"No","id":"columns_22"},{"name":"ethnicity","title":"Ethnicity","type":"Normal","dependOn":"Ethnicity","dependOnField":"name","isKeyField":"Yes","idField":"No","id":"columns_23"},{"name":"EmergencyContact/name","title":"","type":"Attached","dependOn":"EmergencyContact","dependOnField":"name","isKeyField":"Yes","idField":"No","id":"columns_24"},{"name":"EmergencyContact/relationship","title":"","type":"Attached","dependOn":"EmergencyContact","dependOnField":"relationship","isKeyField":"No","idField":"No","id":"columns_25"},{"name":"EmergencyContact/home_phone","title":"","type":"Attached","dependOn":"EmergencyContact","dependOnField":"home_phone","isKeyField":"No","idField":"No","id":"columns_26"},{"name":"ssn_num","title":"","type":"Normal","dependOn":"NULL","dependOnField":"","isKeyField":"No","idField":"No","id":"columns_31"},{"name":"job_title","title":"","type":"Reference","dependOn":"JobTitle","dependOnField":"name","isKeyField":"Yes","idField":"No","id":"columns_32"},{"name":"employment_status","title":"","type":"Reference","dependOn":"EmploymentStatus","dependOnField":"name","isKeyField":"Yes","idField":"No","id":"columns_33"},{"name":"joined_date","title":"","type":"Normal","dependOn":"NULL","dependOnField":"","isKeyField":"No","idField":"No","id":"columns_36"},{"name":"department","title":"","type":"Reference","dependOn":"CompanyStructure","dependOnField":"title","isKeyField":"Yes","idField":"No","id":"columns_38"}]', '2016-06-02 18:56:32', '2016-06-02 18:56:32'),
+    ('Attendance Data Import', 'AttendanceDataImporter', '', '[{"name":"employee","title":"","type":"Reference","dependOn":"Employee","dependOnField":"employee_id","isKeyField":"Yes","idField":"No","id":"columns_1"},{"name":"in_time","title":"","type":"Normal","dependOn":"NULL","dependOnField":"","isKeyField":"No","idField":"No","id":"columns_2"},{"name":"out_time","title":"","type":"Normal","dependOn":"NULL","dependOnField":"","isKeyField":"No","idField":"No","id":"columns_3"},{"name":"note","title":"","type":"Normal","dependOn":"NULL","dependOnField":"","isKeyField":"No","idField":"No","id":"columns_4"}]', '2016-08-14 02:51:56', '2016-08-14 02:51:56');
+
+
+
+REPLACE INTO `UserReports` (`name`, `details`, `parameters`, `query`, `paramOrder`, `type`,`report_group`,`output`) VALUES
+    ('Overtime Report', 'This report list all employee attendance entries by employee with overtime calculations', '[\r\n[ "date_start", {"label":"Start Date","type":"date"}],\r\n[ "date_end", {"label":"End Date","type":"date"}]\r\n]', 'OvertimeReport', '["employee","date_start","date_end"]', 'Class','Time Management','CSV');
+
+REPLACE INTO `UserReports` (`name`, `details`, `parameters`, `query`, `paramOrder`, `type`,`report_group`,`output`) VALUES
+    ('Overtime Summary Report', 'This report list all employee attendance entries by employee with overtime calculation summary', '[\r\n[ "date_start", {"label":"Start Date","type":"date"}],\r\n[ "date_end", {"label":"End Date","type":"date"}]\r\n]', 'OvertimeSummaryReport', '["date_start","date_end"]', 'Class','Time Management','CSV');
+
+REPLACE INTO `UserReports` (`name`, `details`, `parameters`, `query`, `paramOrder`, `type`,`report_group`,`output`) VALUES
+    ('Client Project Time Report', 'View your time entries for projects under a given client',
+     '[\r\n[ "client", {"label":"Select Client","type":"select","allow-null":false,"remote-source":["Client","id","name"]}],\r\n[ "date_start", {"label":"Start Date","type":"date"}],\r\n[ "date_end", {"label":"End Date","type":"date"}]\r\n]',
+     'ClientProjectTimeReport', '["client","date_start","date_end","status"]', 'Class','Time Management','PDF');
+
+REPLACE INTO `UserReports` (`name`, `details`, `parameters`, `query`, `paramOrder`, `type`,`report_group`,`output`) VALUES
+    ('Download Payslips', 'Download your payslips',
+     '[\r\n[ "payroll", {"label":"Select Payroll","type":"select","allow-null":false,"remote-source":["Payroll","id","name","getEmployeePayrolls"]}]]',
+     'PayslipReport', '["payroll"]', 'Class','Finance','PDF');
+
+
+
+
+
+INSERT INTO `DeductionGroup` VALUES
+    (1,'Sri Lanka Payroll Calculation','');
+
+
+
+
+
+INSERT INTO `PayslipTemplates` (`id`, `name`, `data`, `status`, `created`, `updated`) VALUES
+    (1, 'Sri Lanka - Default Payslip', '[{"type":"Company Logo","payrollColumn":"NULL","label":"","text":"","fontSize":"Normal","fontStyle":"Normal","fontColor":"#000000","status":"Show","id":"data_1"},{"type":"Company Name","payrollColumn":"NULL","label":"","text":"","fontSize":"Normal","fontStyle":"Normal","fontColor":"","status":"Show","id":"data_2"},{"type":"Separators","payrollColumn":"NULL","label":"","text":"","fontSize":"Normal","fontStyle":"Normal","fontColor":"","status":"Show","id":"data_8"},{"type":"Payroll Column","payrollColumn":"5","label":"Basic Salary","text":"","status":"Show","id":"data_3"},{"type":"Payroll Column","payrollColumn":"6","label":"Fixed Allowance","text":"","status":"Show","id":"data_4"},{"type":"Payroll Column","payrollColumn":"7","label":"Gross Pay","text":"","status":"Show","id":"data_11"},{"type":"Separators","payrollColumn":"NULL","label":"","text":"","fontSize":"Normal","fontStyle":"Normal","fontColor":"","status":"Show","id":"data_9"},{"type":"Text","payrollColumn":"NULL","label":"","text":"Deductions","status":"Show","id":"data_13"},{"type":"Payroll Column","payrollColumn":"8","label":"EPF Employee Contribution","text":"","status":"Show","id":"data_6"},{"type":"Payroll Column","payrollColumn":"13","label":"PAYE Tax","text":"","status":"Show","id":"data_14"},{"type":"Payroll Column","payrollColumn":"14","label":"Stamp Duty","text":"","status":"Show","id":"data_15"},{"type":"Payroll Column","payrollColumn":"15","label":"Total Deductions","text":"","status":"Show","id":"data_16"},{"type":"Separators","payrollColumn":"NULL","label":"","text":"","status":"Show","id":"data_17"},{"type":"Text","payrollColumn":"NULL","label":"","text":"Employer Contributions","status":"Show","id":"data_18"},{"type":"Payroll Column","payrollColumn":"9","label":"EPF Employer Contribution","text":"","status":"Show","id":"data_19"},{"type":"Payroll Column","payrollColumn":"7","label":"ETF Employer Contribution","text":"","status":"Show","id":"data_20"},{"type":"Separators","payrollColumn":"7","label":"","text":"","status":"Show","id":"data_21"},{"type":"Text","payrollColumn":"7","label":"","text":"Totals","status":"Show","id":"data_22"},{"type":"Payroll Column","payrollColumn":"11","label":"Total EPF 20%","text":"","status":"Show","id":"data_23"},{"type":"Payroll Column","payrollColumn":"12","label":"Total for PAYE","text":"","status":"Show","id":"data_24"},{"type":"Payroll Column","payrollColumn":"16","label":"Net Salary","text":"","status":"Show","id":"data_25"}]', NULL, '2016-06-29 22:07:12', '2016-06-29 22:07:12');
+
+INSERT INTO `Payroll` VALUES
+    (1,'Sri Lanka Payroll Sample',4,1,NULL,'[\"5\",\"8\",\"9\",\"10\",\"6\",\"7\",\"11\",\"12\",\"13\",\"14\",\"15\",\"16\"]','2016-03-01','2016-03-31','Draft', 1);
+
+INSERT INTO `PayrollColumns` VALUES
+    (5,'LK - Basic Salary',NULL,'[\"1\"]','[]','[]','[]',5,'No','Yes','0.00',NULL,NULL),
+    (6,'LK - Fixed Allowance',NULL,'[\"2\"]','[]','[]','[]',6,'No','Yes','0.00',NULL,NULL),
+    (7,'LK - Gross Pay',NULL,'[]','[]','[\"5\",\"6\"]','[]',7,'No','Yes','0.00',NULL,NULL),
+    (8,'LK - EPF Employee Contribution',NULL,'[]','[\"1\"]','[]','[]',8,'No','Yes','0.00',NULL,NULL),
+    (9,'LK - EPF Employer Contribution',NULL,'[]','[\"2\"]','[]','[]',9,'No','Yes','0.00',NULL,NULL),
+    (10,'LK - ETF Employer Contribution',NULL,'[]','[\"3\"]','[]','[]',10,'No','Yes','0.00',NULL,NULL),
+    (11,'LK - Total EPF 20%',NULL,'[]','[]','[\"8\",\"9\"]','[]',11,'No','Yes','0.00',NULL,NULL),
+    (12,'LK - Total for PAYE',NULL,'[]','[]','[\"7\"]','[]',12,'No','Yes','0.00',NULL,NULL),
+    (13,'LK - PAYE Tax',NULL,'[]','[\"4\"]','[]','[]',13,'No','Yes','0.00',NULL,NULL),
+    (14,'LK - Stamp Duty',NULL,'[]','[\"5\"]','[]','[]',14,'No','Yes','0.00',NULL,NULL),
+    (15,'LK - Total Deductions',NULL,'[]','[]','[\"8\",\"13\",\"14\"]','[]',15,'No','Yes','0.00',NULL,NULL),
+    (16,'LK - Salary to Bank',NULL,'[]','[]','[\"7\"]','[\"15\"]',16,'No','Yes','0.00',NULL,NULL);
+
+INSERT INTO `Deductions` VALUES
+    (1,'EPF Employee Contribution','[]','[]',7,'[{\"lowerCondition\":\"No Lower Limit\",\"lowerLimit\":\"0\",\"upperCondition\":\"No Upper Limit\",\"upperLimit\":\"0\",\"amount\":\"X*0.08\",\"id\":\"rangeAmounts_1\"}]',1),
+    (2,'EPF Employer Contribution','[]','[]',7,'[{\"lowerCondition\":\"No Lower Limit\",\"lowerLimit\":\"0\",\"upperCondition\":\"No Upper Limit\",\"upperLimit\":\"0\",\"amount\":\"X*0.12\",\"id\":\"rangeAmounts_1\"}]',1),
+    (3,'ETF Employer Contribution','[]','[]',7,'[{\"lowerCondition\":\"No Lower Limit\",\"lowerLimit\":\"0\",\"upperCondition\":\"No Upper Limit\",\"upperLimit\":\"0\",\"amount\":\"X*0.03\",\"id\":\"rangeAmounts_1\"}]',1),
+    (4,'PAYE Tax','[]','[]',12,'[{\"lowerCondition\":\"No Lower Limit\",\"lowerLimit\":\"0\",\"upperCondition\":\"lte\",\"upperLimit\":\"62500\",\"amount\":\"0\",\"id\":\"rangeAmounts_1\"},{\"lowerCondition\":\"gt\",\"lowerLimit\":\"62500\",\"upperCondition\":\"lte\",\"upperLimit\":\"104167\",\"amount\":\"X*0.04 - 2500\",\"id\":\"rangeAmounts_2\"},{\"lowerCondition\":\"gt\",\"lowerLimit\":\"104167\",\"upperCondition\":\"lte\",\"upperLimit\":\"145833\",\"amount\":\"X*0.08 - 6667\",\"id\":\"rangeAmounts_3\"},{\"lowerCondition\":\"gt\",\"lowerLimit\":\"145833\",\"upperCondition\":\"lte\",\"upperLimit\":\"187500\",\"amount\":\"X*0.12-12500\",\"id\":\"rangeAmounts_4\"},{\"lowerCondition\":\"gt\",\"lowerLimit\":\"187500\",\"upperCondition\":\"No Upper Limit\",\"upperLimit\":\"0\",\"amount\":\"X*0.16 - 20000\",\"id\":\"rangeAmounts_5\"}]',1),
+    (5,'Stamp Duty','[]','[]',12,'[{\"lowerCondition\":\"No Lower Limit\",\"lowerLimit\":\"0\",\"upperCondition\":\"lte\",\"upperLimit\":\"25000\",\"amount\":\"0\",\"id\":\"rangeAmounts_1\"},{\"lowerCondition\":\"gt\",\"lowerLimit\":\"25000\",\"upperCondition\":\"No Upper Limit\",\"upperLimit\":\"0\",\"amount\":\"25\",\"id\":\"rangeAmounts_2\"}]',1);
+
+
+INSERT INTO `DeductionGroup` VALUES
+    (2,'Ghana Payroll Calculation','');
+
+INSERT INTO `PayslipTemplates` VALUES
+    (2,'Ghana Default','[{\"type\":\"Company Name\",\"payrollColumn\":\"NULL\",\"label\":\"\",\"text\":\"\",\"status\":\"Show\",\"id\":\"data_1\"},{\"type\":\"Separators\",\"payrollColumn\":\"NULL\",\"label\":\"\",\"text\":\"\",\"status\":\"Show\",\"id\":\"data_3\"},{\"type\":\"Payroll Column\",\"payrollColumn\":\"105\",\"label\":\"\",\"text\":\"\",\"status\":\"Show\",\"id\":\"data_4\"},{\"type\":\"Payroll Column\",\"payrollColumn\":\"106\",\"label\":\"\",\"text\":\"\",\"status\":\"Show\",\"id\":\"data_5\"},{\"type\":\"Payroll Column\",\"payrollColumn\":\"107\",\"label\":\"\",\"text\":\"\",\"status\":\"Show\",\"id\":\"data_6\"},{\"type\":\"Payroll Column\",\"payrollColumn\":\"112\",\"label\":\"Total\",\"text\":\"\",\"status\":\"Show\",\"id\":\"data_7\"},{\"type\":\"Separators\",\"payrollColumn\":\"NULL\",\"label\":\"\",\"text\":\"\",\"status\":\"Show\",\"id\":\"data_8\"},{\"type\":\"Text\",\"payrollColumn\":\"NULL\",\"label\":\"\",\"text\":\"Deductions \",\"status\":\"Show\",\"id\":\"data_9\"},{\"type\":\"Payroll Column\",\"payrollColumn\":\"109\",\"label\":\"SSNIT (5.5%)\",\"text\":\"\",\"status\":\"Show\",\"id\":\"data_10\"},{\"type\":\"Payroll Column\",\"payrollColumn\":\"113\",\"label\":\"Tax (1st Level 5%)\",\"text\":\"\",\"status\":\"Show\",\"id\":\"data_11\"},{\"type\":\"Payroll Column\",\"payrollColumn\":\"114\",\"label\":\"Tax (2nd Level 10%)\",\"text\":\"\",\"status\":\"Show\",\"id\":\"data_12\"},{\"type\":\"Payroll Column\",\"payrollColumn\":\"115\",\"label\":\"Tax (3rd Level 17.5%)\",\"text\":\"\",\"status\":\"Show\",\"id\":\"data_13\"},{\"type\":\"Payroll Column\",\"payrollColumn\":\"120\",\"label\":\"Tax (4th Level 25%)\",\"text\":\"\",\"status\":\"Show\",\"id\":\"data_14\"},{\"type\":\"Payroll Column\",\"payrollColumn\":\"121\",\"label\":\"Overtime Allow. Tax (5%)\",\"text\":\"\",\"status\":\"Show\",\"id\":\"data_15\"},{\"type\":\"Payroll Column\",\"payrollColumn\":\"122\",\"label\":\"Total (PAYE Tax)\",\"text\":\"\",\"status\":\"Show\",\"id\":\"data_16\"},{\"type\":\"Separators\",\"payrollColumn\":\"NULL\",\"label\":\"\",\"text\":\"\",\"status\":\"Show\",\"id\":\"data_17\"},{\"type\":\"Payroll Column\",\"payrollColumn\":\"123\",\"label\":\"Sub Total\",\"text\":\"\",\"status\":\"Show\",\"id\":\"data_18\"},{\"type\":\"Separators\",\"payrollColumn\":\"NULL\",\"label\":\"\",\"text\":\"\",\"status\":\"Show\",\"id\":\"data_19\"},{\"type\":\"Payroll Column\",\"payrollColumn\":\"125\",\"label\":\"Netto Monthly Salary\",\"text\":\"\",\"status\":\"Show\",\"id\":\"data_20\"}]',NULL,'2016-08-30 21:53:13','2016-08-30 21:53:13');
+
+
+INSERT INTO `Payroll` VALUES
+    (6,'Ghana Payroll Sample',4,1,NULL,'[\"123\",\"125\",\"106\",\"124\",\"113\",\"114\",\"115\",\"121\",\"107\",\"120\",\"109\",\"105\",\"112\",\"108\",\"122\"]','2016-08-01','2016-08-31','Draft',2);
+
+
+INSERT INTO `PayrollColumns` VALUES
+    (105,'GH - Salary (Basic)',NULL,'[\"1\"]','[]','[]','[]',1,'No','Yes','0.00','',''),
+    (106,'GH - Housing Allowance',NULL,'[]','[\"101\"]','[]','[]',2,'No','Yes','0.00','',''),
+    (107,'GH - Overtime Allowance',NULL,'[]','[\"102\"]','[]','[]',3,'No','Yes','0.00','',''),
+    (108,'GH - Total',NULL,'[]','[]','[\"106\",\"107\",\"105\"]','[]',4,'No','Yes','0.00','',''),
+    (109,'GH - SSNIT',NULL,'[]','[\"103\"]','[]','[]',5,'No','Yes','0.00','',''),
+    (112,'GH - Taxable Income',NULL,'[]','[]','[\"106\",\"105\"]','[\"109\"]',7,'No','Yes','0.00','',''),
+    (113,'GH - Next 108 GHC',NULL,'[]','[\"106\"]','[]','[]',9,'No','Yes','0.00','',''),
+    (114,'GH - Next 151 GHC',NULL,'[]','[\"107\"]','[]','[]',10,'No','Yes','0.00','',''),
+    (115,'GH - Next 2765 GHC',NULL,'[]','[\"108\"]','[]','[]',11,'No','Yes','0.00','',''),
+    (120,'GH - Remaining after 3240 GHC',NULL,'[]','[\"111\"]','[]','[]',12,'No','Yes','0.00','',''),
+    (121,'GH - Overtime Allow. Tax',NULL,'[]','[]','[]','[]',13,'No','Yes','0.00','[{\"name\":\"O\",\"column\":\"107\",\"id\":\"calculation_columns_1\"}]','O*0.05'),
+    (122,'GH - Total (PAYE Tax)',NULL,'[]','[]','[\"113\",\"114\",\"115\",\"120\",\"121\"]','[]',14,'No','Yes','0.00','',''),
+    (123,'GH - Deductions - Sub Total',NULL,'[]','[]','[\"109\",\"122\"]','[]',15,'No','Yes','0.00','',''),
+    (125,'GH - Final Total',NULL,'[]','[]','[\"108\"]','[\"123\"]',16,'No','Yes','0.00','','');
+
+
+INSERT INTO `Deductions` VALUES
+    (101,'Housing Allowance (10%)','[]','[\"1\"]',NULL,'[{\"lowerCondition\":\"No Lower Limit\",\"lowerLimit\":0,\"upperCondition\":\"No Upper Limit\",\"upperLimit\":0,\"amount\":\"X*0.1\",\"id\":\"rangeAmounts_1\"}]',2),
+    (102,'Overtime Allowance (10%)','[]','[\"1\"]',NULL,'[{\"lowerCondition\":\"No Lower Limit\",\"lowerLimit\":0,\"upperCondition\":\"No Upper Limit\",\"upperLimit\":0,\"amount\":\"X*0.1\",\"id\":\"rangeAmounts_1\"}]',2),
+    (103,'SSNIT','[]','[\"1\"]',NULL,'[{\"lowerCondition\":\"No Lower Limit\",\"lowerLimit\":0,\"upperCondition\":\"No Upper Limit\",\"upperLimit\":0,\"amount\":\"X*0.055\",\"id\":\"rangeAmounts_1\"}]',2),
+    (104,'Tax - Ghana','[]','[]',NULL,'',2),
+    (106,'Next 108 GHC','[]','[]',112,'[{\"lowerCondition\":\"gte\",\"lowerLimit\":\"216\",\"upperCondition\":\"lt\",\"upperLimit\":\"324\",\"amount\":\"X*0.05\",\"id\":\"rangeAmounts_1\"},{\"lowerCondition\":\"gte\",\"lowerLimit\":\"324\",\"upperCondition\":\"No Upper Limit\",\"upperLimit\":0,\"amount\":\"5.4\",\"id\":\"rangeAmounts_2\"}]',2),
+    (107,'Next 151 GHC','[]','[]',112,'[{\"lowerCondition\":\"gte\",\"lowerLimit\":\"324\",\"upperCondition\":\"lt\",\"upperLimit\":\"475\",\"amount\":\"(X-324) * 0.1\",\"id\":\"rangeAmounts_1\"},{\"lowerCondition\":\"gte\",\"lowerLimit\":\"259\",\"upperCondition\":\"No Upper Limit\",\"upperLimit\":0,\"amount\":\"15.10\",\"id\":\"rangeAmounts_2\"}]',2),
+    (108,'Next 2765 GHC','[]','[]',112,'[{\"lowerCondition\":\"gte\",\"lowerLimit\":\"475\",\"upperCondition\":\"lt\",\"upperLimit\":\"3240\",\"amount\":\"(X - 475) * 0.175\",\"id\":\"rangeAmounts_1\"},{\"lowerCondition\":\"gte\",\"lowerLimit\":\"3240\",\"upperCondition\":\"No Upper Limit\",\"upperLimit\":0,\"amount\":\"483.88\",\"id\":\"rangeAmounts_2\"}]',2),
+    (111,'Remaining after 3240 GHC','[]','[]',112,'[{\"lowerCondition\":\"gte\",\"lowerLimit\":\"3240\",\"upperCondition\":\"No Upper Limit\",\"upperLimit\":0,\"amount\":\"(X-3240)*0.25\",\"id\":\"rangeAmounts_1\"}]',2);
+
+
+
+
+ALTER table `Files` add column `size` bigint(20) NULL;
+
+ALTER table `Files` add column `size_text` varchar(20) NULL;
+
+ALTER table `CompanyDocuments` add column `share_departments` varchar(100) NULL;
+ALTER table `CompanyDocuments` add column `share_employees` varchar(100) NULL;
+ALTER table `CompanyDocuments` add column `share_userlevel` varchar(100) NULL;
+ALTER table `CompanyDocuments` modify column `share_userlevel` varchar(100) NULL;
+
+ALTER table `Notifications` add column `employee` bigint(20) NULL;
+
+create table `Forms` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `name` varchar(50) NOT NULL,
+  `description` varchar(500) NULL,
+  `items` text NULL,
+  `created` timestamp NULL default '0000-00-00 00:00:00',
+  `updated` timestamp NULL default '0000-00-00 00:00:00',
+  primary key  (`id`)
+) engine=innodb default charset=utf8;
+
+create table `EmployeeForms` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `employee` bigint(20) NOT NULL,
+  `form` bigint(20) NOT NULL,
+  `status` enum('Pending','Completed') default 'Pending',
+  `created` timestamp NULL default '0000-00-00 00:00:00',
+  `updated` timestamp NULL default '0000-00-00 00:00:00',
+  CONSTRAINT `Fk_EmployeeForms_Employee` FOREIGN KEY (`employee`) REFERENCES `Employees` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT `Fk_EmployeeForms_Forms` FOREIGN KEY (`form`) REFERENCES `Forms` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  primary key  (`id`)
+) engine=innodb default charset=utf8;
+
+create table `Migrations` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `file` varchar(50) NOT NULL,
+  `version` int(11) NOT NULL,
+  `created` DATETIME default '0000-00-00 00:00:00',
+  `updated` DATETIME default '0000-00-00 00:00:00',
+  `status` enum('Pending','Up','Down','UpError','DownError') default 'Pending',
+  `last_error` varchar(500) NULL,
+primary key  (`id`),
+unique key `KEY_Migrations_file` (`file`),
+index `KEY_Migrations_status` (`status`),
+index `KEY_Migrations_version` (`version`)
+) engine=innodb default charset=utf8;
+

deployment/clients/dev/config.php

@@ -0,0 +1,18 @@
+<?php 
+ini_set('error_log', 'data/icehrm.log');
+
+define('CLIENT_NAME', 'icehrmpro');
+define('APP_BASE_PATH', '/vagrant/build/app/');
+define('CLIENT_BASE_PATH', '/vagrant/deployment/clients/dev/');
+define('BASE_URL','http://app.app.dev/');
+define('CLIENT_BASE_URL','http://clients.app.dev/dev/');
+
+define('APP_DB', 'dev');
+define('APP_USERNAME', 'dev');
+define('APP_PASSWORD', 'dev');
+define('APP_HOST', 'localhost');
+define('APP_CON_STR', 'mysqli://'.APP_USERNAME.':'.APP_PASSWORD.'@'.APP_HOST.'/'.APP_DB);
+
+//file upload
+define('FILE_TYPES', 'jpg,png,jpeg');
+define('MAX_FILE_SIZE_KB', 10 * 1024);

deployment/clients/dev/cron.php

@@ -0,0 +1,7 @@
+<?php
+if(php_sapi_name() != 'cli'){
+    exit();
+}
+
+include ('config.php');
+include (APP_BASE_PATH.'crons/cron.php');

deployment/clients/dev/data.php

@@ -0,0 +1,3 @@
+<?php
+include ('config.php');
+include (APP_BASE_PATH.'data.php');

deployment/clients/dev/data/sample

@@ -0,0 +1 @@
+Test File

deployment/clients/dev/entry.php

@@ -0,0 +1,18 @@
+<?php
+include ('config.php');
+if(!isset($_REQUEST['g']) || !isset($_REQUEST['n'])){
+header("Location:".CLIENT_BASE_URL."login.php");	
+exit();
+}
+$group = $_REQUEST['g'];
+$name= $_REQUEST['n'];
+
+$groups = array('admin','modules');
+
+if($group == 'admin' || $group == 'modules'){
+	$name = str_replace("..","",$name);	
+	$name = str_replace("/","",$name);
+	include APP_BASE_PATH.'/'.$group.'/'.$name.'/entry.php';
+}else{
+	exit();
+}

deployment/clients/dev/fileupload.php

@@ -0,0 +1,3 @@
+<?php
+include ('config.php');
+include (APP_BASE_PATH.'fileupload.php');

deployment/clients/dev/fileupload_page.php

@@ -0,0 +1,3 @@
+<?php
+include ('config.php');
+include (APP_BASE_PATH.'fileupload_page.php');

deployment/clients/dev/header.php

@@ -0,0 +1,3 @@
+<?php
+
+include (APP_BASE_PATH.'header.php');

deployment/clients/dev/index.php

@@ -0,0 +1,22 @@
+<?php
+if(!file_exists('config.php')){
+	header("Location:install/");
+	exit();
+}
+include ('config.php');
+if(!isset($_REQUEST['g']) || !isset($_REQUEST['n'])){
+header("Location:".CLIENT_BASE_URL."login.php");	
+exit();
+}
+$group = $_REQUEST['g'];
+$name= $_REQUEST['n'];
+
+$groups = array('admin','modules');
+
+if($group == 'admin' || $group == 'modules'){
+	$name = str_replace("..","",$name);	
+	$name = str_replace("/","",$name);
+	include APP_BASE_PATH.'/'.$group.'/'.$name.'/index.php';
+}else{
+	exit();
+}

deployment/clients/dev/login.php

@@ -0,0 +1,3 @@
+<?php
+include ('config.php');
+include (APP_BASE_PATH.'login.php');

deployment/clients/dev/logout.php

@@ -0,0 +1,3 @@
+<?php
+include ('config.php');
+include (APP_BASE_PATH.'logout.php');

deployment/clients/dev/rest.php

@@ -0,0 +1,3 @@
+<?php
+include ('config.php');
+include (APP_BASE_PATH.'rest.php');

deployment/clients/dev/service.php

@@ -0,0 +1,3 @@
+<?php
+include ('config.php');
+include (APP_BASE_PATH.'service.php');

deployment/clients/dev/update.php

@@ -0,0 +1,18 @@
+<?php
+include ('config.php');
+if(!isset($_REQUEST['g']) || !isset($_REQUEST['n'])){
+    header("Location:".CLIENT_BASE_URL."login.php");
+    exit();
+}
+$group = $_REQUEST['g'];
+$name= $_REQUEST['n'];
+
+$groups = array('admin','modules');
+
+if($group == 'admin' || $group == 'modules'){
+    $name = str_replace("..","",$name);
+    $name = str_replace("/","",$name);
+    include APP_BASE_PATH.'/'.$group.'/'.$name.'/update.php';
+}else{
+    exit();
+}

deployment/clients/test/config.php

@@ -0,0 +1,18 @@
+<?php 
+ini_set('error_log', 'data/icehrm.log');
+
+define('CLIENT_NAME', 'icehrmpro');
+define('APP_BASE_PATH', '/vagrant/build/app/');
+define('CLIENT_BASE_PATH', '/vagrant/deployment/clients/test/');
+define('BASE_URL','http://app.app.dev/');
+define('CLIENT_BASE_URL','http://clients.app.dev/test/');
+
+define('APP_DB', 'testing');
+define('APP_USERNAME', 'testing');
+define('APP_PASSWORD', 'testing');
+define('APP_HOST', 'localhost');
+define('APP_CON_STR', 'mysqli://'.APP_USERNAME.':'.APP_PASSWORD.'@'.APP_HOST.'/'.APP_DB);
+
+//file upload
+define('FILE_TYPES', 'jpg,png,jpeg');
+define('MAX_FILE_SIZE_KB', 10 * 1024);

deployment/clients/test/cron.php

@@ -0,0 +1,7 @@
+<?php
+if(php_sapi_name() != 'cli'){
+    exit();
+}
+
+include ('config.php');
+include (APP_BASE_PATH.'crons/cron.php');

deployment/clients/test/data.php

@@ -0,0 +1,3 @@
+<?php
+include ('config.php');
+include (APP_BASE_PATH.'data.php');

deployment/clients/test/data/sample

@@ -0,0 +1 @@
+Test File

deployment/clients/test/entry.php

@@ -0,0 +1,18 @@
+<?php
+include ('config.php');
+if(!isset($_REQUEST['g']) || !isset($_REQUEST['n'])){
+header("Location:".CLIENT_BASE_URL."login.php");	
+exit();
+}
+$group = $_REQUEST['g'];
+$name= $_REQUEST['n'];
+
+$groups = array('admin','modules');
+
+if($group == 'admin' || $group == 'modules'){
+	$name = str_replace("..","",$name);	
+	$name = str_replace("/","",$name);
+	include APP_BASE_PATH.'/'.$group.'/'.$name.'/entry.php';
+}else{
+	exit();
+}

deployment/clients/test/fileupload.php

@@ -0,0 +1,3 @@
+<?php
+include ('config.php');
+include (APP_BASE_PATH.'fileupload.php');

deployment/clients/test/fileupload_page.php

@@ -0,0 +1,3 @@
+<?php
+include ('config.php');
+include (APP_BASE_PATH.'fileupload_page.php');

deployment/clients/test/header.php

@@ -0,0 +1,3 @@
+<?php
+
+include (APP_BASE_PATH.'header.php');

deployment/clients/test/index.php

@@ -0,0 +1,22 @@
+<?php
+if(!file_exists('config.php')){
+	header("Location:install/");
+	exit();
+}
+include ('config.php');
+if(!isset($_REQUEST['g']) || !isset($_REQUEST['n'])){
+header("Location:".CLIENT_BASE_URL."login.php");	
+exit();
+}
+$group = $_REQUEST['g'];
+$name= $_REQUEST['n'];
+
+$groups = array('admin','modules');
+
+if($group == 'admin' || $group == 'modules'){
+	$name = str_replace("..","",$name);	
+	$name = str_replace("/","",$name);
+	include APP_BASE_PATH.'/'.$group.'/'.$name.'/index.php';
+}else{
+	exit();
+}

deployment/clients/test/login.php

@@ -0,0 +1,3 @@
+<?php
+include ('config.php');
+include (APP_BASE_PATH.'login.php');

deployment/clients/test/logout.php

@@ -0,0 +1,3 @@
+<?php
+include ('config.php');
+include (APP_BASE_PATH.'logout.php');

deployment/clients/test/rest.php

@@ -0,0 +1,3 @@
+<?php
+include ('config.php');
+include (APP_BASE_PATH.'rest.php');

deployment/clients/test/service.php

@@ -0,0 +1,3 @@
+<?php
+include ('config.php');
+include (APP_BASE_PATH.'service.php');

deployment/clients/test/update.php

@@ -0,0 +1,18 @@
+<?php
+include ('config.php');
+if(!isset($_REQUEST['g']) || !isset($_REQUEST['n'])){
+    header("Location:".CLIENT_BASE_URL."login.php");
+    exit();
+}
+$group = $_REQUEST['g'];
+$name= $_REQUEST['n'];
+
+$groups = array('admin','modules');
+
+if($group == 'admin' || $group == 'modules'){
+    $name = str_replace("..","",$name);
+    $name = str_replace("/","",$name);
+    include APP_BASE_PATH.'/'.$group.'/'.$name.'/update.php';
+}else{
+    exit();
+}

docker/docker.md

@@ -0,0 +1,2 @@
+https://hub.docker.com/r/thilinah/icehrm/
+docker run -i -t -p 192.168.99.100:80:80 thilinah/icehrm /bin/start.sh

docker/start.sh

@@ -0,0 +1,30 @@
+#!/bin/bash
+service nginx start
+service php5-fpm start
+service mysql start
+
+if [ -d "/usr/share/nginx/www/" ]; then
+    echo 'Already Installed'
+else
+    echo 'Installing IceHrm'
+    cd /usr/share/nginx
+    curl -s https://api.github.com/repos/gamonoid/icehrm/releases/latest | jq -r ".assets[] | select(.name) | .browser_download_url" | grep '.zip' | xargs wget
+    ls | grep 'zip' | xargs unzip
+    mv `ls -d */ | grep icehrm | head -1` www/
+    rm *.zip
+
+    echo 'Your MySQL root password : icehrmpwd'
+
+    echo "Following will be needed during installation"
+    echo "--------------------------------------------"
+    echo 'IceHrm Database : icehrmdb'
+    echo 'IceHrm User : icehrmuser'
+    echo 'IceHrm User Password : icehrmuserpwd'
+    echo 'IceHrm Database host : localhost'
+
+    echo 'Please visit your docker installation url to begin installation.'
+
+fi
+
+
+/bin/bash

ext/admin/attendance/api/AttendanceActionManager.php

@@ -41,7 +41,7 @@ class AttendanceActionManager extends SubActionManager{
 		
 		//check if dates are differnet
 		if(!empty($outDate) && $inDate != $outDate){
-			return new IceResponse(IceResponse::ERROR,"Attendance entry should be within a single day");
+			return new IceResponse(IceResponse::ERROR,LanguageManager::tran("Attendance entry should be within a single day"));
 		}
 		
 		//compare dates

ext/admin/attendance/api/AttendanceAdminManager.php

@@ -38,6 +38,8 @@ if (!class_exists('AttendanceAdminManager')) {
             $this->addCalculationHook('AttendanceUtil_getTimeWorkedHours','Total Hours from Attendance','AttendanceUtil','getTimeWorkedHours');
             $this->addCalculationHook('AttendanceUtil_getRegularWorkedHours','Total Regular Hours from Attendance','AttendanceUtil','getRegularWorkedHours');
             $this->addCalculationHook('AttendanceUtil_getOverTimeWorkedHours','Total Overtime Hours from Attendance','AttendanceUtil','getOverTimeWorkedHours');
+            $this->addCalculationHook('AttendanceUtil_getWeeklyRegularWorkedHours','Total Weekly Regular Hours from Attendance','AttendanceUtil','getWeeklyBasedRegularHours');
+            $this->addCalculationHook('AttendanceUtil_getWeeklyOverTimeWorkedHours','Total Weekly Overtime Hours from Attendance','AttendanceUtil','getWeeklyBasedOvertimeHours');
         }
 
     }
@@ -249,6 +251,80 @@ if (!class_exists('AttendanceUtil')) {
             $atSum = $this->getAttendanceSummary($employeeId, $startDate, $endDate);
             return round(($atSum['o']/60)/60,2);
         }
+
+        public function getWeeklyBasedRegularHours($employeeId, $startDate, $endDate){
+            $atSum = $this->getWeeklyBasedOvertimeSummary($employeeId, $startDate, $endDate);
+            return round(($atSum['r']/60)/60,2);
+        }
+
+        public function getWeeklyBasedOvertimeHours($employeeId, $startDate, $endDate){
+            $atSum = $this->getWeeklyBasedOvertimeSummary($employeeId, $startDate, $endDate);
+            return round(($atSum['o']/60)/60,2);
+        }
+
+        public function getWeeklyBasedOvertimeSummary($employeeId, $startDate, $endDate){
+
+            $attendance = new Attendance();
+            $atTimeByWeek = array();
+
+            //Find weeks starting from sunday and ending from saturday in day period
+
+            $weeks = $this->getWeeklyDays($startDate,$endDate);
+            foreach($weeks as $k=>$week){
+                $startTime = $week[0]." 00:00:00";
+                $endTime = $week[count($week) - 1]." 23:59:59";
+                $atts = $attendance->Find("employee = ? and in_time >= ? and out_time <= ?",array($employeeId, $startTime, $endTime));
+                foreach($atts as $atEntry){
+                    if($atEntry->out_time == "0000-00-00 00:00:00" || empty($atEntry->out_time)){
+                        continue;
+                    }
+                    if(!isset($atTimeByWeek[$k])){
+                        $atTimeByWeek[$k]   = 0;
+                    }
+
+                    $diff = strtotime($atEntry->out_time) - strtotime($atEntry->in_time);
+                    if($diff < 0){
+                        $diff = 0;
+                    }
+
+                    $atTimeByWeek[$k] += $diff;
+                }
+            }
+
+            $overtimeStarts = SettingsManager::getInstance()->getSetting('Attendance: Overtime Start Hour');
+            $overtimeStarts = (is_numeric($overtimeStarts))?floatval($overtimeStarts)*60*60*5:0;
+            $regTime = 0;
+            $overTime = 0;
+            foreach($atTimeByWeek as $value){
+                if($value > $overtimeStarts){
+                    $regTime += $overtimeStarts;
+                    $overTime = $value - $overtimeStarts;
+                }else{
+                    $regTime += $value;
+                }
+            }
+
+            return array('r'=>$regTime,'o'=>$overTime);
+
+        }
+
+        private function getWeeklyDays($startDate,$endDate){
+            $start = new DateTime($startDate);
+            $end = new DateTime($endDate.' 23:59');
+            $interval = new DateInterval('P1D');
+            $dateRange = new DatePeriod($start, $interval, $end);
+
+            $weekNumber = 1;
+            $weeks = array();
+            foreach ($dateRange as $date) {
+                $weeks[$weekNumber][] = $date->format('Y-m-d');
+                if ($date->format('w') == 6) {
+                    $weekNumber++;
+                }
+            }
+
+            return $weeks;
+        }
     }
 }
 

ext/admin/attendance/dashboard.html

@@ -2,17 +2,17 @@
     <div class="small-box bg-yellow">
         <div class="inner">
             <h3>
-                Attendance
+                <t>Attendance</t>
             </h3>
             <p id="numberOfAttendanceLastWeek">
-                #_numberOfAttendanceLastWeek_# Entries Last Week
+                #_numberOfAttendanceLastWeek_# <t>Entries Last Week</t>
             </p>
         </div>
         <div class="icon">
             <i class="ion ion-clock"></i>
         </div>
         <a href="#_moduleLink_#" class="small-box-footer" id="attendanceLink">
-            Monitor Attendance <i class="fa fa-arrow-circle-right"></i>
+            <t>Monitor Attendance</t> <i class="fa fa-arrow-circle-right"></i>
         </a>
     </div>
 </div>

ext/admin/attendance/index.php

@@ -28,11 +28,8 @@ include APP_BASE_PATH.'modulejslibs.inc.php';
 ?><div class="span9">
 			  
 	<ul class="nav nav-tabs" id="modTab" style="margin-bottom:0px;margin-left:5px;border-bottom: none;">
-		<li class="active"><a id="tabAttendance" href="#tabPageAttendance">Monitor Attendance</a></li>
+		<li class="active"><a id="tabAttendance" href="#tabPageAttendance"><?=LanguageManager::tran('Monitor Attendance')?></a></li>
-        <li class=""><a id="tabAttendanceStatus" href="#tabPageAttendanceStatus">Current Clocked In Status</a></li>
+        <li class=""><a id="tabAttendanceStatus" href="#tabPageAttendanceStatus"><?=LanguageManager::tran('Current Clocked In Status')?></a></li>
-        <!--
-		<li class=""><a id="tabAttendanceData" href="#tabPageAttendanceData">Attendance Data Update</a></li>
-		-->
 	</ul>
 	
 	<div class="tab-content">
@@ -52,20 +49,6 @@ include APP_BASE_PATH.'modulejslibs.inc.php';
 
             </div>
         </div>
-		<!--  
-		<div class="tab-pane" id="tabPageAttendanceData">
-			<div class="control-group" id="field__id_">
-				<div class="controls">
-				  	<textarea class="input-xxlarge" placeholder="Insert CSV data to submit" type="textarea" width="96%" rows="100" id="attendanceData" name="attendanceData"></textarea>
-				</div>
-			</div>
-			<div class="control-group">
-		    	<div class="controls">
-		      		<button onclick="return false;" class="btn">Update Attendance Data</button>
-		    	</div>
-  			</div>
-		</div>
-		-->
 		
 	</div>
 

ext/admin/charts/LICENSE.txt

@@ -1,44 +0,0 @@
-ICEHRM END USER LICENSE AGREEMENT
-NOTICE TO ALL USERS: BY PURCHASING THE MODULE, YOU (EITHER AN INDIVIDUAL OR A SINGLE ENTITY) CONSENT TO BE BOUND BY AND BECOME A PARTY TO THIS AGREEMENT.
-
-All references to "Software" herein shall be deemed to include the software license with which you will be provided by Gamonoid Media Pvt Ltd, as part of the Software.
-
-1. LICENSE GRANT. Subject to the payment of the applicable licence fees, and subject to the terms and conditions of this Agreement, ICEHRM hereby grants to you a non-exclusive, non-transferable right to use one copy of the specified version of the Software and the accompanying documentation (the "Documentation") for the term of this Agreement solely for your own internal business purposes. You may install one copy of the Software for production use.
-.
-2. USE. The Software is licensed as a single product; it may not be used on more than one ICEHRM Server at a time. The Software is "in use" on a Server when its installed on a Server. You shall not, nor permit any third party to copy (other than as expressly permitted herein). You shall not rent, lease or lend the Software to any other person, nor transfer or sub-licence your licence rights to any other person.
-
-3. TERM. This Agreement is effective until terminated as set forth herein. This Agreement will terminate automatically if you fail to comply with any of the conditions, limitations or other requirements described herein. Upon any termination of this Agreement, you must immediately destroy all copies of the Software and the Documentation. You may terminate this Agreement at any point by destroying all copies of the Software and the Documentation.
-
-4. SUPPORT. Gamonoid Media Pvt Ltd will provide you support according to the support agreement subscribed by the company.
-
-5. OWNERSHIP RIGHTS. The Software is protected by copyright laws. ICEHRM and Gamonoid Media Pvt Ltd own and retain all right, title and interest in and to the Software, including all copyrights, patents, trademarks and other intellectual property rights therein. Your possession, installation, or use of the Software does not transfer to you any title to the intellectual property in the Software, and you will not acquire any rights to the Software except as expressly set forth in this Agreement.
-
-6. LIMITED WARRANTY. You may not rent, lease, loan or resell the Software. You may not permit third parties to benefit from the use or functionality of the Software via a timesharing, service bureau or other arrangement, except to the extent such use is specified in the applicable list price or product packaging for the Software. You may not transfer any of the rights granted to you under this Agreement. You may not modify, or create derivative works based upon, the Software in whole or in part. You may not copy the Software or Documentation except as expressly permitted in Section 1 above. You may not remove any proprietary notices or labels on the Software. All rights not expressly set forth hereunder are reserved by ICEHRM. ICEHRM reserves the right to periodically conduct audits upon advance written notice to verify compliance with the terms of this Agreement.
-
-7. WARRANTY and DISCLAIMER. 
-
-(i) Gamonoid Media Pvt Ltd. warrants that for 30 days from first download or installation the Software will perform substantially in accordance with the functionality described in the Documentation (http://blog.icehrm.com) when operated properly and in the manner specified in the Documentation. 
-
-(ii) You accept all responsibility for the selection of this Software to meet your requirements. 
-
-(iii) Gamonoid Media Pvt Ltd. does not warrant that the Software and/or the Documentation will be suitable for such requirements nor that any use will be uninterrupted and error free.
-
-(iv) The warranty in (i) shall not apply if you (a) make or cause to be made any modifications to this Software, (b) use the Software in a manner for which it was not intended or (c) use the Software other than as permitted under this Agreement. 
-
-(vii) The warranties and conditions stated in this Agreement are in lieu of all other conditions, warranties or other terms concerning the supply or purported supply of, failure to supply or delay in supplying the Software or the Documentation which might but for this paragraph (vii) have effect between the ICEHRM and you or would otherwise be implied into or incorporated into this Agreement or any collateral contract, whether by statute, common law or otherwise, all of which are hereby excluded (including, without limitation, the implied conditions, warranties or other terms as to satisfactory quality, fitness for purpose or as to the use of reasonable skill and care).
-
-8. LIMITATION of LIABILITY. Gamonoid Media Pvt Ltd. shall have no liability (whether in contract, tort, restitution or otherwise) for any of the following losses or damage (whether such losses or damage were foreseen, foreseeable, known or otherwise): 
-- Loss of revenue; 
-- Loss of actual or anticipated profits (including for loss of profits on contracts); 
-- Loss of the use of money; 
-- Loss of anticipated savings; 
-- Loss of business; 
-- Loss of opportunity; 
-- Loss of goodwill; 
-- Loss of reputation; 
-- Loss of, damage to or corruption of data; 
-or 
-Any indirect or consequential loss or damage howsoever caused (including, for the avoidance of doubt, where such loss or damage is of the type specified in paragraph (ii), (a) to (ii), (i). 
-The ICEHRM liability (whether in contract, tort, restitution or otherwise) arising out of or in connection with the supply of the Software shall in no circumstances exceed a sum equal to the amount equally paid by you for the Software.
-The construction and interpretation of this Agreement shall be governed in accordance with the laws of Sri Lanka. The parties hereby submit to the jurisdiction of the courts of Sri Lanka save that ICEHRM as claimant shall be entitled to initiate proceedings in any court of competent jurisdiction.
-This Agreement contains the entire understanding of the parties with respect to the subject matter hereof and supersedes all and any prior understandings, undertakings and promises between you and ICEHRM, whether oral or in writing, which have been given or may be implied from anything written or said in negotiations between us or our representatives prior to this Agreement and all prior agreements between the parties relating to the matters aforesaid shall cease to have effect as from the Effective Date.

ext/admin/charts/README.txt

@@ -1,7 +0,0 @@
-This module is licensed under IceHrm Commercial License, which can be found in LICENSE.txt.
-You are allowed to make any modification required to these module, but only allowed to use
-the module in one production server (even with modifications).
-
-Installation
-------------
-Copy this module into <icehrm path>/admin/ directory

ext/admin/charts/api/ChartsActionManager.php

@@ -1,156 +0,0 @@
-<?php
-if (!class_exists('ChartsActionManager')) {
-	class ChartsActionManager extends SubActionManager{
-
-		public function getTimeUtilization($req){
-			
-			if(empty($req->start)){
-				$req->start = date("Y-m-01");
-			}
-			
-			if(empty($req->end)){
-				$req->end = date("Y-m-t",strtotime($req->start));
-			}
-			
-			//Find Time Entries
-			
-			$employeeTimeEntry = new EmployeeTimeEntry();
-			if(empty($req->employee)){
-				$timeEntryList = $employeeTimeEntry->Find("date(date_start) >= ? and  date(date_end) <= ?",array($req->start, $req->end));	
-			}else{
-				$timeEntryList = $employeeTimeEntry->Find("employee = ? and date(date_start) >= ? and  date(date_end) <= ?",array($req->employee, $req->start, $req->end));
-			}
-			
-			$seconds = 0;
-			$graphTimeArray = array();
-			foreach($timeEntryList as $entry){
-				$seconds = (strtotime($entry->date_end) - strtotime($entry->date_start));
-				$key = date("Y-m-d",strtotime($entry->date_end));
-				if(isset($graphTimeArray[$key])){
-					$graphTimeArray[$key] += $seconds;
-				}else{
-					$graphTimeArray[$key] = $seconds;
-				}
-			}
-			
-			//$minutes = (int)($seconds/60);
-			
-			
-			//Find Attendance Entries
-			
-			$attendance = new Attendance();
-			if(empty($req->employee)){
-				$atteandanceList = 	$attendance->Find("date(in_time) >= ? and  date(out_time) <= ? and in_time < out_time",array($req->start, $req->end));	
-			}else{
-				$atteandanceList = 	$attendance->Find("employee = ? and date(in_time) >= ? and  date(out_time) <= ? and in_time < out_time",array($req->employee, $req->start, $req->end));
-			}
-			
-			$seconds = 0;
-			$graphAttendanceArray = array();
-			foreach($atteandanceList as $entry){
-				$seconds = (strtotime($entry->out_time) - strtotime($entry->in_time));
-				$key = date("Y-m-d",strtotime($entry->in_time));
-				if(isset($graphAttendanceArray[$key])){
-					$graphAttendanceArray[$key] += $seconds;
-				}else{
-					$graphAttendanceArray[$key] = $seconds;
-				}
-			}
-			
-			
-			$data = array();
-			$data[] = array("key"=>"Hours in Attendance", "values"=>array());
-			$data[] = array("key"=>"Hours Worked", "values"=>array());
-			
-			
-			//Iterate date range
-			
-			$interval = DateInterval::createFromDateString('1 day');
-			$period = new DatePeriod(new DateTime($req->start), $interval, new DateTime($req->end));
-			
-			foreach ( $period as $dt ){
-				$key = $dt->format("Y-m-d");
-				if(isset($graphAttendanceArray[$key])){
-					$data[0]['values'][] = array("x"=>$key, "y"=>round(($graphAttendanceArray[$key]/3600),2));
-				}else{
-					$data[0]['values'][] = array("x"=>$key, "y"=>0);
-				}
-				
-				if(isset($graphTimeArray[$key])){
-					$data[1]['values'][] = array("x"=>$key, "y"=>round(($graphTimeArray[$key]/3600),2));
-				}else{
-					$data[1]['values'][] = array("x"=>$key, "y"=>0);
-				}
-			}
-			
-			
-			
-			/*
-			//Test data
-			
-			for($i = 1; $i<31; $i++){
-				$data[0]['values'][] = array("x"=>$i, "y"=>rand(2,9));	
-				$data[1]['values'][] = array("x"=>$i, "y"=>rand(2,8));	
-			}
-			*/ 
-			
-			
-			return new IceResponse(IceResponse::SUCCESS,$data);
-		}
-		
-		public function getAttendance($req){
-				
-			if(empty($req->start)){
-				$req->start = date("Y-m-01");
-			}
-				
-			if(empty($req->end)){
-				$req->end = date("Y-m-t",strtotime($req->start));
-			}
-				
-				
-			//Find Attendance Entries
-				
-			$attendance = new Attendance();
-			if(empty($req->employee)){
-				$atteandanceList = 	$attendance->Find("date(in_time) >= ? and  date(out_time) <= ? and in_time < out_time",array($req->start, $req->end));
-			}else{
-				$atteandanceList = 	$attendance->Find("employee = ? and date(in_time) >= ? and  date(out_time) <= ? and in_time < out_time",array($req->employee, $req->start, $req->end));
-			}
-				
-			$seconds = 0;
-			$graphAttendanceArray = array();
-			foreach($atteandanceList as $entry){
-				$seconds = (strtotime($entry->out_time) - strtotime($entry->in_time));
-				$key = date("Y-m-d",strtotime($entry->in_time));
-				if(isset($graphAttendanceArray[$key])){
-					$graphAttendanceArray[$key] += $seconds;
-				}else{
-					$graphAttendanceArray[$key] = $seconds;
-				}
-			}
-				
-				
-			$data[0] = array();
-			$data[0] = array("key"=>"Attendance", "values"=>array());
-				
-				
-			//Iterate date range
-				
-			$interval = DateInterval::createFromDateString('1 day');
-			$period = new DatePeriod(new DateTime($req->start), $interval, new DateTime($req->end));
-				
-			foreach ( $period as $dt ){
-				$key = $dt->format("Y-m-d");
-				if(isset($graphAttendanceArray[$key])){
-					$data[0]['values'][] = array("x"=>$key, "y"=>round(($graphAttendanceArray[$key]/3600),2));
-				}else{
-					$data[0]['values'][] = array("x"=>$key, "y"=>0);
-				}
-			}
-				
-				
-			return new IceResponse(IceResponse::SUCCESS,$data);
-		}
-	}
-}

ext/admin/charts/index.php

@@ -1,56 +0,0 @@
-<?php 
-
-$moduleName = 'company_structure';
-define('MODULE_PATH',dirname(__FILE__));
-include APP_BASE_PATH.'header.php';
-include APP_BASE_PATH.'modulejslibs.inc.php';
-?>
-
-<link href="<?=BASE_URL.'js/nvd3/src/nv.d3.css?v='.$jsVersion?>" rel="stylesheet" type="text/css">
-
-<script src="<?=BASE_URL.'js/nvd3/lib/d3.v3.js?v='.$jsVersion?>"></script>
-<script src="<?=BASE_URL.'js/nvd3/nv.d3.js?v='.$jsVersion?>"></script>
-<script src="<?=BASE_URL.'js/nvd3/src/tooltip.js?v='.$jsVersion?>"></script>
-<script src="<?=BASE_URL.'js/nvd3/src/utils.js?v='.$jsVersion?>"></script>
-<script src="<?=BASE_URL.'js/nvd3/src/models/legend.js?v='.$jsVersion?>"></script>
-<script src="<?=BASE_URL.'js/nvd3/src/models/axis.js?v='.$jsVersion?>"></script>
-<script src="<?=BASE_URL.'js/nvd3/src/models/multiBar.js?v='.$jsVersion?>"></script>
-<script src="<?=BASE_URL.'js/nvd3/src/models/discreteBar.js?v='.$jsVersion?>"></script>
-<script src="<?=BASE_URL.'js/nvd3/src/models/discreteBarChart.js?v='.$jsVersion?>"></script>
-<script src="<?=BASE_URL.'js/nvd3/stream_layers.js?v='.$jsVersion?>"></script>
-
-<style type="text/css">
-svg .tooltip { opacity: 1; }
-</style>
-
-<div class="span9">
-	
-  		  
-	<ul class="nav nav-tabs" id="modTab" style="margin-bottom:0px;margin-left:5px;border-bottom: none;">
-		<li class="active"><a id="tabAttendanceGraph" href="#tabPageAttendanceGraph">Attendance Graph</a></li>
-		<li><a id="tabTimeUtilizationGraph" href="#tabPageTimeUtilizationGraph">Hours in Office vs Hours Worked Graph</a></li>
-	</ul>
-	 
-	<div class="tab-content">
-		<div class="tab-pane active reviewBlock with-3d-shadow with-transitions" id="tabPageAttendanceGraph" style="height: 500px;position: relative;">
-			<svg></svg>
-		</div>
-		<div class="tab-pane reviewBlock with-3d-shadow with-transitions" id="tabPageTimeUtilizationGraph" style="height: 500px;position: relative;">
-			<svg></svg>
-		</div>
-	</div>
-
-</div>
-<script>
-var modJsList = new Array();
-modJsList['tabAttendanceGraph'] = new AttendanceGraphAdapter('AttendanceGraph');
-modJsList['tabAttendanceGraph'].setShowAddNew(false);
-
-modJsList['tabTimeUtilizationGraph'] = new TimeUtilizationGraphAdapter('TimeUtilizationGraph');
-modJsList['tabTimeUtilizationGraph'].setShowAddNew(false);
-
-var modJs = modJsList['tabAttendanceGraph'];
-
-</script>
-
-<?php include APP_BASE_PATH.'footer.php';?>      

ext/admin/charts/lib.js

@@ -1,284 +0,0 @@
-/**
- * Author: Thilina Hasantha
- */
-function BaseGraphAdapter(endPoint) {
-	this.initAdapter(endPoint);
-}
-
-BaseGraphAdapter.inherits(AdapterBase);
-
-BaseGraphAdapter.method('getDataMapping', function() {
-	return [];
-});
-
-BaseGraphAdapter.method('getHeaders', function() {
-	return [];
-});
-
-BaseGraphAdapter.method('getFormFields', function() {
-	return [];
-});
-
-BaseGraphAdapter.method('createTable', function(elementId) {
-	
-});
-
-/*
- * TimeUtilizationGraphAdapter
- */
-
-
-function AttendanceGraphAdapter(endPoint) {
-	this.initAdapter(endPoint);
-}
-
-AttendanceGraphAdapter.inherits(BaseGraphAdapter);
-
-AttendanceGraphAdapter.method('getFormFields', function() {
-	return [];
-});
-
-AttendanceGraphAdapter.method('getFilters', function() {
-	return [
-	        [ "employee", {"label":"Employee","type":"select2","allow-null":true,"null-label":"All Employees","remote-source":["Employee","id","first_name+last_name"]}],
-	        [ "start", {"label":"Start Date","type":"date","validation":""}],
-	        [ "end", {"label":"End Date","type":"date","validation":""}]
-	        
-	];
-});
-
-AttendanceGraphAdapter.method('get', function() {
-	this.initFieldMasterData();
-	this.getTimeUtilization();
-});
-
-AttendanceGraphAdapter.method('doCustomFilterValidation', function(params) {
-	$("#"+this.table+"_filter_error").html("");
-	$("#"+this.table+"_filter_error").hide();
-	if(Date.parse(params.start).getTime() > Date.parse(params.end).getTime()){
-		$("#"+this.table+"_filter_error").html("End date should be a later date than start date");
-		$("#"+this.table+"_filter_error").show();
-		return false;
-	}
-	
-	var dateDiff = (Date.parse(params.end).getTime() - Date.parse(params.start).getTime())/(1000*60*60*24);
-	
-	if(dateDiff > 45 && (params['employee'] == undefined || params['employee'] == null || params['employee'] == "NULL")){
-		$("#"+this.table+"_filter_error").html("Differance between start and end dates should not be more than 45 days, when creating chart for all employees");
-		$("#"+this.table+"_filter_error").show();
-		return false;
-		
-	}else if(dateDiff > 90){
-		$("#"+this.table+"_filter_error").html("Differance between start and end dates should not be more than 90 days");
-		$("#"+this.table+"_filter_error").show();
-		return false;
-	}
-	
-	return true;
-});
-
-AttendanceGraphAdapter.method('getTimeUtilization', function(object,callBackData) {
-	var that = this;
-	object = {};
-	
-	
-	if(this.filter != null && this.filter != undefined){
-		if(this.filter.employee != "NULL"){
-			object['employee'] = this.filter.employee;
-		}
-		
-		object['start'] = this.filter.start;
-		object['end'] = this.filter.end;
-	}
-	
-	var reqJson = JSON.stringify(object);
-	
-	var callBackData = [];
-	callBackData['callBackData'] = [];
-	callBackData['callBackSuccess'] = 'getAttendanceSuccessCallBack';
-	callBackData['callBackFail'] = 'getAttendanceFailCallBack';
-	
-	this.customAction('getAttendance','admin=charts',reqJson,callBackData);
-});
-
-
-AttendanceGraphAdapter.method('getAttendanceFailCallBack', function(callBackData) {
-	this.showMessage("Error Occured while getting data for chart", callBackData);
-});
-
-
-AttendanceGraphAdapter.method('getAttendanceSuccessCallBack', function(callBackData) {
-
-	var that = this;
-	var chart;
-	
-	var filterHtml = that.getTableTopButtonHtml();
-	$("#tabPageAttendanceGraph svg").remove();
-	$("#tabPageAttendanceGraph div").remove();
-    $("#tabPageAttendanceGraph").html("");
-    $("#tabPageAttendanceGraph").html(filterHtml+"<svg></svg>");
-    
- 
-	nv.addGraph(function() {
-		
-		var chart = nv.models.multiBarChart()
-		  .margin({bottom: 200})
-	      .transitionDuration(0)
-	      .reduceXTicks(true)   //If 'false', every single x-axis tick label will be rendered.
-	      .rotateLabels(45)      //Angle to rotate x-axis labels.
-	      .showControls(false)   //Allow user to switch between 'Grouped' and 'Stacked' mode.
-	      .groupSpacing(0.1)    //Distance between each group of bars.
-	    ;
-
-	    chart.yAxis
-	        .tickFormat(d3.format(',.1f'));
-		
-	    chart.dispatch.on('stateChange', function(e) { nv.log('New State:', JSON.stringify(e)); });
-
-	    chart.tooltip(function (key, x, y, e, graph) {
-	        return '<p><strong>' + key + '</strong></p>' +
-	        '<p>' + y + ' on ' + x + '</p>';
-	    });
-	    
-
-	    d3.select('#tabPageAttendanceGraph svg')
-	        .datum(callBackData)
-	       .call(chart);
-	    
-	    return chart;
-	});
-
-	
-});
-
-/*
- * TimeUtilizationGraphAdapter
- */
-
-
-function TimeUtilizationGraphAdapter(endPoint) {
-	this.initAdapter(endPoint);
-}
-
-TimeUtilizationGraphAdapter.inherits(BaseGraphAdapter);
-
-TimeUtilizationGraphAdapter.method('getFormFields', function() {
-	return [];
-});
-
-TimeUtilizationGraphAdapter.method('getFilters', function() {
-	return [
-	        [ "employee", {"label":"Employee","type":"select2","allow-null":true,"null-label":"All Employees","remote-source":["Employee","id","first_name+last_name"]}],
-	        [ "start", {"label":"Start Date","type":"date","validation":""}],
-	        [ "end", {"label":"End Date","type":"date","validation":""}]
-	        
-	];
-});
-
-TimeUtilizationGraphAdapter.method('get', function() {
-	this.initFieldMasterData();
-	this.getTimeUtilization();
-});
-
-TimeUtilizationGraphAdapter.method('doCustomFilterValidation', function(params) {
-	$("#"+this.table+"_filter_error").html("");
-	$("#"+this.table+"_filter_error").hide();
-	if(Date.parse(params.start).getTime() > Date.parse(params.end).getTime()){
-		$("#"+this.table+"_filter_error").html("End date should be a later date than start date");
-		$("#"+this.table+"_filter_error").show();
-		return false;
-	}
-	
-	var dateDiff = (Date.parse(params.end).getTime() - Date.parse(params.start).getTime())/(1000*60*60*24);
-	
-	if(dateDiff > 45 && (params['employee'] == undefined || params['employee'] == null || params['employee'] == "NULL")){
-		$("#"+this.table+"_filter_error").html("Differance between start and end dates should not be more than 45 days, when creating chart for all employees");
-		$("#"+this.table+"_filter_error").show();
-		return false;
-		
-	}else if(dateDiff > 90){
-		$("#"+this.table+"_filter_error").html("Differance between start and end dates should not be more than 90 days");
-		$("#"+this.table+"_filter_error").show();
-		return false;
-	}
-	
-	return true;
-});
-
-TimeUtilizationGraphAdapter.method('getTimeUtilization', function(object,callBackData) {
-	var that = this;
-	object = {};
-	
-	
-	if(this.filter != null && this.filter != undefined){
-		if(this.filter.employee != "NULL"){
-			object['employee'] = this.filter.employee;
-		}
-		
-		object['start'] = this.filter.start;
-		object['end'] = this.filter.end;
-	}
-	
-	var reqJson = JSON.stringify(object);
-	
-	var callBackData = [];
-	callBackData['callBackData'] = [];
-	callBackData['callBackSuccess'] = 'getTimeUtilizationSuccessCallBack';
-	callBackData['callBackFail'] = 'getTimeUtilizationFailCallBack';
-	
-	this.customAction('getTimeUtilization','admin=charts',reqJson,callBackData);
-});
-
-
-TimeUtilizationGraphAdapter.method('getTimeUtilizationFailCallBack', function(callBackData) {
-	this.showMessage("Error Occured while getting data for chart", callBackData);
-});
-
-
-TimeUtilizationGraphAdapter.method('getTimeUtilizationSuccessCallBack', function(callBackData) {
-
-	var that = this;
-	var chart;
-	
-	var filterHtml = that.getTableTopButtonHtml();
-	$("#tabPageTimeUtilizationGraph svg").remove();
-	$("#tabPageTimeUtilizationGraph div").remove();
-    $("#tabPageTimeUtilizationGraph").html("");
-    $("#tabPageTimeUtilizationGraph").html(filterHtml+"<svg></svg>");
-    
-	nv.addGraph(function() {
-		
-		var chart = nv.models.multiBarChart()
-		  .margin({bottom: 200})
-	      .transitionDuration(0)
-	      .reduceXTicks(true)   //If 'false', every single x-axis tick label will be rendered.
-	      .rotateLabels(45)      //Angle to rotate x-axis labels.
-	      .showControls(true)   //Allow user to switch between 'Grouped' and 'Stacked' mode.
-	      .groupSpacing(0.1)    //Distance between each group of bars.
-	    ;
-
-	    chart.yAxis
-	        .tickFormat(d3.format(',.1f'));
-		
-	    
-
-	    d3.select('#tabPageTimeUtilizationGraph svg')
-	        .datum(callBackData)
-	       .call(chart);
-
-	    chart.dispatch.on('stateChange', function(e) { nv.log('New State:', JSON.stringify(e)); });
-
-	    chart.tooltip(function (key, x, y, e, graph) {
-	        return '<p><strong>' + key + '</strong></p>' +
-	        '<p>' + y + ' on ' + x + '</p>';
-	    });
-	    
-	    return chart;
-	});
-
-	
-});
-
-
-
-

ext/admin/charts/meta.json

@@ -1,11 +0,0 @@
-{
-"label":"Performance Charts",
-"menu":"Employees",
-"order":"93",
-"icon":"fa-bar-chart-o",
-"user_levels":["Admin","Manager"],
-
-"permissions":
-	{
-	}	
-}

ext/admin/company_structure/api/Company_structureAdminManager.php

@@ -87,6 +87,20 @@ if (!class_exists('CompanyStructure')) {
                 }
             }
         }
+
+        public static function isHeadOfCompanyStructure($companyStructureId, $profileId){
+            $companyStructure = new CompanyStructure();
+            $companyStructure->Load("id = ?",array($companyStructureId));
+
+            if(isset($companyStructure->heads) && !empty($companyStructure->heads)){
+                $heads = json_decode($companyStructure->heads);
+                if(is_array($heads) && !empty($heads) && in_array($profileId, $heads)){
+                    return true;
+                }
+            }
+
+            return false;
+        }
 	}
 }
 
@@ -108,4 +122,4 @@ if (!class_exists('Timezone')) {
         }
 
     }
-}
+}

ext/admin/company_structure/dashboard.html

@@ -2,16 +2,16 @@
 
     <div class="small-box bg-green">
         <div class="inner">
-            <h3>Company</h3>
+            <h3><t>Company</t></h3>
             <p id="numberOfCompanyStuctures">
-                #_numberOfCompanyStuctures_# Departments
+                #_numberOfCompanyStuctures_# <t>Departments</t>
             </p>
         </div>
         <div class="icon">
             <i class="ion ion-shuffle"></i>
         </div>
         <a href="#_moduleLink_#" class="small-box-footer" id="companyLink">
-            Manage Company <i class="fa fa-arrow-circle-right"></i>
+            <t>Manage</t> <t>Company</t> <i class="fa fa-arrow-circle-right"></i>
         </a>
     </div>
 </div>

ext/admin/company_structure/index.php

@@ -54,8 +54,8 @@ path.link {
 <div class="span9">
 			  
 	<ul class="nav nav-tabs" id="modTab" style="margin-bottom:0px;margin-left:5px;border-bottom: none;">
-		<li class="active"><a id="tabCompanyStructure" href="#tabPageCompanyStructure">Company Structure</a></li>
+		<li class="active"><a id="tabCompanyStructure" href="#tabPageCompanyStructure"><?=LanguageManager::tran('Company Structure')?></a></li>
-		<li><a id="tabCompanyGraph" href="#tabPageCompanyGraph">Company Graph</a></li>
+		<li><a id="tabCompanyGraph" href="#tabPageCompanyGraph"><?=LanguageManager::tran('Company Graph')?></a></li>
 	</ul>
 	 
 	<div class="tab-content">

ext/admin/company_structure/lib.js

@@ -43,7 +43,8 @@ CompanyStructureAdapter.method('getFormFields', function() {
 	        [ "type", {"label":"Type","type":"select","source":[["Company","Company"],["Head Office","Head Office"],["Regional Office","Regional Office"],["Department","Department"],["Unit","Unit"],["Sub Unit","Sub Unit"],["Other","Other"]]}],
 			[ "country", {"label":"Country","type":"select2","remote-source":["Country","code","name"]}],
 			[ "timezone", {"label":"Time Zone","type":"select2","allow-null":false,"remote-source":["Timezone","name","details"]}],
-			[ "parent", {"label":"Parent Structure","type":"select","allow-null":true,"remote-source":["CompanyStructure","id","title"]}]
+			[ "parent", {"label":"Parent Structure","type":"select","allow-null":true,"remote-source":["CompanyStructure","id","title"]}],
+			[ "heads", {"label":"Heads","type":"select2multi","allow-null":true,"remote-source":["Employee","id","first_name+last_name"]}]
 	];
 });
 

ext/admin/dashboard/index.php

@@ -17,7 +17,7 @@ along with iCE Hrm. If not, see <http://www.gnu.org/licenses/>.
 
 ------------------------------------------------------------------
 
-Original work Copyright (c) 2012 [Gamonoid Media Pvt. Ltd]
+Original work Copyright (c) 2012 [Gamonoid Media Pvt. Ltd]  
 Developer: Thilina Hasantha (thilina.hasantha[at]gmail.com / facebook.com/thilinah)
  */
 
@@ -25,74 +25,68 @@ $moduleName = 'dashboard';
 define('MODULE_PATH',dirname(__FILE__));
 include APP_BASE_PATH.'header.php';
 include APP_BASE_PATH.'modulejslibs.inc.php';
-
 ?><div class="span9">
-    <div class="row">
+<div class="row">
-        <?php
+    <?php
-        $moduleManagers = BaseService::getInstance()->getModuleManagers();
+    $moduleManagers = BaseService::getInstance()->getModuleManagers();
-        $dashBoardList = array();
+    $dashBoardList = array();
-        foreach($moduleManagers as $moduleManagerObj){
+    foreach($moduleManagers as $moduleManagerObj){
 
-            //Check if this is not an admin module
+        //Check if this is not an admin module
-            if($moduleManagerObj->getModuleType() != 'admin'){
+        if($moduleManagerObj->getModuleType() != 'admin'){
-                continue;
+            continue;
-            }
-
-            $allowed = BaseService::getInstance()->isModuleAllowedForUser($moduleManagerObj);
-
-            if(!$allowed){
-                continue;
-            }
-
-            $item = $moduleManagerObj->getDashboardItem();
-            if(!empty($item)) {
-                $index = $moduleManagerObj->getDashboardItemIndex();
-                $dashBoardList[$index] = $item;
-            }
         }
 
-        ksort($dashBoardList);
+        $allowed = BaseService::getInstance()->isModuleAllowedForUser($moduleManagerObj);
 
-        foreach($dashBoardList as $k=>$v){
+        if(!$allowed){
-            echo $v;
+            continue;
         }
-        ?>
-    </div>
-    <div id="iceannon">
-        <div class="callout callout-danger lead" style="font-size: 14px;font-weight: bold;">
-            <h4>Why not upgrade to IceHrm Pro Version</h4>
-            <p>
-                IceHrm Pro is the feature rich upgrade to IceHrm open source version. It comes with improved modules for
-                employee management, leave management and number of other features over open source version.
-                Hit this <a href="http://icehrm.com/#compare" class="btn btn-primary btn-xs target="_blank">link</a> to do a full one to one comparison.
 
-                Also you can learn more about IceHrm Pro <a href="http://blog.icehrm.com/docs/icehrm-pro/" class="btn btn-primary btn-xs" target="_blank">here</a>
+        $item = $moduleManagerObj->getDashboardItem();
-                <br/>
+        if(!empty($item)) {
-                <br/>
+            $index = $moduleManagerObj->getDashboardItemIndex();
-                <a href="http://icehrm.com/modules.php" class="btn btn-success btm-xs" target="_blank"><i class="fa fa-checkout"></i> Buy IceHrm Pro</a>
+            $dashBoardList[$index] = $item;
-            </p>
+        }
-        </div>
+    }
-    </div>
+
+    ksort($dashBoardList);
+
+    foreach($dashBoardList as $k=>$v){
+        echo LanguageManager::translateTnrText($v);
+    }
+    ?>
+</div>
+	
 
 </div>
 <script>
-    var modJsList = new Array();
+var modJsList = new Array();
 
-    modJsList['tabDashboard'] = new DashboardAdapter('Dashboard','Dashboard');
+modJsList['tabDashboard'] = new DashboardAdapter('Dashboard','Dashboard');
 
-    var modJs = modJsList['tabDashboard'];
+var modJs = modJsList['tabDashboard'];
 
-    $(document).ready(function() {
+/*
-        try {
+$("#employeeLink").attr("href",modJs.getCustomUrl('?g=admin&n=employees&m=admin_Admin'));
-            $.ajax({
+$("#companyLink").attr("href",modJs.getCustomUrl('?g=admin&n=company_structure&m=admin_Admin'));
-                url: "https://icehrm-public.s3.amazonaws.com/icehrmnews.html",
+$("#usersLink").attr("href",modJs.getCustomUrl('?g=admin&n=users&m=admin_System'));
-                success: function (result) {
+$("#projectsLink").attr("href",modJs.getCustomUrl('?g=admin&n=projects&m=admin_Admin'));
-                    $('#iceannon').html(result);
+$("#attendanceLink").attr("href",modJs.getCustomUrl('?g=admin&n=attendance&m=admin_Admin'));
-                }
+$("#leaveLink").attr("href",modJs.getCustomUrl('?g=admin&n=leaves&m=admin_Admin'));
-            });
+$("#reportsLink").attr("href",modJs.getCustomUrl('?g=admin&n=reports&m=admin_Reports'));
-        } catch (e) {
+$("#settingsLink").attr("href",modJs.getCustomUrl('?g=admin&n=settings&m=admin_System'));
-        }
+$("#jobsLink").attr("href",modJs.getCustomUrl('?g=admin&n=jobpositions&m=admin_Recruitment'));
+$("#candidatesLink").attr("href",modJs.getCustomUrl('?g=admin&n=candidates&m=admin_Recruitment'));
+$("#trainingLink").attr("href",modJs.getCustomUrl('?g=admin&n=training&m=admin_Admin'));
+$("#travelLink").attr("href",modJs.getCustomUrl('?g=admin&n=travel&m=admin_Employees'));
+$("#documentLink").attr("href",modJs.getCustomUrl('?g=admin&n=documents&m=admin_Employees'));
+$("#expenseLink").attr("href",modJs.getCustomUrl('?g=admin&n=expenses&m=admin_Employees'));
+$("#permissionLink").attr("href",modJs.getCustomUrl('?g=admin&n=permissions&m=admin_System'));
+$("#upgradeLink").attr("href",modJs.getCustomUrl('?g=admin&n=billing&m=admin_System'));
+
+modJs.getInitData();
+*/
 
-    }
 </script>
-<?php include APP_BASE_PATH.'footer.php';?>
+<?php include APP_BASE_PATH.'footer.php';?>      

ext/admin/employees/api/EmployeesActionManager.php

@@ -35,7 +35,7 @@ class EmployeesActionManager extends SubActionManager{
 
         $ok = $employee->Save();
         if(!$ok){
-            return new IceResponse(IceResponse::ERROR, "Error occured while activating employee");
+            return new IceResponse(IceResponse::ERROR, "Error occurred while activating employee");
         }
 
         return new IceResponse(IceResponse::SUCCESS, $employee);
@@ -102,12 +102,13 @@ class EmployeesActionManager extends SubActionManager{
 
         $ok = $archived->Save();
         if(!$ok){
-            return new IceResponse(IceResponse::ERROR, "Error occured while archiving employee");
+            return new IceResponse(IceResponse::ERROR, "Error occurred while archiving employee");
         }
 
+
         $ok = $employee->Delete();
         if(!$ok){
-            return new IceResponse(IceResponse::ERROR, "Error occured while deleting employee");
+            return new IceResponse(IceResponse::ERROR, "Error occurred while deleting employee");
         }
 
         return new IceResponse(IceResponse::SUCCESS, $archived);
@@ -161,4 +162,4 @@ class EmployeesActionManager extends SubActionManager{
         }
         return $data;
     }
-}
+}

ext/admin/employees/api/EmployeesAdminManager.php

@@ -16,10 +16,6 @@ if (!class_exists('EmployeesAdminManager')) {
                 $empRestEndPoint->process('get',$pathParams);
             });
 
-            \NoahBuscher\Macaw\Macaw::get(REST_API_PATH.'employees', function() {
-                $empRestEndPoint = new EmployeesRestEndPoint();
-                $empRestEndPoint->process('get',NULL);
-            });
         }
 
 		public function initializeDatabaseErrorMappings(){
@@ -30,6 +26,7 @@ if (!class_exists('EmployeesAdminManager')) {
 		public function setupModuleClassDefinitions(){
 			$this->addModelClass('Employee');
 			$this->addModelClass('EmploymentStatus');
+			$this->addModelClass('EmployeeApproval');
 		}
 
         public function getDashboardItemData(){
@@ -230,11 +227,11 @@ if (!class_exists('Employee')) {
         }
 
         public static function cleanEmployeeData($obj){
+            unset($obj->keysToIgnore);
             unset($obj->historyFieldsToTrack);
             unset($obj->historyUpdateList);
             unset($obj->oldObjOrig);
             unset($obj->oldObj);
-            unset($obj->oldObj);
             return $obj;
         }
 
@@ -288,52 +285,62 @@ if (!class_exists('EmploymentStatus')) {
 	}
 }
 
+if (!class_exists('EmployeeApproval')) {
+	class EmployeeApproval extends ICEHRM_Record {
+
+		var $_table = 'EmployeeApprovals';
+
+		public function getAdminAccess(){
+			return array("get","element","save","delete");
+		}
+
+		public function getManagerAccess(){
+			return array("get","element","save");
+		}
+
+		public function getUserAccess(){
+			return array();
+		}
+	}
+}
+
 
 if (!class_exists('EmployeeRestEndPoint')) {
     class EmployeeRestEndPoint extends RestEndPoint{
         public function get($parameter){
+
             if(empty($parameter)){
                 return new IceResponse(IceResponse::ERROR, "Employee ID not provided");
             }
 
-            $accessTokenValidation = $this->validateAccessToken();
+            if($parameter === 'list'){
-            if($accessTokenValidation->getStatus() == IceResponse::ERROR){
+                $emp = new Employee();
-                return $accessTokenValidation;
+                $emps = $emp->Find("1=1");
+                $newEmps = array();
+                foreach($emps as $emp){
+                    $employee = new stdClass();
+                    $employee->id = $emp->id;
+                    $employee->employee_id = $emp->employee_id;
+                    $employee->first_name = $emp->first_name;
+                    $employee->middle_name = $emp->middle_name;
+                    $employee->last_name = $emp->last_name;
+                    $newEmps[] = $employee;
+
+                }
+                return new IceResponse(IceResponse::SUCCESS, $newEmps);
+            }else{
+                $mapping = '{"nationality":["Nationality","id","name"],"ethnicity":["Ethnicity","id","name"],"immigration_status":["ImmigrationStatus","id","name"],"employment_status":["EmploymentStatus","id","name"],"job_title":["JobTitle","id","name"],"pay_grade":["PayGrade","id","name"],"country":["Country","code","name"],"province":["Province","id","name"],"department":["CompanyStructure","id","title"],"supervisor":["Employee","id","first_name+last_name"]}';
+                $emp = BaseService::getInstance()->getElement('Employee',$parameter,$mapping,true);
+                if(!empty($emp)){
+                    $emp = Employee::cleanEmployeeData($emp);
+                    return new IceResponse(IceResponse::SUCCESS,$emp);
+                }
+                return new IceResponse(IceResponse::ERROR, "Employee not found" ,404);
             }
 
-            $mapping = '{"nationality":["Nationality","id","name"],"ethnicity":["Ethnicity","id","name"],"immigration_status":["ImmigrationStatus","id","name"],"employment_status":["EmploymentStatus","id","name"],"job_title":["JobTitle","id","name"],"pay_grade":["PayGrade","id","name"],"country":["Country","code","name"],"province":["Province","id","name"],"department":["CompanyStructure","id","title"],"supervisor":["Employee","id","first_name+last_name"]}';
+
-            $employeeResp = BaseService::getInstance()->getElement('Employee',$parameter,$mapping,true);
-            if($employeeResp->getStatus() == IceResponse::SUCCESS){
-                $emp = $employeeResp->getObject();
-                $emp = Employee::cleanEmployeeData($emp);
-                return new IceResponse(IceResponse::SUCCESS,$emp);
-            }
-            return $employeeResp;
         }
 
 
     }
 }
-
-if (!class_exists('EmployeesRestEndPoint')) {
-    class EmployeesRestEndPoint extends RestEndPoint{
-        public function get($parameter){
-
-            $accessTokenValidation = $this->validateAccessToken();
-            if($accessTokenValidation->getStatus() == IceResponse::ERROR){
-                return $accessTokenValidation;
-            }
-
-            $emp = new Employee();
-            $emps = $emp->Find("1=1");
-            $newEmps = array();
-            foreach($emps as $emp){
-                $newEmps[] = Employee::cleanEmployeeData($emp);
-            }
-            return new IceResponse(IceResponse::SUCCESS, $newEmps);
-        }
-
-
-    }
-}
-

ext/admin/employees/customTemplates/myDetails.html

@@ -4,30 +4,30 @@
 			<div class="col-xs-12" style="text-align: center;">
 				<img id="profile_image__id_" src="" class="img-polaroid img-thumbnail" style="max-width: 140px;max-height: 140px;">
 			</div>
-		 	
+
 		</div>
 	</div>
-    <div class="col-xs-12 col-md-10">
+	<div class="col-xs-12 col-md-10">
-    	<div class="row-fluid">
+		<div class="row-fluid">
 			<div class="col-md-12"><h2 id="name"></h2></div>
-		</div>	
+		</div>
 		<div class="row-fluid">
 			<div class="col-md-12">
-			<p>
+				<p>
-				<i class="fa fa-phone"></i> <span id="mobile_phone"></span>&nbsp;&nbsp;
+					<i class="fa fa-phone"></i> <span id="mobile_phone"></span>&nbsp;&nbsp;
-				<i class="fa fa-envelope"></i> <span id="work_email"></span>
+					<i class="fa fa-envelope"></i> <span id="work_email"></span>
-			</p>
+				</p>
 			</div>
 		</div>
-	    <div class="row-fluid">
+		<div class="row-fluid">
-	    	<div class="col-xs-12" style="font-size:18px;border-bottom: 1px solid #DDD;margin-bottom: 10px;padding-bottom: 10px;">
+			<div class="col-xs-12" style="font-size:18px;border-bottom: 1px solid #DDD;margin-bottom: 10px;padding-bottom: 10px;">
 				<button id="employeeProfileEditInfo" class="btn btn-small btn-success" onclick="modJs.edit(_id_);" style="margin-right:10px;"><i class="fa fa-edit"></i> Edit Info</button>
 				<button id="employeeUploadProfileImage" onclick="showUploadDialog('profile_image__id_','Upload Profile Image','profile_image',_id_,'profile_image__id_','src','url','image');return false;" class="btn btn-small btn-primary" type="button" style="margin-right:10px;"><i class="fa fa-upload"></i> Upload Profile Image</button>
 				<button id="employeeDeleteProfileImage" onclick="modJs.deleteProfileImage(_id_);return false;" class="btn btn-small btn-warning" type="button" style="margin-right:10px;"><i class="fa fa-times"></i> Delete Profile Image</button>
 			</div>
-	    </div>
+		</div>
-	    
+
-	    <div class="row-fluid" style="border-top: 1px;">
+		<div class="row-fluid" style="border-top: 1px;">
 			<div class="col-xs-6 col-md-4" style="font-size:16px;">
 				<label class="control-label col-xs-12" style="font-size:13px;font-size:13px;">#_label_employee_id_#</label>
 				<label class="control-label col-xs-12 iceLabel" style="font-size:13px;font-weight: bold;" id="employee_id"></label>
@@ -40,24 +40,24 @@
 				<label class="control-label col-xs-12" style="font-size:13px;">#_label_ssn_num_#</label>
 				<label class="control-label col-xs-12 iceLabel" style="font-size:13px;font-weight: bold;" id="ssn_num"></label>
 			</div>
-		</div>	
+		</div>
-    </div>
+	</div>
 </div>
 
 
 <ul class="nav nav-tabs" id="subModTab" style="margin-bottom:0px;margin-left:5px;border-bottom: none;">
 	<li class="active"><a id="tabBasic" href="#tabPageBasic">Basic Information</a></li>
 	<li class=""><a id="tabQualifications" href="#tabPageQualifications">Qualifications</a></li>
+	<li class=""><a id="tabFamily" href="#tabPageFamily">Family</a></li>
 	<li class=""><a id="tabDocuments" href="#tabPageDocuments">Documents</a></li>
 </ul>
 
 <div class="tab-content">
-	<div class="tab-pane active" id="tabPageBasic" style="border:1px solid #DDD;">
+	<div class="tab-pane sub-tab active" id="tabPageBasic">
 		<div class="row" style="margin-left:10px;margin-top:20px;">
 			<div class="panel panel-default" style="width:97.5%;">
 				<div class="panel-heading"><h4>Personal Information</h4></div>
-				<div class="panel-body">
+				<div class="panel-body" id="cont_personal_information">
-				<div class="row-fluid">
 					<div class="col-xs-6 col-md-3" style="font-size:16px;">
 						<label class="control-label col-xs-12" style="font-size:13px;">#_label_driving_license_#</label>
 						<label class="control-label col-xs-12 iceLabel" style="font-size:13px;font-weight: bold;" id="driving_license"></label>
@@ -74,10 +74,7 @@
 						<label class="control-label col-xs-12" style="font-size:13px;">#_label_gender_#</label>
 						<label class="control-label col-xs-12 iceLabel" style="font-size:13px;font-weight: bold;" id="gender"></label>
 					</div>
-				</div>	
+
-				<hr/>  
-			    <div class="row-fluid">
-					
 					<div class="col-xs-6 col-md-3" style="font-size:16px;">
 						<label class="control-label col-xs-12" style="font-size:13px;">#_label_nationality_#</label>
 						<label class="control-label col-xs-12 iceLabel" style="font-size:13px;font-weight: bold;" id="nationality_Name"></label>
@@ -90,16 +87,14 @@
 						<label class="control-label col-xs-12" style="font-size:13px;">#_label_joined_date_#</label>
 						<label class="control-label col-xs-12 iceLabel" style="font-size:13px;font-weight: bold;" id="joined_date"></label>
 					</div>
-				</div>	
 				</div>
-		    </div>
+			</div>
 		</div>
-		
+
 		<div class="row" style="margin-left:10px;margin-top:20px;">
 			<div class="panel panel-default" style="width:97.5%;">
-			<div class="panel-heading"><h4>Contact Information</h4></div>
+				<div class="panel-heading"><h4>Contact Information</h4></div>
-				<div class="panel-body">
+				<div class="panel-body" id="cont_contact_information">
-				<div class="row-fluid">
 					<div class="col-xs-6 col-md-3" style="font-size:16px;">
 						<label class="control-label col-xs-12" style="font-size:13px;">#_label_address1_#</label>
 						<label class="control-label col-xs-12 iceLabel" style="font-size:13px;font-weight: bold;" id="address1"></label>
@@ -116,9 +111,6 @@
 						<label class="control-label col-xs-12" style="font-size:13px;">#_label_country_#</label>
 						<label class="control-label col-xs-12 iceLabel" style="font-size:13px;font-weight: bold;" id="country_Name"></label>
 					</div>
-				</div>	
-				<hr/>  
-			    <div class="row-fluid">
 					<div class="col-xs-6 col-md-3" style="font-size:16px;">
 						<label class="control-label col-xs-12" style="font-size:13px;">#_label_postal_code_#</label>
 						<label class="control-label col-xs-12 iceLabel" style="font-size:13px;font-weight: bold;" id="postal_code"></label>
@@ -135,16 +127,14 @@
 						<label class="control-label col-xs-12" style="font-size:13px;">#_label_private_email_#</label>
 						<label class="control-label col-xs-12 iceLabel" style="font-size:13px;font-weight: bold;" id="private_email"></label>
 					</div>
-				</div>		  
+				</div>
-				</div>		  
+			</div>
-		    </div>
 		</div>
-		
+
 		<div class="row" style="margin-left:10px;margin-top:20px;">
 			<div class="panel panel-default" style="width:97.5%;">
-			<div class="panel-heading"><h4>Job Details</h4></div>
+				<div class="panel-heading"><h4>Job Details</h4></div>
-				<div class="panel-body">
+				<div class="panel-body" id="cont_job_details">
-				<div class="row-fluid">
 					<div class="col-xs-6 col-md-3" style="font-size:16px;">
 						<label class="control-label col-xs-12" style="font-size:13px;">#_label_job_title_#</label>
 						<label class="control-label col-xs-12 iceLabel" style="font-size:13px;font-weight: bold;" id="job_title_Name"></label>
@@ -161,82 +151,97 @@
 						<label class="control-label col-xs-12" style="font-size:13px;">Direct Reports</label>
 						<label class="control-label col-xs-12 iceLabel" style="font-size:13px;font-weight: bold;" id="subordinates"></label>
 					</div>
-				</div>	
-				<hr/>
-				<div class="row-fluid">
 					<div class="col-xs-6 col-md-3" style="font-size:16px;">
 						<label class="control-label col-xs-12" style="font-size:13px;">#_label_department_#</label>
 						<label class="control-label col-xs-12 iceLabel" style="font-size:13px;font-weight: bold;" id="department_Name"></label>
 					</div>
-				</div>	
+				</div>
-				</div>	
+			</div>
-		    </div>
 		</div>
-		
+
-		
+
+		<div id="customFieldsCont">
+
+		</div>
+
+
 		<div class="modal" id="adminUsersModel" tabindex="-1" role="dialog" aria-labelledby="messageModelLabel" aria-hidden="true">
-		<div class="modal-dialog">
+			<div class="modal-dialog">
-		<div class="modal-content">	
+				<div class="modal-content">
-			<div class="modal-header">
+					<div class="modal-header">
-				<button type="button" class="close" data-dismiss="modal" aria-hidden="true"><li class="fa fa-times"/></button>
+						<button type="button" class="close" data-dismiss="modal" aria-hidden="true"><li class="fa fa-times"/></button>
-				<h3 style="font-size: 17px;">Change User Password</h3>
+						<h3 style="font-size: 17px;">Change User Password</h3>
-			</div>
+					</div>
-			<div class="modal-body">
+					<div class="modal-body">
-				<form id="adminUsersChangePwd">
+						<form id="adminUsersChangePwd">
-				<div class="control-group">
+							<div class="control-group">
-				<div class="controls">
+								<div class="controls">
-				  	<span class="label label-warning" id="adminUsersChangePwd_error" style="display:none;"></span>
+									<span class="label label-warning" id="adminUsersChangePwd_error" style="display:none;"></span>
-				</div>
+								</div>
-				</div>
+							</div>
-				<div class="control-group" id="field_newpwd">
+							<div class="control-group" id="field_newpwd">
-					<label class="control-label" for="newpwd">New Password</label>
+								<label class="control-label" for="newpwd">New Password</label>
-					<div class="controls">
+								<div class="controls">
-					  	<input class="" type="password" id="newpwd" name="newpwd" value="" class="form-control"/>
+									<input class="" type="password" id="newpwd" name="newpwd" value="" class="form-control"/>
-					  	<span class="help-inline" id="help_newpwd"></span>
+									<span class="help-inline" id="help_newpwd"></span>
+								</div>
+							</div>
+							<div class="control-group" id="field_conpwd">
+								<label class="control-label" for="conpwd">Confirm Password</label>
+								<div class="controls">
+									<input class="" type="password" id="conpwd" name="conpwd" value="" class="form-control"/>
+									<span class="help-inline" id="help_conpwd"></span>
+								</div>
+							</div>
+						</form>
+					</div>
+					<div class="modal-footer">
+						<button class="btn btn-primary" onclick="modJs.changePasswordConfirm();">Change Password</button>
+						<button class="btn" onclick="modJs.closeChangePassword();">Not Now</button>
 					</div>
 				</div>
-				<div class="control-group" id="field_conpwd">
-					<label class="control-label" for="conpwd">Confirm Password</label>
-					<div class="controls">
-					  	<input class="" type="password" id="conpwd" name="conpwd" value="" class="form-control"/>
-					  	<span class="help-inline" id="help_conpwd"></span>
-					</div>
-				</div>
-				</form>
-			</div>
-			<div class="modal-footer">
-		 		<button class="btn btn-primary" onclick="modJs.changePasswordConfirm();">Change Password</button>
-		 		<button class="btn" onclick="modJs.closeChangePassword();">Not Now</button>
 			</div>
 		</div>
-		</div>
-		</div>	
 	</div><!-- End tabPageBasic -->
-	<div class="tab-pane" id="tabPageQualifications" style="border:1px solid #DDD;">
+	<div class="tab-pane sub-tab" id="tabPageQualifications">
 		<div class="row" style="margin-top:20px;">
-			<div class="col-md-3">
+			<div class="col-md-3 sub-column">
 				<div id="EmployeeSkillSubTab" class="" data-content="List" style="padding-left:5px;">
-					
+
 				</div>
 			</div>
-			<div class="col-md-3">
+			<div class="col-md-3 sub-column">
 				<div id="EmployeeEducationSubTab" class="" data-content="List" style="padding-left:5px;">
-					
+
 				</div>
 			</div>
-			<div class="col-md-3">
+			<div class="col-md-3 sub-column">
 				<div id="EmployeeCertificationSubTab" class="" data-content="List" style="padding-left:5px;">
-					
+
 				</div>
 			</div>
-			<div class="col-md-3">
+			<div class="col-md-3 sub-column">
 				<div id="EmployeeLanguageSubTab" class="" data-content="List" style="padding-left:5px;">
-					
+
 				</div>
 			</div>
 		</div><!-- End tabPageQualifications -->
 	</div>
-    <div class="tab-pane" id="tabPageDocuments" style="border:1px solid #DDD;">
+	<div class="tab-pane sub-tab" id="tabPageFamily">
+		<div class="row" style="margin-top:20px;">
+			<div class="col-md-6 sub-column">
+				<div id="EmployeeEmergencyContactSubTab" class="" data-content="List" style="padding-left:5px;">
+
+				</div>
+			</div>
+			<div class="col-md-6 sub-column">
+				<div id="EmployeeDependentSubTab" class="" data-content="List" style="padding-left:5px;">
+
+				</div>
+			</div>
+		</div>
+	</div>
+	<div class="tab-pane sub-tab" id="tabPageDocuments">
 		<div class="row" style="margin-top:20px;">
 			<div class="col-md-12">
 				<div id="EmployeeDocumentSubTab" class="" data-content="List" style="padding-left:5px;">

ext/admin/employees/dashboard.html

@@ -3,17 +3,17 @@
     <div class="small-box bg-aqua">
         <div class="inner">
             <h3>
-                People
+                <t>People</t>
             </h3>
             <p id="numberOfEmployees">
-                #_numberOfEmployees_# Employees
+                #_numberOfEmployees_# <t>Employees</t>
             </p>
         </div>
         <div class="icon">
             <i class="ion ion-person-stalker"></i>
         </div>
         <a href="#_moduleLink_#" class="small-box-footer" id="employeeLink">
-            Manage Employees <i class="fa fa-arrow-circle-right"></i>
+            <t>Manage</t> <t>Employees</t> <i class="fa fa-arrow-circle-right"></i>
         </a>
     </div>
 </div>

ext/admin/employees/index.php

@@ -11,30 +11,30 @@ $customFields = BaseService::getInstance()->getCustomFields("Employee");
 	<ul class="nav nav-tabs" id="modTab" style="margin-bottom:0px;margin-left:5px;border-bottom: none;">
         <?php if($user->user_level != "Admin"){
         ?>
-		    <li class="active"><a id="tabEmployee" href="#tabPageEmployee">Employees (Direct Reports)</a></li>
+		    <li class="active"><a id="tabEmployee" href="#tabPageEmployee"><?=LanguageManager::tran('Employees (Direct Reports)')?></a></li>
         <?php }else{ ?>
-            <li class="active"><a id="tabEmployee" href="#tabPageEmployee">Employees</a></li>
+            <li class="active"><a id="tabEmployee" href="#tabPageEmployee"><?=LanguageManager::tran('Employees')?></a></li>
         <?php }?>
 
         <?php if($user->user_level == "Admin"){
         ?>
-		<li><a id="tabEmployeeSkill" href="#tabPageEmployeeSkill">Skills</a></li>
+		<li><a id="tabEmployeeSkill" href="#tabPageEmployeeSkill"><?=LanguageManager::tran('Skills')?></a></li>
-		<li><a id="tabEmployeeEducation" href="#tabPageEmployeeEducation">Education</a></li>
+		<li><a id="tabEmployeeEducation" href="#tabPageEmployeeEducation"><?=LanguageManager::tran('Education')?></a></li>
-		<li><a id="tabEmployeeCertification" href="#tabPageEmployeeCertification">Certifications</a></li>
+		<li><a id="tabEmployeeCertification" href="#tabPageEmployeeCertification"><?=LanguageManager::tran('Certifications')?></a></li>
-		<li><a id="tabEmployeeLanguage" href="#tabPageEmployeeLanguage">Languages</a></li>
+		<li><a id="tabEmployeeLanguage" href="#tabPageEmployeeLanguage"><?=LanguageManager::tran('Languages')?></a></li>
-		<li><a id="tabEmployeeDependent" href="#tabPageEmployeeDependent">Dependents</a></li>
+		<li><a id="tabEmployeeDependent" href="#tabPageEmployeeDependent"><?=LanguageManager::tran('Dependents')?></a></li>
-		<li><a id="tabEmergencyContact" href="#tabPageEmergencyContact">Emergency Contacts</a></li>
+		<li><a id="tabEmergencyContact" href="#tabPageEmergencyContact"><?=LanguageManager::tran('Emergency Contacts')?></a></li>
-            <?php if (!class_exists('DocumentsAdminManager')) {?>
+            <?php if (class_exists('DocumentsAdminManager')) {?>
-                <li><a id="tabEmployeeDocument" href="#tabPageEmployeeDocument">Documents</a></li>
+                <li><a id="tabEmployeeDocument" href="#tabPageEmployeeDocument"><?=LanguageManager::tran('Documents')?></a></li>
             <?php } ?>
         <?php }?>
         <?php if($user->user_level == "Admin"){
         ?>
         <li class="dropdown">
-            <a href="#" id="terminatedEmployeeMenu" class="dropdown-toggle" data-toggle="dropdown" aria-controls="terminatedEmployeeMenu-contents">Suspended Employees <span class="caret"></span></a>
+            <a href="#" id="terminatedEmployeeMenu" class="dropdown-toggle" data-toggle="dropdown" aria-controls="terminatedEmployeeMenu-contents"><?=LanguageManager::tran('Deactivated Employees')?> <span class="caret"></span></a>
             <ul class="dropdown-menu" role="menu" aria-labelledby="terminatedEmployeeMenu" id="terminatedEmployeeMenu-contents">
-                <li><a id="tabTerminatedEmployee" href="#tabPageTerminatedEmployee">Temporarily Suspended Employees</a></li>
+                <li><a id="tabTerminatedEmployee" href="#tabPageTerminatedEmployee"><?=LanguageManager::tran('Temporarily Deactivated Employees')?></a></li>
-                <li><a id="tabArchivedEmployee" href="#tabPageArchivedEmployee">Terminated Employee Data</a></li>
+                <li><a id="tabArchivedEmployee" href="#tabPageArchivedEmployee"><?=LanguageManager::tran('Terminated Employee Data')?></a></li>
             </ul>
         </li>
         <?php }?>
@@ -115,7 +115,7 @@ $customFields = BaseService::getInstance()->getCustomFields("Employee");
 		
 			</div>
 		</div>
-        <?php if (!class_exists('DocumentsAdminManager')) {?>
+        <?php if (class_exists('DocumentsAdminManager')) {?>
             <div class="tab-pane" id="tabPageEmployeeDocument">
                 <div id="EmployeeDocument" class="reviewBlock" data-content="List" style="padding-left:5px;">
 
@@ -133,7 +133,7 @@ $customFields = BaseService::getInstance()->getCustomFields("Employee");
 var modJsList = new Array();
 <?php if($user->user_level != "Admin"){
 ?>
-modJsList['tabEmployee'] = new EmployeeAdapter('Employee','Employee',{"status":"Active", "supervisor":"__myid__"});
+modJsList['tabEmployee'] = new EmployeeAdapter('Employee','Employee',{"status":"Active"});
 modJsList['tabEmployee'].setShowAddNew(false);
 <?php
 }else{
@@ -176,7 +176,7 @@ modJsList['tabTerminatedEmployee'] = new TerminatedEmployeeAdapter('Employee','T
 modJsList['tabTerminatedEmployee'].setRemoteTable(true);
 modJsList['tabTerminatedEmployee'].setShowAddNew(false);
 
-<?php if (!class_exists('DocumentsAdminManager')) {?>
+<?php if (class_exists('DocumentsAdminManager')) {?>
 modJsList['tabEmployeeDocument'] = new EmployeeDocumentAdapter('EmployeeDocument','EmployeeDocument');
 modJsList['tabTerminatedEmployee'].setRemoteTable(true);
 <?php } ?>
@@ -193,10 +193,10 @@ var modJs = modJsList['tabEmployee'];
         <div class="modal-content">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><li class="fa fa-times"/></button>
-                <h3 style="font-size: 17px;">Employee Saved Successfully</h3>
+                <h3 style="font-size: 17px;"><?=LanguageManager::tran('Employee Saved Successfully')?></h3>
             </div>
             <div class="modal-body">
-                 Employee needs a User to login to IceHrm. Do you want to create a user for this employee now? <br/><br/>You can do this later through Users module if required.
+				<?=LanguageManager::tran('Employee needs a User to login to IceHrm. Do you want to create a user for this employee now?')?> <br/><br/><?=LanguageManager::tran('You can do this later through Users module if required.')?>
             </div>
             <div class="modal-footer">
                 <button class="btn btn-primary" onclick="modJs.createUser();">Yes</button>
@@ -207,4 +207,4 @@ var modJs = modJsList['tabEmployee'];
 </div>
 
 
-<?php include APP_BASE_PATH.'footer.php';?>      
+<?php include APP_BASE_PATH.'footer.php';?>      

ext/admin/employees/lib.js

@@ -36,7 +36,7 @@ EmployeeAdapter.method('setFieldNameMap', function(fields) {
         if(field.display == "Hidden"){
             this.hiddenFields[field.name] = field;
         }else{
-            if(field.display == "Table and Form"){
+            if(field.display == "Table and Form" || field.display == "Form"){
                 this.tableFields[field.name] = field;
             }else{
                 this.formOnlyFields[field.name] = field;
@@ -197,6 +197,9 @@ EmployeeAdapter.method('getFormFields', function() {
         [ "department", {"label":"Department","type":"select2","remote-source":["CompanyStructure","id","title"]}],
         [ "supervisor", {"label":"Direct Supervisor","type":"select2","allow-null":true,"remote-source":["Employee","id","first_name+last_name"]}],
         [ "indirect_supervisors", {"label":"Indirect Supervisors","type":"select2multi","allow-null":true,"remote-source":["Employee","id","first_name+last_name"]}],
+        [ "approver1", {"label":"First Level Approver","type":"select2","allow-null":true,"remote-source":["Employee","id","first_name+last_name"]}],
+        [ "approver2", {"label":"Second Level Approver","type":"select2","allow-null":true,"remote-source":["Employee","id","first_name+last_name"]}],
+        [ "approver3", {"label":"Third Level Approver","type":"select2","allow-null":true,"remote-source":["Employee","id","first_name+last_name"]}],
         [ "notes", {"label":"Notes","type":"datagroup",
             "form":[
                 [ "note", {"label":"Note","type":"textarea","validation":""}]
@@ -413,7 +416,7 @@ EmployeeAdapter.method('renderEmployee', function(data) {
         }
     }
 
-    html = html.replace(/#_.+_#/i,"");
+    html = html.replace(/#_.+_#/gi,"");
     html = html.replace(/_id_/g,data.id);
 
     $("#"+this.getTableName()).html(html);
@@ -447,6 +450,43 @@ EmployeeAdapter.method('renderEmployee', function(data) {
 
     $("#"+this.getTableName()+" #profile_image_"+data.id).attr('src',data.image);
 
+
+    var sectionTemplate = '<div class="row" style="margin-left:10px;margin-top:20px;"><div class="panel panel-default" style="width:97.5%;"><div class="panel-heading"><h4>#_section.name_#</h4></div> <div class="panel-body"  id="cont_#_section_#"> </div></div></div>';
+    var sectionId = '';
+    var sectionHtml = '';
+    //Add custom fields
+    if(data.customFields != undefined && data.customFields != null && Object.keys(data.customFields).length > 0) {
+
+
+        var ct = '<div class="col-xs-6 col-md-3" style="font-size:16px;"><label class="control-label col-xs-12" style="font-size:13px;">#_label_#</label><label class="control-label col-xs-12 iceLabel" style="font-size:13px;font-weight: bold;">#_value_#</label></div>';
+        var customFieldHtml;
+        for (index in data.customFields) {
+
+            if(!data.customFields[index][1]){
+                data.customFields[index][1] = 'Other Details';
+            }
+
+            sectionId = data.customFields[index][1].toLocaleLowerCase();
+            sectionId = sectionId.replace(' ','_');
+
+            if($("#cont_"+sectionId).length <= 0){
+                //Add section
+                sectionHtml = sectionTemplate;
+                sectionHtml = sectionHtml.replace('#_section_#', sectionId);
+                sectionHtml = sectionHtml.replace('#_section.name_#', data.customFields[index][1]);
+                $("#customFieldsCont").append($(sectionHtml));
+            }
+
+            customFieldHtml = ct;
+            customFieldHtml = customFieldHtml.replace('#_label_#', index);
+            customFieldHtml = customFieldHtml.replace('#_value_#', data.customFields[index][0]);
+            $("#cont_"+sectionId).append($(customFieldHtml));
+        }
+    }else{
+        $("#customFieldsCont").remove();
+    }
+
+
     this.cancel();
 
     if(!this.isModuleInstalled("admin","documents")) {
@@ -469,6 +509,12 @@ EmployeeAdapter.method('renderEmployee', function(data) {
     modJs.subModJsList['tabEmployeeLanguageSubTab'] = new EmployeeSubLanguageAdapter('EmployeeLanguage','EmployeeLanguageSubTab',{"employee":data.id});
     modJs.subModJsList['tabEmployeeLanguageSubTab'].parent = this;
 
+    modJs.subModJsList['tabEmployeeDependentSubTab'] = new EmployeeSubDependentAdapter('EmployeeDependent','EmployeeDependentSubTab',{"employee":data.id});
+    modJs.subModJsList['tabEmployeeDependentSubTab'].parent = this;
+
+    modJs.subModJsList['tabEmployeeEmergencyContactSubTab'] = new EmployeeSubEmergencyContactAdapter('EmergencyContact','EmployeeEmergencyContactSubTab',{"employee":data.id});
+    modJs.subModJsList['tabEmployeeEmergencyContactSubTab'].parent = this;
+
     if(this.isModuleInstalled("admin","documents")) {
         modJs.subModJsList['tabEmployeeDocumentSubTab'] = new EmployeeSubDocumentAdapter('EmployeeDocument', 'EmployeeDocumentSubTab', {"employee": data.id});
         modJs.subModJsList['tabEmployeeDocumentSubTab'].parent = this;
@@ -510,6 +556,16 @@ EmployeeAdapter.method('renderEmployee', function(data) {
     modJs.subModJsList['tabEmployeeLanguageSubTab'].setShowCancel(false);
     modJs.subModJsList['tabEmployeeLanguageSubTab'].get([]);
 
+    modJs.subModJsList['tabEmployeeDependentSubTab'].setShowFormOnPopup(true);
+    modJs.subModJsList['tabEmployeeDependentSubTab'].setShowAddNew(false);
+    modJs.subModJsList['tabEmployeeDependentSubTab'].setShowCancel(false);
+    modJs.subModJsList['tabEmployeeDependentSubTab'].get([]);
+
+    modJs.subModJsList['tabEmployeeEmergencyContactSubTab'].setShowFormOnPopup(true);
+    modJs.subModJsList['tabEmployeeEmergencyContactSubTab'].setShowAddNew(false);
+    modJs.subModJsList['tabEmployeeEmergencyContactSubTab'].setShowCancel(false);
+    modJs.subModJsList['tabEmployeeEmergencyContactSubTab'].get([]);
+
     if(this.isModuleInstalled("admin","documents")) {
         modJs.subModJsList['tabEmployeeDocumentSubTab'].setShowFormOnPopup(true);
         modJs.subModJsList['tabEmployeeDocumentSubTab'].setShowAddNew(false);
@@ -1335,7 +1391,7 @@ EmployeeSubSkillsAdapter.method('getSubHeaderTitle', function() {
 });
 
 EmployeeSubSkillsAdapter.method('getSubItemHtml', function(item, itemDelete, itemEdit) {
-    var itemHtml = $('<a href="#" class="list-group-item"><h5 class="list-group-item-heading" style="font-weight:bold;">'+item[2]+itemDelete+itemEdit+'</h5><p class="list-group-item-text">'+nl2br(item[3])+'</p></a>');
+    var itemHtml = $('<div class="list-group-item sub-tab-item"><h5 class="list-group-item-heading" style="font-weight:bold;">'+item[2]+itemDelete+itemEdit+'</h5><p class="list-group-item-text">'+nl2br(item[3])+'</p></div>');
     return itemHtml;
 });
 
@@ -1414,8 +1470,8 @@ EmployeeSubEducationAdapter.method('getSubItemHtml', function(item, itemDelete,
     try{
         end = Date.parse(item[5]).toString('MMM d, yyyy');
     }catch(e){}
-    //var itemHtml = $('<a href="#" class="list-group-item"><h5 class="list-group-item-heading" style="font-weight:bold;">'+item[2]+itemDelete+itemEdit+'</h5><p class="list-group-item-text">'+nl2br(item[3])+'</p></a>');
+    //var itemHtml = $('<div class="list-group-item sub-tab-item"><h5 class="list-group-item-heading" style="font-weight:bold;">'+item[2]+itemDelete+itemEdit+'</h5><p class="list-group-item-text">'+nl2br(item[3])+'</p></div>');
-    var itemHtml = $('<a href="#" class="list-group-item"><h5 class="list-group-item-heading" style="font-weight:bold;">'+item[2]+itemDelete+itemEdit+'</h5><p class="list-group-item-text"><i class="fa fa-calendar"></i> Start: <b>'+start+'</b></p><p class="list-group-item-text">'+'<i class="fa fa-calendar"></i> Completed: <b>'+end+'</b></p><p class="list-group-item-text">'+'<i class="fa fa-building-o"></i> Institute: <b>'+item[3]+'</b></p></a>');
+    var itemHtml = $('<div class="list-group-item sub-tab-item"><h5 class="list-group-item-heading" style="font-weight:bold;">'+item[2]+itemDelete+itemEdit+'</h5><p class="list-group-item-text"><i class="fa fa-calendar"></i> Start: <b>'+start+'</b></p><p class="list-group-item-text">'+'<i class="fa fa-calendar"></i> Completed: <b>'+end+'</b></p><p class="list-group-item-text">'+'<i class="fa fa-building-o"></i> Institute: <b>'+item[3]+'</b></p></div>');
     return itemHtml;
 });
 
@@ -1492,7 +1548,7 @@ EmployeeSubCertificationAdapter.method('getSubItemHtml', function(item, itemDele
     try{
         end = Date.parse(item[5]).toString('MMM d, yyyy');
     }catch(e){}
-    var itemHtml = $('<a href="#" class="list-group-item"><h5 class="list-group-item-heading" style="font-weight:bold;">'+item[2]+itemDelete+itemEdit+'</h5><p class="list-group-item-text"><i class="fa fa-calendar"></i> Granted On: <b>'+start+'</b></p><p class="list-group-item-text">'+'<i class="fa fa-calendar"></i> Valid Thru: <b>'+end+'</b></p><p class="list-group-item-text">'+'<i class="fa fa-building-o"></i> Institute: <b>'+item[3]+'</b></p></a>');
+    var itemHtml = $('<div class="list-group-item sub-tab-item"><h5 class="list-group-item-heading" style="font-weight:bold;">'+item[2]+itemDelete+itemEdit+'</h5><p class="list-group-item-text"><i class="fa fa-calendar"></i> Granted On: <b>'+start+'</b></p><p class="list-group-item-text">'+'<i class="fa fa-calendar"></i> Valid Thru: <b>'+end+'</b></p><p class="list-group-item-text">'+'<i class="fa fa-building-o"></i> Institute: <b>'+item[3]+'</b></p></div>');
     return itemHtml;
 });
 
@@ -1570,7 +1626,7 @@ EmployeeSubLanguageAdapter.method('getSubHeaderTitle', function() {
 });
 
 EmployeeSubLanguageAdapter.method('getSubItemHtml', function(item, itemDelete, itemEdit) {
-    var itemHtml = $('<a href="#" class="list-group-item"><h5 class="list-group-item-heading" style="font-weight:bold;">'+item[2]+itemDelete+itemEdit+'</h5><p class="list-group-item-text"><i class="fa fa-asterisk"></i> Reading: <b>'+item[3]+'</b></p><p class="list-group-item-text">'+'<i class="fa fa-asterisk"></i> Speaking: <b>'+ item[4] +'</b></p><p class="list-group-item-text">'+'<i class="fa fa-asterisk"></i> Writing: <b>'+item[5]+'</b></p><p class="list-group-item-text">'+'<i class="fa fa-asterisk"></i> Understanding: <b>'+item[6]+'</b></p></a>');
+    var itemHtml = $('<div class="list-group-item sub-tab-item"><h5 class="list-group-item-heading" style="font-weight:bold;">'+item[2]+itemDelete+itemEdit+'</h5><p class="list-group-item-text"><i class="fa fa-asterisk"></i> Reading: <b>'+item[3]+'</b></p><p class="list-group-item-text">'+'<i class="fa fa-asterisk"></i> Speaking: <b>'+ item[4] +'</b></p><p class="list-group-item-text">'+'<i class="fa fa-asterisk"></i> Writing: <b>'+item[5]+'</b></p><p class="list-group-item-text">'+'<i class="fa fa-asterisk"></i> Understanding: <b>'+item[6]+'</b></p></div>');
     return itemHtml;
 });
 
@@ -1582,6 +1638,154 @@ EmployeeSubLanguageAdapter.method('isSubProfileTable', function() {
     }
 });
 
+/**
+ * @class EmployeeSubDependentAdapter
+ * @param endPoint
+ * @param tab
+ * @param filter
+ * @param orderBy
+ * @returns
+ */
+
+function EmployeeSubDependentAdapter(endPoint,tab,filter,orderBy) {
+    this.initAdapter(endPoint,tab,filter,orderBy);
+}
+
+EmployeeSubDependentAdapter.inherits(SubAdapterBase);
+
+
+
+EmployeeSubDependentAdapter.method('getDataMapping', function() {
+    return [
+        "id",
+        "employee",
+        "name",
+        "relationship",
+        "dob",
+        "id_number"
+    ];
+});
+
+
+EmployeeSubDependentAdapter.method('getHeaders', function() {
+    return [
+        { "sTitle": "ID" ,"bVisible":false},
+        { "sTitle": "Employee" },
+        { "sTitle": "Name" },
+        { "sTitle": "Relationship"},
+        { "sTitle": "Date of Birth"},
+        { "sTitle": "Id Number"}
+    ];
+});
+
+EmployeeSubDependentAdapter.method('getFormFields', function() {
+    return [
+        [ "id", {"label":"ID","type":"hidden"}],
+        [ "employee", {"label":"Employee","type":"hidden"}],
+        [ "name", {"label":"Name","type":"text","validation":""}],
+        [ "relationship", {"label":"Relationship","type":"select","source":[["Child","Child"],["Spouse","Spouse"],["Parent","Parent"],["Other","Other"]]}],
+        [ "dob", {"label":"Date of Birth","type":"date","validation":""}],
+        [ "id_number", {"label":"Id Number","type":"text","validation":"none"}]
+    ];
+});
+
+
+EmployeeSubDependentAdapter.method('forceInjectValuesBeforeSave', function(params) {
+    params['employee'] = this.parent.currentId;
+    return params;
+});
+
+EmployeeSubDependentAdapter.method('getSubHeaderTitle', function() {
+    var addBtn = '<button class="btn btn-small btn-success" onclick="modJs.subModJsList[\'tab'+this.tab+'\'].renderForm();" style="margin-right:10px;"><i class="fa fa-plus"></i></button>';
+    return addBtn + "Dependents";
+});
+
+EmployeeSubDependentAdapter.method('getSubItemHtml', function(item, itemDelete, itemEdit) {
+
+
+    var itemHtml = $('<div class="list-group-item sub-tab-item"><h5 class="list-group-item-heading" style="font-weight:bold;">'+item[2]+itemDelete+itemEdit+'</h5><p class="list-group-item-text"><i class="fa fa-users"></i> Relationship: <b>'+item[3]+'</b></p><p class="list-group-item-text">'+'<i class="fa fa-user"></i> Name: <b>'+item[2]+'</b></p></div>');
+    return itemHtml;
+});
+
+
+
+/**
+ * @class EmployeeSubEmergencyContactAdapter
+ * @param endPoint
+ * @param tab
+ * @param filter
+ * @param orderBy
+ * @returns
+ */
+
+function EmployeeSubEmergencyContactAdapter(endPoint,tab,filter,orderBy) {
+    this.initAdapter(endPoint,tab,filter,orderBy);
+}
+
+EmployeeSubEmergencyContactAdapter.inherits(SubAdapterBase);
+
+
+
+EmployeeSubEmergencyContactAdapter.method('getDataMapping', function() {
+    return [
+        "id",
+        "employee",
+        "name",
+        "relationship",
+        "home_phone",
+        "work_phone",
+        "mobile_phone"
+    ];
+});
+
+
+EmployeeSubEmergencyContactAdapter.method('getHeaders', function() {
+    return [
+        { "sTitle": "ID" ,"bVisible":false},
+        { "sTitle": "Employee" },
+        { "sTitle": "Name" },
+        { "sTitle": "Relationship"},
+        { "sTitle": "Home Phone"},
+        { "sTitle": "Work Phone"},
+        { "sTitle": "Mobile Phone"}
+    ];
+});
+
+EmployeeSubEmergencyContactAdapter.method('getFormFields', function() {
+    return [
+        [ "id", {"label":"ID","type":"hidden"}],
+        [ "employee", {"label":"Employee","type":"hidden"}],
+        [ "name", {"label":"Name","type":"text","validation":""}],
+        [ "relationship", {"label":"Relationship","type":"text","validation":"none"}],
+        [ "home_phone", {"label":"Home Phone","type":"text","validation":"none"}],
+        [ "work_phone", {"label":"Work Phone","type":"text","validation":"none"}],
+        [ "mobile_phone", {"label":"Mobile Phone","type":"text","validation":"none"}]
+    ];
+});
+
+
+EmployeeSubEmergencyContactAdapter.method('forceInjectValuesBeforeSave', function(params) {
+    params['employee'] = this.parent.currentId;
+    return params;
+});
+
+EmployeeSubEmergencyContactAdapter.method('getSubHeaderTitle', function() {
+    var addBtn = '<button class="btn btn-small btn-success" onclick="modJs.subModJsList[\'tab'+this.tab+'\'].renderForm();" style="margin-right:10px;"><i class="fa fa-plus"></i></button>';
+    return addBtn + "Emergency Contacts";
+});
+
+EmployeeSubEmergencyContactAdapter.method('getSubItemHtml', function(item, itemDelete, itemEdit) {
+
+
+    var itemHtml = $('<div class="list-group-item sub-tab-item"><h5 class="list-group-item-heading" style="font-weight:bold;">'+item[2]+itemDelete+itemEdit+'</h5><p class="list-group-item-text"><i class="fa fa-users"></i> Relationship: <b>'+item[3]+'</b></p><p class="list-group-item-text">'+'<i class="fa fa-user"></i> Name: <b>'+item[2]+'</b></p><p class="list-group-item-text"><i class="fa fa-phone"></i> Home Phone: <b>'+item[4]+'</b></p><p class="list-group-item-text"><i class="fa fa-phone"></i> Mobile Phone: <b>'+item[6]+'</b></p></div>');
+    return itemHtml;
+});
+
+
+
+
+
+
 
 /**
  * @class EmployeeSubDocumentAdapter
@@ -1655,10 +1859,15 @@ EmployeeSubDocumentAdapter.method('getSubItemHtml', function(item, itemDelete, i
     try{
         expire = Date.parse(item[5]).toString('MMM d, yyyy');
     }catch(e){}
-    var itemHtml = $('<a href="#" class="list-group-item"><h5 class="list-group-item-heading" style="font-weight:bold;">'+item[2]+itemDelete+itemEdit+'</h5><p class="list-group-item-text">'+nl2br(item[3])+'</p><p class="list-group-item-text">'+'<i class="fa fa-calendar"></i> Expire On: <b>'+expire+'</b></p></a>');
+
+    var downloadButton = '<button id="#_id_#_download" onclick="download(\''+item[7]+'\');return false;" type="button" style="position: absolute;bottom: 5px;right: 70px;font-size: 13px;" tooltip="Download"><li class="fa fa-cloud-download"></li></button>';
+
+    var itemHtml = $('<div class="list-group-item sub-tab-item"><h5 class="list-group-item-heading" style="font-weight:bold;">'+item[2]+downloadButton+itemDelete+itemEdit+'</h5><p class="list-group-item-text">'+nl2br(item[3])+'</p><p class="list-group-item-text">'+'<i class="fa fa-calendar"></i> Expire On: <b>'+expire+'</b></p></div>');
     return itemHtml;
 });
 
+
+
 EmployeeSubDocumentAdapter.method('isSubProfileTable', function() {
     if(this.user.user_level == "Admin"){
         return false;

ext/admin/fieldnames/api/FieldnamesAdminManager.php

@@ -53,5 +53,30 @@ if (!class_exists('CustomField')) {
 		public function getAnonymousAccess(){
 			return array("get","element");
 		}
+
+        public function validateSave($obj){
+            $type = $obj->type;
+            $baseObject = new $type();
+            $fields = $baseObject->getObjectKeys();
+            if(isset($fields[$obj->name])){
+                return new IceResponse(IceResponse::ERROR,"Column name already exists by default");
+            }
+
+            $cf = new CustomField();
+            if(empty($obj->id)){
+                $cf->Load("type = ? and name = ?",array($obj->type, $obj->name));
+                if($cf->name == $obj->name){
+                    return new IceResponse(IceResponse::ERROR,"Another custom field with same name has already been added");
+                }
+            }else{
+                $cf->Load("type = ? and name = ? and id <> ?",array($obj->type, $obj->name, $obj->id));
+                if($cf->name == $obj->name){
+                    return new IceResponse(IceResponse::ERROR,"Another custom field with same name has already been added");
+                }
+            }
+
+            return new IceResponse(IceResponse::SUCCESS,"");
+        }
+
 	}
 }

ext/admin/fieldnames/index.php

@@ -15,13 +15,8 @@ include APP_BASE_PATH.'modulejslibs.inc.php';
 ?><div class="span9">
 			  
 	<ul class="nav nav-tabs" id="modTab" style="margin-bottom:0px;margin-left:5px;border-bottom: none;">
-        <li class="dropdown">
+        <li class="active"><a id="tabEmployeeFieldName" href="#tabPageEmployeeFieldName"><?=LanguageManager::tran('Employee Field Names')?></a></li>
-            <a href="#" id="settingsEmployeeMenu" class="dropdown-toggle" data-toggle="dropdown" aria-controls="settingsEmployeeMenu-contents">Employee Fields <span class="caret"></span></a>
+        <li><a id="tabEmployeeCustomField" href="#tabPageEmployeeCustomField"><?=LanguageManager::tran('Employee Custom Fields')?></a></li>
-            <ul class="dropdown-menu" role="menu" aria-labelledby="settingsEmployeeMenu" id="settingsEmployeeMenu-contents">
-                <li><a id="tabEmployeeFieldName" href="#tabPageEmployeeFieldName">Employee Field Name Mapping</a></li>
-                <li><a id="tabEmployeeCustomField" href="#tabPageEmployeeCustomField">Employee Custom Fields</a></li>
-            </ul>
-        </li>
 	</ul>
 	 
 	<div class="tab-content">
@@ -51,9 +46,9 @@ modJsList['tabEmployeeFieldName'] = new FieldNameAdapter('FieldNameMapping','Emp
 modJsList['tabEmployeeFieldName'].setRemoteTable(true);
 modJsList['tabEmployeeFieldName'].setShowAddNew(false);
 
-modJsList['tabEmployeeCustomField'] = new CustomFieldAdapter('CustomField','EmployeeCustomField',{"type":"Employee"});
+modJsList['tabEmployeeCustomField'] = new CustomFieldAdapter('CustomField','EmployeeCustomField',{"type":"Employee"},"display_order desc");
 modJsList['tabEmployeeCustomField'].setRemoteTable(true);
-modJsList['tabEmployeeCustomField'].setShowAddNew(false);
+modJsList['tabEmployeeCustomField'].setTableType("Employee");
 
 
 var modJs = modJsList['tabEmployeeFieldName'];

ext/admin/fieldnames/lib.js

@@ -52,6 +52,7 @@ FieldNameAdapter.method('getFormFields', function() {
 
 function CustomFieldAdapter(endPoint,tab,filter,orderBy) {
     this.initAdapter(endPoint,tab,filter,orderBy);
+	this.tableType = "";
 }
 
 CustomFieldAdapter.inherits(AdapterBase);
@@ -62,7 +63,8 @@ CustomFieldAdapter.method('getDataMapping', function() {
 	return [
 	        "id",
 	        "name",
-	        "display"
+	        "display",
+	        "display_order"
 	];
 });
 
@@ -70,17 +72,74 @@ CustomFieldAdapter.method('getHeaders', function() {
 	return [
 			{ "sTitle": "ID" ,"bVisible":false},
 			{ "sTitle": "Name" },
-			{ "sTitle": "Display Status"}
+			{ "sTitle": "Display Status"},
+			{ "sTitle": "Priority"}
 	];
 });
 
 CustomFieldAdapter.method('getFormFields', function() {
 	return [
 	        [ "id", {"label":"ID","type":"hidden"}],
-	        [ "type", {"label":"Type","type":"placeholder","validation":""}],
+	        //[ "type", {"label":"Type","type":"placeholder","validation":""}],
-	        [ "name", {"label":"Name","type":"placeholder","validation":""}],
+	        [ "name", {"label":"Name","type":"text","validation":""}],
-	        [ "data", {"label":"Data","type":"textarea","validation":""}],
+            [ "display", {"label":"Display Status","type":"select","source":[["Form","Show"],["Hidden","Hidden"]]}],
-            [ "display", {"label":"Display Status","type":"select","source":[["Form","Form"],["Table and Form","Table and Form"],["Hidden","Hidden"]]}]
+            [ "field_type", {"label":"Field Type","type":"select","source":[["text","Text Field"],["textarea","Text Area"],["select","Select"],["select2","Select2"],["select2multi","Multi Select"],["fileupload","File Upload"],["date","Date"],["datetime","Date Time"],["time","Time"]]}],
+            [ "field_label", {"label":"Field Label","type":"text","validation":""}],
+			[ "field_validation", {"label":"Validation","type":"select","validation":"none","sort":"none","source":[["","Required"],["none","None"],["number","Number"],["numberOrEmpty","Number or Empty"],["float","Decimal"],["email","Email"],["emailOrEmpty","Email or Empty"]]}],
+			[ "field_options", {"label":"Field Options","type":"datagroup",
+				"form":[
+					[ "label", {"label":"Label","type":"text","validation":""}],
+					[ "value", {"label":"Value","type":"text","validation":"none"}]
+				],
+				"html":'<div id="#_id_#" class="panel panel-default"><div class="panel-body">#_delete_##_edit_#<span style="color:#999;font-size:13px;font-weight:bold">#_label_#</span>:#_value_#</div></div>',
+				"validation":"none"
+			}],
+			[ "display_order", {"label":"Priority","type":"text","validation":"number"}],
+			[ "display_section", {"label":"Display Section","type":"text","validation":""}]
 	];
 });
 
+CustomFieldAdapter.method('setTableType', function(type) {
+	this.tableType = type;
+});
+
+CustomFieldAdapter.method('doCustomValidation', function(params) {
+	var validateName= function (str) {
+		var name = /^[a-z][a-z0-9\._]+$/;
+		return str != null && name.test(str);
+	};
+
+	if(!validateName(params.name)){
+		return "Invalid name for custom field";
+	}
+
+
+	return null;
+});
+
+CustomFieldAdapter.method('forceInjectValuesBeforeSave', function(params) {
+
+
+	//Build data field
+	var data = [params.name], options = [], optionsData;
+	data.push({});
+	data[1]['label'] = params.field_label;
+	data[1]['type'] = params.field_type;
+	data[1]['validation'] = params.field_validation;
+	if(["select","select2","select2multi"].indexOf(params.field_type) >= 0){
+		optionsData = JSON.parse(params.field_options);
+		for(index in optionsData){
+			options.push([optionsData[index].value, optionsData[index].label]);
+		}
+		data[1]['source'] = options;
+	}
+	if(params.field_validation == null || params.field_validation == undefined){
+		params.field_validation = "";
+	}
+	params.data = JSON.stringify(data);
+	params.type = this.tableType;
+	return params;
+});
+
+
+

ext/admin/jobs/index.php

@@ -20,7 +20,6 @@ along with iCE Hrm. If not, see <http://www.gnu.org/licenses/>.
 Original work Copyright (c) 2012 [Gamonoid Media Pvt. Ltd]  
 Developer: Thilina Hasantha (thilina.hasantha[at]gmail.com / facebook.com/thilinah)
  */
-
 $moduleName = 'jobs';
 define('MODULE_PATH',dirname(__FILE__));
 include APP_BASE_PATH.'header.php';
@@ -28,9 +27,9 @@ include APP_BASE_PATH.'modulejslibs.inc.php';
 ?><div class="span9">
 			  
 	<ul class="nav nav-tabs" id="modTab" style="margin-bottom:0px;margin-left:5px;border-bottom: none;">
-		<li class="active"><a id="tabJobTitles" href="#tabPageJobTitles">Job Titles</a></li>
+		<li class="active"><a id="tabJobTitles" href="#tabPageJobTitles"><?=LanguageManager::tran('Job Titles')?></a></li>
-		<li><a id="tabPayGrades" href="#tabPagePayGrades">Pay Grades</a></li>
+		<li><a id="tabPayGrades" href="#tabPagePayGrades"><?=LanguageManager::tran('Pay Grades')?></a></li>
-		<li><a id="tabEmploymentStatus" href="#tabPageEmploymentStatus">Employment Status</a></li>
+		<li><a id="tabEmploymentStatus" href="#tabPageEmploymentStatus"><?=LanguageManager::tran('Employment Status')?></a></li>
 	</ul>
 	 
 	<div class="tab-content">

ext/admin/loans/index.php

@@ -28,8 +28,8 @@ include APP_BASE_PATH.'modulejslibs.inc.php';
 ?><div class="span9">
 			  
 	<ul class="nav nav-tabs" id="modTab" style="margin-bottom:0px;margin-left:5px;border-bottom: none;">
-		<li class="active"><a id="tabCompanyLoan" href="#tabPageCompanyLoan">Loan Types</a></li>
+		<li class="active"><a id="tabCompanyLoan" href="#tabPageCompanyLoan"><?=LanguageManager::tran('Loan Types')?></a></li>
-		<li><a id="tabEmployeeCompanyLoan" href="#tabPageEmployeeCompanyLoan">Employee Loans</a></li>
+		<li><a id="tabEmployeeCompanyLoan" href="#tabPageEmployeeCompanyLoan"><?=LanguageManager::tran('Employee Loans')?></a></li>
 	</ul>
 	 
 	<div class="tab-content">

ext/admin/meta.json

@@ -1,7 +1,8 @@
 {
 "Admin":"fa-cubes",
 "Employees":"fa-users",
-"Reports":"fa-file-text",
+"Admin Reports":"fa-file-text",
 "System":"fa-cogs",
+"Insights":"fa-bar-chart-o",
 "Payroll":"fa-money"
 }

ext/admin/metadata/api/MetadataAdminManager.php

@@ -52,7 +52,12 @@ if (!class_exists('Country')) {
 			}
 
 			if(!empty($allowedCountries)){
-				return parent::Find("id in (".implode(",",$allowedCountries).")" , array());
+				$res =  parent::Find("id in (".implode(",",$allowedCountries).")" , array());
+				if(empty($res)){
+					SettingsManager::getInstance()->setSetting('System: Allowed Countries','');
+				}else{
+					return $res;
+				}
 			}
 
 			return parent::Find($whereOrderBy, $bindarr, $pkeysArr, $extra);
@@ -103,7 +108,12 @@ if (!class_exists('CurrencyType')) {
 			}
 
 			if(!empty($allowedCountries)){
-				return parent::Find("id in (".implode(",",$allowedCountries).")" , array());
+				$res =  parent::Find("id in (".implode(",",$allowedCountries).")" , array());
+				if(empty($res)){
+					SettingsManager::getInstance()->setSetting('System: Allowed Currencies','');
+				}else{
+					return $res;
+				}
 			}
 
 			return parent::Find($whereOrderBy, $bindarr, $pkeysArr, $extra);
@@ -136,7 +146,12 @@ if (!class_exists('Nationality')) {
 			}
 
 			if(!empty($allowedCountries)){
-				return parent::Find("id in (".implode(",",$allowedCountries).")" , array());
+				$res = parent::Find("id in (".implode(",",$allowedCountries).")" , array());
+				if(empty($res)){
+					SettingsManager::getInstance()->setSetting('System: Allowed Currencies','');
+				}else{
+					return $res;
+				}
 			}
 
 			return parent::Find($whereOrderBy, $bindarr, $pkeysArr, $extra);
@@ -210,6 +225,42 @@ if (!class_exists('CalculationHook')) {
     }
 }
 
+if (!class_exists('CustomFieldValue')) {
+	class CustomFieldValue extends ICEHRM_Record {
+		var $_table = 'CustomFieldValues';
+
+		public function getAdminAccess(){
+			return array("get","element","save","delete");
+		}
+
+		public function getUserAccess(){
+			return array("get","element","save","delete");
+		}
+
+		public function getAnonymousAccess(){
+			return array();
+		}
+	}
+}
+
+if (!class_exists('SupportedLanguage')) {
+	class SupportedLanguage extends ICEHRM_Record {
+		var $_table = 'SupportedLanguages';
+
+		public function getAdminAccess(){
+			return array("get","element","save","delete");
+		}
+
+		public function getUserAccess(){
+			return array();
+		}
+
+		public function getAnonymousAccess(){
+			return array("get","element");
+		}
+	}
+}
+
 
 
 

ext/admin/modules/index.php

@@ -28,7 +28,7 @@ include APP_BASE_PATH.'modulejslibs.inc.php';
 ?><div class="span9">
 			  
 	<ul class="nav nav-tabs" id="modTab" style="margin-bottom:0px;margin-left:5px;border-bottom: none;">
-		<li class="active"><a id="tabModule" href="#tabPageModule">Modules</a></li>
+		<li class="active"><a id="tabModule" href="#tabPageModule"><?=LanguageManager::tran('Modules')?></a></li>
 	</ul>
 	 
 	<div class="tab-content">
@@ -51,4 +51,4 @@ modJsList['tabModule'].setShowAddNew(false);
 var modJs = modJsList['tabModule'];
 
 </script>
-<?php include APP_BASE_PATH.'footer.php';?>      
+<?php include APP_BASE_PATH.'footer.php';?>      

ext/admin/overtime/api/OvertimeActionManager.php

@@ -0,0 +1,27 @@
+<?php
+class OvertimeActionManager extends ApproveAdminActionManager{
+
+    public function getModelClass(){
+        return "EmployeeOvertime";
+    }
+
+    public function getItemName(){
+        return "Overtime Request";
+    }
+
+    public function getModuleName(){
+        return "Overtime Management";
+    }
+
+    public function getModuleTabUrl(){
+        return "g=modules&n=overtime&m=module_Time_Management#tabEmployeeOvertime";
+    }
+
+    public function getModuleSubordinateTabUrl(){
+        return "g=modules&n=overtime&m=module_Time_Management#tabSubordinateEmployeeOvertime";
+    }
+
+    public function getModuleApprovalTabUrl(){
+        return "g=modules&n=overtime&m=module_Time_Management#tabEmployeeOvertimeApproval";
+    }
+}

ext/admin/overtime/api/OvertimeAdminManager.php

@@ -0,0 +1,123 @@
+<?php
+if (!class_exists('OvertimeAdminManager')) {
+	
+	class OvertimeAdminManager extends AbstractModuleManager{
+
+		public function initializeUserClasses(){
+			if(defined('MODULE_TYPE') && MODULE_TYPE != 'admin'){
+				$this->addUserClass("EmployeeOvertime");
+			}
+		}
+
+		public function initializeFieldMappings(){
+
+		}
+
+		public function initializeDatabaseErrorMappings(){
+
+		}
+
+		public function setupModuleClassDefinitions(){
+			
+			$this->addModelClass('OvertimeCategory');
+			$this->addModelClass('EmployeeOvertime');
+			$this->addModelClass('EmployeeOvertimeApproval');
+			
+		}
+
+	}
+}
+
+
+if (!class_exists('OvertimeCategory')) {
+	class OvertimeCategory extends ICEHRM_Record {
+		var $_table = 'OvertimeCategories';
+
+		public function getAdminAccess(){
+			return array("get","element","save","delete");
+		}
+
+		public function getManagerAccess(){
+			return array("get","element","save","delete");
+		}
+
+		public function getUserAccess(){
+			return array("get");
+		}
+
+		public function getUserOnlyMeAccess(){
+			return array("get","element");
+		}
+	}
+}
+
+
+
+if (!class_exists('EmployeeOvertime')) {
+	class EmployeeOvertime extends ApproveModel
+    {
+        var $_table = 'EmployeeOvertime';
+
+        var $notificationModuleName = "Overtime Management";
+        var $notificationUnitName = "OvertimeRequest";
+        var $notificationUnitPrefix = "An";
+        var $notificationUnitAdminUrl = "g=modules&n=overtime&m=module_Time_Management#tabSubordinateEmployeeOvertime";
+        var $preApproveSettingName = "Attendance: Pre-Approve Overtime Request";
+
+		public function isMultiLevelApprovalsEnabled(){
+			return (SettingsManager::getInstance()->getSetting('Overtime: Enable Multi Level Approvals') == '1');
+		}
+
+        public function getAdminAccess()
+        {
+            return array("get", "element", "save", "delete");
+        }
+
+        public function getManagerAccess()
+        {
+            return array("get", "element", "save", "delete");
+        }
+
+        public function getUserAccess()
+        {
+            return array("get");
+        }
+
+        public function getUserOnlyMeAccess()
+        {
+            return array("element", "save", "delete");
+        }
+
+        public function fieldsNeedToBeApproved()
+        {
+            return array(
+                "start_time",
+                "end_time"
+            );
+        }
+
+		public function getType(){
+			return 'EmployeeOvertime';
+		}
+
+		public function allowIndirectMapping(){
+			if(SettingsManager::getInstance()->getSetting('Overtime: Allow Indirect Admins to Approve') == '1'){
+				return true;
+			}
+			return false;
+		}
+
+    }
+}
+
+
+if (!class_exists('EmployeeOvertimeApproval')) {
+
+	class EmployeeOvertimeApproval extends EmployeeOvertime
+	{
+
+		public function Find($whereOrderBy,$bindarr=false,$pkeysArr=false,$extra=array()){
+			return $this->findApprovals(new EmployeeOvertime(), $whereOrderBy,$bindarr,$pkeysArr,$extra);
+		}
+	}
+}

ext/admin/overtime/index.php

@@ -0,0 +1,42 @@
+<?php 
+/*
+This file is part of iCE Hrm.
+
+iCE Hrm is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+iCE Hrm is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with iCE Hrm. If not, see <http://www.gnu.org/licenses/>.
+
+------------------------------------------------------------------
+
+Original work Copyright (c) 2012 [Gamonoid Media Pvt. Ltd]  
+Developer: Thilina Hasantha (thilina.hasantha[at]gmail.com / facebook.com/thilinah)
+ */
+
+$moduleName = 'travel';
+define('MODULE_PATH',dirname(__FILE__));
+include APP_BASE_PATH.'header.php';
+include APP_BASE_PATH.'modulejslibs.inc.php';
+
+$options = array();
+$options['setRemoteTable'] = 'true';
+
+$moduleBuilder = new ModuleBuilder();
+$moduleBuilder->addModuleOrGroup(new ModuleTab('OvertimeCategory','OvertimeCategory','Overtime Categories','OvertimeCategoryAdapter','','',true,$options));
+$moduleBuilder->addModuleOrGroup(new ModuleTab('EmployeeOvertime','EmployeeOvertime','Overtime Requests','EmployeeOvertimeAdminAdapter','','',false,$options));
+echo UIManager::getInstance()->renderModule($moduleBuilder);
+
+
+$itemName = 'OvertimeRequest';
+$moduleName = 'Time Management';
+$itemNameLower = strtolower($itemName);
+
+include APP_BASE_PATH.'footer.php';

ext/admin/overtime/lib.js

@@ -0,0 +1,99 @@
+/**
+ * Author: Thilina Hasantha
+ */
+
+
+/**
+ * OvertimeCategoryAdapter
+ */
+
+function OvertimeCategoryAdapter(endPoint) {
+	this.initAdapter(endPoint);
+}
+
+OvertimeCategoryAdapter.inherits(AdapterBase);
+
+
+
+OvertimeCategoryAdapter.method('getDataMapping', function() {
+	return [
+	        "id",
+	        "name"
+	];
+});
+
+OvertimeCategoryAdapter.method('getHeaders', function() {
+	return [
+			{ "sTitle": "ID" ,"bVisible":false},
+			{ "sTitle": "Name" }
+	];
+});
+
+OvertimeCategoryAdapter.method('getFormFields', function() {
+	return [
+	        [ "id", {"label":"ID","type":"hidden"}],
+	        [ "name", {"label":"Name","type":"text","validation":""}]
+	];
+});
+
+
+
+
+/**
+ * EmployeeOvertimeAdminAdapter
+ */
+
+
+function EmployeeOvertimeAdminAdapter(endPoint,tab,filter,orderBy) {
+    this.initAdapter(endPoint,tab,filter,orderBy);
+    this.itemName = 'OvertimeRequest';
+    this.itemNameLower = 'overtimerequest';
+    this.modulePathName = 'overtime';
+}
+
+EmployeeOvertimeAdminAdapter.inherits(ApproveAdminAdapter);
+
+
+
+EmployeeOvertimeAdminAdapter.method('getDataMapping', function() {
+	return [
+	        "id",
+	        "employee",
+	        "category",
+	        "start_time",
+	        "end_time",
+	        "project",
+            "status"
+	];
+});
+
+EmployeeOvertimeAdminAdapter.method('getHeaders', function() {
+	return [
+			{ "sTitle": "ID" ,"bVisible":false},
+			{ "sTitle": "Employee" },
+			{ "sTitle": "Category" },
+			{ "sTitle": "Start Time" },
+			{ "sTitle": "End Time"},
+			{ "sTitle": "Project"},
+			{ "sTitle": "Status"}
+	];
+});
+
+EmployeeOvertimeAdminAdapter.method('getFormFields', function() {
+    return [
+        ["id", {"label": "ID", "type": "hidden"}],
+        ["employee", {
+            "label": "Employee",
+            "type": "select2",
+            "sort": "none",
+            "allow-null": false,
+            "remote-source": ["Employee", "id", "first_name+last_name", "getActiveSubordinateEmployees"]
+        }],
+		["category", {"label": "Category", "type": "select2", "allow-null":false, "remote-source": ["OvertimeCategory", "id", "name"]}],
+		["start_time", {"label": "Start Time", "type": "datetime", "validation": ""}],
+		["end_time", {"label": "End Time", "type": "datetime", "validation": ""}],
+		["project", {"label": "Project", "type": "select2", "allow-null":true,"null=label":"none","remote-source": ["Project", "id", "name"]}],
+		["notes", {"label": "Notes", "type": "textarea", "validation": "none"}]
+    ];
+});
+

ext/admin/overtime/meta.json

@@ -0,0 +1,12 @@
+{
+  "label":"Overtime Administration",
+  "menu":"Employees",
+  "order":"94",
+  "icon":"fa-align-center",
+  "user_levels":["Admin","Manager"],
+  "dashboardPosition":13,
+
+  "permissions":
+      {
+      }
+}

ext/admin/permissions/dashboard.html

@@ -3,17 +3,17 @@
     <div class="small-box bg-aqua">
         <div class="inner">
             <h3>
-                Permission
+                <t>Permission</t>
             </h3>
             <p>
-                Management
+                <t>Management</t>
             </p>
         </div>
         <div class="icon">
             <i class="ion ion-locked"></i>
         </div>
         <a href="#_moduleLink_#" class="small-box-footer" id="permissionLink">
-            Manage Permissions <i class="fa fa-arrow-circle-right"></i>
+            <t>Manage</t> <t>Permissions</t> <i class="fa fa-arrow-circle-right"></i>
         </a>
     </div>
 </div>