Change version to v16.1.OS

------------------
### Features
 * Advanced Employee Management Module is now included in IceHrm Open Source Edition
 * LDAP Module which was only available in IceHrm Enterprise is now included in open source also
 * Initial implementation of icehrm REST Api for reading employee details
 * Improvements to data filtering
 * Multiple tabs for settings module
 * Overtime reports - now its possible to calculate overtime for employees.compatible with US overtime rules
 * Logout the user if tried accessing an unauthorized module
 * Setting for updating module names

### Fixes
 * Fix issue: classes should be loaded even the module is disabled
 * Deleting the only Admin user is not allowed
 * Fixes for handling non UTF-8
 * Fix for non-mandatory select boxes are shown as mandatory

.gitignore

@@ -2,3 +2,4 @@
 /.buildpath
 /.project
 /.idea
+build

build.xml

@@ -8,14 +8,15 @@
  <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"
-         depends="prepare,lint,phpunit,copyapp,release,install"
+         depends="prepare,lint,copyapp,release,install"
          description=""/>
-	
-<target name="buildlocal"
-         depends="prepare,copyapp"
+
+ <target name="buildlocal"
+         depends="prepare,copyapp,installLocal"
          description=""/>
 
  <target name="clean"
@@ -37,6 +38,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,29 +49,6 @@
   <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>
@@ -204,7 +183,6 @@
 
 
 <target name="copyapp"
-     depends=""
      description="Copy generated files to QA app">
 	
 	<delete includeemptydirs="true">
@@ -213,11 +191,29 @@
 	    </fileset>
 	</delete>
 	
-	<copy todir="${destination}">
+	<copy todir="${destination}" overwrite="true">
 	  <fileset dir="${origin}">
 	    <include name="**/*"/>
 	  </fileset>
 	</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>
 	
 </target>
 	
@@ -233,8 +229,8 @@
 	
 	<mkdir dir="${installpath}"/>
 
-	<copy todir="${installpath}">
-	  <fileset dir="${origin}">
+	<copy todir="${installpath}" overwrite="true">
+	  <fileset dir="${destination}">
 	    <include name="**/*"/>
 	  </fileset>
 	</copy>
@@ -245,6 +241,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/app/install/config.php

@@ -5,4 +5,4 @@ define('CURRENT_PATH',dirname(__FILE__));
 define('CLIENT_APP_PATH',realpath(dirname(__FILE__)."/..")."/");
 define('APP_PATH',realpath(dirname(__FILE__)."/../..")."/");
 define('APP_NAME',"ICE Hrm");
-define('APP_ID',"icehrm");
+define('APP_ID',"icehrm");

core-ext/classes/LDAPManager.php

@@ -0,0 +1,82 @@
+<?php
+
+class LDAPManager {
+
+    private static $me = null;
+
+    private function __construct(){
+
+    }
+
+
+    public static function getInstance(){
+        if(empty(self::$me)){
+            self::$me = new LDAPManager();
+        }
+
+        return self::$me;
+    }
+
+    public function checkLDAPLogin($user, $password){
+        $ldap_host = SettingsManager::getInstance()->getSetting("LDAP: Server");
+        $ldap_port = SettingsManager::getInstance()->getSetting("LDAP: Port");
+        $ldap_dn = SettingsManager::getInstance()->getSetting("LDAP: Root DN");
+
+        $managerDN = SettingsManager::getInstance()->getSetting("LDAP: Manager DN");
+        $managerPassword = SettingsManager::getInstance()->getSetting("LDAP: Manager Password");
+
+        // connect to active directory
+        if(empty($ldap_port)){
+            $ldap_port = 389;
+        }
+
+        $ldap = ldap_connect($ldap_host, intval($ldap_port));
+
+        if(!$ldap){
+            return new IceResponse(IceResponse::ERROR,"Could not connect to LDAP Server");
+        }
+
+        LogManager::getInstance()->debug("LDAP Connect Result:".print_r($ldap,true));
+
+        if(SettingsManager::getInstance()->getSetting("LDAP: Version 3") == "1"){
+            ldap_set_option($ldap, LDAP_OPT_PROTOCOL_VERSION, 3);
+        }
+        ldap_set_option($ldap, LDAP_OPT_REFERRALS, 0);
+
+        // verify user and password
+        $bind = @ldap_bind($ldap, $managerDN, $managerPassword);
+
+        LogManager::getInstance()->debug("LDAP Manager Bind:".print_r($bind,true));
+
+        if($bind) {
+
+            $userFilterStr = SettingsManager::getInstance()->getSetting("LDAP: User Filter");
+
+            $filter = str_replace("{}", $user, $userFilterStr);   //"(uid=" . $user . ")";
+            $result = ldap_search($ldap, $ldap_dn, $filter);
+            LogManager::getInstance()->debug("LDAP Search Result:".print_r($result,true));
+            if(!$result){
+                exit("Unable to search LDAP server");
+            }
+            $entries = ldap_get_entries($ldap, $result);
+            LogManager::getInstance()->debug("LDAP Search Entries:".print_r($entries,true));
+
+            if(empty($entries) || !isset($entries[0]) || !isset($entries[0]['dn'])){
+                return new IceResponse(IceResponse::ERROR,"Invalid user");
+            }
+
+            $bind = @ldap_bind($ldap,$entries[0]['dn'], $password);
+            ldap_unbind($ldap);
+
+            if($bind){
+                return new IceResponse(IceResponse::SUCCESS, $entries[0]);
+            }else{
+                return new IceResponse(IceResponse::ERROR,"Invalid user");
+            }
+
+
+        } else {
+            return new IceResponse(IceResponse::ERROR,"Invalid manager user");
+        }
+    }
+}

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

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

core-ext/config.base.php

@@ -9,13 +9,13 @@ 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', '15.0.OS');
-define('CACHE_VALUE', '15.0.OS');
-define('VERSION_DATE', '07/02/2016');
+define('VERSION', '16.1.OS');
+define('CACHE_VALUE', '16.1.OS');
+define('VERSION_DATE', '02/05/2016');
 
 if(!defined('CONTACT_EMAIL')){define('CONTACT_EMAIL','icehrm@gamonoid.com');}
 if(!defined('KEY_PREFIX')){define('KEY_PREFIX','IceHrm');}
 if(!defined('APP_SEC')){define('APP_SEC','dbcs234d2s111');}
 
 define('UI_SHOW_SWITCH_PROFILE', true);
-define('CRON_LOG', '/var/log/nginx/icehrmcron.log');
+define('CRON_LOG', '/var/log/nginx/icehrmcron.log');

core-ext/doc/ldap-config.txt

@@ -0,0 +1,27 @@
+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/login.com.inc.php

@@ -0,0 +1,2 @@
+<?php
+//Nothing here

core-ext/login.php

@@ -3,17 +3,65 @@ 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(empty($suser)){
-            $suser = new User();
-            $suser->Load("(username = ? or email = ?) and password = ?",array($_REQUEST['username'],$_REQUEST['username'],md5($_REQUEST['password'])));
+        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 :" . print_r($ldapResp, true));
+                LogManager::getInstance()->debug("LDAP Response Status :" . $ldapResp->getStatus());
+                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']));
+                    LogManager::getInstance()->debug("LDAP Response :[".$_REQUEST['username']."]" . print_r($suser, true));
+                    if (empty($suser)) {
+                        header("Location:" . CLIENT_BASE_URL . "login.php?f=1");
+                        exit();
+                    }
+
+                    $ssoUserLoaded = true;
+                }
+            }
         }
 
-        if($suser->password == md5($_REQUEST['password']) || $ssoUserLoaded){
+
+        if(!isset($_REQUEST['hashedPwd'])){
+            $_REQUEST['hashedPwd'] = md5($_REQUEST['password']);
+        }
+
+        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");
@@ -24,12 +72,29 @@ if(empty($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"){
-                    header("Location:".HOME_LINK_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);
@@ -39,12 +104,13 @@ if(empty($user)){
                         if($defaultModule->mod_group == "user"){
                             $defaultModule->mod_group = "modules";
                         }
-                        $homeLink = CLIENT_BASE_URL."?g=".$defaultModule->mod_group."&n=".$defaultModule->name.
+                        $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");
         }
@@ -70,27 +136,25 @@ if(empty($user)){
 }
 
 $tuser = SessionUtils::getSessionObject('user');
-//check user
-
 $logoFileUrl = UIManager::getInstance()->getCompanyLogoUrl();
 
 ?><!DOCTYPE html>
 <html lang="en">
-  <head>
+<head>
     <meta charset="utf-8">
-    <title><?=APP_NAME?> Login v<?=VERSION?> &copy; http://icehrm.com</title>
+    <title><?=APP_NAME?> Login</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta name="description" content="A Powerful But Simple Way to Manage Your Company and People. http://icehrm.com">
-    <meta name="author" content="http://gamonoid.com">
+    <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="https://ajax.googleapis.com/ajax/libs/jquery/1.8.1/jquery.js"></script>
+
+    <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>
+    <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">
@@ -98,7 +162,7 @@ $logoFileUrl = UIManager::getInstance()->getCompanyLogoUrl();
 
     <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
     <!--[if lt IE 9]>
-    <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+    <script src="<?=BASE_URL?>js/html5.js"></script>
     <![endif]-->
 
     <style type="text/css">
@@ -113,29 +177,29 @@ $logoFileUrl = UIManager::getInstance()->getCompanyLogoUrl();
             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);
-      }
+        /* 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;
-	  }
+        .login-form {
+            margin-left: 65px;
+        }
+
+        legend {
+            margin-right: -50px;
+            font-weight: bold;
+            color: #404040;
+        }
 
         .add-on{
             -webkit-border-radius:0px;
@@ -143,212 +207,203 @@ $logoFileUrl = UIManager::getInstance()->getCompanyLogoUrl();
             border-radius: 0px;
         }
 
-      input{
-          -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>
-  <div itemscope itemtype="http://schema.org/WebApplication" style="display: none;">
-      <span itemprop="name">IceHrm Pro</span> -
+<body>
 
-      REQUIRES <span itemprop="operatingSystem">Windows, OSX, Linux</span>
-      <link itemprop="applicationCategory" href="http://icehrm.com"/>
+<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');
 
-      RATING:
-      <div itemprop="aggregateRating" itemscope itemtype="http://schema.org/AggregateRating">
-          <span itemprop="ratingValue">4.5</span> (
-          <span itemprop="ratingCount">12</span> ratings )
-      </div>
+    ga('create', '<?=BaseService::getInstance()->getGAKey()?>', 'gamonoid.com');
+    ga('send', 'pageview');
 
-      <div itemprop="offers" itemscope itemtype="http://schema.org/Offer">
-          Price: $<span itemprop="price">199.99</span>
-          <meta itemprop="priceCurrency" content="USD" />
-      </div>
-  </div>
-  <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');
+</script>
 
-  ga('create', '<?=BaseService::getInstance()->getGAKey()?>', 'gamonoid.com');
-  ga('send', 'pageview');
+<script type="text/javascript">
+    var key = "";
+    <?php if(isset($_REQUEST['key'])){?>
+    key = '<?=$_REQUEST['key']?>';
+    key = key.replace(/ /g,"+");
+    <?php }?>
 
-  </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;
+            }
+        });
 
-  $(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;
+            }
+        });
+    });
 
-	  $("#password").keydown(function(event){
-		    if(event.keyCode == 13) {
-		      submitLogin();
-		      return false;
-		    }
-		  });
-	});
+    function showForgotPassword(){
+        $("#loginForm").hide();
+        $("#requestPasswordChangeForm").show();
+    }
 
-  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 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();
 
-  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);
+        };
 
-	  	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");
-  }
+        if(!passwordValidation(password)){
+            $("#newPasswordFormAlert").show();
+            $("#newPasswordFormAlert").html("Password may contain only letters, numbers and should be longer than 6 characters");
+            return;
+        }
 
-  function submitLogin(){
-	$("#loginForm").submit();  
-  }
-  
-  </script>
-	<div class="container">
-		<?php if(defined('DEMO_MODE')){?>
-		<div class="content" style="top: 30px;
+
+        $.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>
-							<?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>
+
+            <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">
-                            <span style="font-size:9px;">&copy; <a href="http://icehrm.com" target="_blank">IceHrm - v<?=VERSION?></a> Developed by <a href="http://gamonoid.com" target="_blank">Gamonoid (Pvt) Ltd.</a></span>
+                            <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 -->
+                    </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

@@ -5,9 +5,9 @@ class ICEHRM_Record extends ADOdb_Active_Record{
 		return array("get","element","save","delete");
 	}
 
-    public function getOtherAccess(){
-        return array("get","element","save","delete");
-    }
+	public function getOtherAccess(){
+		return array("get","element","save","delete");
+	}
 
 	public function getManagerAccess(){
 		return array("get","element");
@@ -16,7 +16,7 @@ class ICEHRM_Record extends ADOdb_Active_Record{
 	public function getUserAccess(){
 		return array("get","element");
 	}
-	
+
 	public function getEmployeeAccess(){
 		return $this->getUserAccess();
 	}
@@ -57,20 +57,24 @@ class ICEHRM_Record extends ADOdb_Active_Record{
 
 	}
 
-    public function postProcessGetData($obj){
-        return $obj;
-    }
+	public function postProcessGetData($obj){
+		return $obj;
+	}
 
-    public function getDefaultAccessLevel(){
-        return array("get","element","save","delete");
-    }
+	public function postProcessGetElement($obj){
+		return $obj;
+	}
 
-    public function getVirtualFields(){
-        return array(
-        );
-    }
+	public function getDefaultAccessLevel(){
+		return array("get","element","save","delete");
+	}
 
-    public function allowIndirectMapping(){
-        return false;
-    }
-}
+	public function getVirtualFields(){
+		return array(
+		);
+	}
+
+	public function allowIndirectMapping(){
+		return false;
+	}
+}

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-content">	
-	<div class="modal-header">
-		<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>
-	</div>
-	<div class="modal-body">
-		<p id="deleteModelBody"></p>
-	</div>
-	<div class="modal-footer">
- 		<button class="btn" onclick="modJs.cancelDelete();">Cancel</button>
-		<button class="btn btn-primary" onclick="modJs.confirmDelete();">Delete</button>
-	</div>
-</div>
-</div>
+    <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 id="deleteModelLabel" style="font-size: 17px;"></h3>
+            </div>
+            <div class="modal-body">
+                <p id="deleteModelBody"></p>
+            </div>
+            <div class="modal-footer">
+                <button class="btn" onclick="modJs.cancelDelete();">Cancel</button>
+                <button class="btn btn-primary" onclick="modJs.confirmDelete();">Delete</button>
+            </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-content">	
-	<div class="modal-header">
-		<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>
-	</div>
-	<div class="modal-body">
-		<p id="messageModelBody"></p>
-	</div>
-	<div class="modal-footer">
- 		<button class="btn" onclick="modJs.closeMessage();">Ok</button>
-	</div>
-</div>
-</div>
+    <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 id="messageModelLabel" style="font-size: 17px;"></h3>
+            </div>
+            <div class="modal-body">
+                <p id="messageModelBody"></p>
+            </div>
+            <div class="modal-footer">
+                <button class="btn" onclick="modJs.closeMessage();">Ok</button>
+            </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-content">	
-	<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>
-	</div>
-	<div class="modal-body">
-		<p id="plainMessageModelBody"></p>
-	</div>
-</div>
-</div>
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <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>
+            </div>
+            <div class="modal-body">
+                <p id="plainMessageModelBody"></p>
+            </div>
+        </div>
+    </div>
 </div>
 <!-- Plain Message Modal -->
 
@@ -89,98 +89,98 @@
 
 <!-- Upload Modal -->
 <div class="modal fade" id="uploadModel" tabindex="-1" role="dialog" 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 id="uploadModelLabel" style="font-size: 17px;"></h3>
-	</div>
-	<div class="modal-body">
-		<p id="uploadModelBody"></p>
-	</div>
-	<div class="modal-footer">
- 		<button class="btn" onclick="$('#uploadModel').modal('hide');">Cancel</button>
-	</div>
-</div>
-</div>
+    <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 id="uploadModelLabel" style="font-size: 17px;"></h3>
+            </div>
+            <div class="modal-body">
+                <p id="uploadModelBody"></p>
+            </div>
+            <div class="modal-footer">
+                <button class="btn" onclick="$('#uploadModel').modal('hide');">Cancel</button>
+            </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-content">	
-	<div class="modal-header">
-		<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>
-	</div>
-	<div class="modal-body">
-		<p id="verifyModelBody">
-			<b>Step 1:</b><br/>
-			Please get your Instance Key from here:<br/> 
-			<a target="_blank" href="http://icehrm.com/generateInstanceKey.php?id=<?=$baseService->getInstanceId()?>">
-			http://icehrm.com/generateInstanceKey.php?id=<?=$baseService->getInstanceId()?>
-			</a>
-			
-			<br/><b>Step 2:</b><br/>
-			Enter the key you generated in step 1 here and click "Verify"<br/>
-			<form role="form">
-			<div class="row">
-				<label class="col-sm-12 control-label" for="verificationKey">Verification Key</label>
-				<div class="controls col-sm-12">
-					<input class="form-control" type="text" id="verificationKey" name="verificationKey" value=""/>
-				</div>
-			</div>
-			<br/><br/>
-			<div class="control-group row">
-		    	<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="$('#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 class="controls col-sm-3">
-		    	</div>
-		  	</div>
-		</div>
-	</form>
-		</p>
-	</div>
-</div>
+    <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 id="verifyModelLabel" style="font-size: 17px;"></h3>
+            </div>
+            <div class="modal-body">
+                <p id="verifyModelBody">
+                    <b>Step 1:</b><br/>
+                    Please get your Instance Key from here:<br/>
+                    <a target="_blank" href="http://icehrm.com/generateInstanceKey.php?id=<?=$baseService->getInstanceId()?>">
+                        http://icehrm.com/generateInstanceKey.php?id=<?=$baseService->getInstanceId()?>
+                    </a>
+
+                    <br/><b>Step 2:</b><br/>
+                    Enter the key you generated in step 1 here and click "Verify"<br/>
+                <form role="form">
+                    <div class="row">
+                        <label class="col-sm-12 control-label" for="verificationKey">Verification Key</label>
+                        <div class="controls col-sm-12">
+                            <input class="form-control" type="text" id="verificationKey" name="verificationKey" value=""/>
+                        </div>
+                    </div>
+                    <br/><br/>
+                    <div class="control-group row">
+                        <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="$('#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 class="controls col-sm-3">
+                        </div>
+                    </div>
+            </div>
+            </form>
+            </p>
+        </div>
+    </div>
 </div>
 </div>
 <!-- Message Modal -->
 
 
 <?php if($user->user_level == 'Admin'){?>
-            <!-- Modal -->
-            <div class="modal fade" id="profileSwitchModal" tabindex="-1" role="dialog" 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 id="myModalLabel">Switch Employee</h3>
-	              </div>
-	              <div class="modal-body">
-	                <p>Select the employee to Edit</p>
-	                <div style="border: solid 1px #EEE;">
-	                <select id="switch_emp" style="width:100%;">
-	                <!--
-	                <option value="-1">No Employee</option>
-	                -->
-	                <?php 
-	                $employees = $baseService->get('Employee');
-	                foreach($employees as $empTemp){
-	                ?>
-	                <option value="<?=$empTemp->id?>"><?=$empTemp->first_name." ".$empTemp->last_name?></option>
-	                <?php }?>
-	                </select>
-	                </div>
-	              </div>
-	              <div class="modal-footer">
-	                <button class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
-	                <button class="btn btn-primary" onclick="modJs.setAdminProfile($('#switch_emp').val());return false;">Switch</button>
-	              </div>
-	        	</div>
-	        </div>
+    <!-- Modal -->
+    <div class="modal fade" id="profileSwitchModal" tabindex="-1" role="dialog" 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 id="myModalLabel">Switch Employee</h3>
+                </div>
+                <div class="modal-body">
+                    <p>Select the employee to Edit</p>
+                    <div style="border: solid 1px #EEE;">
+                        <select id="switch_emp" style="width:100%;">
+                            <!--
+                            <option value="-1">No Employee</option>
+                            -->
+                            <?php
+                            $employees = $baseService->get('Employee');
+                            foreach($employees as $empTemp){
+                                ?>
+                                <option value="<?=$empTemp->id?>"><?=$empTemp->first_name." ".$empTemp->last_name?></option>
+                            <?php }?>
+                        </select>
+                    </div>
+                </div>
+                <div class="modal-footer">
+                    <button class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
+                    <button class="btn btn-primary" onclick="modJs.setAdminProfile($('#switch_emp').val());return false;">Switch</button>
+                </div>
             </div>
-            <!-- Modal -->
-        <?php }?>
+        </div>
+    </div>
+    <!-- Modal -->
+<?php }?>

core-ext/scripts/icehrm_sample_data.sql

@@ -1,5 +1,19 @@
 /*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
 
+DELIMITER $$
+CREATE FUNCTION generate_fname () RETURNS varchar(255)
+  BEGIN
+    RETURN ELT(FLOOR(1 + (RAND() * (100-1))), "James","Mary","John","Patricia","Robert","Linda","Michael","Barbara","William","Elizabeth","David","Jennifer","Richard","Maria","Charles","Susan","Joseph","Margaret","Thomas","Dorothy","Christopher","Lisa","Daniel","Nancy","Paul","Karen","Mark","Betty","Donald","Helen","George","Sandra","Kenneth","Donna","Steven","Carol","Edward","Ruth","Brian","Sharon","Ronald","Michelle","Anthony","Laura","Kevin","Sarah","Jason","Kimberly","Matthew","Deborah","Gary","Jessica","Timothy","Shirley","Jose","Cynthia","Larry","Angela","Jeffrey","Melissa","Frank","Brenda","Scott","Amy","Eric","Anna","Stephen","Rebecca","Andrew","Virginia","Raymond","Kathleen","Gregory","Pamela","Joshua","Martha","Jerry","Debra","Dennis","Amanda","Walter","Stephanie","Patrick","Carolyn","Peter","Christine","Harold","Marie","Douglas","Janet","Henry","Catherine","Carl","Frances","Arthur","Ann","Ryan","Joyce","Roger","Diane");
+  END$$
+
+DELIMITER ;
+
+DELIMITER $$
+CREATE FUNCTION generate_lname () RETURNS varchar(255)
+  BEGIN
+    RETURN ELT(FLOOR(1 + (RAND() * (100-1))), "Smith","Johnson","Williams","Jones","Brown","Davis","Miller","Wilson","Moore","Taylor","Anderson","Thomas","Jackson","White","Harris","Martin","Thompson","Garcia","Martinez","Robinson","Clark","Rodriguez","Lewis","Lee","Walker","Hall","Allen","Young","Hernandez","King","Wright","Lopez","Hill","Scott","Green","Adams","Baker","Gonzalez","Nelson","Carter","Mitchell","Perez","Roberts","Turner","Phillips","Campbell","Parker","Evans","Edwards","Collins","Stewart","Sanchez","Morris","Rogers","Reed","Cook","Morgan","Bell","Murphy","Bailey","Rivera","Cooper","Richardson","Cox","Howard","Ward","Torres","Peterson","Gray","Ramirez","James","Watson","Brooks","Kelly","Sanders","Price","Bennett","Wood","Barnes","Ross","Henderson","Coleman","Jenkins","Perry","Powell","Long","Patterson","Hughes","Flores","Washington","Butler","Simmons","Foster","Gonzales","Bryant","Alexander","Russell","Griffin","Diaz","Hayes");
+  END$$
+DELIMITER ;
 
 INSERT INTO `CompanyStructures` (`id`, `title`, `description`, `address`, `type`, `country`, `parent`) VALUES
 (4, 'Development Center', 'Development Center', 'PO Box 001002\nSample Road, Sample Town', 'Regional Office', 'SG', 1),
@@ -10,11 +24,23 @@ INSERT INTO `CompanyStructures` (`id`, `title`, `description`, `address`, `type`
 (9, 'Administration & HR', 'Administration and Human Resource', '', 'Department', 'SG', 4);
 
 
-INSERT INTO `Employees` (`id`, `employee_id`, `first_name`, `middle_name`, `last_name`, `nationality`, `birthday`, `gender`, `marital_status`, `ssn_num`, `nic_num`, `other_id`, `driving_license`, `driving_license_exp_date`, `employment_status`, `job_title`, `pay_grade`, `work_station_id`, `address1`, `address2`, `city`, `country`, `province`, `postal_code`, `home_phone`, `mobile_phone`, `work_phone`, `work_email`, `private_email`, `joined_date`, `confirmation_date`, `supervisor`, `department`, `custom1`, `custom2`, `custom3`, `custom4`, `custom5`, `custom6`, `custom7`, `custom8`, `custom9`, `custom10`) VALUES
-(2, 'EMP002', 'Lala', 'Nadila ', 'Lamees', 175, '1984-03-12 18:30:00', 'Female', 'Single', '', '4594567WE3', '4595567WE3', '349-066-YUO', '2012-03-01', 1, 8, 2, 'W001', 'Green War Rd, 00123', '', 'Istanbul', 'TR', NULL, '909066', '+960112345', '+960112345', '+960112345', 'icehrm+manager@web-stalk.com', 'icehrm+manager@web-stalk.com', '2011-03-07 18:30:00', '2012-02-14 18:30:00', 1, 2, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
-(3, 'EMP003', 'Sofia', '', 'O''Sullivan', 4, '1975-08-28 18:30:00', 'Female', 'Married', '', '768-20-4394', '768-20-4394', '', NULL, 3, 10, 2, '', '2792 Trails End Road', 'Fort Lauderdale', 'Fort Lauderdale', 'US', 12, '33308', '954-388-3340', '954-388-3340', '954-388-3340', 'icehrm+user1@web-stalk.com', 'icehrm+user1@web-stalk.com', '2010-02-08 18:30:00', '0000-00-00 00:00:00', 2, 2, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
-(4, 'EMP004', 'Taylor', '', 'Holmes', 10, '1979-07-15 18:30:00', 'Male', '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);
+INSERT INTO `Employees` (`id`, `employee_id`, `first_name`, `middle_name`, `last_name`, `nationality`, `birthday`, `gender`, `marital_status`, `ssn_num`, `nic_num`, `other_id`, `driving_license`, `driving_license_exp_date`, `employment_status`, `job_title`, `pay_grade`, `work_station_id`, `address1`, `address2`, `city`, `country`, `province`, `postal_code`, `home_phone`, `mobile_phone`, `work_phone`, `work_email`, `private_email`, `joined_date`, `confirmation_date`, `supervisor`, `department`, `custom1`, `custom2`, `custom3`, `custom4`, `custom5`, `custom6`, `custom7`, `custom8`, `custom9`, `custom10`,`indirect_supervisors`) VALUES
+(2, 'EMP002', 'Lala', 'Nadila ', 'Lamees', 175, '1984-03-12 18:30:00', 'Female', 'Single', '', '4594567WE3', '4595567WE3', '349-066-YUO', '2012-03-01', 1, 8, 2, 'W001', 'Green War Rd, 00123', '', 'Istanbul', 'TR', NULL, '909066', '+960112345', '+960112345', '+960112345', 'icehrm+manager@web-stalk.com', 'icehrm+manager@web-stalk.com', '2011-03-07 18:30:00', '2012-02-14 18:30:00', 1, 2, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,NULL),
+(3, 'EMP003', 'Sofia', '', 'O''Sullivan', 4, '1975-08-28 18:30:00', 'Female', 'Married', '', '768-20-4394', '768-20-4394', '', NULL, 3, 10, 2, '', '2792 Trails End Road', 'Fort Lauderdale', 'Fort Lauderdale', 'US', 12, '33308', '954-388-3340', '954-388-3340', '954-388-3340', 'icehrm+user1@web-stalk.com', 'icehrm+user1@web-stalk.com', '2010-02-08 18:30:00', '0000-00-00 00:00:00', 2, 2, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,'[\"1\"]'),
+(4, 'EMP004', 'Taylor', '', 'Holmes', 10, '1979-07-15 18:30:00', 'Male', '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,NULL);
 
+INSERT INTO `Employees` (`id`, `employee_id`, `first_name`, `middle_name`, `last_name`, `nationality`, `birthday`, `gender`, `marital_status`, `ssn_num`, `nic_num`, `other_id`, `driving_license`, `driving_license_exp_date`, `employment_status`, `job_title`, `pay_grade`, `work_station_id`, `address1`, `address2`, `city`, `country`, `province`, `postal_code`, `home_phone`, `mobile_phone`, `work_phone`, `work_email`, `private_email`, `joined_date`, `confirmation_date`, `supervisor`, `department`, `custom1`, `custom2`, `custom3`, `custom4`, `custom5`, `custom6`, `custom7`, `custom8`, `custom9`, `custom10`) VALUES
+  (5, CONCAT('EMP', RAND()), generate_fname(), '', generate_fname(), 10, '1979-07-15 18:30:00', 'Male', '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),
+  (6, CONCAT('EMP', RAND()), generate_fname(), '', generate_fname(), 10, '1979-07-15 18:30:00', 'Male', '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),
+  (7, CONCAT('EMP', RAND()), generate_fname(), '', generate_fname(), 10, '1979-07-15 18:30:00', 'Male', '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),
+  (8, CONCAT('EMP', RAND()), generate_fname(), '', generate_fname(), 10, '1979-07-15 18:30:00', 'Male', '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),
+  (9, CONCAT('EMP', RAND()), generate_fname(), '', generate_fname(), 10, '1979-07-15 18:30:00', 'Male', '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),
+  (10, 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),
+  (11, 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),
+  (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);
 
 
 INSERT INTO `EmergencyContacts` (`id`, `employee`, `name`, `relationship`, `home_phone`, `work_phone`, `mobile_phone`) VALUES
@@ -36,9 +62,6 @@ INSERT INTO `EmployeeDependents` (`id`, `employee`, `name`, `relationship`, `dob
 (2, 1, 'Mica Singroo', 'Other', '2000-06-13', '');
 
 
-
-
-
 INSERT INTO `EmployeeEducations` (`id`, `education_id`, `employee`, `institute`, `date_start`, `date_end`) VALUES
 (1, 1, 1, 'National University of Turky', '2004-02-03', '2006-06-13'),
 (2, 1, 2, 'MIT', '1995-02-21', '1999-10-12');
@@ -56,12 +79,38 @@ INSERT INTO `EmployeeProjects` (`id`, `employee`, `project`, `date_start`, `date
 (5, 2, 3, '2013-02-24', '0000-00-00', 'Current', '');
 
 
+INSERT INTO `EmployeeSalary` (`employee`, `component`,`amount`, `details`) VALUES
+  (1, 1,'50000.00', ''),
+  (1, 2,'20000.00', ''),
+  (1, 3,'30000.00', ''),
+  (1, 4,'2000.00', ''),
 
-INSERT INTO `EmployeeSalary` (`id`, `employee`, `component`, `pay_frequency`, `currency`, `amount`, `details`) VALUES
-(1, 1, 1, 'Monthly', 131, '2700.00', ''),
-(2, 2, 2, 'Monthly', 151, '12000.00', ''),
-(3, 2, 3, 'Monthly', 131, '5000.00', '');
+  (2, 1,'90500.00', ''),
+  (2, 2,'40000.00', ''),
+  (2, 3,'50000.00', ''),
 
+  (3, 1,'131409.00', ''),
+  (3, 2,'143471.00', ''),
+  (3, 3,'50000.00', ''),
+  (3, 4,'30000.00', ''),
+
+  (4, 5,'1432.00', ''),
+  (4, 6,'2100.00', ''),
+
+  (5, 5,'1200.00', ''),
+  (5, 6,'1500.00', ''),
+  (5, 7,'2000.00', ''),
+
+  (5, 1,round(rand() * 100000 + rand() * 20000 - rand() * 20000, 2), ''),
+  (6, 1,round(rand() * 100000 + rand() * 20000 - rand() * 20000, 2), ''),
+  (7, 1,round(rand() * 100000 + rand() * 20000 - rand() * 20000, 2), ''),
+  (8, 1,round(rand() * 100000 + rand() * 20000 - rand() * 20000, 2), ''),
+  (9, 1,round(rand() * 100000 + rand() * 20000 - rand() * 20000, 2), ''),
+  (10, 1,round(rand() * 100000 + rand() * 20000 - rand() * 20000, 2), ''),
+  (11, 1,round(rand() * 100000 + rand() * 20000 - rand() * 20000, 2), ''),
+  (12, 1,round(rand() * 100000 + rand() * 20000 - rand() * 20000, 2), ''),
+  (13, 1,round(rand() * 100000 + rand() * 20000 - rand() * 20000, 2), ''),
+  (14, 1,round(rand() * 100000 + rand() * 20000 - rand() * 20000, 2), '');
 
 INSERT INTO `EmployeeSkills` (`id`, `skill_id`, `employee`, `details`) VALUES
 (1, 9, 1, 'Creating web sites'),
@@ -69,11 +118,169 @@ INSERT INTO `EmployeeSkills` (`id`, `skill_id`, `employee`, `details`) VALUES
 
 
 
-INSERT INTO `Users` (`id`, `username`, `email`, `password`, `employee`, `user_level`, `last_login`, `last_update`, `created`) VALUES
-(2, 'manager', 'icehrm+manager@web-stalk.com', '4048bb914a704a0728549a26b92d8550', 2, '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, '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, 'Employee', '2013-01-03 02:58:55', '2013-01-03 02:58:55', '2013-01-03 02:58:55');
 
+INSERT INTO `LeaveRules` (`id`, `leave_type`, `job_title`, `employment_status`, `employee`, `supervisor_leave_assign`, `employee_can_apply`, `apply_beyond_current`, `leave_accrue`, `carried_forward`, `default_per_year`) VALUES
+(1, 1, 11, NULL, NULL, 'No', 'Yes', 'Yes', 'No', 'No', 25),
+(2, 2, NULL, NULL, 2, 'No', 'Yes', 'Yes', 'No', 'No', 10);
+
+
+
+INSERT INTO `Users` (`id`, `username`, `email`, `password`, `employee`,`default_module`, `user_level`,`user_roles`, `last_login`, `last_update`, `created`) VALUES
+(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');
+
+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),
+  (2,'QA Senior Test Automation Engineer','As a QA Senior Test Automation Engineer at Rocket you will help us launch the most successful startup companies around the world.','As a QA Senior Test Automation Engineer at Rocket you will help us launch the most successful startup companies around the world.','Responsibilities:\n\nAutomated testing of web and mobile applications\nDevelop automated scenarios/scripts using Cucumber (for web applications) and Calabash (for mobile applications)\nOptimize existing test cases to get more stability and efficiency\nRun automated functional tests as well as performance and load tests\nAnalyze automated test results and report bugs to responsible employees\nSupport the test automation team during the whole development process (starting from the analysis of requirements up to the integration of automated test cases into the CI system (Jenkins)\n\n\nRequirements:\n\nSeveral years of experience as a Test Automation Engineer ( 5+ years )\nExperience with automated solutions such as Cucumber/Calabash, Gherkin, Selenium or similar tools/frameworks\nExperience with Ruby, Python, PHP, JAVA or similar programming languages\nExperience with source code controls like SVN, GIT, CVS\nFamiliarity with Continuous Integration and Delivery\nExperience in Agile Methodologies like Scrum and Kanban or extreme programming\nFluency in speaking & writing English skills\nISTQB certification\n Technology stack we use:\n\nTools: GitHub, Jira, Confluence, Bamboo, Jenkins, Testlink\nScrum, Kanban\nCucumber, Calabash, Capybara, JMeter','[\"Life insurance\"]',80,3,NULL,'JC002',3,NULL,5,14,6,151,'Yes',4000,4500,'','Active','0000-00-00 00:00:00',NULL,'Text Only',1),
+  (3,'Online Editor','Online Editors required for a reputed news agency','Online Editors required for a reputed news agency','','[]',129,NULL,NULL,'J0003',1,NULL,7,23,9,103,'No',0,0,'','Active','0001-01-01 00:00:00','attachment_BI5XQCYFxZO12W1447383181684','Image and Full Text',1);
+
+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');
+
+
+INSERT INTO `EmployeeDocuments` (`id`,`employee`, `document`, `date_added`, `valid_until`, `status`, `details`, `attachment`, `expire_notification_last`) VALUES
+  (1, 1, 1, CURDATE(), DATE_ADD(CURDATE(), INTERVAL 30 DAY), 'Active', '', NULL, -1),
+  (2, 1, 2, CURDATE(), DATE_ADD(CURDATE(), INTERVAL 7 DAY), 'Active', '', NULL, -1),
+  (3, 1, 3, CURDATE(), DATE_ADD(CURDATE(), INTERVAL 1 DAY), 'Active', '', NULL, -1);
+
+
+
+INSERT INTO `Attendance` (`employee`,`in_time`,`out_time`,`note`) VALUES
+(1, FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 30 DAY))) + FLOOR(28800 + (RAND() * 3600)),'%Y-%m-%d %T'), FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 30 DAY))) + FLOOR(57600 + (RAND() * 21600)),'%Y-%m-%d %T'), ''),
+(1, FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 29 DAY))) + FLOOR(28800 + (RAND() * 3600)),'%Y-%m-%d %T'), FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 29 DAY))) + FLOOR(57600 + (RAND() * 21600)),'%Y-%m-%d %T'), ''),
+(1, FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 28 DAY))) + FLOOR(28800 + (RAND() * 3600)),'%Y-%m-%d %T'), FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 28 DAY))) + FLOOR(57600 + (RAND() * 21600)),'%Y-%m-%d %T'), ''),
+(1, FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 27 DAY))) + FLOOR(28800 + (RAND() * 3600)),'%Y-%m-%d %T'), FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 27 DAY))) + FLOOR(57600 + (RAND() * 21600)),'%Y-%m-%d %T'), ''),
+(1, FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 26 DAY))) + FLOOR(28800 + (RAND() * 3600)),'%Y-%m-%d %T'), FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 26 DAY))) + FLOOR(57600 + (RAND() * 21600)),'%Y-%m-%d %T'), ''),
+(1, FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 25 DAY))) + FLOOR(28800 + (RAND() * 3600)),'%Y-%m-%d %T'), FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 25 DAY))) + FLOOR(57600 + (RAND() * 21600)),'%Y-%m-%d %T'), ''),
+(1, FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 24 DAY))) + FLOOR(28800 + (RAND() * 3600)),'%Y-%m-%d %T'), FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 24 DAY))) + FLOOR(57600 + (RAND() * 21600)),'%Y-%m-%d %T'), ''),
+(1, FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 23 DAY))) + FLOOR(28800 + (RAND() * 3600)),'%Y-%m-%d %T'), FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 23 DAY))) + FLOOR(57600 + (RAND() * 21600)),'%Y-%m-%d %T'), ''),
+(1, 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'), ''),
+(1, FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 21 DAY))) + FLOOR(28800 + (RAND() * 3600)),'%Y-%m-%d %T'), FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 21 DAY))) + FLOOR(57600 + (RAND() * 21600)),'%Y-%m-%d %T'), ''),
+(1, FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 20 DAY))) + FLOOR(28800 + (RAND() * 3600)),'%Y-%m-%d %T'), FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 20 DAY))) + FLOOR(57600 + (RAND() * 21600)),'%Y-%m-%d %T'), ''),
+(1, FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 19 DAY))) + FLOOR(28800 + (RAND() * 3600)),'%Y-%m-%d %T'), FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 19 DAY))) + FLOOR(57600 + (RAND() * 21600)),'%Y-%m-%d %T'), ''),
+(1, FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 18 DAY))) + FLOOR(28800 + (RAND() * 3600)),'%Y-%m-%d %T'), FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 18 DAY))) + FLOOR(57600 + (RAND() * 21600)),'%Y-%m-%d %T'), ''),
+(1, FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 17 DAY))) + FLOOR(28800 + (RAND() * 3600)),'%Y-%m-%d %T'), FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 17 DAY))) + FLOOR(57600 + (RAND() * 21600)),'%Y-%m-%d %T'), ''),
+(1, FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 16 DAY))) + FLOOR(28800 + (RAND() * 3600)),'%Y-%m-%d %T'), FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 16 DAY))) + FLOOR(57600 + (RAND() * 21600)),'%Y-%m-%d %T'), ''),
+(1, FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 15 DAY))) + FLOOR(28800 + (RAND() * 3600)),'%Y-%m-%d %T'), FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 15 DAY))) + FLOOR(57600 + (RAND() * 21600)),'%Y-%m-%d %T'), ''),
+
+
+
+(2, FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 30 DAY))) + FLOOR(28800 + (RAND() * 3600)),'%Y-%m-%d %T'), FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 30 DAY))) + FLOOR(57600 + (RAND() * 21600)),'%Y-%m-%d %T'), ''),
+(2, FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 29 DAY))) + FLOOR(28800 + (RAND() * 3600)),'%Y-%m-%d %T'), FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 29 DAY))) + FLOOR(57600 + (RAND() * 21600)),'%Y-%m-%d %T'), ''),
+(2, FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 28 DAY))) + FLOOR(28800 + (RAND() * 3600)),'%Y-%m-%d %T'), FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 28 DAY))) + FLOOR(57600 + (RAND() * 21600)),'%Y-%m-%d %T'), ''),
+(2, FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 27 DAY))) + FLOOR(28800 + (RAND() * 3600)),'%Y-%m-%d %T'), FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 27 DAY))) + FLOOR(57600 + (RAND() * 21600)),'%Y-%m-%d %T'), ''),
+(2, FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 26 DAY))) + FLOOR(28800 + (RAND() * 3600)),'%Y-%m-%d %T'), FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 26 DAY))) + FLOOR(57600 + (RAND() * 21600)),'%Y-%m-%d %T'), ''),
+(2, FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 25 DAY))) + FLOOR(28800 + (RAND() * 3600)),'%Y-%m-%d %T'), FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 25 DAY))) + FLOOR(57600 + (RAND() * 21600)),'%Y-%m-%d %T'), ''),
+(2, FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 24 DAY))) + FLOOR(28800 + (RAND() * 3600)),'%Y-%m-%d %T'), FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 24 DAY))) + FLOOR(57600 + (RAND() * 21600)),'%Y-%m-%d %T'), ''),
+(2, FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 23 DAY))) + FLOOR(28800 + (RAND() * 3600)),'%Y-%m-%d %T'), FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 23 DAY))) + FLOOR(57600 + (RAND() * 21600)),'%Y-%m-%d %T'), ''),
+(2, 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'), ''),
+
+
+(3, FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 30 DAY))) + FLOOR(28800 + (RAND() * 3600)),'%Y-%m-%d %T'), FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 30 DAY))) + FLOOR(57600 + (RAND() * 21600)),'%Y-%m-%d %T'), ''),
+(3, FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 29 DAY))) + FLOOR(28800 + (RAND() * 3600)),'%Y-%m-%d %T'), FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 29 DAY))) + FLOOR(57600 + (RAND() * 21600)),'%Y-%m-%d %T'), ''),
+(3, FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 28 DAY))) + FLOOR(28800 + (RAND() * 3600)),'%Y-%m-%d %T'), FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 28 DAY))) + FLOOR(57600 + (RAND() * 21600)),'%Y-%m-%d %T'), ''),
+(3, FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 27 DAY))) + FLOOR(28800 + (RAND() * 3600)),'%Y-%m-%d %T'), FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 27 DAY))) + FLOOR(57600 + (RAND() * 21600)),'%Y-%m-%d %T'), ''),
+(3, FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 26 DAY))) + FLOOR(28800 + (RAND() * 3600)),'%Y-%m-%d %T'), FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 26 DAY))) + FLOOR(57600 + (RAND() * 21600)),'%Y-%m-%d %T'), ''),
+(3, FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 25 DAY))) + FLOOR(28800 + (RAND() * 3600)),'%Y-%m-%d %T'), FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 25 DAY))) + FLOOR(57600 + (RAND() * 21600)),'%Y-%m-%d %T'), ''),
+(3, FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 24 DAY))) + FLOOR(28800 + (RAND() * 3600)),'%Y-%m-%d %T'), FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 24 DAY))) + FLOOR(57600 + (RAND() * 21600)),'%Y-%m-%d %T'), ''),
+(3, FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 23 DAY))) + FLOOR(28800 + (RAND() * 3600)),'%Y-%m-%d %T'), FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 23 DAY))) + FLOOR(57600 + (RAND() * 21600)),'%Y-%m-%d %T'), ''),
+(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),
+  (2,2,4,151,'[]','[]',1),
+  (3,3,4,151,'[]','[]',1),
+  (4,4,2,151,'[]','[]',1),
+  (5,5,2,151,'[]','[]',1),
+  (6,6,4,151,'[]','[]',1),
+  (7,7,4,151,'[]','[]',1),
+  (8,8,4,151,'[]','[]',1),
+  (9,9,4,151,'[]','[]',1),
+  (10,10,4,151,'[]','[]',1);
+
+INSERT INTO `EmployeeLeaves` VALUES
+  (1,1,1,4,FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 3 DAY))),'%Y-%m-%d'),FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 3 DAY))),'%Y-%m-%d'),'Test Reason 1','Pending',''),
+  (2,1,1,4,FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 4 DAY))),'%Y-%m-%d'),FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 4 DAY))),'%Y-%m-%d'),'Test Reason 2','Approved',''),
+  (3,2,1,4,FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 3 DAY))),'%Y-%m-%d'),FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 3 DAY))),'%Y-%m-%d'),'Test Reason 3','Approved',''),
+
+  (4,3,1,4,FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 8 DAY))),'%Y-%m-%d'),FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 8 DAY))),'%Y-%m-%d'),'Test Reason 4','Pending',''),
+  (5,3,1,4,FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 9 DAY))),'%Y-%m-%d'),FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 9 DAY))),'%Y-%m-%d'),'Test Reason 4','Pending',''),
+  (6,3,1,4,FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 10 DAY))),'%Y-%m-%d'),FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 10 DAY))),'%Y-%m-%d'),'Test Reason 4','Pending',''),
+  (7,3,1,4,FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 11 DAY))),'%Y-%m-%d'),FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 11 DAY))),'%Y-%m-%d'),'Test Reason 4','Pending',''),
+  (8,3,1,4,FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 12 DAY))),'%Y-%m-%d'),FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 12 DAY))),'%Y-%m-%d'),'Test Reason 4','Pending',''),
+  (9,3,1,4,FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 13 DAY))),'%Y-%m-%d'),FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 13 DAY))),'%Y-%m-%d'),'Test Reason 4','Pending',''),
+  (10,3,1,4,FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 14 DAY))),'%Y-%m-%d'),FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 14 DAY))),'%Y-%m-%d'),'Test Reason 4','Pending',''),
+  (11,3,1,4,FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 15 DAY))),'%Y-%m-%d'),FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 15 DAY))),'%Y-%m-%d'),'Test Reason 4','Pending',''),
+  (12,3,1,4,FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 16 DAY))),'%Y-%m-%d'),FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 16 DAY))),'%Y-%m-%d'),'Test Reason 4','Pending',''),
+  (13,3,1,4,FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 17 DAY))),'%Y-%m-%d'),FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 17 DAY))),'%Y-%m-%d'),'Test Reason 4','Pending',''),
+  (14,3,1,4,FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 18 DAY))),'%Y-%m-%d'),FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 18 DAY))),'%Y-%m-%d'),'Test Reason 4','Pending',''),
+  (15,3,1,4,FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 19 DAY))),'%Y-%m-%d'),FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 19 DAY))),'%Y-%m-%d'),'Test Reason 4','Pending',''),
+  (16,3,1,4,FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 20 DAY))),'%Y-%m-%d'),FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 20 DAY))),'%Y-%m-%d'),'Test Reason 4','Pending',''),
+  (17,3,1,4,FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 21 DAY))),'%Y-%m-%d'),FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 21 DAY))),'%Y-%m-%d'),'Test Reason 4','Pending',''),
+  (18,3,1,4,FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 22 DAY))),'%Y-%m-%d'),FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 22 DAY))),'%Y-%m-%d'),'Test Reason 22','Pending','');
+
+INSERT INTO `EmployeeLeaveDays` VALUES
+  (1,1,FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 3 DAY))),'%Y-%m-%d'),'Full Day'),
+  (2,1,FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 4 DAY))),'%Y-%m-%d'),'Half Day - Morning'),
+  (3,2,FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 3 DAY))),'%Y-%m-%d'),'Half Day - Morning'),
+
+  (4,3,FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 8 DAY))),'%Y-%m-%d'),'3 Hours - Morning'),
+  (5,3,FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 9 DAY))),'%Y-%m-%d'),'Full Day'),
+  (6,3,FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 10 DAY))),'%Y-%m-%d'),'Full Day'),
+  (7,3,FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 11 DAY))),'%Y-%m-%d'),'Full Day'),
+  (8,3,FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 12 DAY))),'%Y-%m-%d'),'Full Day'),
+  (9,3,FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 13 DAY))),'%Y-%m-%d'),'Full Day'),
+  (10,3,FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 14 DAY))),'%Y-%m-%d'),'Full Day'),
+  (11,3,FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 15 DAY))),'%Y-%m-%d'),'Full Day'),
+  (12,3,FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 16 DAY))),'%Y-%m-%d'),'Full Day'),
+  (13,3,FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 17 DAY))),'%Y-%m-%d'),'Full Day'),
+  (14,3,FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 18 DAY))),'%Y-%m-%d'),'Full Day'),
+  (15,3,FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 19 DAY))),'%Y-%m-%d'),'Full Day'),
+  (16,3,FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 20 DAY))),'%Y-%m-%d'),'Full Day'),
+  (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 */;
 
@@ -82,11 +289,3 @@ INSERT INTO `Users` (`id`, `username`, `email`, `password`, `employee`, `user_le
 
 
 
-
-
-
-
-
-
-
-

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

@@ -0,0 +1,70 @@
+INSERT INTO `Settings` (`name`, `value`, `description`, `meta`) VALUES
+  ('System: Default Country', '0', 'Set the default Country','[ "value", {"label":"Country","type":"select2","remote-source":["Country","code","name"]}]');
+
+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"]]}]');
+
+INSERT 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
+  ('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"]]}]');
+
+
+ALTER table `Reports` ADD COLUMN `report_group` varchar(500) NULL;
+
+UPDATE Reports set report_group = 'Employee Information' where name = 'Employee Details Report';
+UPDATE Reports set report_group = 'Time Management' where name = 'Employee Time Entry Report';
+UPDATE Reports set report_group = 'Time Management' where name = 'Employee Attendance Report';
+UPDATE Reports set report_group = 'Time Management' where name = 'Employee Time Tracking Report';
+UPDATE Reports set report_group = 'Employee Information' where name = 'Active Employee Report';
+UPDATE Reports set report_group = 'Employee Information' where name = 'New Hires Employee Report';
+UPDATE Reports set report_group = 'Employee Information' where name = 'Terminated Employee Report';
+UPDATE Reports set report_group = 'Travel and Expense Management' where name = 'Travel Request Report';
+
+
+REPLACE INTO `Reports` (`id`, `name`, `details`, `parameters`, `query`, `paramOrder`, `type`,`report_group`) 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'),
+  (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'),
+  (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');
+
+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
+  ('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');
+
+
+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 `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');
+
+
+
+
+
+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';

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');

ext/admin/attendance/api/AttendanceAdminManager.php

@@ -34,6 +34,12 @@ if (!class_exists('AttendanceAdminManager')) {
             UIManager::getInstance()->addQuickAccessMenuItem("Clocked In Employees","fa-clock-o",CLIENT_BASE_URL."?g=admin&n=attendance&m=admin_Employees#tabAttendanceStatus",array("Admin","Manager"));
         }
 
+        public function initCalculationHooks(){
+            $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');
+        }
+
     }
 }
 
@@ -211,4 +217,265 @@ if (!class_exists('AttendanceStatus')) {
             return array("element","save","delete");
         }
     }
-}
+}
+
+if (!class_exists('AttendanceUtil')) {
+    class AttendanceUtil{
+        public function getAttendanceSummary($employeeId, $startDate, $endDate){
+            $startTime = $startDate." 00:00:00";
+            $endTime = $endDate." 23:59:59";
+            $attendance = new Attendance();
+            $atts = $attendance->Find("employee = ? and in_time >= ? and out_time <= ?",array($employeeId, $startTime, $endTime));
+
+            $atCalClassName = SettingsManager::getInstance()->getSetting('Attendance: Overtime Calculation Class');
+
+            $atCal = new $atCalClassName();
+            $atSum = $atCal->getDataSeconds($atts, $startDate, true);
+
+            return $atSum;
+        }
+
+        public function getTimeWorkedHours($employeeId, $startDate, $endDate){
+            $atSum = $this->getAttendanceSummary($employeeId, $startDate, $endDate);
+            return round(($atSum['t']/60)/60,2);
+        }
+
+        public function getRegularWorkedHours($employeeId, $startDate, $endDate){
+            $atSum = $this->getAttendanceSummary($employeeId, $startDate, $endDate);
+            return round(($atSum['r']/60)/60,2);
+        }
+
+        public function getOverTimeWorkedHours($employeeId, $startDate, $endDate){
+            $atSum = $this->getAttendanceSummary($employeeId, $startDate, $endDate);
+            return round(($atSum['o']/60)/60,2);
+        }
+    }
+}
+
+
+if (!class_exists('BasicOvertimeCalculator')) {
+
+    class BasicOvertimeCalculator{
+
+        public function createAttendanceSummary($atts){
+
+            $atTimeByDay = array();
+
+            foreach($atts as $atEntry){
+                if($atEntry->out_time == "0000-00-00 00:00:00" || empty($atEntry->out_time)){
+                    continue;
+                }
+
+                $atDate = date("Y-m-d",strtotime($atEntry->in_time));
+
+                if(!isset($atTimeByDay[$atDate])){
+                    $atTimeByDay[$atDate]   = 0;
+                }
+
+                $diff = strtotime($atEntry->out_time) - strtotime($atEntry->in_time);
+                if($diff < 0){
+                    $diff = 0;
+                }
+
+                $atTimeByDay[$atDate] += $diff;
+
+            }
+
+            return $atTimeByDay;
+        }
+
+        public function calculateOvertime($atTimeByDay){
+            $overtimeStarts = SettingsManager::getInstance()->getSetting('Attendance: Overtime Start Hour');
+            $doubletimeStarts = SettingsManager::getInstance()->getSetting('Attendance: Double time Start Hour');
+
+            $overtimeStarts = (is_numeric($overtimeStarts))?floatval($overtimeStarts)*60*60:0;
+            $doubletimeStarts = (is_numeric($doubletimeStarts))?floatval($doubletimeStarts)*60*60:0;
+
+            $atTimeByDayNew = array();
+            foreach($atTimeByDay as $k=>$v){
+                $atTimeByDayNewEntry = array("t"=>$v,"r"=>0,"o"=>0,"d"=>0);
+                if($overtimeStarts > 0 && $v > $overtimeStarts){
+                    $atTimeByDayNewEntry["r"] = $overtimeStarts;
+                    if($doubletimeStarts > 0 && $doubletimeStarts > $overtimeStarts){
+                        //calculate double time
+                        if($v > $doubletimeStarts){
+                            $atTimeByDayNewEntry['d'] =  $v - $doubletimeStarts;
+                            $atTimeByDayNewEntry['o'] = $doubletimeStarts - $overtimeStarts;
+                        }else{
+                            $atTimeByDayNewEntry['d'] = 0 ;
+                            $atTimeByDayNewEntry['o'] = $v - $overtimeStarts;
+                        }
+
+                    }else{
+                        //ignore double time
+                        $atTimeByDayNewEntry['o'] = $v - $overtimeStarts;
+                    }
+                }else{
+                    //ignore overtime
+                    $atTimeByDayNewEntry['r'] = $v;
+                }
+
+                $atTimeByDayNew[$k] = $atTimeByDayNewEntry;
+            }
+
+            return $atTimeByDayNew;
+        }
+
+        protected function removeAdditionalDays($atSummary, $actualStartDate){
+            $newAtSummary = array();
+            foreach($atSummary as $k => $v){
+                if(strtotime($k) >= strtotime($actualStartDate)){
+                    $newAtSummary[$k] = $v;
+                }
+            }
+
+            return $newAtSummary;
+        }
+
+        public function getData($atts, $actualStartDate, $aggregate = false){
+            $atSummary = $this->createAttendanceSummary($atts);
+            $overtime = $this->calculateOvertime($this->removeAdditionalDays($atSummary, $actualStartDate));
+            if($aggregate){
+                $overtime = $this->aggregateData($overtime);
+                return $this->convertToHoursAggregated($overtime);
+            }else{
+                return $this->convertToHours($overtime);
+            }
+
+        }
+
+        public function getDataSeconds($atts, $actualStartDate, $aggregate = false){
+            $atSummary = $this->createAttendanceSummary($atts);
+            $overtime = $this->calculateOvertime($this->removeAdditionalDays($atSummary, $actualStartDate));
+            if($aggregate){
+                $overtime = $this->aggregateData($overtime);
+                return $overtime;
+            }else{
+                return $overtime;
+            }
+
+        }
+
+
+
+        public function convertToHours($overtime){
+            foreach($overtime as $k=>$v){
+                $overtime[$k]['t'] =  $this->convertToHoursAndMinutes($overtime[$k]['t']);
+                $overtime[$k]['r'] =  $this->convertToHoursAndMinutes($overtime[$k]['r']);
+                $overtime[$k]['o'] =  $this->convertToHoursAndMinutes($overtime[$k]['o']);
+                $overtime[$k]['d'] =  $this->convertToHoursAndMinutes($overtime[$k]['d']);
+            }
+
+            return $overtime;
+        }
+
+        public function convertToHoursAggregated($overtime){
+            $overtime['t'] =  $this->convertToHoursAndMinutes($overtime['t']);
+            $overtime['r'] =  $this->convertToHoursAndMinutes($overtime['r']);
+            $overtime['o'] =  $this->convertToHoursAndMinutes($overtime['o']);
+            $overtime['d'] =  $this->convertToHoursAndMinutes($overtime['d']);
+
+            return $overtime;
+        }
+
+        protected function aggregateData($overtime){
+            $ag = array("t"=>0,"r"=>0,"o"=>0,"d"=>0);
+            foreach($overtime as $k=>$v){
+                $ag['t'] += $v['t'];
+                $ag['r'] += $v['r'];
+                $ag['o'] += $v['o'];
+                $ag['d'] += $v['d'];
+            }
+
+            return $ag;
+        }
+
+        public function convertToHoursAndMinutes($val){
+            $sec = $val % 60;
+            $minutesTot = ($val - $sec)/60;
+
+            $minutes = $minutesTot % 60;
+            $hours = ($minutesTot - $minutes)/60;
+
+            if($hours < 10){
+                $hours = "0".$hours;
+            }
+            if($minutes < 10){
+                $minutes = "0".$minutes;
+            }
+
+            return $hours.":".$minutes;
+
+        }
+
+    }
+
+}
+
+
+if (!class_exists('CaliforniaOvertimeCalculator')) {
+
+    class CaliforniaOvertimeCalculator extends BasicOvertimeCalculator{
+
+        public function getData($atts, $actualStartDate, $aggregate = false){
+
+            if(count($atts) == 0){
+                return array();
+            }
+
+            $atSummary = $this->createAttendanceSummary($atts);
+            $overtime = $this->calculateOvertime($atSummary);
+
+            $workWeekStartDate = SettingsManager::getInstance()->getSetting('Attendance: Work Week Start Day');
+
+            //TODO - just assume a work week from Sunday to Saturday
+
+            //Find first Sunday in array
+            $firstDate = null;
+            //Find double time days (7th work day of a week without a break)
+            $doubleTimeDates = array();
+            $prvDate = null;
+            $consecutiveWorkDays = 1;
+            foreach($overtime as $k=>$v){
+                if($firstDate == null) {
+                    $dw = date("w", strtotime($k));
+                    if ($dw == $workWeekStartDate) {
+                        $firstDate = $k;
+                    }
+                }
+
+                if($firstDate != null){
+                    if($prvDate != null && date('Y-m-d', strtotime('-1 day',strtotime($k))) == $prvDate){
+
+                        $consecutiveWorkDays++;
+                        if($consecutiveWorkDays == 7){
+                            //This is a double time day
+                            $overtime[$k]['d'] = $overtime[$k]['d'] + $overtime[$k]['o'];
+                            $overtime[$k]['o'] = 0;
+                        }
+                    }
+
+                    //Resetting $consecutiveWorkDays at the start of the work week
+                    if($prvDate != null && date( "w", strtotime($k)) == $workWeekStartDate){
+                        $consecutiveWorkDays = 1;
+                        $prvDate = null;
+                    }
+
+                    $prvDate = $k;
+                }
+            }
+
+            $overtime = $this->removeAdditionalDays($overtime, $actualStartDate);
+            if($aggregate){
+                $overtime = $this->aggregateData($overtime);
+                return $this->convertToHoursAggregated($overtime);
+            }else{
+                return $this->convertToHours($overtime);
+            }
+
+
+        }
+
+    }
+
+}

ext/admin/company_structure/api/Company_structureAdminManager.php

@@ -56,6 +56,37 @@ if (!class_exists('CompanyStructure')) {
 
 			return new IceResponse(IceResponse::SUCCESS,"");
 		}
+
+        public static function getAllChildCompanyStructures($companyStructureId){
+            $structures = array();
+            $companyStructure = new CompanyStructure();
+            $companyStructure->Load("id = ?",array($companyStructureId));
+
+            if($companyStructure->id != $companyStructureId || empty($companyStructure->id)){
+                return new IceResponse(IceResponse::ERROR, array());
+            }
+
+            self::getChildCompanyStructures($companyStructure, $structures);
+
+            $structures[$companyStructure->id] = $companyStructure;
+
+            return new IceResponse(IceResponse::SUCCESS, array_values($structures));
+
+        }
+
+        private static function getChildCompanyStructures($companyStructure, &$structures){
+            $child = new CompanyStructure();
+            $children = $child->Find("parent = ?",array($companyStructure->id));
+            if(!empty($children)){
+                foreach($children as $c){
+                    if(isset($structures[$c->id])){
+                        continue;
+                    }
+                    $structures[$c->id] = $c;
+                    self::getChildCompanyStructures($c, $structures);
+                }
+            }
+        }
 	}
 }
 

ext/admin/dashboard/index.php

@@ -58,7 +58,21 @@ include APP_BASE_PATH.'modulejslibs.inc.php';
         }
         ?>
     </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>
+                <br/>
+                <br/>
+                <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>
+            </p>
+        </div>
+    </div>
 
 </div>
 <script>
@@ -68,5 +82,17 @@ include APP_BASE_PATH.'modulejslibs.inc.php';
 
     var modJs = modJsList['tabDashboard'];
 
+    $(document).ready(function() {
+        try {
+            $.ajax({
+                url: "https://icehrm-public.s3.amazonaws.com/icehrmnews.html",
+                success: function (result) {
+                    $('#iceannon').html(result);
+                }
+            });
+        } catch (e) {
+        }
+
+    });
 </script>
 <?php include APP_BASE_PATH.'footer.php';?>

ext/admin/employees/api/EmployeesActionManager.php

@@ -0,0 +1,164 @@
+<?php
+class EmployeesActionManager extends SubActionManager{
+
+    public function terminateEmployee($req){
+        $employee = new Employee();
+        $employee->Load("id = ?",array($req->id));
+
+        if(empty($employee->id)){
+            return new IceResponse(IceResponse::ERROR, "Employee Not Found");
+        }
+
+        $employee->termination_date = date('Y-m-d H:i:s');
+        $employee->status = 'Terminated';
+
+        $ok = $employee->Save();
+        if(!$ok){
+            return new IceResponse(IceResponse::ERROR, "Error occured while terminating employee");
+        }
+
+        return new IceResponse(IceResponse::SUCCESS, $employee);
+
+        //$user = BaseService::getInstance()->getUserFromProfileId($employee->id);
+    }
+
+    public function activateEmployee($req){
+        $employee = new Employee();
+        $employee->Load("id = ?",array($req->id));
+
+        if(empty($employee->id)){
+            return new IceResponse(IceResponse::ERROR, "Employee Not Found");
+        }
+
+        $employee->termination_date = NULL;
+        $employee->status = 'Active';
+
+        $ok = $employee->Save();
+        if(!$ok){
+            return new IceResponse(IceResponse::ERROR, "Error occured while activating employee");
+        }
+
+        return new IceResponse(IceResponse::SUCCESS, $employee);
+
+        //$user = BaseService::getInstance()->getUserFromProfileId($employee->id);
+    }
+
+    public function deleteEmployee($req){
+
+        $employee = new Employee();
+        $employee->Load("id = ?",array($req->id));
+
+        if(empty($employee->id)){
+            return new IceResponse(IceResponse::ERROR, "Employee Not Found");
+        }
+
+        $archived = new ArchivedEmployee();
+        $archived->ref_id = $employee->id;
+        $archived->employee_id = $employee->employee_id;
+        $archived->first_name = $employee->first_name;
+        $archived->last_name = $employee->last_name;
+        $archived->gender = $employee->gender;
+        $archived->ssn_num = $employee->ssn_num;
+        $archived->nic_num = $employee->nic_num;
+        $archived->other_id = $employee->other_id;
+        $archived->work_email = $employee->work_email;
+        $archived->joined_date = $employee->joined_date;
+        $archived->confirmation_date = $employee->confirmation_date;
+        $archived->supervisor = $employee->supervisor;
+        $archived->department = $employee->department;
+        $archived->termination_date = $employee->termination_date;
+        $archived->notes = $employee->notes;
+
+        //$archived = BaseService::getInstance()->cleanUpAdoDB($archived);
+
+        $mapping = '{"nationality":["Nationality","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"]}';
+
+        $employeeEnriched = BaseService::getInstance()->getElement('Employee',$employee->id,$mapping,true);
+        $employeeEnriched = BaseService::getInstance()->cleanUpAdoDB($employeeEnriched);
+
+        $data = new stdClass();
+        $data->enrichedEmployee = $employeeEnriched;
+
+        $data->timesheets = $this->getEmployeeData($employee->id, new EmployeeTimeSheet());
+        $data->timesheetEntries = $this->getEmployeeData($employee->id, new EmployeeTimeEntry());
+        $data->attendance = $this->getEmployeeData($employee->id, new Attendance());
+        $data->documents = $this->getEmployeeData($employee->id, new EmployeeDocument());
+        if(class_exists('EmployeeTrainingSession')){
+            $data->trainingSessions = $this->getEmployeeData($employee->id, new EmployeeTrainingSession());
+        }
+        $data->travelRecords = $this->getEmployeeData($employee->id, new EmployeeTravelRecord());
+        $data->qualificationSkills = $this->getEmployeeData($employee->id, new EmployeeSkill());
+        $data->qualificationEducation = $this->getEmployeeData($employee->id, new EmployeeEducation());
+        $data->qualificationCertifications = $this->getEmployeeData($employee->id, new EmployeeCertification());
+        $data->qualificationLanguages = $this->getEmployeeData($employee->id, new EmployeeLanguage());
+        $data->salary = $this->getEmployeeData($employee->id, new EmployeeSalary());
+        $data->dependants = $this->getEmployeeData($employee->id, new EmployeeDependent());
+        $data->emergencyContacts = $this->getEmployeeData($employee->id, new EmergencyContact());
+        $data->projects = $this->getEmployeeData($employee->id, new EmployeeProject());
+        $data->leaves = $this->getEmployeeData($employee->id, new EmployeeLeave());
+        $data->leaveDays = $this->getEmployeeData($employee->id, new EmployeeLeaveDay());
+
+        $archived->data = json_encode($data, JSON_PRETTY_PRINT);
+
+        $ok = $archived->Save();
+        if(!$ok){
+            return new IceResponse(IceResponse::ERROR, "Error occured while archiving employee");
+        }
+
+        $ok = $employee->Delete();
+        if(!$ok){
+            return new IceResponse(IceResponse::ERROR, "Error occured while deleting employee");
+        }
+
+        return new IceResponse(IceResponse::SUCCESS, $archived);
+    }
+
+    public function downloadArchivedEmployee($req){
+
+
+        if($this->baseService->currentUser->user_level != 'Admin'){
+            echo "Error: Permission denied";
+            exit();
+        }
+
+        $employee = new ArchivedEmployee();
+        $employee->Load("id = ?",array($req->id));
+
+        if(empty($employee->id)){
+            return new IceResponse(IceResponse::ERROR, "Employee Not Found");
+        }
+
+        $employee->data = json_decode($employee->data);
+        $employee = $this->baseService->cleanUpAdoDB($employee);
+
+        $str = json_encode($employee, JSON_PRETTY_PRINT);
+
+        $filename = uniqid();
+        $file = fopen("/tmp/".$filename,"w");
+        fwrite($file,$str);
+        fclose($file);
+
+        $downloadFileName = "employee_".$employee->id."_".str_replace(" ", "_", $employee->first_name)."_".str_replace(" ", "_", $employee->last_name).".txt";
+
+        header("Pragma: public"); // required
+        header("Expires: 0");
+        header("Cache-Control: must-revalidate, post-check=0, pre-check=0");
+        header("Content-Description: File Transfer");
+        header("Content-Type: image/jpg");
+        header('Content-Disposition: attachment; filename="'.$downloadFileName.'"');
+        header("Content-Transfer-Encoding: binary");
+        header("Content-Length: ".filesize("/tmp/".$filename));
+        readfile("/tmp/".$filename);
+        exit();
+
+    }
+
+    private function getEmployeeData($id, $obj){
+        $data = array();
+        $objs = $obj->Find("employee = ?",array($id));
+        foreach($objs as $entry){
+            $data[] = BaseService::getInstance()->cleanUpAdoDB($entry);
+        }
+        return $data;
+    }
+}

ext/admin/employees/api/EmployeesAdminManager.php

@@ -10,6 +10,18 @@ if (!class_exists('EmployeesAdminManager')) {
 			
 		}
 
+        public function setupRestEndPoints(){
+            \NoahBuscher\Macaw\Macaw::get(REST_API_PATH.'employee/(:any)', function($pathParams) {
+                $empRestEndPoint = new EmployeeRestEndPoint();
+                $empRestEndPoint->process('get',$pathParams);
+            });
+
+            \NoahBuscher\Macaw\Macaw::get(REST_API_PATH.'employees', function() {
+                $empRestEndPoint = new EmployeesRestEndPoint();
+                $empRestEndPoint->process('get',NULL);
+            });
+        }
+
 		public function initializeDatabaseErrorMappings(){
 			$this->addDatabaseErrorMapping('CONSTRAINT `Fk_User_Employee` FOREIGN KEY',"Can not delete Employee, please delete the User for this employee first.");
 			$this->addDatabaseErrorMapping("Duplicate entry|for key 'employee'","A duplicate entry found");
@@ -40,47 +52,288 @@ if (!class_exists('EmployeesAdminManager')) {
 
 if (!class_exists('Employee')) {
 	class Employee extends ICEHRM_Record {
-	
+
+        var $oldObj = null;
+        var $oldObjOrig = null;
+        var $historyUpdateList = array();
+        var $historyFieldsToTrack = array(
+            "employee_id"=>"employee_id",
+            "first_name"=>"first_name",
+            "middle_name"=>"middle_name",
+            "last_name"=>"last_name",
+            "nationality"=>"nationality_Name",
+            "birthday"=>"birthday",
+            "gender"=>"gender",
+            "marital_status"=>"marital_status",
+            "ssn_num"=>"ssn_num",
+            "nic_num"=>"nic_num",
+            "other_id"=>"other_id",
+            "employment_status"=>"employment_status_Name",
+            "job_title"=>"job_title_Name",
+            "pay_grade"=>"pay_grade_Name",
+            "work_station_id"=>"work_station_id",
+            "address1"=>"address1",
+            "address2"=>"address2",
+            "city"=>"city_Name",
+            "country"=>"country_Name",
+            "province"=>"province_Name",
+            "postal_code"=>"postal_code",
+            "home_phone"=>"home_phone",
+            "mobile_phone"=>"mobile_phone",
+            "work_phone"=>"work_phone",
+            "work_email"=>"work_email",
+            "private_email"=>"private_email",
+            "joined_date"=>"joined_date",
+            "confirmation_date"=>"confirmation_date",
+            "supervisor"=>"supervisor_Name",
+            "indirect_supervisors"=>"indirect_supervisors",
+            "department"=>"department_Name"
+        );
+
 		public function getAdminAccess(){
 			return array("get","element","save","delete");
 		}
-	
+
 		public function getManagerAccess(){
 			return array("get","element","save");
 		}
-	
+
 		public function getUserAccess(){
 			return array("get");
 		}
-	
+
 		public function getUserOnlyMeAccess(){
 			return array("element","save");
 		}
-	
+
 		public function getUserOnlyMeAccessField(){
 			return "id";
 		}
-	
+
+
+        private function initHistory($obj){
+
+            $oldObjOrig = new Employee();
+            $oldObjOrig->Load("id = ?",array($obj->id));
+            $this->oldObjOrig = $oldObjOrig;
+
+            $mapping = '{"nationality":["Nationality","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"]}';
+
+            $this->oldObj = BaseService::getInstance()->getElement('Employee',$obj->id,$mapping,true);
+
+        }
+
+        private function saveHistory($obj){
+
+            $oldObj = $this->oldObj;
+            $oldObjOrig = $this->oldObjOrig;
+
+            $mapping = '{"nationality":["Nationality","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"]}';
+
+            $objEnriched = BaseService::getInstance()->getElement('Employee',$obj->id,$mapping,true);
+
+            foreach($this->historyFieldsToTrack as $k => $v){
+
+                if(empty($oldObjOrig->$k) && $obj->$k = '[]'){
+                    continue;
+                }
+
+                if(empty($obj->$k) && $oldObjOrig->$k = '0000-00-00'){
+                    continue;
+                }
+
+                if($oldObjOrig->$k != $obj->$k){
+
+                    $enrichNewVal = '';
+                    $enrichOldVal = '';
+
+                    if($k == 'indirect_supervisors'){
+                        if(!empty($obj->$k) && $obj->$k != '[]'){
+                            $newIndeirectSupervisorIds = json_decode($obj->$k);
+                            foreach($newIndeirectSupervisorIds as $id){
+                                $item = BaseService::getInstance()->getItemFromCache("Employee", $id);
+                                if($enrichNewVal != ""){
+                                    $enrichNewVal .= ", ";
+                                }
+                                $enrichNewVal .= $item->first_name." ".$item->last_name;
+                            }
+                        }
+
+                        if(!empty($oldObjOrig->$k) && $oldObjOrig->$k != '[]'){
+                            $oldIndeirectSupervisorIds = json_decode($oldObjOrig->$k);
+                            foreach($oldIndeirectSupervisorIds as $id){
+                                $item = BaseService::getInstance()->getItemFromCache("Employee", $id);
+                                if($enrichOldVal != ""){
+                                    $enrichOldVal .= ", ";
+                                }
+                                $enrichOldVal .= $item->first_name." ".$item->last_name;
+                            }
+                        }
+                    }else{
+                        $enrichOldVal = $oldObj->$v;
+                        $enrichNewVal = $objEnriched->$v;
+                    }
+
+                    $this->historyUpdateList[] = array($obj->id,$k,$enrichOldVal,$enrichNewVal);
+                }
+            }
+
+            while(count($this->historyUpdateList)){
+                $ele = array_pop($this->historyUpdateList);
+                BaseService::getInstance()->addHistoryItem("Employee","Employee",$ele[0],$ele[1],$ele[2],$ele[3]);
+            }
+        }
+		
+		public function executePreSaveActions($obj){
+			if(empty($obj->status)){
+				$obj->status = 'Active';
+			}
+			return new IceResponse(IceResponse::SUCCESS,$obj);
+		}
+
+        public function executePreUpdateActions($obj){
+            $this->initHistory($obj);
+            return new IceResponse(IceResponse::SUCCESS,$obj);
+        }
+
+        public function executePostUpdateActions($obj){
+            $this->saveHistory($obj);
+        }
+
+        public function postProcessGetData($obj){
+            $obj = FileService::getInstance()->updateSmallProfileImage($obj);
+            return $obj;
+        }
+
+        public function getVirtualFields(){
+            return array(
+                "image"
+            );
+        }
+
+        public function getActiveEmployees(){
+            $employee = new Employee();
+            $list = $employee->Find("status = ?",array('Active'));
+            return $list;
+        }
+
+        public function getActiveSubordinateEmployees(){
+
+            $employee = new Employee();
+            if(BaseService::getInstance()->currentUser->user_level != 'Admin'){
+                $cemp = BaseService::getInstance()->getCurrentProfileId();
+                $list = $employee->Find("status = ? and supervisor = ?",array('Active', $cemp));
+            }else{
+                $list = $employee->Find("status = ?",array('Active'));
+            }
+            return $list;
+        }
+
+        public static function cleanEmployeeData($obj){
+            unset($obj->historyFieldsToTrack);
+            unset($obj->historyUpdateList);
+            unset($obj->oldObjOrig);
+            unset($obj->oldObj);
+            unset($obj->oldObj);
+            return $obj;
+        }
+
 		var $_table = 'Employees';
 	}
 }
 
+if (!class_exists('ArchivedEmployee')) {
+	class ArchivedEmployee extends ICEHRM_Record {
+
+		public function getAdminAccess(){
+			return array("get","element","save","delete");
+		}
+
+		public function getManagerAccess(){
+			return array("get","element","save");
+		}
+
+		public function getUserAccess(){
+			return array("get");
+		}
+
+		public function getUserOnlyMeAccess(){
+			return array("element","save");
+		}
+
+		public function getUserOnlyMeAccessField(){
+			return "id";
+		}
+
+		var $_table = 'ArchivedEmployees';
+	}
+}
+
 if (!class_exists('EmploymentStatus')) {
 	class EmploymentStatus extends ICEHRM_Record {
-		
+
 		var $_table = 'EmploymentStatus';
-	
+
 		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($accessTokenValidation->getStatus() == IceResponse::ERROR){
+                return $accessTokenValidation;
+            }
+
+            $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

@@ -0,0 +1,248 @@
+<div class="row">
+	<div class="col-xs-12 col-md-2">
+		<div class="row-fluid">
+			<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="row-fluid">
+			<div class="col-md-12"><h2 id="name"></h2></div>
+		</div>	
+		<div class="row-fluid">
+			<div class="col-md-12">
+			<p>
+				<i class="fa fa-phone"></i> <span id="mobile_phone"></span>&nbsp;&nbsp;
+				<i class="fa fa-envelope"></i> <span id="work_email"></span>
+			</p>
+			</div>
+		</div>
+	    <div class="row-fluid">
+	    	<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 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>
+			</div>
+			<div class="col-xs-6 col-md-4" style="font-size:16px;">
+				<label class="control-label col-xs-12" style="font-size:13px;">#_label_nic_num_#</label>
+				<label class="control-label col-xs-12 iceLabel" style="font-size:13px;font-weight: bold;" id="nic_num"></label>
+			</div>
+			<div class="col-xs-6 col-md-4" style="font-size:16px;">
+				<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>
+
+
+<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="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="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="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>
+					</div>
+					<div class="col-xs-6 col-md-3" style="font-size:16px;">
+						<label class="control-label col-xs-12" style="font-size:13px;">#_label_other_id_#</label>
+						<label class="control-label col-xs-12 iceLabel" style="font-size:13px;font-weight: bold;" id="other_id"></label>
+					</div>
+					<div class="col-xs-6 col-md-3" style="font-size:16px;">
+						<label class="control-label col-xs-12" style="font-size:13px;">#_label_birthday_#</label>
+						<label class="control-label col-xs-12 iceLabel" style="font-size:13px;font-weight: bold;" id="birthday"></label>
+					</div>
+					<div class="col-xs-6 col-md-3" style="font-size:16px;">
+						<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>
+					</div>
+					<div class="col-xs-6 col-md-3" style="font-size:16px;">
+						<label class="control-label col-xs-12" style="font-size:13px;">#_label_marital_status_#</label>
+						<label class="control-label col-xs-12 iceLabel" style="font-size:13px;font-weight: bold;" id="marital_status"></label>
+					</div>
+					<div class="col-xs-6 col-md-3" style="font-size:16px;">
+						<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 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-body">
+				<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>
+					</div>
+					<div class="col-xs-6 col-md-3" style="font-size:16px;">
+						<label class="control-label col-xs-12" style="font-size:13px;">#_label_address2_#</label>
+						<label class="control-label col-xs-12 iceLabel" style="font-size:13px;font-weight: bold;" id="address2"></label>
+					</div>
+					<div class="col-xs-6 col-md-3" style="font-size:16px;">
+						<label class="control-label col-xs-12" style="font-size:13px;">#_label_city_#</label>
+						<label class="control-label col-xs-12 iceLabel" style="font-size:13px;font-weight: bold;" id="city"></label>
+					</div>
+					<div class="col-xs-6 col-md-3" style="font-size:16px;">
+						<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>
+					</div>
+					<div class="col-xs-6 col-md-3" style="font-size:16px;">
+						<label class="control-label col-xs-12" style="font-size:13px;">#_label_home_phone_#</label>
+						<label class="control-label col-xs-12 iceLabel" style="font-size:13px;font-weight: bold;" id="home_phone"></label>
+					</div>
+					<div class="col-xs-6 col-md-3" style="font-size:16px;">
+						<label class="control-label col-xs-12" style="font-size:13px;">#_label_work_phone_#</label>
+						<label class="control-label col-xs-12 iceLabel" style="font-size:13px;font-weight: bold;" id="work_phone"></label>
+					</div>
+					<div class="col-xs-6 col-md-3" style="font-size:16px;">
+						<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 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-body">
+				<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>
+					</div>
+					<div class="col-xs-6 col-md-3" style="font-size:16px;">
+						<label class="control-label col-xs-12" style="font-size:13px;">#_label_employment_status_#</label>
+						<label class="control-label col-xs-12 iceLabel" style="font-size:13px;font-weight: bold;" id="employment_status_Name"></label>
+					</div>
+					<div class="col-xs-6 col-md-3" style="font-size:16px;">
+						<label class="control-label col-xs-12" style="font-size:13px;">#_label_supervisor_#</label>
+						<label class="control-label col-xs-12 iceLabel" style="font-size:13px;font-weight: bold;" id="supervisor_Name"></label>
+					</div>
+					<div class="col-xs-6 col-md-3" style="font-size:16px;">
+						<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 class="modal" id="adminUsersModel" 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 User Password</h3>
+			</div>
+			<div class="modal-body">
+				<form id="adminUsersChangePwd">
+				<div class="control-group">
+				<div class="controls">
+				  	<span class="label label-warning" id="adminUsersChangePwd_error" style="display:none;"></span>
+				</div>
+				</div>
+				<div class="control-group" id="field_newpwd">
+					<label class="control-label" for="newpwd">New Password</label>
+					<div class="controls">
+					  	<input class="" type="password" id="newpwd" name="newpwd" value="" class="form-control"/>
+					  	<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>
+		</div>	
+	</div><!-- End tabPageBasic -->
+	<div class="tab-pane" id="tabPageQualifications" style="border:1px solid #DDD;">
+		<div class="row" style="margin-top:20px;">
+			<div class="col-md-3">
+				<div id="EmployeeSkillSubTab" class="" data-content="List" style="padding-left:5px;">
+					
+				</div>
+			</div>
+			<div class="col-md-3">
+				<div id="EmployeeEducationSubTab" class="" data-content="List" style="padding-left:5px;">
+					
+				</div>
+			</div>
+			<div class="col-md-3">
+				<div id="EmployeeCertificationSubTab" class="" data-content="List" style="padding-left:5px;">
+					
+				</div>
+			</div>
+			<div class="col-md-3">
+				<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="row" style="margin-top:20px;">
+			<div class="col-md-12">
+				<div id="EmployeeDocumentSubTab" class="" data-content="List" style="padding-left:5px;">
+
+				</div>
+			</div>
+		</div><!-- End tabPageQualifications -->
+	</div>
+</div><!-- End tab-content -->

ext/admin/employees/db_update.sql

@@ -0,0 +1,108 @@
+ALTER TABLE Employees ADD COLUMN `status` enum('Active','Terminated') default 'Active';
+
+create table `ArchivedEmployees` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `ref_id` bigint(20) NOT NULL,
+  `employee_id` varchar(50) default null,
+  `first_name` varchar(100) default '' not null,
+  `last_name` varchar(100) default '' not null,
+  `gender` enum('Male','Female') default NULL,
+  `ssn_num` varchar(100) default '',
+  `nic_num` varchar(100) default '',
+  `other_id` varchar(100) default '',
+  `work_email` varchar(100) default null,
+  `joined_date` DATETIME default '0000-00-00 00:00:00',
+  `confirmation_date` DATETIME default '0000-00-00 00:00:00',
+  `supervisor` bigint(20) default null,
+  `department` bigint(20) default null,
+  `termination_date` DATETIME default '0000-00-00 00:00:00',
+  `notes` text default null,
+  `data` longtext default null,
+  primary key  (`id`)
+
+) engine=innodb default charset=utf8;
+
+
+create table `FieldNameMappings` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `type` varchar(20) NOT NULL,
+  `name` varchar(20) NOT NULL,
+  `textOrig` varchar(200) default null,
+  `textMapped` varchar(200) default null,
+  `display` enum('Form','Table and Form','Hidden') default 'Form',
+  `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;
+
+INSERT INTO `FieldNameMappings` (`type`, `name`, `textOrig`, `textMapped`, `display`) VALUES
+  ('Employee', 'employee_id', 'Employee Number', 'Employee Number', 'Table and Form'),
+  ('Employee', 'first_name', 'First Name', 'First Name', 'Table and Form'),
+  ('Employee', 'middle_name', 'Middle Name', 'Middle Name', 'Form'),
+  ('Employee', 'last_name', 'Last Name', 'Last Name', 'Table and Form'),
+  ('Employee', 'nationality', 'Nationality', 'Nationality', 'Form'),
+  ('Employee', 'birthday', 'Date of Birth', 'Date of Birth', 'Form'),
+  ('Employee', 'gender', 'Gender', 'Gender', 'Form'),
+  ('Employee', 'marital_status', 'Marital Status', 'Marital Status', 'Form'),
+  ('Employee', 'ssn_num', 'SSN/NRIC', 'SSN/NRIC', 'Form'),
+  ('Employee', 'nic_num', 'NIC', 'NIC', 'Form'),
+  ('Employee', 'other_id', 'Other ID', 'Other ID', 'Form'),
+  ('Employee', 'driving_license', 'Driving License No', 'Driving License No', 'Form'),
+  ('Employee', 'employment_status', 'Employment Status', 'Employment Status', 'Form'),
+  ('Employee', 'job_title', 'Job Title', 'Job Title', 'Form'),
+  ('Employee', 'pay_grade', 'Pay Grade', 'Pay Grade', 'Form'),
+  ('Employee', 'work_station_id', 'Work Station Id', 'Work Station Id', 'Form'),
+  ('Employee', 'address1', 'Address Line 1', 'Address Line 1', 'Form'),
+  ('Employee', 'address2', 'Address Line 2', 'Address Line 2', 'Form'),
+  ('Employee', 'city', 'City', 'City', 'Form'),
+  ('Employee', 'country', 'Country', 'Country', 'Form'),
+  ('Employee', 'province', 'Province', 'Province', 'Form'),
+  ('Employee', 'postal_code', 'Postal/Zip Code', 'Postal/Zip Code', 'Form'),
+  ('Employee', 'home_phone', 'Home Phone', 'Home Phone', 'Form'),
+  ('Employee', 'mobile_phone', 'Mobile Phone', 'Mobile Phone', 'Table and Form'),
+  ('Employee', 'work_phone', 'Work Phone', 'Work Phone', 'Form'),
+  ('Employee', 'work_email', 'Work Email', 'Work Email', 'Form'),
+  ('Employee', 'private_email', 'Private Email', 'Private Email', 'Form'),
+  ('Employee', 'joined_date', 'Joined Date', 'Joined Date', 'Form'),
+  ('Employee', 'confirmation_date', 'Confirmation Date', 'Confirmation Date', 'Form'),
+  ('Employee', 'termination_date', 'Termination Date', 'Termination Date', 'Form'),
+  ('Employee', 'supervisor', 'Supervisor', 'Supervisor', 'Table and Form'),
+  ('Employee', 'department', 'Department', 'Department', 'Table and Form'),
+  ('Employee', 'notes', 'Notes', 'Notes', 'Form');
+
+
+create table `CustomFields` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `type` varchar(20) NOT NULL,
+  `name` varchar(20) NOT NULL,
+  `data` text default null,
+  `display` enum('Form','Table and Form','Hidden') default 'Form',
+  `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;
+
+
+INSERT INTO `CustomFields` (`type`, `name`, `data`,`display`) VALUES
+  ('Employee', 'custom1', '', 'Hidden'),
+  ('Employee', 'custom2', '', 'Hidden'),
+  ('Employee', 'custom3', '', 'Hidden'),
+  ('Employee', 'custom4', '', 'Hidden'),
+  ('Employee', 'custom5', '', 'Hidden'),
+  ('Employee', 'custom6', '', 'Hidden'),
+  ('Employee', 'custom7', '', 'Hidden'),
+  ('Employee', 'custom8', '', 'Hidden'),
+  ('Employee', 'custom9', '', 'Hidden'),
+  ('Employee', 'custom10', '', 'Hidden');
+
+
+Alter table `Employees` MODIFY COLUMN `middle_name` varchar(100) default null;
+Alter table `Employees` MODIFY COLUMN `last_name` varchar(100) default null;
+Alter table `Employees` MODIFY COLUMN `ssn_num` varchar(100) default NULL;
+Alter table `Employees` MODIFY COLUMN `nic_num` varchar(100) default NULL;
+Alter table `Employees` MODIFY COLUMN `other_id` varchar(100) default NULL;
+Alter table `Employees` MODIFY COLUMN `driving_license` varchar(100) default NULL;
+Alter table `Employees` MODIFY COLUMN `work_station_id` varchar(100) default NULL;
+Alter table `Employees` MODIFY COLUMN `address1` varchar(100) default NULL;
+Alter table `Employees` MODIFY COLUMN `address2` varchar(100) default NULL;
+Alter table `Employees` MODIFY COLUMN `city` varchar(150) default NULL;

ext/admin/employees/index.php

@@ -4,10 +4,41 @@ $moduleName = 'employees';
 define('MODULE_PATH',dirname(__FILE__));
 include APP_BASE_PATH.'header.php';
 include APP_BASE_PATH.'modulejslibs.inc.php';
+$fieldNameMap = BaseService::getInstance()->getFieldNameMappings("Employee");
+$customFields = BaseService::getInstance()->getCustomFields("Employee");
 ?><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="tabEmployee" href="#tabPageEmployee">Employees</a></li>
+        <?php if($user->user_level != "Admin"){
+        ?>
+		    <li class="active"><a id="tabEmployee" href="#tabPageEmployee">Employees (Direct Reports)</a></li>
+        <?php }else{ ?>
+            <li class="active"><a id="tabEmployee" href="#tabPageEmployee">Employees</a></li>
+        <?php }?>
+
+        <?php if($user->user_level == "Admin"){
+        ?>
+		<li><a id="tabEmployeeSkill" href="#tabPageEmployeeSkill">Skills</a></li>
+		<li><a id="tabEmployeeEducation" href="#tabPageEmployeeEducation">Education</a></li>
+		<li><a id="tabEmployeeCertification" href="#tabPageEmployeeCertification">Certifications</a></li>
+		<li><a id="tabEmployeeLanguage" href="#tabPageEmployeeLanguage">Languages</a></li>
+		<li><a id="tabEmployeeDependent" href="#tabPageEmployeeDependent">Dependents</a></li>
+		<li><a id="tabEmergencyContact" href="#tabPageEmergencyContact">Emergency Contacts</a></li>
+            <?php if (!class_exists('DocumentsAdminManager')) {?>
+                <li><a id="tabEmployeeDocument" href="#tabPageEmployeeDocument">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>
+            <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="tabArchivedEmployee" href="#tabPageArchivedEmployee">Terminated Employee Data</a></li>
+            </ul>
+        </li>
+        <?php }?>
+
 	</ul>
 	 
 	<div class="tab-content">
@@ -19,16 +50,161 @@ include APP_BASE_PATH.'modulejslibs.inc.php';
 		
 			</div>
 		</div>
+		<div class="tab-pane" id="tabPageEmployeeSkill">
+			<div id="EmployeeSkill" class="reviewBlock" data-content="List" style="padding-left:5px;">
+		
+			</div>
+			<div id="EmployeeSkillForm" class="reviewBlock" data-content="Form" style="padding-left:5px;display:none;">
+		
+			</div>
+		</div>
+		<div class="tab-pane" id="tabPageEmployeeEducation">
+			<div id="EmployeeEducation" class="reviewBlock" data-content="List" style="padding-left:5px;">
+		
+			</div>
+			<div id="EmployeeEducationForm" class="reviewBlock" data-content="Form" style="padding-left:5px;display:none;">
+		
+			</div>
+		</div>
+		<div class="tab-pane" id="tabPageEmployeeCertification">
+			<div id="EmployeeCertification" class="reviewBlock" data-content="List" style="padding-left:5px;">
+		
+			</div>
+			<div id="EmployeeCertificationForm" class="reviewBlock" data-content="Form" style="padding-left:5px;display:none;">
+		
+			</div>
+		</div>
+		<div class="tab-pane" id="tabPageEmployeeLanguage">
+			<div id="EmployeeLanguage" class="reviewBlock" data-content="List" style="padding-left:5px;">
+		
+			</div>
+			<div id="EmployeeLanguageForm" class="reviewBlock" data-content="Form" style="padding-left:5px;display:none;">
+		
+			</div>
+		</div>
+		<div class="tab-pane" id="tabPageEmployeeDependent">
+			<div id="EmployeeDependent" class="reviewBlock" data-content="List" style="padding-left:5px;">
+		
+			</div>
+			<div id="EmployeeDependentForm" class="reviewBlock" data-content="Form" style="padding-left:5px;display:none;">
+		
+			</div>
+		</div>
+		<div class="tab-pane" id="tabPageEmergencyContact">
+			<div id="EmergencyContact" class="reviewBlock" data-content="List" style="padding-left:5px;">
+		
+			</div>
+			<div id="EmergencyContactForm" class="reviewBlock" data-content="Form" style="padding-left:5px;display:none;">
+		
+			</div>
+		</div>
+
+		<div class="tab-pane" id="tabPageArchivedEmployee">
+			<div id="ArchivedEmployee" class="reviewBlock" data-content="List" style="padding-left:5px;">
+		
+			</div>
+			<div id="ArchivedEmployeeForm" class="reviewBlock" data-content="Form" style="padding-left:5px;display:none;">
+		
+			</div>
+		</div>
+		<div class="tab-pane" id="tabPageTerminatedEmployee">
+			<div id="TerminatedEmployee" class="reviewBlock" data-content="List" style="padding-left:5px;">
+		
+			</div>
+			<div id="TerminatedEmployeeForm" class="reviewBlock" data-content="Form" style="padding-left:5px;display:none;">
+		
+			</div>
+		</div>
+        <?php if (!class_exists('DocumentsAdminManager')) {?>
+            <div class="tab-pane" id="tabPageEmployeeDocument">
+                <div id="EmployeeDocument" class="reviewBlock" data-content="List" style="padding-left:5px;">
+
+                </div>
+                <div id="EmployeeDocumentForm" class="reviewBlock" data-content="Form" style="padding-left:5px;display:none;">
+
+                </div>
+            </div>
+        <?php } ?>
 		
 	</div>
 
 </div>
 <script>
 var modJsList = new Array();
-modJsList['tabEmployee'] = new EmployeeAdapter('Employee');
+<?php if($user->user_level != "Admin"){
+?>
+modJsList['tabEmployee'] = new EmployeeAdapter('Employee','Employee',{"status":"Active", "supervisor":"__myid__"});
+modJsList['tabEmployee'].setShowAddNew(false);
+<?php
+}else{
+?>
+modJsList['tabEmployee'] = new EmployeeAdapter('Employee','Employee',{"status":"Active"});
+<?php
+}
+?>
+
 modJsList['tabEmployee'].setRemoteTable(true);
+modJsList['tabEmployee'].setFieldNameMap(<?=json_encode($fieldNameMap)?>);
+modJsList['tabEmployee'].setCustomFields(<?=json_encode($customFields)?>);
+
+modJsList['tabEmployeeSkill'] = new EmployeeSkillAdapter('EmployeeSkill');
+modJsList['tabEmployeeSkill'].setRemoteTable(true);
+
+modJsList['tabEmployeeEducation'] = new EmployeeEducationAdapter('EmployeeEducation');
+modJsList['tabEmployeeEducation'].setRemoteTable(true);
+
+modJsList['tabEmployeeCertification'] = new EmployeeCertificationAdapter('EmployeeCertification');
+modJsList['tabEmployeeCertification'].setRemoteTable(true);
+
+modJsList['tabEmployeeLanguage'] = new EmployeeLanguageAdapter('EmployeeLanguage');
+modJsList['tabEmployeeLanguage'].setRemoteTable(true);
+
+modJsList['tabEmployeeDependent'] = new EmployeeDependentAdapter('EmployeeDependent');
+modJsList['tabEmployeeDependent'].setRemoteTable(true);
+
+modJsList['tabEmergencyContact'] = new EmergencyContactAdapter('EmergencyContact');
+modJsList['tabEmergencyContact'].setRemoteTable(true);
+
+modJsList['tabEmployeeImmigration'] = new EmployeeImmigrationAdapter('EmployeeImmigration');
+modJsList['tabEmployeeImmigration'].setRemoteTable(true);
+
+modJsList['tabArchivedEmployee'] = new ArchivedEmployeeAdapter('ArchivedEmployee');
+modJsList['tabArchivedEmployee'].setRemoteTable(true);
+modJsList['tabArchivedEmployee'].setShowAddNew(false);
+
+modJsList['tabTerminatedEmployee'] = new TerminatedEmployeeAdapter('Employee','TerminatedEmployee',{"status":"Terminated"});
+modJsList['tabTerminatedEmployee'].setRemoteTable(true);
+modJsList['tabTerminatedEmployee'].setShowAddNew(false);
+
+<?php if (!class_exists('DocumentsAdminManager')) {?>
+modJsList['tabEmployeeDocument'] = new EmployeeDocumentAdapter('EmployeeDocument','EmployeeDocument');
+modJsList['tabTerminatedEmployee'].setRemoteTable(true);
+<?php } ?>
 
 var modJs = modJsList['tabEmployee'];
 
+	
+
 </script>
-<?php include APP_BASE_PATH.'footer.php';?>      
+
+
+<div class="modal" id="createUserModel" 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;">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.
+            </div>
+            <div class="modal-footer">
+                <button class="btn btn-primary" onclick="modJs.createUser();">Yes</button>
+                <button class="btn" onclick="modJs.closeCreateUser();">No</button>
+            </div>
+        </div>
+    </div>
+</div>
+
+
+<?php include APP_BASE_PATH.'footer.php';?>      

ext/admin/fieldnames/api/FieldnamesAdminManager.php

@@ -0,0 +1,57 @@
+<?php
+if (!class_exists('FieldnamesAdminManager')) {
+    class FieldnamesAdminManager extends AbstractModuleManager{
+        public function initializeUserClasses(){
+
+        }
+
+        public function initializeFieldMappings(){
+
+        }
+
+        public function initializeDatabaseErrorMappings(){
+
+        }
+
+        public function setupModuleClassDefinitions(){
+            $this->addModelClass('FieldNameMapping');
+            $this->addModelClass('CustomField');
+        }
+    }
+}
+
+if (!class_exists('FieldNameMapping')) {
+    class FieldNameMapping extends ICEHRM_Record {
+        var $_table = 'FieldNameMappings';
+
+        public function getAdminAccess(){
+            return array("get","element","save","delete");
+        }
+
+        public function getUserAccess(){
+            return array();
+        }
+
+        public function getAnonymousAccess(){
+            return array("get","element");
+        }
+    }
+}
+
+if (!class_exists('CustomField')) {
+	class CustomField extends ICEHRM_Record {
+		var $_table = 'CustomFields';
+
+		public function getAdminAccess(){
+			return array("get","element","save","delete");
+		}
+
+		public function getUserAccess(){
+			return array();
+		}
+
+		public function getAnonymousAccess(){
+			return array("get","element");
+		}
+	}
+}

ext/admin/fieldnames/index.php

@@ -0,0 +1,62 @@
+<?php 
+/*
+This file is part of Ice Framework.
+
+------------------------------------------------------------------
+
+Original work Copyright (c) 2012 [Gamonoid Media Pvt. Ltd]  
+Developer: Thilina Hasantha (thilina.hasantha[at]gmail.com / facebook.com/thilinah)
+ */
+
+$moduleName = 'fieldnames';
+define('MODULE_PATH',dirname(__FILE__));
+include APP_BASE_PATH.'header.php';
+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">
+            <a href="#" id="settingsEmployeeMenu" class="dropdown-toggle" data-toggle="dropdown" aria-controls="settingsEmployeeMenu-contents">Employee Fields <span class="caret"></span></a>
+            <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">
+        <div class="tab-pane active" id="tabPageEmployeeFieldName">
+            <div id="EmployeeFieldName" class="reviewBlock" data-content="List" style="padding-left:5px;">
+
+            </div>
+            <div id="EmployeeFieldNameForm" class="reviewBlock" data-content="Form" style="padding-left:5px;display:none;">
+
+            </div>
+        </div>
+        <div class="tab-pane" id="tabPageEmployeeCustomField">
+            <div id="EmployeeCustomField" class="reviewBlock" data-content="List" style="padding-left:5px;">
+
+            </div>
+            <div id="EmployeeCustomFieldForm" class="reviewBlock" data-content="Form" style="padding-left:5px;display:none;">
+
+            </div>
+        </div>
+	</div>
+
+</div>
+<script>
+var modJsList = new Array();
+
+modJsList['tabEmployeeFieldName'] = new FieldNameAdapter('FieldNameMapping','EmployeeFieldName',{"type":"Employee"});
+modJsList['tabEmployeeFieldName'].setRemoteTable(true);
+modJsList['tabEmployeeFieldName'].setShowAddNew(false);
+
+modJsList['tabEmployeeCustomField'] = new CustomFieldAdapter('CustomField','EmployeeCustomField',{"type":"Employee"});
+modJsList['tabEmployeeCustomField'].setRemoteTable(true);
+modJsList['tabEmployeeCustomField'].setShowAddNew(false);
+
+
+var modJs = modJsList['tabEmployeeFieldName'];
+
+</script>
+<?php include APP_BASE_PATH.'footer.php';?>      

ext/admin/fieldnames/lib.js

@@ -0,0 +1,86 @@
+/**
+ * Author: Thilina Hasantha
+ */
+
+
+/**
+ * FieldNameAdapter
+ */
+
+function FieldNameAdapter(endPoint,tab,filter,orderBy) {
+    this.initAdapter(endPoint,tab,filter,orderBy);
+}
+
+FieldNameAdapter.inherits(AdapterBase);
+
+
+
+FieldNameAdapter.method('getDataMapping', function() {
+	return [
+	        "id",
+	        "name",
+	        "textOrig",
+	        "textMapped",
+	        "display"
+	];
+});
+
+FieldNameAdapter.method('getHeaders', function() {
+	return [
+			{ "sTitle": "ID" ,"bVisible":false},
+			{ "sTitle": "Name" },
+			{ "sTitle": "Original Text"},
+			{ "sTitle": "Mapped Text"},
+			{ "sTitle": "Display Status"}
+	];
+});
+
+FieldNameAdapter.method('getFormFields', function() {
+	return [
+	        [ "id", {"label":"ID","type":"hidden"}],
+	        [ "type", {"label":"Type","type":"placeholder","validation":""}],
+	        [ "name", {"label":"Name","type":"placeholder","validation":""}],
+	        [ "textOrig", {"label":"Original Text","type":"placeholder","validation":""}],
+	        [ "textMapped", {"label":"Mapped Text","type":"text","validation":""}],
+            [ "display", {"label":"Display Status","type":"select","source":[["Form","Form"],["Table and Form","Table and Form"],["Hidden","Hidden"]]}]
+	];
+});
+
+/*
+ *
+ */
+
+function CustomFieldAdapter(endPoint,tab,filter,orderBy) {
+    this.initAdapter(endPoint,tab,filter,orderBy);
+}
+
+CustomFieldAdapter.inherits(AdapterBase);
+
+
+
+CustomFieldAdapter.method('getDataMapping', function() {
+	return [
+	        "id",
+	        "name",
+	        "display"
+	];
+});
+
+CustomFieldAdapter.method('getHeaders', function() {
+	return [
+			{ "sTitle": "ID" ,"bVisible":false},
+			{ "sTitle": "Name" },
+			{ "sTitle": "Display Status"}
+	];
+});
+
+CustomFieldAdapter.method('getFormFields', function() {
+	return [
+	        [ "id", {"label":"ID","type":"hidden"}],
+	        [ "type", {"label":"Type","type":"placeholder","validation":""}],
+	        [ "name", {"label":"Name","type":"placeholder","validation":""}],
+	        [ "data", {"label":"Data","type":"textarea","validation":""}],
+            [ "display", {"label":"Display Status","type":"select","source":[["Form","Form"],["Table and Form","Table and Form"],["Hidden","Hidden"]]}]
+	];
+});
+

ext/admin/fieldnames/meta.json

@@ -0,0 +1,11 @@
+{
+"label":"Field Names Setup",
+"menu":"System",
+"order":"7",
+"icon":"fa-sort-alpha-asc",
+"user_levels":["Admin"],
+
+"permissions":
+	{
+	}
+}

ext/admin/meta.json

@@ -3,5 +3,5 @@
 "Employees":"fa-users",
 "Reports":"fa-file-text",
 "System":"fa-cogs",
-"Salary Details":"fa-money"
+"Payroll":"fa-money"
 }

ext/admin/metadata/api/MetadataAdminManager.php

@@ -22,6 +22,7 @@ if (!class_exists('MetadataAdminManager')) {
 			$this->addModelClass('Nationality');
 			$this->addModelClass('ImmigrationStatus');
 			$this->addModelClass('Ethnicity');
+			$this->addModelClass('CalculationHook');
 		}
 		
 	}
@@ -42,6 +43,20 @@ if (!class_exists('Country')) {
 		public function getAnonymousAccess(){
 			return array("get","element");
 		}
+
+		function Find($whereOrderBy,$bindarr=false,$pkeysArr=false,$extra=array()){
+			$allowedCountriesStr = SettingsManager::getInstance()->getSetting('System: Allowed Countries');
+			$allowedCountries = array();
+			if(!empty($allowedCountriesStr)){
+				$allowedCountries = json_decode($allowedCountriesStr,true);
+			}
+
+			if(!empty($allowedCountries)){
+				return parent::Find("id in (".implode(",",$allowedCountries).")" , array());
+			}
+
+			return parent::Find($whereOrderBy, $bindarr, $pkeysArr, $extra);
+		}
 	}	
 }
 
@@ -79,6 +94,20 @@ if (!class_exists('CurrencyType')) {
 		public function getAnonymousAccess(){
 			return array("get","element");
 		}
+
+		function Find($whereOrderBy,$bindarr=false,$pkeysArr=false,$extra=array()){
+			$allowedCountriesStr = SettingsManager::getInstance()->getSetting('System: Allowed Currencies');
+			$allowedCountries = array();
+			if(!empty($allowedCountriesStr)){
+				$allowedCountries = json_decode($allowedCountriesStr,true);
+			}
+
+			if(!empty($allowedCountries)){
+				return parent::Find("id in (".implode(",",$allowedCountries).")" , array());
+			}
+
+			return parent::Find($whereOrderBy, $bindarr, $pkeysArr, $extra);
+		}
 	}	
 }
 
@@ -98,6 +127,22 @@ if (!class_exists('Nationality')) {
 		public function getAnonymousAccess(){
 			return array("get","element");
 		}
+
+		function Find($whereOrderBy,$bindarr=false,$pkeysArr=false,$extra=array()){
+			$allowedCountriesStr = SettingsManager::getInstance()->getSetting('System: Allowed Nationality');
+			$allowedCountries = array();
+			if(!empty($allowedCountriesStr)){
+				$allowedCountries = json_decode($allowedCountriesStr,true);
+			}
+
+			if(!empty($allowedCountries)){
+				return parent::Find("id in (".implode(",",$allowedCountries).")" , array());
+			}
+
+			return parent::Find($whereOrderBy, $bindarr, $pkeysArr, $extra);
+		}
+
+
 	}
 }
 
@@ -139,6 +184,32 @@ if (!class_exists('Ethnicity')) {
     }
 }
 
+if (!class_exists('CalculationHook')) {
+    class CalculationHook extends ICEHRM_Record {
+        var $_table = 'CalculationHooks';
+
+        public function getAdminAccess(){
+            return array("get","element","save","delete");
+        }
+
+        public function getUserAccess(){
+            return array();
+        }
+
+        public function getAnonymousAccess(){
+            return array("get","element");
+        }
+
+		function Find($whereOrderBy,$bindarr=false,$pkeysArr=false,$extra=array()){
+			return BaseService::getInstance()->getCalculationHooks();
+		}
+
+		function Load($where=null,$bindarr=false){
+			return BaseService::getInstance()->getCalculationHook($bindarr[0]);
+		}
+    }
+}
+
 
 
 

ext/admin/metadata/index.php

@@ -32,7 +32,6 @@ $moduleBuilder->addModuleOrGroup(new ModuleTab('Country','Country','Countries','
 $moduleBuilder->addModuleOrGroup(new ModuleTab('Province','Province','Provinces','ProvinceAdapter','',''));
 $moduleBuilder->addModuleOrGroup(new ModuleTab('CurrencyType','CurrencyType','Currency Types','CurrencyTypeAdapter','',''));
 $moduleBuilder->addModuleOrGroup(new ModuleTab('Nationality','Nationality','Nationality','NationalityAdapter','',''));
-$moduleBuilder->addModuleOrGroup(new ModuleTab('Nationality','Nationality','Nationality','NationalityAdapter','',''));
 $moduleBuilder->addModuleOrGroup(new ModuleTab('Ethnicity','Ethnicity','Ethnicity','EthnicityAdapter','',''));
 $moduleBuilder->addModuleOrGroup(new ModuleTab('ImmigrationStatus','ImmigrationStatus','Immigration Status','ImmigrationStatusAdapter','',''));
 

ext/admin/modules/index.php

@@ -46,9 +46,9 @@ include APP_BASE_PATH.'modulejslibs.inc.php';
 <script>
 var modJsList = new Array();
 
-modJsList['moduleModule'] = new ModuleAdapter('Module','Module');
-modJsList['moduleModule'].setShowAddNew(false);
-var modJs = modJsList['moduleModule'];
+modJsList['tabModule'] = new ModuleAdapter('Module','Module');
+modJsList['tabModule'].setShowAddNew(false);
+var modJs = modJsList['tabModule'];
 
 </script>
 <?php include APP_BASE_PATH.'footer.php';?>      

ext/admin/modules/lib.js

@@ -58,7 +58,7 @@ ModuleAdapter.method('getActionButtonsHtml', function(id,data) {
 	var nonEditableFields = {};
 	nonEditableFields["admin_Company Structure"] = 1;
 	nonEditableFields["admin_Employees"] = 1;
-	nonEditableFields["admin_Jobs"] = 1;
+	nonEditableFields["admin_Job Details Setup"] = 1;
 	nonEditableFields["admin_Leaves"] = 1;
 	nonEditableFields["admin_Manage Modules"] = 1;
 	nonEditableFields["admin_Projects"] = 1;
@@ -66,10 +66,11 @@ ModuleAdapter.method('getActionButtonsHtml', function(id,data) {
 	nonEditableFields["admin_Settings"] = 1;
 	nonEditableFields["admin_Users"] = 1;
 	nonEditableFields["admin_Upgrade"] = 1;
-	nonEditableFields["admin_Upgrade"] = 1;
+	nonEditableFields["admin_Dashboard"] = 1;
 
 	nonEditableFields["user_Basic Information"] = 1;
-	
+	nonEditableFields["user_Dashboard"] = 1;
+
 	if(nonEditableFields[data[3]+"_"+data[1]] == 1){
 		return "";
 	}

ext/admin/payroll/meta.json

@@ -1,11 +0,0 @@
-{
-"label":"Setup",
-"menu":"Salary Details",
-"order":"6",
-"icon":"fa-cogs",
-"user_levels":["Admin"],
-
-"permissions":
-	{
-	}
-}

ext/admin/reports/reportClasses/EmployeeLeavesReport.php

@@ -32,33 +32,49 @@ from EmployeeLeaves lv";
 		if(in_array("NULL", $employeeList) ){
 			$employeeList = array();
 		}
+
+		if($request['department'] != "NULL" && empty($employeeList)){
+			$empTmp = new Employee();
+			$empTemps = $empTmp->Find("department = ? and status = Active",array($request['department']));
+			foreach($empTemps as $empTmp){
+				$employeeList[] = $empTmp->id;
+			}
+		}
 		
 		
 		if(!empty($employeeList) && ($request['status'] != "NULL" && !empty($request['status']))){
-			$query = "where employee in (".implode(",", $employeeList).") and date_start >= ? and date_end <= ? and status = ?;";
+			$query = "where employee in (".implode(",", $employeeList).") and ((date_start >= ? and date_start <= ?) or (date_end >= ? and date_end <= ?)) and status = ?;";
 			$params = array(	
 					$request['date_start'],	
-					$request['date_end'],	
+					$request['date_end'],
+                    $request['date_start'],
+                    $request['date_end'],
 					$request['status']
 			);
 		}else if(!empty($employeeList)){
-			$query = "where employee in (".implode(",", $employeeList).") and date_start >= ? and date_end <= ?;";
+			$query = "where employee in (".implode(",", $employeeList).") and ((date_start >= ? and date_start <= ?) or (date_end >= ? and date_end <= ?));";
 			$params = array(
+					$request['date_start'],
+					$request['date_end'],
 					$request['date_start'],
 					$request['date_end']
 			);
 		}else if(($request['status'] != "NULL" && !empty($request['status']))){
-			$query = "where status = ? and date_start >= ? and date_end <= ?;";
+			$query = "where status = ? and ((date_start >= ? and date_start <= ?) or (date_end >= ? and date_end <= ?));";
 			$params = array(
 					$request['status'],
 					$request['date_start'],
-					$request['date_end']
+					$request['date_end'],
+                    $request['date_start'],
+                    $request['date_end']
 			);
 		}else{
-			$query = "where date_start >= ? and date_end <= ?;";
+			$query = "where ((date_start >= ? and date_start <= ?) or (date_end >= ? and date_end <= ?));";
 			$params = array(
 					$request['date_start'],
-					$request['date_end']
+					$request['date_end'],
+                    $request['date_start'],
+                    $request['date_end']
 			);
 		}
 		

ext/admin/reports/reportClasses/OvertimeReport.php

@@ -0,0 +1,100 @@
+<?php
+if(!interface_exists('ReportBuilderInterface')){
+    include_once APP_BASE_PATH.'admin/reports/reportClasses/ReportBuilderInterface.php';
+}
+
+if(!class_exists('AttendanceAdminManager')){
+    include_once APP_BASE_PATH.'admin/attendance/api/AttendanceAdminManager.php';
+}
+class OvertimeReport implements ReportBuilderInterface{
+    public function getData($report,$request){
+
+        $employeeList = array();
+        if(!empty($request['employee'])){
+            $employeeList = json_decode($request['employee'],true);
+        }
+
+        if(in_array("NULL", $employeeList) ){
+            $employeeList = array();
+        }
+
+        $sevenDateBefore = date('Y-m-d', strtotime('-7 days',strtotime($request['date_start'])));
+
+        if(!empty($employeeList)){
+            $query = "employee in (".implode(",", $employeeList).") and in_time >= ? and out_time <= ? order by in_time;";
+            $params = array(
+                $sevenDateBefore." 00:00:00",
+                $request['date_end']." 23:59:59",
+            );
+        }else{
+            $query = "in_time >= ? and out_time <= ? order by in_time;";
+            $params = array(
+                $sevenDateBefore." 00:00:00",
+                $request['date_end']." 23:59:59",
+            );
+        }
+
+        $at = new Attendance();
+        $attendance = $at->Find($query, $params);
+
+
+        //Group records by employee
+        $employeeAttendance = array();
+        foreach($attendance as $entry){
+            if(!isset($employeeAttendance[$entry->employee])){
+                $employeeAttendance[$entry->employee] = array();
+            }
+
+            $employeeAttendance[$entry->employee][] = $entry;
+
+        }
+
+        $atCalClassName = SettingsManager::getInstance()->getSetting('Attendance: Overtime Calculation Class');
+
+        $atCal = new $atCalClassName();
+
+        $reportData = array();
+        if(!$this->isAggregated()) {
+            $reportData[] = array("Date", "Employee ID", "Employee", "Time in Office", "Regular Time", "Overtime", "Double Time");
+        }else{
+            $reportData[] = array("Employee ID", "Employee", "Time in Office", "Regular Time", "Overtime", "Double Time");
+        }
+
+        foreach($employeeAttendance as $employeeId => $atData){
+
+            $employee = new Employee();
+            $employee->Load("id = ?",array($employeeId));
+            $atSum = $atCal->getData($atData, $request['date_start'], $this->isAggregated());
+            if(!$this->isAggregated()){
+                foreach($atSum as $date=>$counts){
+                    $reportData[] = array(
+                        $date,
+                        $employee->employee_id,
+                        $employee->first_name." ".$employee->last_name,
+                        $counts['t'],
+                        $counts['r'],
+                        $counts['o'],
+                        $counts['d']
+                    );
+                }
+            }else{
+                $reportData[] = array(
+                    $employee->employee_id,
+                    $employee->first_name." ".$employee->last_name,
+                    $atSum['t'],
+                    $atSum['r'],
+                    $atSum['o'],
+                    $atSum['d']
+                );
+            }
+
+
+        }
+
+        return $reportData;
+    }
+
+    protected function isAggregated(){
+        return false;
+    }
+}

ext/admin/reports/reportClasses/OvertimeSummaryReport.php

@@ -0,0 +1,10 @@
+<?php
+if(!interface_exists('OvertimeReport')){
+    include_once APP_BASE_PATH.'admin/reports/reportClasses/OvertimeReport.php';
+}
+
+class OvertimeSummaryReport extends OvertimeReport{
+    protected function isAggregated(){
+        return true;
+    }
+}

ext/admin/salary/LICENSE.txt

@@ -0,0 +1,44 @@
+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/salary/README.txt

@@ -0,0 +1,7 @@
+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/salary/api/SalaryAdminManager.php

@@ -1,27 +1,26 @@
 <?php
-if (!class_exists('PayrollAdminManager')) {
-	class PayrollAdminManager extends AbstractModuleManager{
-		
-		public function initializeUserClasses(){
-			
-		}
-		
-		public function initializeFieldMappings(){
-			
-		}
-		
-		public function initializeDatabaseErrorMappings(){
+if (!class_exists('SalaryAdminManager')) {
+    class SalaryAdminManager extends AbstractModuleManager{
 
-		}
-		
-		public function setupModuleClassDefinitions(){
+        public function initializeUserClasses(){
+
+        }
+
+        public function initializeFieldMappings(){
+
+        }
+
+        public function initializeDatabaseErrorMappings(){
+
+        }
+
+        public function setupModuleClassDefinitions(){
             $this->addModelClass('SalaryComponentType');
             $this->addModelClass('SalaryComponent');
-            $this->addModelClass('Deduction');
+            $this->addModelClass('PayrollEmployee');
+        }
 
-		}
-		
-	}
+    }
 }
 
 if (!class_exists('SalaryComponentType')) {
@@ -52,9 +51,10 @@ if (!class_exists('SalaryComponent')) {
     }
 }
 
-if (!class_exists('Deduction')) {
-    class Deduction extends ICEHRM_Record {
-        var $_table = 'Deductions';
+
+if (!class_exists('PayrollEmployee')) {
+    class PayrollEmployee extends ICEHRM_Record {
+        var $_table = 'PayrollEmployees';
 
         public function getAdminAccess(){
             return array("get","element","save","delete");
@@ -66,4 +66,3 @@ if (!class_exists('Deduction')) {
     }
 }
 
-

ext/admin/salary/index.php

@@ -1,15 +1,15 @@
 <?php
 
-$moduleName = 'metadata';
+$moduleName = 'salary';
 define('MODULE_PATH',dirname(__FILE__));
 include APP_BASE_PATH.'header.php';
-include APP_BASE_PATH.'modulejslibs.inc.php';
+include APP_BASE_PATH.'mod-houlejslibs.inc.php';
 
 $moduleBuilder = new ModuleBuilder();
 
 $moduleBuilder->addModuleOrGroup(new ModuleTab('SalaryComponentType','SalaryComponentType','Salary Component Types','SalaryComponentTypeAdapter','','',true));
 $moduleBuilder->addModuleOrGroup(new ModuleTab('SalaryComponent','SalaryComponent','Salary Components','SalaryComponentAdapter','',''));
-$moduleBuilder->addModuleOrGroup(new ModuleTab('EmployeeSalary','EmployeeSalary','Employee Salary','EmployeeSalaryAdapter','','',false,array("setRemoteTable"=>"true")));
+$moduleBuilder->addModuleOrGroup(new ModuleTab('EmployeeSalary','EmployeeSalary','Employee Salary Components','EmployeeSalaryAdapter','','',false,array("setRemoteTable"=>"true")));
 
 
 echo UIManager::getInstance()->renderModule($moduleBuilder);

ext/admin/salary/lib.js

@@ -2,7 +2,6 @@
  * Author: Thilina Hasantha
  */
 
-
 /**
  * SalaryComponentTypeAdapter
  */
@@ -16,27 +15,27 @@ SalaryComponentTypeAdapter.inherits(AdapterBase);
 
 
 SalaryComponentTypeAdapter.method('getDataMapping', function() {
-	return [
-	        "id",
-	        "code",
-	        "name"
-	];
+    return [
+        "id",
+        "code",
+        "name"
+    ];
 });
 
 SalaryComponentTypeAdapter.method('getHeaders', function() {
-	return [
-			{ "sTitle": "ID" ,"bVisible":false},
-			{ "sTitle": "Code" },
-			{ "sTitle": "Name"}
-	];
+    return [
+        { "sTitle": "ID" ,"bVisible":false},
+        { "sTitle": "Code" },
+        { "sTitle": "Name"}
+    ];
 });
 
 SalaryComponentTypeAdapter.method('getFormFields', function() {
-	return [
-	        [ "id", {"label":"ID","type":"hidden"}],
-	        [ "code", {"label":"Code","type":"text","validation":""}],
-	        [ "name", {"label":"Name","type":"text","validation":""}]
-	];
+    return [
+        [ "id", {"label":"ID","type":"hidden"}],
+        [ "code", {"label":"Code","type":"text","validation":""}],
+        [ "name", {"label":"Name","type":"text","validation":""}]
+    ];
 });
 
 
@@ -53,30 +52,30 @@ SalaryComponentAdapter.inherits(AdapterBase);
 
 
 SalaryComponentAdapter.method('getDataMapping', function() {
-	return [
-	        "id",
-	        "name",
-	        "componentType",
-            "details"
-	];
+    return [
+        "id",
+        "name",
+        "componentType",
+        "details"
+    ];
 });
 
 SalaryComponentAdapter.method('getHeaders', function() {
-	return [
-			{ "sTitle": "ID" ,"bVisible":false},
-			{ "sTitle": "Name" },
-			{ "sTitle": "Salary Component Type" },
-			{ "sTitle": "Details"}
-	];
+    return [
+        { "sTitle": "ID" ,"bVisible":false},
+        { "sTitle": "Name" },
+        { "sTitle": "Salary Component Type" },
+        { "sTitle": "Details"}
+    ];
 });
 
 SalaryComponentAdapter.method('getFormFields', function() {
-	return [
-	        [ "id", {"label":"ID","type":"hidden"}],
-	        [ "name", {"label":"Name","type":"text","validation":""}],
-            [ "componentType", {"label":"Salary Component Type","type":"select2","remote-source":["SalaryComponentType","id","name"]}],
-	        [ "details", {"label":"Details","type":"textarea","validation":"none"}]
-	];
+    return [
+        [ "id", {"label":"ID","type":"hidden"}],
+        [ "name", {"label":"Name","type":"text","validation":""}],
+        [ "componentType", {"label":"Salary Component Type","type":"select2","remote-source":["SalaryComponentType","id","name"]}],
+        [ "details", {"label":"Details","type":"textarea","validation":"none"}]
+    ];
 });
 
 
@@ -96,8 +95,7 @@ DeductionAdapter.method('getDataMapping', function() {
     return [
         "id",
         "name",
-        "contributor",
-        "type",
+        "deduction_group"
     ];
 });
 
@@ -105,32 +103,52 @@ DeductionAdapter.method('getHeaders', function() {
     return [
         { "sTitle": "ID" ,"bVisible":false},
         { "sTitle": "Name" },
-        { "sTitle": "Contributor"},
-        { "sTitle": "Deduction Type"}
+        { "sTitle": "Calculation Group"}
     ];
 });
 
 DeductionAdapter.method('getFormFields', function() {
 
-    var rangeAmounts = [ "rangeAmounts", {"label":"Deduction Amounts","type":"datagroup",
+    var rangeAmounts = [ "rangeAmounts", {"label":"Calculation Process","type":"datagroup",
         "form":[
-            [ "lowerCondition", {"label":"Lower Limit Condition","type":"select","source":[["No Lower Limit","No Lower Limit"],[">","Greater than"],[">=","Greater than or Equal"]]}],
-            [ "lowerLimit", {"label":"Lower Limit","type":"text","validation":"none"}],
-            [ "upperCondition", {"label":"Upper Limit Condition","type":"select","source":[["No Upper Limit","No Upper Limit"],["<","Less than"],["<=","Less than or Equal"]]}],
-            [ "upperLimit", {"label":"Upper Limit","type":"text","validation":"none"}],
-            [ "amount", {"label":"Value","type":"text","validation":"float"}]
+            [ "lowerCondition", {"label":"Lower Limit Condition","type":"select","source":[["No Lower Limit","No Lower Limit"],["gt","Greater than"],["gte","Greater than or Equal"]]}],
+            [ "lowerLimit", {"label":"Lower Limit","type":"text","validation":"float"}],
+            [ "upperCondition", {"label":"Upper Limit Condition","type":"select","source":[["No Upper Limit","No Upper Limit"],["lt","Less than"],["lte","Less than or Equal"]]}],
+            [ "upperLimit", {"label":"Upper Limit","type":"text","validation":"float"}],
+            [ "amount", {"label":"Value","type":"text","validation":""}]
         ],
         "html":'<div id="#_id_#" class="panel panel-default">#_delete_##_edit_#<div class="panel-body">#_renderFunction_#</div></div>',
         "validation":"none",
+        "custom-validate-function":function (data){
+            var res = {};
+            res['valid'] = true;
+            if(lowerCondition != 'No Lower Limit'){
+                data.lowerLimit = 0;
+            }
+            if(upperCondition != 'No Upper Limit'){
+                data.upperLimit = 0;
+            }
+            res['params'] = data;
+            return res;
+        },
         "render":function(item){
             var output = "";
+            var getSymbol = function(text){
+                var map = {};
+                map['gt'] = '>';
+                map['gte'] = '>=';
+                map['lt'] = '<';
+                map['lte'] = '<=';
+
+                return map[text];
+            }
             if(item.lowerCondition != "No Lower Limit"){
-                output += item.lowerLimit + " " + item.lowerCondition + " ";
-                output += " and ";
+                output += item.lowerLimit + " " + getSymbol(item.lowerCondition) + " ";
             }
 
             if(item.upperCondition != "No Upper Limit"){
-                output += item.upperCondition + " " + item.upperLimit + " ";
+                output += " and ";
+                output += getSymbol(item.upperCondition) + " " + item.upperLimit + " ";
             }
             if(output == ""){
                 return  "Deduction is "+item.amount + " for all ranges";
@@ -148,17 +166,16 @@ DeductionAdapter.method('getFormFields', function() {
     return [
         [ "id", {"label":"ID","type":"hidden"}],
         [ "name", {"label":"Name","type":"text","validation":""}],
-        [ "contributor", {"label":"Contributor","type":"select","source":[["Employee","Employee"],["Employer","Employer"]]}],
-        [ "type", {"label":"Deduction Type","type":"select","source":[["Fixed","Fixed"],["Percentage","Percentage"]]}],
-        [ "percentage_type", {"label":"Percentage Type","type":"select","source":[["On Component","On Component"],["On Component Type","On Component Type"]]}],
-        [ "componentType", {"label":"Salary Component Type","type":"select2","allow-null":true,"null-label":"N/A","remote-source":["SalaryComponentType","id","name"]}],
-        [ "component", {"label":"Salary Component","type":"select2","allow-null":true,"null-label":"N/A","remote-source":["SalaryComponent","id","name"]}],
+        [ "componentType", {"label":"Salary Component Type","type":"select2multi","allow-null":true,"remote-source":["SalaryComponentType","id","name"]}],
+        [ "component", {"label":"Salary Component","type":"select2multi","allow-null":true,"remote-source":["SalaryComponent","id","name"]}],
+        [ "payrollColumn", {"label":"Payroll Report Column","type":"select2","allow-null":true,"remote-source":["PayrollColumn","id","name"]}],
         rangeAmounts,
-        [ "country", {"label":"Country","type":"select2","remote-source":["Country","id","name"]}]
+        [ "deduction_group", {"label":"Calculation Group","type":"select2","allow-null":true,"null-label":"None","remote-source":["DeductionGroup","id","name"]}]
 
     ];
 });
 
+/*
 DeductionAdapter.method('doCustomValidation', function(params) {
     if(params.type == "Fixed"){
         return null;
@@ -177,7 +194,8 @@ DeductionAdapter.method('doCustomValidation', function(params) {
 
     return null;
 });
-
+*/
+/*
 DeductionAdapter.method('postRenderForm', function(object, $tempDomObj) {
 
     $tempDomObj.find("#field_componentType").hide();
@@ -213,6 +231,10 @@ DeductionAdapter.method('postRenderForm', function(object, $tempDomObj) {
         }
     });
 });
+*/
+
+
+
 
 
 /*
@@ -232,8 +254,6 @@ EmployeeSalaryAdapter.method('getDataMapping', function() {
         "id",
         "employee",
         "component",
-        "pay_frequency",
-        "currency",
         "amount",
         "details"
     ];
@@ -244,8 +264,6 @@ EmployeeSalaryAdapter.method('getHeaders', function() {
         { "sTitle": "ID" ,"bVisible":false},
         { "sTitle": "Employee" },
         { "sTitle": "Salary Component" },
-        { "sTitle": "Pay Frequency"},
-        { "sTitle": "Currency"},
         { "sTitle": "Amount"},
         { "sTitle": "Details"}
     ];
@@ -256,8 +274,6 @@ EmployeeSalaryAdapter.method('getFormFields', function() {
         [ "id", {"label":"ID","type":"hidden"}],
         [ "employee", {"label":"Employee","type":"select2","remote-source":["Employee","id","first_name+last_name"]}],
         [ "component", {"label":"Salary Component","type":"select2","remote-source":["SalaryComponent","id","name"]}],
-        [ "pay_frequency", {"label":"Pay Frequency","type":"select","source":[["Hourly","Hourly"],["Daily","Daily"],["Bi Weekly","Bi Weekly"],["Weekly","Weekly"],["Semi Monthly","Semi Monthly"],["Monthly","Monthly"]]}],
-        [ "currency", {"label":"Currency","type":"select2","remote-source":["CurrencyType","id","name"]}],
         [ "amount", {"label":"Amount","type":"text","validation":"float"}],
         [ "details", {"label":"Details","type":"textarea","validation":"none"}]
     ];
@@ -272,3 +288,43 @@ EmployeeSalaryAdapter.method('getFilters', function() {
 
 
 
+/*
+ * DeductionGroupAdapter
+ */
+
+function DeductionGroupAdapter(endPoint,tab,filter,orderBy) {
+    this.initAdapter(endPoint,tab,filter,orderBy);
+}
+
+DeductionGroupAdapter.inherits(AdapterBase);
+
+
+
+DeductionGroupAdapter.method('getDataMapping', function() {
+    return [
+        "id",
+        "name",
+        "description"
+    ];
+});
+
+DeductionGroupAdapter.method('getHeaders', function() {
+    return [
+        { "sTitle": "ID" ,"bVisible":false},
+        { "sTitle": "Name" },
+        { "sTitle": "Details" }
+    ];
+});
+
+DeductionGroupAdapter.method('getFormFields', function() {
+    return [
+        [ "id", {"label":"ID","type":"hidden"}],
+        [ "name", {"label":"Name","type":"text","validation":""}],
+        [ "description", {"label":"Details","type":"textarea","validation":"none"}]
+    ];
+});
+
+
+
+
+

ext/admin/salary/meta.json

@@ -0,0 +1,11 @@
+{
+"label":"Salary",
+"menu":"Payroll",
+"order":"1",
+"icon":"fa-money",
+"user_levels":["Admin"],
+
+"permissions":
+	{
+	}
+}

ext/admin/settings/api/SettingsInitialize.php

@@ -22,18 +22,21 @@ Developer: Thilina Hasantha (thilina.hasantha[at]gmail.com / facebook.com/thilin
  */
 
 class SettingsInitialize extends AbstractInitialize{
-	
+
 	public function init(){
 		if(SettingsManager::getInstance()->getSetting("Api: REST Api Enabled") == "1"){
 			$user = BaseService::getInstance()->getCurrentUser();
+			if(empty($user)){
+				return;
+			}
 			$dbUser = new User();
 			$dbUser->Load("id = ?",array($user->id));
 			$resp = RestApiManager::getInstance()->getAccessTokenForUser($dbUser);
 			if($resp->getStatus() != IceResponse::SUCCESS){
-				LogManager::getInstance()->error("Error occured while creating REST Api acces token for ".$user->username);
+				LogManager::getInstance()->error("Error occurred while creating REST Api access token for ".$user->username);
 			}
 		}
 		
 	}
 	
-}
+}

ext/admin/settings/index.php

@@ -25,37 +25,26 @@ $moduleName = 'settings';
 define('MODULE_PATH',dirname(__FILE__));
 include APP_BASE_PATH.'header.php';
 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="tabSetting" href="#tabPageSetting">Settings</a></li>
-	</ul>
-	 
-	<div class="tab-content">
-		<div class="tab-pane active" id="tabPageSetting">
-			<div id="Setting" class="reviewBlock" data-content="List" style="padding-left:5px;">
-		
-			</div>
-			<div id="SettingForm" class="reviewBlock" data-content="Form" style="padding-left:5px;display:none;">
-		
-			</div>
-		</div>
-	</div>
 
+$moduleBuilder = new ModuleBuilder();
+
+$options1 = array();
+$options1['setShowAddNew'] = 'false';
+
+$moduleBuilder->addModuleOrGroup(new ModuleTab('CompanySetting','Setting','Company','SettingAdapter','{"name":["Company:"]}','name',true,$options1));
+$moduleBuilder->addModuleOrGroup(new ModuleTab('SystemSetting','Setting','System','SettingAdapter','{"name":["System:"]}','name',false,$options1));
+$moduleBuilder->addModuleOrGroup(new ModuleTab('EmailSetting','Setting','Email','SettingAdapter','{"name":["Email:"]}','name',false,$options1));
+//$moduleBuilder->addModuleOrGroup(new ModuleTab('LeaveSetting','Setting','Leave / PTO','SettingAdapter','{"name":["Leave:"]}','name',false,$options1));
+$moduleBuilder->addModuleOrGroup(new ModuleTab('LDAPSetting','Setting','LDAP','SettingAdapter','{"name":["LDAP:"]}','name',false,$options1));
+$moduleBuilder->addModuleOrGroup(new ModuleTab('OtherSetting','Setting','Other','SettingAdapter','{"name":["Projects:","Attendance:","Recruitment:","Notifications:","Expense:","Travel:","Api:"]}','name',false,$options1));
+echo UIManager::getInstance()->renderModule($moduleBuilder);
+?>
 </div>
 <script>
-var modJsList = new Array();
-
-modJsList['tabSetting'] = new SettingAdapter('Setting','Setting','','name');
-modJsList['tabSetting'].setShowAddNew(false);
-
-var modJs = modJsList['tabSetting'];
 
 $(window).load(function() {
     modJs.loadRemoteDataForSettings();
 });
 
-
-
 </script>
 <?php include APP_BASE_PATH.'footer.php';?>      

ext/admin/settings/lib.js

@@ -62,24 +62,46 @@ SettingAdapter.method('edit', function(id) {
 
 
 SettingAdapter.method('fillForm', function(object) {
-	this.uber('fillForm',object);
+
+	var metaField = this.getMetaFieldForRendering('value');
+	var metaVal = object[metaField];
+	var formFields = null;
+
+	if(metaVal != "" && metaVal != undefined){
+		var formFields = [
+			[ "id", {"label":"ID","type":"hidden"}],
+			JSON.parse(metaVal)
+		];
+	}
+
+
+	this.uber('fillForm',object, null, formFields);
 	$("#helptext").html(object.description);
 });
 
 
 SettingAdapter.method('loadRemoteDataForSettings', function () {
-    var field = ["country", {"label": "Country", "type": "select2", "remote-source": ["Country", "code", "name"]}];
-    if (field[1]['remote-source'] != undefined && field[1]['remote-source'] != null) {
-        var key = field[1]['remote-source'][0] + "_" + field[1]['remote-source'][1] + "_" + field[1]['remote-source'][2];
-        this.fieldMasterDataKeys[key] = false;
-        this.sourceMapping[field[0]] = field[1]['remote-source'];
+	var fields = [];
+	var field = null;
+	fields.push(["country", {"label": "Country", "type": "select2multi", "remote-source": ["Country", "id", "name"]}]);
+	fields.push(["currency", {"label": "Currency", "type": "select2multi", "remote-source": ["CurrencyType","id","code+name"]}]);
+	fields.push(["nationality", {"label": "Nationality", "type": "select2multi", "remote-source": ["Nationality","id","name"]}]);
 
-        var callBackData = {};
-        callBackData['callBack'] = 'initFieldMasterDataResponse';
-        callBackData['callBackData'] = [key];
+	for(index in fields){
+		field = fields[index];
+		if (field[1]['remote-source'] != undefined && field[1]['remote-source'] != null) {
+			var key = field[1]['remote-source'][0] + "_" + field[1]['remote-source'][1] + "_" + field[1]['remote-source'][2];
+			this.fieldMasterDataKeys[key] = false;
+			this.sourceMapping[field[0]] = field[1]['remote-source'];
+
+			var callBackData = {};
+			callBackData['callBack'] = 'initFieldMasterDataResponse';
+			callBackData['callBackData'] = [key];
+
+			this.getFieldValues(field[1]['remote-source'], callBackData);
+		}
+	}
 
-        this.getFieldValues(field[1]['remote-source'], callBackData);
-    }
 });
 
 

ext/admin/users/api/UsersActionManager.php

@@ -23,8 +23,16 @@ Developer: Thilina Hasantha (thilina.hasantha[at]gmail.com / facebook.com/thilin
 
 class UsersActionManager extends SubActionManager{
 	public function changePassword($req){
-		if($this->user->user_level == 'Admin' || $this->user->id == $req->id){
-			$user = $this->baseService->getElement('User',$req->id);
+        if(defined('DEMO_MODE')){
+            return new IceResponse(IceResponse::ERROR,"You are not allowed to change the password in demo mode");
+        }
+
+        $user = new User();
+        $user->Load("id = ?",array($req->id));
+        LogManager::getInstance()->debug("Current User:".print_r($this->user,true));
+        LogManager::getInstance()->debug("Edit User:".print_r($user,true));
+		if($this->user->user_level == 'Admin' || $this->user->id == $user->id){
+
 			if(empty($user->id)){
 				return new IceResponse(IceResponse::ERROR,"Please save the user first");
 			}	

ext/admin/users/api/UsersAdminManager.php

@@ -54,10 +54,39 @@ if (!class_exists('User')) {
 				if(count($users) > 0){
 					return new IceResponse(IceResponse::ERROR,"A user with same authentication email already exist");
 				}
+
+                //Check if you are trying to change user level
+                $oldUser = new User();
+                $oldUser->Load("id = ?",array($obj->id));
+                if($oldUser->user_level != $obj->user_level && $oldUser->user_level == 'Admin'){
+                    $adminUsers = $userTemp->Find("user_level = ?",array("Admin"));
+                    if(count($adminUsers) == 1 && $adminUsers[0]->id == $obj->id){
+                        return new IceResponse(IceResponse::ERROR,"You are the only admin user for the application. You are not allowed to revoke your admin rights");
+                    }
+                }
+
+
 			}
+
+            //Check if the user have rights to the default module
+            if(!empty($obj->default_module)){
+                $module = new Module();
+                $module->Load("id = ?",array($obj->default_module));
+                if($module->mod_group == "user"){
+                    $module->mod_group = "modules";
+                }
+                $moduleManager = BaseService::getInstance()->getModuleManager($module->mod_group, $module->name);
+                if(!BaseService::getInstance()->isModuleAllowedForGivenUser($moduleManager, $obj)){
+                    return new IceResponse(IceResponse::ERROR,"This module can not be set as the default module for the user since the user do not have access to this module");
+                }
+
+            }
+
+
 	
 			return new IceResponse(IceResponse::SUCCESS,"");
 		}
+
 	
 		var $_table = 'Users';
 	}	

ext/modules/employees/api/EmployeesActionManager.php

@@ -23,8 +23,20 @@ Developer: Thilina Hasantha (thilina.hasantha[at]gmail.com / facebook.com/thilin
 
 class EmployeesActionManager extends SubActionManager{
 	public function get($req){
+        $profileId = $this->getCurrentProfileId();
+        $subordinate = new Employee();
+        $subordinatesCount = $subordinate->Count("supervisor = ? and id = ?",array($profileId, $req->id));
+
+
+		if($this->user->user_level == 'Admin' || $subordinatesCount > 0){
+			$id = $req->id;
+		}
 		
-		$employee = $this->baseService->getElement('Employee',$this->getCurrentProfileId(),$req->map,true);	
+		if(empty($id)){
+			$id = $profileId;
+		}
+		
+		$employee = $this->baseService->getElement('Employee',$id,$req->map,true);	
 		
 		$subordinate = new Employee();
 		$subordinates = $subordinate->Find("supervisor = ?",array($employee->id));
@@ -53,11 +65,19 @@ class EmployeesActionManager extends SubActionManager{
 	}
 	
 	public function deleteProfileImage($req){
-		if($this->user->user_level == 'Admin' || $this->user->employee == $req->id){
+
+        $profileId = $this->getCurrentProfileId();
+        $subordinate = new Employee();
+        $subordinatesCount = $subordinate->Count("supervisor = ? and id = ?",array($profileId, $req->id));
+
+
+        if($this->user->user_level == 'Admin' || $this->user->employee == $req->id || $subordinatesCount == 1){
 			$fs = FileService::getInstance();
 			$res = $fs->deleteProfileImage($req->id);
 			return new IceResponse(IceResponse::SUCCESS,$res);	
 		}
+
+        return new IceResponse(IceResponse::ERROR,"Not allowed to delete profile image");
 	}
 	
 	public function changePassword($req){
@@ -65,8 +85,9 @@ class EmployeesActionManager extends SubActionManager{
 		if($this->getCurrentProfileId() != $this->user->employee || empty($this->user->employee)){
 			return new IceResponse(IceResponse::ERROR,"You are not allowed to change passwords of other employees");
 		}
-		
-		$user = $this->baseService->getElement('User',$this->user->id);
+
+        $user = new User();
+        $user->Load("id = ?",array($this->user->id));
 		if(empty($user->id)){
 			return new IceResponse(IceResponse::ERROR,"Error occured while changing password");
 		}

ext/modules/employees/customTemplates/myDetails.html

@@ -1,59 +1,69 @@
-<div class="row-fluid">
-	<div class="col-xs-12 col-md-3">
+<div class="row">
+	<div class="col-xs-12 col-md-2">
 		<div class="row-fluid">
 			<div class="col-xs-12" style="text-align: center;">
-				<img id="profile_image__id_" src="" class="img-polaroid" style="max-width: 140px;max-height: 140px;">
+				<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-9">
+    <div class="col-xs-12 col-md-10">
+    	<div class="row-fluid">
+			<div class="col-md-12"><h2 id="name"></h2></div>
+		</div>	
+		<div class="row-fluid">
+			<div class="col-md-12">
+			<p>
+				<i class="fa fa-phone"></i> <span id="mobile_phone"></span>&nbsp;&nbsp;
+				<i class="fa fa-envelope"></i> <span id="work_email"></span>
+			</p>
+			</div>
+		</div>
 	    <div class="row-fluid">
 	    	<div class="col-xs-12" style="font-size:18px;border-bottom: 1px solid #DDD;margin-bottom: 10px;padding-bottom: 10px;">
-	    		<span id="name"></span><br/>
-				<button id="employeeProfileEditInfo" class="btn btn-inverse btn-xs" onclick="modJs.editEmployee();" style="margin-right:10px;">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-xs btn-inverse" type="button" style="margin-right:10px;">Upload Profile Image</button>
-				<button id="employeeDeleteProfileImage" onclick="modJs.deleteProfileImage(_id_);return false;" class="btn btn-xs btn-inverse" type="button">Delete Profile Image</button>
-				<button id="employeeUpdatePassword" onclick="modJs.changePassword();return false;" class="btn btn-xs btn-inverse" type="button">Change Password</button>
+				<button id="employeeProfileEditInfo" class="btn btn-small btn-success" onclick="modJs.editEmployee();" 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>
+				<button id="employeeUpdatePassword" onclick="modJs.changePassword();return false;" class="btn btn-small btn-success" type="button" style="margin-right:10px;"><i class="fa fa-lock"></i> Change Password</button>
 			</div>
 	    </div>
 	    
 	    <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;">Employee Id</label>
+				<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>
 			</div>
 			<div class="col-xs-6 col-md-4" style="font-size:16px;">
-				<label class="control-label col-xs-12" style="font-size:13px;">NIC Number</label>
+				<label class="control-label col-xs-12" style="font-size:13px;">#_label_nic_num_#</label>
 				<label class="control-label col-xs-12 iceLabel" style="font-size:13px;font-weight: bold;" id="nic_num"></label>
 			</div>
 			<div class="col-xs-6 col-md-4" style="font-size:16px;">
-				<label class="control-label col-xs-12" style="font-size:13px;">EPF/CPF No</label>
+				<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 class="row-fluid" style="margin-left:10px;">
-	<div class="col-xs-12">
-	<hr/>
-	<span class="label label-inverse" style="font-size:16px;background: #405A6A;">Personal Information</span><br/><br/>
+<div class="row" style="margin-left:10px;">
+	<div class="panel panel-default" style="width:97.5%;">
+		<div class="panel-heading"><h4>Personal Information</h4></div>
+		<div class="panel-body">
 		<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;">Driver's License Number</label>
+				<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>
 			</div>
 			<div class="col-xs-6 col-md-3" style="font-size:16px;">
-				<label class="control-label col-xs-12" style="font-size:13px;">Other Id</label>
+				<label class="control-label col-xs-12" style="font-size:13px;">#_label_other_id_#</label>
 				<label class="control-label col-xs-12 iceLabel" style="font-size:13px;font-weight: bold;" id="other_id"></label>
 			</div>
 			<div class="col-xs-6 col-md-3" style="font-size:16px;">
-				<label class="control-label col-xs-12" style="font-size:13px;">Birth Day</label>
+				<label class="control-label col-xs-12" style="font-size:13px;">#_label_birthday_#</label>
 				<label class="control-label col-xs-12 iceLabel" style="font-size:13px;font-weight: bold;" id="birthday"></label>
 			</div>
 			<div class="col-xs-6 col-md-3" style="font-size:16px;">
-				<label class="control-label col-xs-12" style="font-size:13px;">Gender</label>
+				<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>	
@@ -61,87 +71,78 @@
 	    <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;">Nationality</label>
+				<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>
 			</div>
 			<div class="col-xs-6 col-md-3" style="font-size:16px;">
-				<label class="control-label col-xs-12" style="font-size:13px;">Marital Status</label>
+				<label class="control-label col-xs-12" style="font-size:13px;">#_label_marital_status_#</label>
 				<label class="control-label col-xs-12 iceLabel" style="font-size:13px;font-weight: bold;" id="marital_status"></label>
 			</div>
 			<div class="col-xs-6 col-md-3" style="font-size:16px;">
-				<label class="control-label col-xs-12" style="font-size:13px;">Joined Date</label>
+				<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 class="row-fluid" style="margin-left:10px;margin-top:20px;">
-	<div class="col-xs-12">
-	<hr/>
-	<span class="label label-inverse" style="font-size:16px;background: #405A6A;">Contact Information</span><br/><br/>
+<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-body">
 		<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;">Address 1</label>
+				<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>
 			</div>
 			<div class="col-xs-6 col-md-3" style="font-size:16px;">
-				<label class="control-label col-xs-12" style="font-size:13px;">Address 2</label>
+				<label class="control-label col-xs-12" style="font-size:13px;">#_label_address2_#</label>
 				<label class="control-label col-xs-12 iceLabel" style="font-size:13px;font-weight: bold;" id="address2"></label>
 			</div>
 			<div class="col-xs-6 col-md-3" style="font-size:16px;">
-				<label class="control-label col-xs-12" style="font-size:13px;">City</label>
+				<label class="control-label col-xs-12" style="font-size:13px;">#_label_city_#</label>
 				<label class="control-label col-xs-12 iceLabel" style="font-size:13px;font-weight: bold;" id="city"></label>
 			</div>
 			<div class="col-xs-6 col-md-3" style="font-size:16px;">
-				<label class="control-label col-xs-12" style="font-size:13px;">Country</label>
+				<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;">Postal Code</label>
+				<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>
 			</div>
 			<div class="col-xs-6 col-md-3" style="font-size:16px;">
-				<label class="control-label col-xs-12" style="font-size:13px;">Home Phone</label>
+				<label class="control-label col-xs-12" style="font-size:13px;">#_label_home_phone_#</label>
 				<label class="control-label col-xs-12 iceLabel" style="font-size:13px;font-weight: bold;" id="home_phone"></label>
 			</div>
 			<div class="col-xs-6 col-md-3" style="font-size:16px;">
-				<label class="control-label col-xs-12" style="font-size:13px;">Mobile Phone</label>
-				<label class="control-label col-xs-12 iceLabel" style="font-size:13px;font-weight: bold;" id="mobile_phone"></label>
-			</div>
-			<div class="col-xs-6 col-md-3" style="font-size:16px;">
-				<label class="control-label col-xs-12" style="font-size:13px;">Work Phone</label>
+				<label class="control-label col-xs-12" style="font-size:13px;">#_label_work_phone_#</label>
 				<label class="control-label col-xs-12 iceLabel" style="font-size:13px;font-weight: bold;" id="work_phone"></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;">Work Email</label>
-				<label class="control-label col-xs-12 iceLabel" style="font-size:13px;font-weight: bold;" id="work_email"></label>
-			</div>
-			<div class="col-xs-6 col-md-3" style="font-size:16px;">
-				<label class="control-label col-xs-12" style="font-size:13px;">Private Email</label>
+				<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 class="row-fluid" style="margin-left:10px;margin-top:20px;">
-	<div class="col-xs-12">
-	<hr/>
-	<span class="label label-inverse" style="font-size:16px;background: #405A6A;">Job Details</span><br/><br/>
+<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-body">
 		<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;">Job Title</label>
+				<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>
 			</div>
 			<div class="col-xs-6 col-md-3" style="font-size:16px;">
-				<label class="control-label col-xs-12" style="font-size:13px;">Employment Status</label>
+				<label class="control-label col-xs-12" style="font-size:13px;">#_label_employment_status_#</label>
 				<label class="control-label col-xs-12 iceLabel" style="font-size:13px;font-weight: bold;" id="employment_status_Name"></label>
 			</div>
 			<div class="col-xs-6 col-md-3" style="font-size:16px;">
@@ -149,17 +150,18 @@
 				<label class="control-label col-xs-12 iceLabel" style="font-size:13px;font-weight: bold;" id="supervisor_Name"></label>
 			</div>
 			<div class="col-xs-6 col-md-3" style="font-size:16px;">
-				<label class="control-label col-xs-12" style="font-size:13px;">Subordinates</label>
+				<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;">Department</label>
+				<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>
 

ext/modules/employees/dashboard.html

@@ -0,0 +1,17 @@
+<div class="col-lg-3 col-xs-12">
+    <!-- small box -->
+    <div class="small-box bg-red">
+        <div class="inner">
+            <h3>My Profile</h3>
+            <p>
+                Edit Details
+            </p>
+        </div>
+        <div class="icon">
+            <i class="ion ion-ios7-person"></i>
+        </div>
+        <a href="#_moduleLink_#" class="small-box-footer" id="myProfileLink">
+            Manage Profile <i class="fa fa-arrow-circle-right"></i>
+        </a>
+    </div>
+</div>

ext/modules/employees/index.php

@@ -25,9 +25,32 @@ $moduleName = 'employees';
 define('MODULE_PATH',dirname(__FILE__));
 include APP_BASE_PATH.'header.php';
 include APP_BASE_PATH.'modulejslibs.inc.php';
+$fieldNameMap = BaseService::getInstance()->getFieldNameMappings("Employee");
+$customFields = BaseService::getInstance()->getCustomFields("Employee");
 ?>
-<script type="text/javascript" src="<?=BASE_URL.'js/raphael-min.js?v='.$jsVersion?>"></script>
-<script type="text/javascript" src="<?=BASE_URL.'js/graffle.js?v='.$jsVersion?>"></script>
+<script type="text/javascript" src="<?=BASE_URL.'js/d3js/d3.js?v='.$jsVersion?>"></script>
+<script type="text/javascript" src="<?=BASE_URL.'js/d3js/d3.layout.js?v='.$jsVersion?>"></script>
+<style type="text/css">
+
+
+.node circle {
+  cursor: pointer;
+  fill: #fff;
+  stroke: steelblue;
+  stroke-width: 1.5px;
+}
+
+.node text {
+  font-size: 11px;
+}
+
+path.link {
+  fill: none;
+  stroke: #ccc;
+  stroke-width: 1.5px;
+}
+
+    </style>
 <div class="span9">
 			  
 	<ul class="nav nav-tabs" id="modTab" style="margin-bottom:0px;margin-left:5px;border-bottom: none;">
@@ -37,20 +60,15 @@ include APP_BASE_PATH.'modulejslibs.inc.php';
 	 
 	<div class="tab-content">
 		<div class="tab-pane active" id="tabPageEmployee">
-			<div id="Employee" class="container reviewBlock" data-content="List" style="padding-left:5px;">
+			<div id="Employee" class="container reviewBlock" data-content="List" style="padding:25px 0px 0px 0px; width:99%;">
 		
 			</div>
 			<div id="EmployeeForm" class="reviewBlock" data-content="Form" style="padding-left:5px;display:none;">
 		
 			</div>
 		</div>
-		<div class="tab-pane" id="tabPageCompanyGraph">
-			<div id="CompanyGraph" class="reviewBlock" data-content="List" style="padding-left:5px;">
-		
-			</div>
-			<div id="CompanyGraphForm" class="reviewBlock" data-content="Form" style="padding-left:5px;display:none;">
-		
-			</div>
+		<div class="tab-pane reviewBlock" id="tabPageCompanyGraph" style="overflow-x: scroll;">
+			
 		</div>
 	</div>
 
@@ -58,6 +76,8 @@ include APP_BASE_PATH.'modulejslibs.inc.php';
 <script>
 var modJsList = new Array();
 modJsList['tabEmployee'] = new EmployeeAdapter('Employee');
+modJsList['tabEmployee'].setFieldNameMap(<?=json_encode($fieldNameMap)?>);
+modJsList['tabEmployee'].setCustomFields(<?=json_encode($customFields)?>);
 modJsList['tabCompanyGraph'] = new CompanyGraphAdapter('CompanyStructure');
 
 var modJs = modJsList['tabEmployee'];

ext/modules/employees/lib.js

@@ -22,12 +22,57 @@ Developer: Thilina Hasantha (thilina.hasantha[at]gmail.com / facebook.com/thilin
 
 function EmployeeAdapter(endPoint) {
 	this.initAdapter(endPoint);
+    this.fieldNameMap = {};
+    this.hiddenFields = {};
+    this.tableFields = {};
+    this.formOnlyFields = {};
+    this.customFields = [];
 }
 
 EmployeeAdapter.inherits(AdapterBase);
 
 this.currentUserId = null;
 
+EmployeeAdapter.method('setFieldNameMap', function(fields) {
+    var field;
+    for(var i=0;i<fields.length;i++){
+        field = fields[i];
+        this.fieldNameMap[field.name] = field;
+        if(field.display == "Hidden"){
+            this.hiddenFields[field.name] = field;
+        }else{
+            if(field.display == "Table and Form"){
+                this.tableFields[field.name] = field;
+            }else{
+                this.formOnlyFields[field.name] = field;
+            }
+
+        }
+    }
+});
+
+EmployeeAdapter.method('setCustomFields', function(fields) {
+	  var field, parsed;
+	  for(var i=0;i<fields.length;i++){
+	      field = fields[i];
+	      if(field.display != "Hidden" && field.data != "" && field.data != undefined){
+	    	  try{
+	    		parsed = JSON.parse(field.data);
+	    		if(parsed == undefined || parsed == null){
+	    			continue;
+	    		}else if(parsed.length != 2){
+	    			continue;
+	    		}else if(parsed[1].type == undefined || parsed[1].type == null){
+	    			continue;
+	    		}
+	    		this.customFields.push(parsed);
+	    	  }catch(e){
+	    		  
+	    	  }
+	      }
+	  }
+	});
+
 EmployeeAdapter.method('getDataMapping', function() {
 	return [
 	        "id",
@@ -55,7 +100,7 @@ EmployeeAdapter.method('getHeaders', function() {
 });
 
 EmployeeAdapter.method('getFormFields', function() {
-	
+	var fields, newFields = [];
 	var employee_id, ssn_num, employment_status, job_title, pay_grade, joined_date, department, work_email, country;
 	
 	if(this.checkPermission("Edit Employee Number") == "Yes"){
@@ -111,8 +156,8 @@ EmployeeAdapter.method('getFormFields', function() {
 	}else{
 		country = [ "country", {"label":"Country","type":"placeholder","remote-source":["Country","code","name"]}];
 	}
-	
-	return [
+
+    fields = [
 	        [ "id", {"label":"ID","type":"hidden","validation":""}],
 	        employee_id,
 	        [ "first_name", {"label":"First Name","type":"text","validation":""}],
@@ -144,6 +189,24 @@ EmployeeAdapter.method('getFormFields', function() {
 	        joined_date,
 	        department
 	];
+    
+    for(var i=0;i<this.customFields.length;i++){
+		fields.push(this.customFields[i]);
+	}
+
+
+    for(var i=0;i<fields.length;i++){
+    	tempField = fields[i];
+        if(this.hiddenFields[tempField[0]] == undefined || this.hiddenFields[tempField[0]] == null ){
+            if(this.fieldNameMap[tempField[0]] != undefined && this.fieldNameMap[tempField[0]] != null){
+                title = this.fieldNameMap[tempField[0]].textMapped;
+                tempField[1]['label'] = title;
+            }
+            newFields.push(tempField);
+        }
+    }
+
+    return newFields;
 });
 
 EmployeeAdapter.method('getSourceMapping' , function() {
@@ -187,17 +250,28 @@ EmployeeAdapter.method('modEmployeeDeleteProfileImageCallBack', function(data) {
 });
 
 EmployeeAdapter.method('modEmployeeGetSuccessCallBack' , function(data) {
+    var fields = this.getFormFields();
 	var currentEmpId = data[1];
 	var userEmpId = data[2];
 	data = data[0];
 	var html = this.getCustomTemplate('myDetails.html');
-	
+
+    for(var i=0;i<fields.length;i++) {
+        if(this.fieldNameMap[fields[i][0]] != undefined && this.fieldNameMap[fields[i][0]] != null){
+            title = this.fieldNameMap[fields[i][0]].textMapped;
+            html = html.replace("#_label_"+fields[i][0]+"_#",title);
+        }
+    }
+
+    html = html.replace(/#_.+_#/i,"");
+
 	html = html.replace(/_id_/g,data.id);
 	
 	$("#"+this.getTableName()).html(html);
-	var fields = this.getFormFields();
+
 	for(var i=0;i<fields.length;i++) {
 		$("#"+this.getTableName()+" #" + fields[i][0]).html(data[fields[i][0]]);
+        $("#"+this.getTableName()+" #" + fields[i][0]+"_Name").html(data[fields[i][0]+"_Name"]);
 	}
 	
 	var subordinates = "";
@@ -217,14 +291,7 @@ EmployeeAdapter.method('modEmployeeGetSuccessCallBack' , function(data) {
 	}
 	
 	$("#"+this.getTableName()+" #subordinates").html(subordinates);
-	
-	$("#"+this.getTableName()+" #nationality_Name").html(data.nationality_Name);
-	$("#"+this.getTableName()+" #employment_status_Name").html(data.employment_status_Name);
-	$("#"+this.getTableName()+" #job_title_Name").html(data.job_title_Name);
-	$("#"+this.getTableName()+" #country_Name").html(data.country_Name);
-	$("#"+this.getTableName()+" #province_Name").html(data.province_Name);
-	$("#"+this.getTableName()+" #supervisor_Name").html(data.supervisor_Name);
-	$("#"+this.getTableName()+" #department_Name").html(data.department_Name);
+
 	
 	$("#"+this.getTableName()+" #name").html(data.first_name + " " + data.last_name);
 	this.currentUserId = data.id;
@@ -318,16 +385,15 @@ EmployeeAdapter.method('changePasswordFailCallBack', function(callBackData,serve
  * Company Graph
  */
 
-
-function CompanyGraphAdapter(endPoint) {
+function CompanyStructureAdapter(endPoint) {
 	this.initAdapter(endPoint);
 }
 
-CompanyGraphAdapter.inherits(AdapterBase);
+CompanyStructureAdapter.inherits(AdapterBase);
 
 
 
-CompanyGraphAdapter.method('getDataMapping', function() {
+CompanyStructureAdapter.method('getDataMapping', function() {
 	return [
 	        "id",
 	        "title",
@@ -338,7 +404,7 @@ CompanyGraphAdapter.method('getDataMapping', function() {
 	];
 });
 
-CompanyGraphAdapter.method('getHeaders', function() {
+CompanyStructureAdapter.method('getHeaders', function() {
 	return [
 			{ "sTitle": "ID","bVisible":false },
 			{ "sTitle": "Name" },
@@ -349,7 +415,7 @@ CompanyGraphAdapter.method('getHeaders', function() {
 	];
 });
 
-CompanyGraphAdapter.method('getFormFields', function() {
+CompanyStructureAdapter.method('getFormFields', function() {
 	return [
 	        [ "id", {"label":"ID","type":"hidden","validation":""}],
 	        [ "title", {"label":"Name","type":"text","validation":""}],
@@ -361,25 +427,252 @@ CompanyGraphAdapter.method('getFormFields', function() {
 	];
 });
 
-CompanyGraphAdapter.method('createTable', function(elementId) {
 
-	var sourceData = this.sourceData;
 
-	if(modJs['r'] == undefined || modJs['r'] == null){
-		modJs['r'] = Raphael("CompanyGraph", 800, 1000);
-	}else{
-		return;
-	}
+function CompanyGraphAdapter(endPoint) {
+	this.initAdapter(endPoint);
+	this.nodeIdCounter = 0;
+}
 
-	var r = modJs['r'];
+CompanyGraphAdapter.inherits(CompanyStructureAdapter);
 
-	for(var i=0; i< sourceData.length; i++){
-		sourceData[i].parent = sourceData[i]._original[6];
+
+CompanyGraphAdapter.method('convertToTree', function(data) {
+	var ice = {};
+	ice['id'] = -1;
+	ice['title'] = '';
+	ice['name'] = '';
+	ice['children'] = [];
+	
+	var parent = null;
+	
+	var added = {};
+	
+	
+	for(var i=0;i<data.length;i++){
+		
+		data[i].name = data[i].title;
+		
+		if(data[i].parent != null && data[i].parent != undefined){
+			parent = this.findParent(data,data[i].parent);
+			if(parent != null){
+				if(parent.children == undefined || parent.children == null){
+					parent.children = [];
+				}
+				parent.children.push(data[i]);
+			}
+		}
+		
 	}
 	
-	var hierarchy = new HierarchyJs();
-	var nodes = hierarchy.createNodes(sourceData);
-	hierarchy.createHierarchy(nodes, r);
+	for(var i=0;i<data.length;i++){
+		if(data[i].parent == null || data[i].parent == undefined){
+			ice['children'].push(data[i]);
+		}
+	}
 	
+	return ice;
 	
 });
+
+
+CompanyGraphAdapter.method('findParent', function(data, parent) {
+	for(var i=0;i<data.length;i++){
+		if(data[i].title == parent || data[i].title == parent){
+			return data[i];
+		}
+	}
+	return null;
+});
+
+
+CompanyGraphAdapter.method('createTable', function(elementId) {
+	$("#tabPageCompanyGraph").html("");
+	var that = this;
+	var sourceData = this.sourceData;
+	
+	//this.fixCyclicParent(sourceData);
+	var treeData = this.convertToTree(sourceData);
+	
+	var m = [20, 120, 20, 120],
+    w = 5000 - m[1] - m[3],
+    h = 1000 - m[0] - m[2],
+    root;
+
+	var tree = d3.layout.tree()
+	    .size([h, w]);
+	
+	this.diagonal  = d3.svg.diagonal()
+	    .projection(function(d) { return [d.y, d.x]; });
+	
+	this.vis = d3.select("#tabPageCompanyGraph").append("svg:svg")
+	    .attr("width", w + m[1] + m[3])
+	    .attr("height", h + m[0] + m[2])
+	    .append("svg:g")
+	    .attr("transform", "translate(" + m[3] + "," + m[0] + ")");
+	
+	  root = treeData;
+	  root.x0 = h / 2;
+	  root.y0 = 0;
+	
+	  function toggleAll(d) {
+	    if (d.children) {
+	      console.log(d.name);
+	      d.children.forEach(toggleAll);
+	      that.toggle(d);
+	    }
+	  }
+	  this.update(root, tree, root);
+	  
+	  
+	
+});
+
+CompanyGraphAdapter.method('update', function(source, tree, root) {
+	var that = this;
+	  var duration = d3.event && d3.event.altKey ? 5000 : 500;
+
+	  // Compute the new tree layout.
+	  var nodes = tree.nodes(root).reverse();
+
+	  // Normalize for fixed-depth.
+	  nodes.forEach(function(d) { d.y = d.depth * 180; });
+
+	  // Update the nodes<65>
+	  var node = that.vis.selectAll("g.node")
+	      .data(nodes, function(d) { return d.id || (d.id = ++that.nodeIdCounter); });
+
+	  // Enter any new nodes at the parent's previous position.
+	  var nodeEnter = node.enter().append("svg:g")
+	      .attr("class", "node")
+	      .attr("transform", function(d) { return "translate(" + source.y0 + "," + source.x0 + ")"; })
+	      .on("click", function(d) { that.toggle(d); that.update(d, tree, root); });
+
+	  nodeEnter.append("svg:circle")
+	      .attr("r", 1e-6)
+	      .style("fill", function(d) { return d._children ? "lightsteelblue" : "#fff"; });
+
+	  nodeEnter.append("svg:text")
+	      .attr("x", function(d) { return d.children || d._children ? -10 : 10; })
+	      .attr("dy", ".35em")
+	      .attr("text-anchor", function(d) { return d.children || d._children ? "end" : "start"; })
+	      .text(function(d) { return d.name; })
+	      .style("fill-opacity", 1e-6);
+
+	  // Transition nodes to their new position.
+	  var nodeUpdate = node.transition()
+	      .duration(duration)
+	      .attr("transform", function(d) { return "translate(" + d.y + "," + d.x + ")"; });
+
+	  nodeUpdate.select("circle")
+	      .attr("r", 4.5)
+	      .style("fill", function(d) { return d._children ? "lightsteelblue" : "#fff"; });
+
+	  nodeUpdate.select("text")
+	      .style("fill-opacity", 1);
+
+	  // Transition exiting nodes to the parent's new position.
+	  var nodeExit = node.exit().transition()
+	      .duration(duration)
+	      .attr("transform", function(d) { return "translate(" + source.y + "," + source.x + ")"; })
+	      .remove();
+
+	  nodeExit.select("circle")
+	      .attr("r", 1e-6);
+
+	  nodeExit.select("text")
+	      .style("fill-opacity", 1e-6);
+
+	  // Update the links<6B>
+	  var link = that.vis.selectAll("path.link")
+	      .data(tree.links(nodes), function(d) { return d.target.id; });
+
+	  // Enter any new links at the parent's previous position.
+	  link.enter().insert("svg:path", "g")
+	      .attr("class", "link")
+	      .attr("d", function(d) {
+	        var o = {x: source.x0, y: source.y0};
+	        return that.diagonal({source: o, target: o});
+	      })
+	    .transition()
+	      .duration(duration)
+	      .attr("d", that.diagonal);
+
+	  // Transition links to their new position.
+	  link.transition()
+	      .duration(duration)
+	      .attr("d", that.diagonal);
+
+	  // Transition exiting nodes to the parent's new position.
+	  link.exit().transition()
+	      .duration(duration)
+	      .attr("d", function(d) {
+	        var o = {x: source.x, y: source.y};
+	        return that.diagonal({source: o, target: o});
+	      })
+	      .remove();
+
+	  // Stash the old positions for transition.
+	  nodes.forEach(function(d) {
+	    d.x0 = d.x;
+	    d.y0 = d.y;
+	  });
+});
+
+// Toggle children.
+CompanyGraphAdapter.method('toggle', function(d) {
+  if (d.children) {
+    d._children = d.children;
+    d.children = null;
+  } else {
+    d.children = d._children;
+    d._children = null;
+  }
+});
+
+
+CompanyGraphAdapter.method('getSourceDataById', function(id) {
+
+	for(var i=0; i< this.sourceData.length; i++){
+		if(this.sourceData[i].id == id){
+			return this.sourceData[i];
+		}
+	}
+	
+	return null;
+	
+});
+
+CompanyGraphAdapter.method('fixCyclicParent', function(sourceData) {
+	var errorMsg = "";
+	for(var i=0; i< sourceData.length; i++){
+		var obj = sourceData[i];
+		
+		
+		var curObj = obj;
+		var parentIdArr = {};
+		parentIdArr[curObj.id] = 1;
+		
+		while(curObj.parent != null && curObj.parent != undefined){
+			var parent = this.getSourceDataById(curObj.parent);
+			if(parent == null){
+				break;
+			}else if(parentIdArr[parent.id] == 1){
+				errorMsg = obj.title +"'s parent structure set to "+parent.title+"<br/>";
+				obj.parent = null;
+				break;
+			}
+			parentIdArr[parent.id] = 1;
+			curObj = parent;
+		}
+	}
+	
+	if(errorMsg != ""){
+		this.showMessage("Company Structure is having a cyclic dependency","We found a cyclic dependency due to following reasons:<br/>"+errorMsg);
+		return false;
+	}
+	
+	return true;
+	
+});
+

ext/modules/employees/meta.json

@@ -4,6 +4,7 @@
 "order":"2",
 "icon":"fa-user",
 "user_levels":["Admin","Manager","Employee"],
+  "dashboardPosition":101,
 
 "permissions":
 	{

ext/modules/meta.json

@@ -1,7 +1,10 @@
 {
 "Personal Information":"fa-male",
-"Subordinates":"fa-user",
+"Leave":"fa-calendar-o",
 "Time Management":"fa-clock-o",
+"Documents":"fa-files-o",
+"Company":"fa-building",
+"Training":"fa-briefcase",
 "Travel Management":"fa-plane",
-  "Finance":"fa-money"
-}
+"Finance":"fa-money"
+}

ext/modules/salary/lib.js

@@ -32,8 +32,6 @@ EmployeeSalaryAdapter.method('getDataMapping', function() {
 	return [
 	        "id",
 	        "component",
-	        "pay_frequency",
-	        "currency",
 	        "amount",
 	        "details"
 	];
@@ -43,8 +41,6 @@ EmployeeSalaryAdapter.method('getHeaders', function() {
 	return [
 			{ "sTitle": "ID" ,"bVisible":false},
 			{ "sTitle": "Salary Component" },
-			{ "sTitle": "Pay Frequency"},
-			{ "sTitle": "Currency"},
 			{ "sTitle": "Amount"},
 			{ "sTitle": "Details"}
 	];
@@ -54,8 +50,6 @@ EmployeeSalaryAdapter.method('getFormFields', function() {
 	return [
 	        [ "id", {"label":"ID","type":"hidden"}],
             [ "component", {"label":"Salary Component","type":"select2","remote-source":["SalaryComponent","id","name"]}],
-	        [ "pay_frequency", {"label":"Pay Frequency","type":"select","source":[["Hourly","Hourly"],["Daily","Daily"],["Bi Weekly","Bi Weekly"],["Weekly","Weekly"],["Semi Monthly","Semi Monthly"],["Monthly","Monthly"]]}],
-	        [ "currency", {"label":"Currency","type":"select","remote-source":["CurrencyType","id","name"]}],
 	        [ "amount", {"label":"Amount","type":"text","validation":"float"}],
 	        [ "details", {"label":"Details","type":"textarea","validation":"none"}]
 	];

readme.md

@@ -26,45 +26,37 @@ Installation
 Upgrade from Previous Versions to Latest Version
 ------------------------------------------------
 
- * Backup icehrm installation file and DB
- * Remove all folders except icehrm/app from your existing installation
- * Copy all folders except icehrm/app into installation folder
- * Use sql scripts inside 'db_upgrade/(version)' folder to upgrade the icehrm current version
- 
- 
- Note: If you are upgrading from older versions of icehrm please note that the icehrm leave module is removed since v13.0
- 
+Refer: [http://blog.icehrm.com/docs/upgrade/](http://blog.icehrm.com/docs/upgrade/)
 
-
-Following is a list of features supported in each version of icehrm
+Following is a list of features supported in each edition of icehrm
 -------------------------------------------------------------------
 
-### IceHrm Open Source Version 
+### IceHrm Open Source Edition 
  * IceHrm Core Modules - Both Enterprise and Open source versions developed on same core concept. But the core modules in professional and enterprise versions are more feature rich and updated with latest security improvements.
  * [Company Information Management](http://icehrm.com/compare.php) - Store and manage details about how companies, departments and branches of the organisation are connected
  * Basic [Employee Management](http://icehrm.com) - Store, manage and retrieve employee information when required
  * Time sheets - IceHrm is a [timesheet app](http://icehrm.com) / [Open source timesheet management](http://icehrm.com) application to track time spent by employees on various projects
  * [Attendance Management](http://icehrm.com) - IceHrm can be used as a [attendance management system](http://icehrm.com) effectively for any size a company.
- * [Performance Charts](http://icehrm.com) - Charts for monitoring attendance hours and comparing attendance with time sheets
+ * [LDAP Login](http://icehrm.com) - Users can share login with company LDAP server
  * [Travel Management](http://icehrm.com) - Module for managing travel requests
  
+ #### Advanced Employee Module (from v16.0.OS)
  
-### IceHrm Pro Version | [Buy now for 349.49 USD](http://icehrm.com)
+ ![Advanced Employee Module](https://icehrm.s3.amazonaws.com/images/blog-images/advanced-employee-module.png)
+ 
+ - Update all employee information without having to switch employees.
+ - Search employee skills, qualifications and other information<br/>easily across whole company.
+ - Terminate employees while keeping data in system.
+ - Re-enable temporarily terminated employees with one click.
+ - Employee archive feature to archive data of terminated employees.
+ 
+### IceHrm Pro Edition | [Buy now for 349.49 USD](http://icehrm.com)
 
 IceHrm Profession version (in short IceHrmPro) is the feature rich commercial alternative for icehrm
 open source version.  IceHrm Pro supports following features
 
 Following features are supported in IceHrm Pro version in addition to the features supported in open source version.
 
-#### Advanced Employee Module
-
-![Advanced Employee Module](https://icehrm.s3.amazonaws.com/images/blog-images/advanced-employee-module.png)
-
-- Update all employee information without having to switch employees.
-- Search employee skills, qualifications and other information<br/>easily across whole company.
-- Terminate employees while keeping data in system.
-- Re-enable temporarily terminated employees with one click.
-- Employee archive feature to archive data of terminated employees.
     
 #### Leave Management
 
@@ -89,10 +81,14 @@ You can learn more about [IceHrm Pro here](http://blog.icehrm.com/docs/icehrm-pr
 
 To purchase IceHrmPro please visit [http://icehrm.com/modules.php](http://icehrm.com/modules.php)
 
+#### Training Management
 
-### IceHrm Enterprise Version [Starts from 1498 USD](http://icehrm.com)
+Icehrm [training management system](http://icehrm.com) is for Module for managing courses, training sessions and employee attendance to training sessions.
+ 
 
-In addition to pro version features icehrm enterprise version includes following features
+### IceHrm Hosted Edition [Starts from 1498 USD](http://icehrm.com)
+
+In addition to pro version features icehrm enterprise hosted edition includes following features
 
 #### Candidate / Recruitment Management
 
@@ -111,12 +107,6 @@ following features
 
 More about [recruitment module](http://blog.icehrm.com/docs/recruitment/)
 
-#### LDAP Support
-
-#### Training Management
-
-Icehrm [training management system](http://icehrm.com) is for Module for managing courses, training sessions and employee attendance to training sessions.
- 
 
 Your Company Structure (Departments / Branches and other Organization Units)
 -------------------------------------------
@@ -529,9 +519,50 @@ for these clients. The clients section represent both external and internal clie
 That way you can attach each and every project to a client.
 
 ###Employee Projects
+
 Under employee projects tab you can assign projects to employees. You need to add projects to employees to enable them to add time against 
 these projects in time-sheets.
 
+Release note v16.1
+------------------
+ 
+### Fixes
+ * Fix LDAP user login issue
+ * Allow creating users with username having dot and dash
+
+Release note v16.0
+------------------
+### Features
+ * Advanced Employee Management Module is now included in IceHrm Open Source Edition
+ * LDAP Module which was only available in IceHrm Enterprise is now included in open source also
+ * Initial implementation of icehrm REST Api for reading employee details
+ * Improvements to data filtering
+ * Multiple tabs for settings module
+ * Overtime reports - now its possible to calculate overtime for employees.compatible with US overtime rules
+ * Logout the user if tried accessing an unauthorized module
+ * Setting for updating module names
+ 
+### Fixes
+ * Fix issue: classes should be loaded even the module is disabled
+ * Deleting the only Admin user is not allowed
+ * Fixes for handling non UTF-8
+ * Fix for non-mandatory select boxes are shown as mandatory
+
+Release note v15.2
+------------------
+
+### Features
+ * Overtime Reports
+ * Overtime calculation for california
+ 
+### Fixes
+ * Fix issue: uncaught error when placeholder value is empty
+ * Log email sending success status
+ * Fix broken longer company name issue
+ * Make the application accessible when client on an intranet with no internet connection
+ * Fix issue: when a module is disabled other modules depend on it stops working
+
+
 Release note v15.0
 ------------------
 

src/adodb512/adodb-csvlib.inc.php

@@ -0,0 +1,318 @@
+<?php
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+global $ADODB_INCLUDED_CSV;
+$ADODB_INCLUDED_CSV = 1;
+
+/* 
+
+  V5.11 5 May 2010   (c) 2000-2010 John Lim (jlim#natsoft.com). All rights reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence. See License.txt. 
+  Set tabs to 4 for best viewing.
+  
+  Latest version is available at http://adodb.sourceforge.net
+  
+  Library for CSV serialization. This is used by the csv/proxy driver and is the 
+  CacheExecute() serialization format. 
+  
+  ==== NOTE ====
+  Format documented at http://php.weblogs.com/ADODB_CSV
+  ==============
+*/
+
+	/**
+ 	 * convert a recordset into special format
+	 *
+	 * @param rs	the recordset
+	 *
+	 * @return	the CSV formated data
+	 */
+	function _rs2serialize(&$rs,$conn=false,$sql='')
+	{
+		$max = ($rs) ? $rs->FieldCount() : 0;
+		
+		if ($sql) $sql = urlencode($sql);
+		// metadata setup
+		
+		if ($max <= 0 || $rs->dataProvider == 'empty') { // is insert/update/delete
+			if (is_object($conn)) {
+				$sql .= ','.$conn->Affected_Rows();
+				$sql .= ','.$conn->Insert_ID();
+			} else
+				$sql .= ',,';
+			
+			$text = "====-1,0,$sql\n";
+			return $text;
+		}
+		$tt = ($rs->timeCreated) ? $rs->timeCreated : time();
+		
+		## changed format from ====0 to ====1
+		$line = "====1,$tt,$sql\n";
+		
+		if ($rs->databaseType == 'array') {
+			$rows = $rs->_array;
+		} else {
+			$rows = array();
+			while (!$rs->EOF) {	
+				$rows[] = $rs->fields;
+				$rs->MoveNext();
+			} 
+		}
+		
+		for($i=0; $i < $max; $i++) {
+			$o = $rs->FetchField($i);
+			$flds[] = $o;
+		}
+	
+		$savefetch = isset($rs->adodbFetchMode) ? $rs->adodbFetchMode : $rs->fetchMode;
+		$class = $rs->connection->arrayClass;
+		$rs2 = new $class();
+		$rs2->timeCreated = $rs->timeCreated; # memcache fix
+		$rs2->sql = $rs->sql;
+		$rs2->oldProvider = $rs->dataProvider; 
+		$rs2->InitArrayFields($rows,$flds);
+		$rs2->fetchMode = $savefetch;
+		return $line.serialize($rs2);
+	}
+
+	
+/**
+* Open CSV file and convert it into Data. 
+*
+* @param url  		file/ftp/http url
+* @param err		returns the error message
+* @param timeout	dispose if recordset has been alive for $timeout secs
+*
+* @return		recordset, or false if error occured. If no
+*			error occurred in sql INSERT/UPDATE/DELETE, 
+*			empty recordset is returned
+*/
+	function csv2rs($url,&$err,$timeout=0, $rsclass='ADORecordSet_array')
+	{
+		$false = false;
+		$err = false;
+		$fp = @fopen($url,'rb');
+		if (!$fp) {
+			$err = $url.' file/URL not found';
+			return $false;
+		}
+		@flock($fp, LOCK_SH);
+		$arr = array();
+		$ttl = 0;
+		
+		if ($meta = fgetcsv($fp, 32000, ",")) {
+			// check if error message
+			if (strncmp($meta[0],'****',4) === 0) {
+				$err = trim(substr($meta[0],4,1024));
+				fclose($fp);
+				return $false;
+			}
+			// check for meta data
+			// $meta[0] is -1 means return an empty recordset
+			// $meta[1] contains a time 
+	
+			if (strncmp($meta[0], '====',4) === 0) {
+			
+				if ($meta[0] == "====-1") {
+					if (sizeof($meta) < 5) {
+						$err = "Corrupt first line for format -1";
+						fclose($fp);
+						return $false;
+					}
+					fclose($fp);
+					
+					if ($timeout > 0) {
+						$err = " Illegal Timeout $timeout ";
+						return $false;
+					}
+					
+					$rs = new $rsclass($val=true);
+					$rs->fields = array();
+					$rs->timeCreated = $meta[1];
+					$rs->EOF = true;
+					$rs->_numOfFields = 0;
+					$rs->sql = urldecode($meta[2]);
+					$rs->affectedrows = (integer)$meta[3];
+					$rs->insertid = $meta[4];	
+					return $rs;
+				} 
+			# Under high volume loads, we want only 1 thread/process to _write_file
+			# so that we don't have 50 processes queueing to write the same data.
+			# We use probabilistic timeout, ahead of time.
+			#
+			# -4 sec before timeout, give processes 1/32 chance of timing out
+			# -2 sec before timeout, give processes 1/16 chance of timing out
+			# -1 sec after timeout give processes 1/4 chance of timing out
+			# +0 sec after timeout, give processes 100% chance of timing out
+				if (sizeof($meta) > 1) {
+					if($timeout >0){ 
+						$tdiff = (integer)( $meta[1]+$timeout - time());
+						if ($tdiff <= 2) {
+							switch($tdiff) {
+							case 4:
+							case 3:
+								if ((rand() & 31) == 0) {
+									fclose($fp);
+									$err = "Timeout 3";
+									return $false;
+								}
+								break;
+							case 2: 
+								if ((rand() & 15) == 0) {
+									fclose($fp);
+									$err = "Timeout 2";
+									return $false;
+								}
+								break;
+							case 1:
+								if ((rand() & 3) == 0) {
+									fclose($fp);
+									$err = "Timeout 1";
+									return $false;
+								}
+								break;
+							default: 
+								fclose($fp);
+								$err = "Timeout 0";
+								return $false;
+							} // switch
+							
+						} // if check flush cache
+					}// (timeout>0)
+					$ttl = $meta[1];
+				}
+				//================================================
+				// new cache format - use serialize extensively...
+				if ($meta[0] === '====1') {
+					// slurp in the data
+					$MAXSIZE = 128000;
+					
+					$text = fread($fp,$MAXSIZE);
+					if (strlen($text)) {
+						while ($txt = fread($fp,$MAXSIZE)) {
+							$text .= $txt;
+						}
+					}
+					fclose($fp);
+					$rs = unserialize($text);
+					if (is_object($rs)) $rs->timeCreated = $ttl;
+					else {
+						$err = "Unable to unserialize recordset";
+						//echo htmlspecialchars($text),' !--END--!<p>';
+					}
+					return $rs;
+				}
+				
+				$meta = false;
+				$meta = fgetcsv($fp, 32000, ",");
+				if (!$meta) {
+					fclose($fp);
+					$err = "Unexpected EOF 1";
+					return $false;
+				}
+			}
+
+			// Get Column definitions
+			$flds = array();
+			foreach($meta as $o) {
+				$o2 = explode(':',$o);
+				if (sizeof($o2)!=3) {
+					$arr[] = $meta;
+					$flds = false;
+					break;
+				}
+				$fld = new ADOFieldObject();
+				$fld->name = urldecode($o2[0]);
+				$fld->type = $o2[1];
+				$fld->max_length = $o2[2];
+				$flds[] = $fld;
+			}
+		} else {
+			fclose($fp);
+			$err = "Recordset had unexpected EOF 2";
+			return $false;
+		}
+		
+		// slurp in the data
+		$MAXSIZE = 128000;
+		
+		$text = '';
+		while ($txt = fread($fp,$MAXSIZE)) {
+			$text .= $txt;
+		}
+			
+		fclose($fp);
+		@$arr = unserialize($text);
+		//var_dump($arr);
+		if (!is_array($arr)) {
+			$err = "Recordset had unexpected EOF (in serialized recordset)";
+			if (get_magic_quotes_runtime()) $err .= ". Magic Quotes Runtime should be disabled!";
+			return $false;
+		}
+		$rs = new $rsclass();
+		$rs->timeCreated = $ttl;
+		$rs->InitArrayFields($arr,$flds);
+		return $rs;
+	}
+	
+
+	/**
+	* Save a file $filename and its $contents (normally for caching) with file locking
+	* Returns true if ok, false if fopen/fwrite error, 0 if rename error (eg. file is locked)
+	*/
+	function adodb_write_file($filename, $contents,$debug=false)
+	{ 
+	# http://www.php.net/bugs.php?id=9203 Bug that flock fails on Windows
+	# So to simulate locking, we assume that rename is an atomic operation.
+	# First we delete $filename, then we create a $tempfile write to it and 
+	# rename to the desired $filename. If the rename works, then we successfully 
+	# modified the file exclusively.
+	# What a stupid need - having to simulate locking.
+	# Risks:
+	# 1. $tempfile name is not unique -- very very low
+	# 2. unlink($filename) fails -- ok, rename will fail
+	# 3. adodb reads stale file because unlink fails -- ok, $rs timeout occurs
+	# 4. another process creates $filename between unlink() and rename() -- ok, rename() fails and  cache updated
+		if (strncmp(PHP_OS,'WIN',3) === 0) {
+			// skip the decimal place
+			$mtime = substr(str_replace(' ','_',microtime()),2); 
+			// getmypid() actually returns 0 on Win98 - never mind!
+			$tmpname = $filename.uniqid($mtime).getmypid();
+			if (!($fd = @fopen($tmpname,'w'))) return false;
+			if (fwrite($fd,$contents)) $ok = true;
+			else $ok = false;
+			fclose($fd);
+			
+			if ($ok) {
+				@chmod($tmpname,0644);
+				// the tricky moment
+				@unlink($filename);
+				if (!@rename($tmpname,$filename)) {
+					unlink($tmpname);
+					$ok = 0;
+				}
+				if (!$ok) {
+					if ($debug) ADOConnection::outp( " Rename $tmpname ".($ok? 'ok' : 'failed'));
+				}
+			}
+			return $ok;
+		}
+		if (!($fd = @fopen($filename, 'a'))) return false;
+		if (flock($fd, LOCK_EX) && ftruncate($fd, 0)) {
+			if (fwrite( $fd, $contents )) $ok = true;
+			else $ok = false;
+			fclose($fd);
+			@chmod($filename,0644);
+		}else {
+			fclose($fd);
+			if ($debug)ADOConnection::outp( " Failed acquiring lock for $filename<br>\n");
+			$ok = false;
+		}
+	
+		return $ok;
+	}
+?>

src/adodb512/adodb-error.inc.php

@@ -0,0 +1,258 @@
+<?php
+/** 
+ * @version V5.06 16 Oct 2008  (c) 2000-2010 John Lim (jlim#natsoft.com). All rights reserved.
+ * Released under both BSD license and Lesser GPL library license. 
+ * Whenever there is any discrepancy between the two licenses, 
+ * the BSD license will take precedence. 
+ *
+ * Set tabs to 4 for best viewing.
+ * 
+ * The following code is adapted from the PEAR DB error handling code.
+ * Portions (c)1997-2002 The PHP Group.
+ */
+
+
+if (!defined("DB_ERROR")) define("DB_ERROR",-1);
+
+if (!defined("DB_ERROR_SYNTAX")) {
+	define("DB_ERROR_SYNTAX",              -2);
+	define("DB_ERROR_CONSTRAINT",          -3);
+	define("DB_ERROR_NOT_FOUND",           -4);
+	define("DB_ERROR_ALREADY_EXISTS",      -5);
+	define("DB_ERROR_UNSUPPORTED",         -6);
+	define("DB_ERROR_MISMATCH",            -7);
+	define("DB_ERROR_INVALID",             -8);
+	define("DB_ERROR_NOT_CAPABLE",         -9);
+	define("DB_ERROR_TRUNCATED",          -10);
+	define("DB_ERROR_INVALID_NUMBER",     -11);
+	define("DB_ERROR_INVALID_DATE",       -12);
+	define("DB_ERROR_DIVZERO",            -13);
+	define("DB_ERROR_NODBSELECTED",       -14);
+	define("DB_ERROR_CANNOT_CREATE",      -15);
+	define("DB_ERROR_CANNOT_DELETE",      -16);
+	define("DB_ERROR_CANNOT_DROP",        -17);
+	define("DB_ERROR_NOSUCHTABLE",        -18);
+	define("DB_ERROR_NOSUCHFIELD",        -19);
+	define("DB_ERROR_NEED_MORE_DATA",     -20);
+	define("DB_ERROR_NOT_LOCKED",         -21);
+	define("DB_ERROR_VALUE_COUNT_ON_ROW", -22);
+	define("DB_ERROR_INVALID_DSN",        -23);
+	define("DB_ERROR_CONNECT_FAILED",     -24);
+	define("DB_ERROR_EXTENSION_NOT_FOUND",-25);
+	define("DB_ERROR_NOSUCHDB",           -25);
+	define("DB_ERROR_ACCESS_VIOLATION",   -26);
+}
+
+function adodb_errormsg($value)
+{
+global $ADODB_LANG,$ADODB_LANG_ARRAY;
+
+	if (empty($ADODB_LANG)) $ADODB_LANG = 'en';
+	if (isset($ADODB_LANG_ARRAY['LANG']) && $ADODB_LANG_ARRAY['LANG'] == $ADODB_LANG) ;
+	else {
+		include_once(ADODB_DIR."/lang/adodb-$ADODB_LANG.inc.php");
+    }
+	return isset($ADODB_LANG_ARRAY[$value]) ? $ADODB_LANG_ARRAY[$value] : $ADODB_LANG_ARRAY[DB_ERROR];
+}
+
+function adodb_error($provider,$dbType,$errno)
+{
+	//var_dump($errno);
+	if (is_numeric($errno) && $errno == 0) return 0;
+	switch($provider) { 
+	case 'mysql': $map = adodb_error_mysql(); break;
+	
+	case 'oracle':
+	case 'oci8': $map = adodb_error_oci8(); break;
+	
+	case 'ibase': $map = adodb_error_ibase(); break;
+	
+	case 'odbc': $map = adodb_error_odbc(); break;
+	
+	case 'mssql':
+	case 'sybase': $map = adodb_error_mssql(); break;
+	
+	case 'informix': $map = adodb_error_ifx(); break;
+	
+	case 'postgres': return adodb_error_pg($errno); break;
+	
+	case 'sqlite': return $map = adodb_error_sqlite(); break;
+	default:
+		return DB_ERROR;
+	}	
+	//print_r($map);
+	//var_dump($errno);
+	if (isset($map[$errno])) return $map[$errno];
+	return DB_ERROR;
+}
+
+//**************************************************************************************
+
+function adodb_error_pg($errormsg)
+{
+	if (is_numeric($errormsg)) return (integer) $errormsg;
+    static $error_regexps = array(
+            '/(Table does not exist\.|Relation [\"\'].*[\"\'] does not exist|sequence does not exist|class ".+" not found)$/i' => DB_ERROR_NOSUCHTABLE,
+            '/Relation [\"\'].*[\"\'] already exists|Cannot insert a duplicate key into (a )?unique index.*/i'      => DB_ERROR_ALREADY_EXISTS,
+            '/divide by zero$/i'                     => DB_ERROR_DIVZERO,
+            '/pg_atoi: error in .*: can\'t parse /i' => DB_ERROR_INVALID_NUMBER,
+            '/ttribute [\"\'].*[\"\'] not found|Relation [\"\'].*[\"\'] does not have attribute [\"\'].*[\"\']/i' => DB_ERROR_NOSUCHFIELD,
+            '/parser: parse error at or near \"/i'   => DB_ERROR_SYNTAX,
+            '/referential integrity violation/i'     => DB_ERROR_CONSTRAINT,
+			'/Relation [\"\'].*[\"\'] already exists|Cannot insert a duplicate key into (a )?unique index.*|duplicate key.*violates unique constraint/i'     
+			 	 => DB_ERROR_ALREADY_EXISTS
+        );
+	reset($error_regexps);
+    while (list($regexp,$code) = each($error_regexps)) {
+        if (preg_match($regexp, $errormsg)) {
+            return $code;
+        }
+    }
+    // Fall back to DB_ERROR if there was no mapping.
+    return DB_ERROR;
+}
+	
+function adodb_error_odbc()
+{
+static $MAP = array(
+            '01004' => DB_ERROR_TRUNCATED,
+            '07001' => DB_ERROR_MISMATCH,
+            '21S01' => DB_ERROR_MISMATCH,
+            '21S02' => DB_ERROR_MISMATCH,
+            '22003' => DB_ERROR_INVALID_NUMBER,
+            '22008' => DB_ERROR_INVALID_DATE,
+            '22012' => DB_ERROR_DIVZERO,
+            '23000' => DB_ERROR_CONSTRAINT,
+            '24000' => DB_ERROR_INVALID,
+            '34000' => DB_ERROR_INVALID,
+            '37000' => DB_ERROR_SYNTAX,
+            '42000' => DB_ERROR_SYNTAX,
+            'IM001' => DB_ERROR_UNSUPPORTED,
+            'S0000' => DB_ERROR_NOSUCHTABLE,
+            'S0001' => DB_ERROR_NOT_FOUND,
+            'S0002' => DB_ERROR_NOSUCHTABLE,
+            'S0011' => DB_ERROR_ALREADY_EXISTS,
+            'S0012' => DB_ERROR_NOT_FOUND,
+            'S0021' => DB_ERROR_ALREADY_EXISTS,
+            'S0022' => DB_ERROR_NOT_FOUND,
+			'S1000' => DB_ERROR_NOSUCHTABLE,
+            'S1009' => DB_ERROR_INVALID,
+            'S1090' => DB_ERROR_INVALID,
+            'S1C00' => DB_ERROR_NOT_CAPABLE
+        );
+		return $MAP;
+}
+
+function adodb_error_ibase()
+{
+static $MAP = array(
+            -104 => DB_ERROR_SYNTAX,
+            -150 => DB_ERROR_ACCESS_VIOLATION,
+            -151 => DB_ERROR_ACCESS_VIOLATION,
+            -155 => DB_ERROR_NOSUCHTABLE,
+            -157 => DB_ERROR_NOSUCHFIELD,
+            -158 => DB_ERROR_VALUE_COUNT_ON_ROW,
+            -170 => DB_ERROR_MISMATCH,
+            -171 => DB_ERROR_MISMATCH,
+            -172 => DB_ERROR_INVALID,
+            -204 => DB_ERROR_INVALID,
+            -205 => DB_ERROR_NOSUCHFIELD,
+            -206 => DB_ERROR_NOSUCHFIELD,
+            -208 => DB_ERROR_INVALID,
+            -219 => DB_ERROR_NOSUCHTABLE,
+            -297 => DB_ERROR_CONSTRAINT,
+            -530 => DB_ERROR_CONSTRAINT,
+            -803 => DB_ERROR_CONSTRAINT,
+            -551 => DB_ERROR_ACCESS_VIOLATION,
+            -552 => DB_ERROR_ACCESS_VIOLATION,
+            -922 => DB_ERROR_NOSUCHDB,
+            -923 => DB_ERROR_CONNECT_FAILED,
+            -924 => DB_ERROR_CONNECT_FAILED
+        );
+		
+		return $MAP;
+}
+
+function adodb_error_ifx()
+{
+static $MAP = array(
+            '-201'    => DB_ERROR_SYNTAX,
+            '-206'    => DB_ERROR_NOSUCHTABLE,
+            '-217'    => DB_ERROR_NOSUCHFIELD,
+            '-329'    => DB_ERROR_NODBSELECTED,
+            '-1204'   => DB_ERROR_INVALID_DATE,
+            '-1205'   => DB_ERROR_INVALID_DATE,
+            '-1206'   => DB_ERROR_INVALID_DATE,
+            '-1209'   => DB_ERROR_INVALID_DATE,
+            '-1210'   => DB_ERROR_INVALID_DATE,
+            '-1212'   => DB_ERROR_INVALID_DATE
+       );
+	   
+	   return $MAP;
+}
+
+function adodb_error_oci8()
+{
+static $MAP = array(
+			 1 => DB_ERROR_ALREADY_EXISTS,
+            900 => DB_ERROR_SYNTAX,
+            904 => DB_ERROR_NOSUCHFIELD,
+            923 => DB_ERROR_SYNTAX,
+            942 => DB_ERROR_NOSUCHTABLE,
+            955 => DB_ERROR_ALREADY_EXISTS,
+            1476 => DB_ERROR_DIVZERO,
+            1722 => DB_ERROR_INVALID_NUMBER,
+            2289 => DB_ERROR_NOSUCHTABLE,
+            2291 => DB_ERROR_CONSTRAINT,
+            2449 => DB_ERROR_CONSTRAINT
+        );
+	   
+	return $MAP;
+}
+
+function adodb_error_mssql()
+{
+static $MAP = array(
+		  208 => DB_ERROR_NOSUCHTABLE,
+          2601 => DB_ERROR_ALREADY_EXISTS
+       );
+	   
+	return $MAP;
+}
+
+function adodb_error_sqlite()
+{
+static $MAP = array(
+		  1 => DB_ERROR_SYNTAX
+       );
+	   
+	return $MAP;
+}
+
+function adodb_error_mysql()
+{
+static $MAP = array(
+           1004 => DB_ERROR_CANNOT_CREATE,
+           1005 => DB_ERROR_CANNOT_CREATE,
+           1006 => DB_ERROR_CANNOT_CREATE,
+           1007 => DB_ERROR_ALREADY_EXISTS,
+           1008 => DB_ERROR_CANNOT_DROP,
+		   1045 => DB_ERROR_ACCESS_VIOLATION,
+           1046 => DB_ERROR_NODBSELECTED,
+		   1049 => DB_ERROR_NOSUCHDB,
+           1050 => DB_ERROR_ALREADY_EXISTS,
+           1051 => DB_ERROR_NOSUCHTABLE,
+           1054 => DB_ERROR_NOSUCHFIELD,
+           1062 => DB_ERROR_ALREADY_EXISTS,
+           1064 => DB_ERROR_SYNTAX,
+           1100 => DB_ERROR_NOT_LOCKED,
+           1136 => DB_ERROR_VALUE_COUNT_ON_ROW,
+           1146 => DB_ERROR_NOSUCHTABLE,
+           1048 => DB_ERROR_CONSTRAINT,
+		    2002 => DB_ERROR_CONNECT_FAILED,
+			2005 => DB_ERROR_CONNECT_FAILED
+       );
+	   
+	return $MAP;
+}
+?>

src/adodb512/adodb-errorhandler.inc.php

@@ -0,0 +1,79 @@
+<?php
+/**
+ * @version V5.11 5 May 2010   (c) 2000-2010 John Lim (jlim#natsoft.com). All rights reserved.
+ * Released under both BSD license and Lesser GPL library license.
+ * Whenever there is any discrepancy between the two licenses,
+ * the BSD license will take precedence.
+ *
+ * Set tabs to 4 for best viewing.
+ *
+ * Latest version is available at http://php.weblogs.com
+ *
+*/
+
+
+// added Claudio Bustos  clbustos#entelchile.net
+if (!defined('ADODB_ERROR_HANDLER_TYPE')) define('ADODB_ERROR_HANDLER_TYPE',E_USER_ERROR); 
+
+if (!defined('ADODB_ERROR_HANDLER')) define('ADODB_ERROR_HANDLER','ADODB_Error_Handler');
+
+/**
+* Default Error Handler. This will be called with the following params
+*
+* @param $dbms		the RDBMS you are connecting to
+* @param $fn		the name of the calling function (in uppercase)
+* @param $errno		the native error number from the database
+* @param $errmsg	the native error msg from the database
+* @param $p1		$fn specific parameter - see below
+* @param $p2		$fn specific parameter - see below
+* @param $thisConn	$current connection object - can be false if no connection object created
+*/
+function ADODB_Error_Handler($dbms, $fn, $errno, $errmsg, $p1, $p2, &$thisConnection)
+{
+	if (error_reporting() == 0) return; // obey @ protocol
+	switch($fn) {
+	case 'EXECUTE':
+		$sql = $p1;
+		$inputparams = $p2;
+
+		$s = "$dbms error: [$errno: $errmsg] in $fn(\"$sql\")\n";
+		break;
+
+	case 'PCONNECT':
+	case 'CONNECT':
+		$host = $p1;
+		$database = $p2;
+
+		$s = "$dbms error: [$errno: $errmsg] in $fn($host, '****', '****', $database)\n";
+		break;
+	default:
+		$s = "$dbms error: [$errno: $errmsg] in $fn($p1, $p2)\n";
+		break;
+	}
+	/*
+	* Log connection error somewhere
+	*	0 message is sent to PHP's system logger, using the Operating System's system
+	*		logging mechanism or a file, depending on what the error_log configuration
+	*		directive is set to.
+	*	1 message is sent by email to the address in the destination parameter.
+	*		This is the only message type where the fourth parameter, extra_headers is used.
+	*		This message type uses the same internal function as mail() does.
+	*	2 message is sent through the PHP debugging connection.
+	*		This option is only available if remote debugging has been enabled.
+	*		In this case, the destination parameter specifies the host name or IP address
+	*		and optionally, port number, of the socket receiving the debug information.
+	*	3 message is appended to the file destination
+	*/
+	if (defined('ADODB_ERROR_LOG_TYPE')) {
+		$t = date('Y-m-d H:i:s');
+		if (defined('ADODB_ERROR_LOG_DEST'))
+			error_log("($t) $s", ADODB_ERROR_LOG_TYPE, ADODB_ERROR_LOG_DEST);
+		else
+			error_log("($t) $s", ADODB_ERROR_LOG_TYPE);
+	}
+
+
+	//print "<p>$s</p>";
+	trigger_error($s,ADODB_ERROR_HANDLER_TYPE); 
+}
+?>

src/adodb512/adodb-errorpear.inc.php

@@ -0,0 +1,88 @@
+<?php
+/** 
+ * @version V5.06 16 Oct 2008  (c) 2000-2010 John Lim (jlim#natsoft.com). All rights reserved.
+ * Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence. 
+ *
+ * Set tabs to 4 for best viewing.
+ * 
+ * Latest version is available at http://php.weblogs.com
+ * 
+*/
+include_once('PEAR.php');
+
+if (!defined('ADODB_ERROR_HANDLER')) define('ADODB_ERROR_HANDLER','ADODB_Error_PEAR');
+
+/*
+* Enabled the following if you want to terminate scripts when an error occurs
+*/
+//PEAR::setErrorHandling (PEAR_ERROR_DIE);
+
+/*
+* Name of the PEAR_Error derived class to call.
+*/
+if (!defined('ADODB_PEAR_ERROR_CLASS')) define('ADODB_PEAR_ERROR_CLASS','PEAR_Error');
+
+/*
+* Store the last PEAR_Error object here
+*/
+global $ADODB_Last_PEAR_Error; $ADODB_Last_PEAR_Error = false;
+
+  /**
+* Error Handler with PEAR support. This will be called with the following params
+*
+* @param $dbms		the RDBMS you are connecting to
+* @param $fn		the name of the calling function (in uppercase)
+* @param $errno		the native error number from the database 
+* @param $errmsg	the native error msg from the database
+* @param $p1		$fn specific parameter - see below
+* @param $P2		$fn specific parameter - see below
+	*/
+function ADODB_Error_PEAR($dbms, $fn, $errno, $errmsg, $p1=false, $p2=false)
+{
+global $ADODB_Last_PEAR_Error;
+	
+	if (error_reporting() == 0) return; // obey @ protocol
+	switch($fn) {
+	case 'EXECUTE':
+		$sql = $p1;
+		$inputparams = $p2;
+		
+		$s = "$dbms error: [$errno: $errmsg] in $fn(\"$sql\")";
+		break;
+		
+	case 'PCONNECT':
+	case 'CONNECT':
+		$host = $p1;
+		$database = $p2;
+		
+		$s = "$dbms error: [$errno: $errmsg] in $fn('$host', ?, ?, '$database')";
+		break;
+		
+	default:
+		$s = "$dbms error: [$errno: $errmsg] in $fn($p1, $p2)";
+		break;
+	}
+	
+	$class = ADODB_PEAR_ERROR_CLASS;
+	$ADODB_Last_PEAR_Error = new $class($s, $errno,
+		$GLOBALS['_PEAR_default_error_mode'],
+		$GLOBALS['_PEAR_default_error_options'], 
+		$errmsg);
+		
+	//print "<p>!$s</p>";
+}
+
+/**
+* Returns last PEAR_Error object. This error might be for an error that
+* occured several sql statements ago.
+*/
+function ADODB_PEAR_Error()
+{
+global $ADODB_Last_PEAR_Error;
+
+	return $ADODB_Last_PEAR_Error;
+}
+		
+?>

src/adodb512/adodb-exceptions.inc.php

@@ -0,0 +1,82 @@
+<?php
+
+/**
+ * @version V5.11 5 May 2010   (c) 2000-2010 John Lim (jlim#natsoft.com). All rights reserved.
+ * Released under both BSD license and Lesser GPL library license.
+ * Whenever there is any discrepancy between the two licenses,
+ * the BSD license will take precedence.
+ *
+ * Set tabs to 4 for best viewing.
+ *
+ * Latest version is available at http://php.weblogs.com
+ *
+ * Exception-handling code using PHP5 exceptions (try-catch-throw).
+ */
+
+
+if (!defined('ADODB_ERROR_HANDLER_TYPE')) define('ADODB_ERROR_HANDLER_TYPE',E_USER_ERROR); 
+define('ADODB_ERROR_HANDLER','adodb_throw');
+
+class ADODB_Exception extends Exception {
+var $dbms;
+var $fn;
+var $sql = '';
+var $params = '';
+var $host = '';
+var $database = '';
+	
+	function __construct($dbms, $fn, $errno, $errmsg, $p1, $p2, $thisConnection)
+	{
+		switch($fn) {
+		case 'EXECUTE':
+			$this->sql = $p1;
+			$this->params = $p2;
+			$s = "$dbms error: [$errno: $errmsg] in $fn(\"$p1\")\n";
+			break;
+	
+		case 'PCONNECT':
+		case 'CONNECT':
+			$user = $thisConnection->user;
+			$s = "$dbms error: [$errno: $errmsg] in $fn($p1, '$user', '****', $p2)\n";
+			break;
+		default:
+			$s = "$dbms error: [$errno: $errmsg] in $fn($p1, $p2)\n";
+			break;
+		}
+	
+		$this->dbms = $dbms;
+		if ($thisConnection) {
+			$this->host = $thisConnection->host;
+			$this->database = $thisConnection->database;
+		}
+		$this->fn = $fn;
+		$this->msg = $errmsg;
+				
+		if (!is_numeric($errno)) $errno = -1;
+		parent::__construct($s,$errno);
+	}
+}
+
+/**
+* Default Error Handler. This will be called with the following params
+*
+* @param $dbms		the RDBMS you are connecting to
+* @param $fn		the name of the calling function (in uppercase)
+* @param $errno		the native error number from the database
+* @param $errmsg	the native error msg from the database
+* @param $p1		$fn specific parameter - see below
+* @param $P2		$fn specific parameter - see below
+*/
+
+function adodb_throw($dbms, $fn, $errno, $errmsg, $p1, $p2, $thisConnection)
+{
+global $ADODB_EXCEPTION;
+	
+	if (error_reporting() == 0) return; // obey @ protocol
+	if (is_string($ADODB_EXCEPTION)) $errfn = $ADODB_EXCEPTION;
+	else $errfn = 'ADODB_EXCEPTION';
+	throw new $errfn($dbms, $fn, $errno, $errmsg, $p1, $p2, $thisConnection);
+}
+
+
+?>

src/adodb512/adodb-iterator.inc.php

@@ -0,0 +1,30 @@
+<?php
+
+/*
+  V5.11 5 May 2010   (c) 2000-2010 John Lim (jlim#natsoft.com). All rights reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence.
+  
+  Set tabs to 4.
+  
+  Declares the ADODB Base Class for PHP5 "ADODB_BASE_RS", and supports iteration with 
+  the ADODB_Iterator class.
+  
+  		$rs = $db->Execute("select * from adoxyz");
+		foreach($rs as $k => $v) {
+			echo $k; print_r($v); echo "<br>";
+		}
+		
+		
+	Iterator code based on http://cvs.php.net/cvs.php/php-src/ext/spl/examples/cachingiterator.inc?login=2
+	
+	
+	Moved to adodb.inc.php to improve performance.
+ */
+ 
+
+
+
+
+?>

src/adodb512/adodb-memcache.lib.inc.php

@@ -0,0 +1,190 @@
+<?php
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+global $ADODB_INCLUDED_MEMCACHE;
+$ADODB_INCLUDED_MEMCACHE = 1;
+
+global $ADODB_INCLUDED_CSV;
+if (empty($ADODB_INCLUDED_CSV)) include(ADODB_DIR.'/adodb-csvlib.inc.php');
+
+/* 
+
+  V5.06 16 Oct 2008  (c) 2000-2010 John Lim (jlim#natsoft.com). All rights reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence. See License.txt. 
+  Set tabs to 4 for best viewing.
+  
+  Latest version is available at http://adodb.sourceforge.net
+
+Usage:
+  
+$db = NewADOConnection($driver);
+$db->memCache = true; /// should we use memCache instead of caching in files
+$db->memCacheHost = array($ip1, $ip2, $ip3);
+$db->memCachePort = 11211; /// this is default memCache port
+$db->memCacheCompress = false; /// Use 'true' to store the item compressed (uses zlib)
+
+$db->Connect(...);
+$db->CacheExecute($sql);
+  
+  Note the memcache class is shared by all connections, is created during the first call to Connect/PConnect.
+  
+  Class instance is stored in $ADODB_CACHE
+*/
+
+	class ADODB_Cache_MemCache {
+		var $createdir = false; // create caching directory structure?
+		
+		//-----------------------------
+		// memcache specific variables
+		
+		var $hosts;	// array of hosts
+		var $port = 11211;
+		var $compress = false; // memcache compression with zlib
+		
+		var $_connected = false;
+		var $_memcache = false;
+		
+		function ADODB_Cache_MemCache(&$obj)
+		{
+			$this->hosts = $obj->memCacheHost;
+			$this->port = $obj->memCachePort;
+			$this->compress = $obj->memCacheCompress;
+		}
+		
+		// implement as lazy connection. The connection only occurs on CacheExecute call
+		function connect(&$err)
+		{
+			if (!function_exists('memcache_pconnect')) {
+				$err = 'Memcache module PECL extension not found!';
+				return false;
+			}
+
+			$memcache = new MemCache;
+			
+			if (!is_array($this->hosts)) $this->hosts = array($this->hosts);
+		
+			$failcnt = 0;
+			foreach($this->hosts as $host) {
+				if (!@$memcache->addServer($host,$this->port,true)) {
+					$failcnt += 1;
+				}
+			}
+			if ($failcnt == sizeof($this->hosts)) {
+				$err = 'Can\'t connect to any memcache server';
+				return false;
+			}
+			$this->_connected = true;
+			$this->_memcache = $memcache;
+			return true;
+		}
+		
+		// returns true or false. true if successful save
+		function writecache($filename, $contents, $debug, $secs2cache)
+		{
+			if (!$this->_connected) {
+				$err = '';
+				if (!$this->connect($err) && $debug) ADOConnection::outp($err);
+			}
+			if (!$this->_memcache) return false;
+			
+			if (!$this->_memcache->set($filename, $contents, $this->compress, $secs2cache)) {
+				if ($debug) ADOConnection::outp(" Failed to save data at the memcached server!<br>\n");
+				return false;
+			}
+			
+			return true;
+		}
+		
+		// returns a recordset
+		function readcache($filename, &$err, $secs2cache, $rsClass)
+		{
+			$false = false;
+			if (!$this->_connected) $this->connect($err);
+			if (!$this->_memcache) return $false;
+			
+			$rs = $this->_memcache->get($filename);
+			if (!$rs) {
+				$err = 'Item with such key doesn\'t exists on the memcached server.';
+				return $false;
+			}
+			
+			// hack, should actually use _csv2rs
+			$rs = explode("\n", $rs);
+            unset($rs[0]);
+            $rs = join("\n", $rs);
+ 			$rs = unserialize($rs);
+			if (! is_object($rs)) {
+				$err = 'Unable to unserialize $rs';		
+				return $false;
+			}
+			if ($rs->timeCreated == 0) return $rs; // apparently have been reports that timeCreated was set to 0 somewhere
+			
+			$tdiff = intval($rs->timeCreated+$secs2cache - time());
+			if ($tdiff <= 2) {
+				switch($tdiff) {
+					case 2: 
+						if ((rand() & 15) == 0) {
+							$err = "Timeout 2";
+							return $false;
+						}
+						break;
+					case 1:
+						if ((rand() & 3) == 0) {
+							$err = "Timeout 1";
+							return $false;
+						}
+						break;
+					default: 
+						$err = "Timeout 0";
+						return $false;
+				}
+			}
+			return $rs;
+		}
+		
+		function flushall($debug=false)
+		{
+			if (!$this->_connected) {
+				$err = '';
+				if (!$this->connect($err) && $debug) ADOConnection::outp($err);
+			}
+			if (!$this->_memcache) return false;
+			
+			$del = $this->_memcache->flush();
+			
+			if ($debug) 
+				if (!$del) ADOConnection::outp("flushall: failed!<br>\n");
+				else ADOConnection::outp("flushall: succeeded!<br>\n");
+				
+			return $del;
+		}
+		
+		function flushcache($filename, $debug=false)
+		{
+			if (!$this->_connected) {
+  				$err = '';
+  				if (!$this->connect($err) && $debug) ADOConnection::outp($err); 
+			} 
+			if (!$this->_memcache) return false;
+  
+			$del = $this->_memcache->delete($filename);
+			
+			if ($debug) 
+				if (!$del) ADOConnection::outp("flushcache: $key entry doesn't exist on memcached server!<br>\n");
+				else ADOConnection::outp("flushcache: $key entry flushed from memcached server!<br>\n");
+				
+			return $del;
+		}
+		
+		// not used for memcache
+		function createdir($dir, $hash) 
+		{
+			return true;
+		}
+	}
+
+?>

src/adodb512/adodb-pager.inc.php

@@ -0,0 +1,290 @@
+<?php
+
+/*
+	V5.11 5 May 2010   (c) 2000-2010 John Lim (jlim#natsoft.com). All rights reserved.
+	  Released under both BSD license and Lesser GPL library license. 
+	  Whenever there is any discrepancy between the two licenses, 
+	  the BSD license will take precedence. 
+	  Set tabs to 4 for best viewing.
+
+  	This class provides recordset pagination with 
+	First/Prev/Next/Last links. 
+	
+	Feel free to modify this class for your own use as
+	it is very basic. To learn how to use it, see the 
+	example in adodb/tests/testpaging.php.
+	
+	"Pablo Costa" <pablo@cbsp.com.br> implemented Render_PageLinks().
+	
+	Please note, this class is entirely unsupported, 
+	and no free support requests except for bug reports
+	will be entertained by the author.
+
+*/
+class ADODB_Pager {
+	var $id; 	// unique id for pager (defaults to 'adodb')
+	var $db; 	// ADODB connection object
+	var $sql; 	// sql used
+	var $rs;	// recordset generated
+	var $curr_page;	// current page number before Render() called, calculated in constructor
+	var $rows;		// number of rows per page
+    var $linksPerPage=10; // number of links per page in navigation bar
+    var $showPageLinks; 
+
+	var $gridAttributes = 'width=100% border=1 bgcolor=white';
+	
+	// Localize text strings here
+	var $first = '<code>|&lt;</code>';
+	var $prev = '<code>&lt;&lt;</code>';
+	var $next = '<code>>></code>';
+	var $last = '<code>>|</code>';
+	var $moreLinks = '...';
+	var $startLinks = '...';
+	var $gridHeader = false;
+	var $htmlSpecialChars = true;
+	var $page = 'Page';
+	var $linkSelectedColor = 'red';
+	var $cache = 0;  #secs to cache with CachePageExecute()
+	
+	//----------------------------------------------
+	// constructor
+	//
+	// $db	adodb connection object
+	// $sql	sql statement
+	// $id	optional id to identify which pager, 
+	//		if you have multiple on 1 page. 
+	//		$id should be only be [a-z0-9]*
+	//
+	function ADODB_Pager(&$db,$sql,$id = 'adodb', $showPageLinks = false)
+	{
+	global $PHP_SELF;
+	
+		$curr_page = $id.'_curr_page';
+		if (!empty($PHP_SELF)) $PHP_SELF = htmlspecialchars($_SERVER['PHP_SELF']); // htmlspecialchars() to prevent XSS attacks
+		
+		$this->sql = $sql;
+		$this->id = $id;
+		$this->db = $db;
+		$this->showPageLinks = $showPageLinks;
+		
+		$next_page = $id.'_next_page';	
+		
+		if (isset($_GET[$next_page])) {
+			$_SESSION[$curr_page] = (integer) $_GET[$next_page];
+		}
+		if (empty($_SESSION[$curr_page])) $_SESSION[$curr_page] = 1; ## at first page
+		
+		$this->curr_page = $_SESSION[$curr_page];
+		
+	}
+	
+	//---------------------------
+	// Display link to first page
+	function Render_First($anchor=true)
+	{
+	global $PHP_SELF;
+		if ($anchor) {
+	?>
+		<a href="<?php echo $PHP_SELF,'?',$this->id;?>_next_page=1"><?php echo $this->first;?></a> &nbsp; 
+	<?php
+		} else {
+			print "$this->first &nbsp; ";
+		}
+	}
+	
+	//--------------------------
+	// Display link to next page
+	function render_next($anchor=true)
+	{
+	global $PHP_SELF;
+	
+		if ($anchor) {
+		?>
+		<a href="<?php echo $PHP_SELF,'?',$this->id,'_next_page=',$this->rs->AbsolutePage() + 1 ?>"><?php echo $this->next;?></a> &nbsp; 
+		<?php
+		} else {
+			print "$this->next &nbsp; ";
+		}
+	}
+	
+	//------------------
+	// Link to last page
+	// 
+	// for better performance with large recordsets, you can set
+	// $this->db->pageExecuteCountRows = false, which disables
+	// last page counting.
+	function render_last($anchor=true)
+	{
+	global $PHP_SELF;
+	
+		if (!$this->db->pageExecuteCountRows) return;
+		
+		if ($anchor) {
+		?>
+			<a href="<?php echo $PHP_SELF,'?',$this->id,'_next_page=',$this->rs->LastPageNo() ?>"><?php echo $this->last;?></a> &nbsp; 
+		<?php
+		} else {
+			print "$this->last &nbsp; ";
+		}
+	}
+	
+	//---------------------------------------------------
+	// original code by "Pablo Costa" <pablo@cbsp.com.br> 
+        function render_pagelinks()
+        {
+        global $PHP_SELF;
+            $pages        = $this->rs->LastPageNo();
+            $linksperpage = $this->linksPerPage ? $this->linksPerPage : $pages;
+            for($i=1; $i <= $pages; $i+=$linksperpage)
+            {
+                if($this->rs->AbsolutePage() >= $i)
+                {
+                    $start = $i;
+                }
+            }
+			$numbers = '';
+            $end = $start+$linksperpage-1;
+			$link = $this->id . "_next_page";
+            if($end > $pages) $end = $pages;
+			
+			
+			if ($this->startLinks && $start > 1) {
+				$pos = $start - 1;
+				$numbers .= "<a href=$PHP_SELF?$link=$pos>$this->startLinks</a>  ";
+            } 
+			
+			for($i=$start; $i <= $end; $i++) {
+                if ($this->rs->AbsolutePage() == $i)
+                    $numbers .= "<font color=$this->linkSelectedColor><b>$i</b></font>  ";
+                else 
+                     $numbers .= "<a href=$PHP_SELF?$link=$i>$i</a>  ";
+            
+            }
+			if ($this->moreLinks && $end < $pages) 
+				$numbers .= "<a href=$PHP_SELF?$link=$i>$this->moreLinks</a>  ";
+            print $numbers . ' &nbsp; ';
+        }
+	// Link to previous page
+	function render_prev($anchor=true)
+	{
+	global $PHP_SELF;
+		if ($anchor) {
+	?>
+		<a href="<?php echo $PHP_SELF,'?',$this->id,'_next_page=',$this->rs->AbsolutePage() - 1 ?>"><?php echo $this->prev;?></a> &nbsp; 
+	<?php 
+		} else {
+			print "$this->prev &nbsp; ";
+		}
+	}
+	
+	//--------------------------------------------------------
+	// Simply rendering of grid. You should override this for
+	// better control over the format of the grid
+	//
+	// We use output buffering to keep code clean and readable.
+	function RenderGrid()
+	{
+	global $gSQLBlockRows; // used by rs2html to indicate how many rows to display
+		include_once(ADODB_DIR.'/tohtml.inc.php');
+		ob_start();
+		$gSQLBlockRows = $this->rows;
+		rs2html($this->rs,$this->gridAttributes,$this->gridHeader,$this->htmlSpecialChars);
+		$s = ob_get_contents();
+		ob_end_clean();
+		return $s;
+	}
+	
+	//-------------------------------------------------------
+	// Navigation bar
+	//
+	// we use output buffering to keep the code easy to read.
+	function RenderNav()
+	{
+		ob_start();
+		if (!$this->rs->AtFirstPage()) {
+			$this->Render_First();
+			$this->Render_Prev();
+		} else {
+			$this->Render_First(false);
+			$this->Render_Prev(false);
+		}
+        if ($this->showPageLinks){
+            $this->Render_PageLinks();
+        }
+		if (!$this->rs->AtLastPage()) {
+			$this->Render_Next();
+			$this->Render_Last();
+		} else {
+			$this->Render_Next(false);
+			$this->Render_Last(false);
+		}
+		$s = ob_get_contents();
+		ob_end_clean();
+		return $s;
+	}
+	
+	//-------------------
+	// This is the footer
+	function RenderPageCount()
+	{
+		if (!$this->db->pageExecuteCountRows) return '';
+		$lastPage = $this->rs->LastPageNo();
+		if ($lastPage == -1) $lastPage = 1; // check for empty rs.
+		if ($this->curr_page > $lastPage) $this->curr_page = 1;
+		return "<font size=-1>$this->page ".$this->curr_page."/".$lastPage."</font>";
+	}
+	
+	//-----------------------------------
+	// Call this class to draw everything.
+	function Render($rows=10)
+	{
+	global $ADODB_COUNTRECS;
+	
+		$this->rows = $rows;
+		
+		if ($this->db->dataProvider == 'informix') $this->db->cursorType = IFX_SCROLL;
+		
+		$savec = $ADODB_COUNTRECS;
+		if ($this->db->pageExecuteCountRows) $ADODB_COUNTRECS = true;
+		if ($this->cache)
+			$rs = $this->db->CachePageExecute($this->cache,$this->sql,$rows,$this->curr_page);
+		else
+			$rs = $this->db->PageExecute($this->sql,$rows,$this->curr_page);
+		$ADODB_COUNTRECS = $savec;
+		
+		$this->rs = $rs;
+		if (!$rs) {
+			print "<h3>Query failed: $this->sql</h3>";
+			return;
+		}
+		
+		if (!$rs->EOF && (!$rs->AtFirstPage() || !$rs->AtLastPage())) 
+			$header = $this->RenderNav();
+		else
+			$header = "&nbsp;";
+		
+		$grid = $this->RenderGrid();
+		$footer = $this->RenderPageCount();
+		
+		$this->RenderLayout($header,$grid,$footer);
+		
+		$rs->Close();
+		$this->rs = false;
+	}
+	
+	//------------------------------------------------------
+	// override this to control overall layout and formating
+	function RenderLayout($header,$grid,$footer,$attributes='border=1 bgcolor=beige')
+	{
+		echo "<table ".$attributes."><tr><td>",
+				$header,
+			"</td></tr><tr><td>",
+				$grid,
+			"</td></tr><tr><td>",
+				$footer,
+			"</td></tr></table>";
+	}
+}
+
+
+?>

src/adodb512/adodb-pear.inc.php

@@ -0,0 +1,374 @@
+<?php
+/** 
+ * @version V5.06 16 Oct 2008  (c) 2000-2010 John Lim (jlim#natsoft.com). All rights reserved.
+ * Released under both BSD license and Lesser GPL library license. 
+ * Whenever there is any discrepancy between the two licenses, 
+ * the BSD license will take precedence. 
+ *
+ * Set tabs to 4 for best viewing.
+ * 
+ * PEAR DB Emulation Layer for ADODB.
+ *
+ * The following code is modelled on PEAR DB code by Stig Bakken <ssb@fast.no>								   |
+ * and Tomas V.V.Cox <cox@idecnet.com>.	Portions (c)1997-2002 The PHP Group.
+ */
+
+ /*
+ We support:
+ 
+ DB_Common
+ ---------
+ 	query - returns PEAR_Error on error
+	limitQuery - return PEAR_Error on error
+	prepare - does not return PEAR_Error on error
+	execute - does not return PEAR_Error on error
+	setFetchMode - supports ASSOC and ORDERED
+	errorNative
+	quote
+	nextID
+	disconnect
+	
+	getOne
+	getAssoc
+	getRow
+	getCol
+	getAll
+	
+ DB_Result
+ ---------
+ 	numRows - returns -1 if not supported
+	numCols
+	fetchInto - does not support passing of fetchmode
+	fetchRows - does not support passing of fetchmode
+	free
+ */
+ 
+define('ADODB_PEAR',dirname(__FILE__));
+include_once "PEAR.php";
+include_once ADODB_PEAR."/adodb-errorpear.inc.php";
+include_once ADODB_PEAR."/adodb.inc.php";
+
+if (!defined('DB_OK')) {
+define("DB_OK",	1);
+define("DB_ERROR",-1);
+
+// autoExecute constants
+define('DB_AUTOQUERY_INSERT', 1);
+define('DB_AUTOQUERY_UPDATE', 2);
+
+/**
+ * This is a special constant that tells DB the user hasn't specified
+ * any particular get mode, so the default should be used.
+ */
+
+define('DB_FETCHMODE_DEFAULT', 0);
+
+/**
+ * Column data indexed by numbers, ordered from 0 and up
+ */
+
+define('DB_FETCHMODE_ORDERED', 1);
+
+/**
+ * Column data indexed by column names
+ */
+
+define('DB_FETCHMODE_ASSOC', 2);
+
+/* for compatibility */
+
+define('DB_GETMODE_ORDERED', DB_FETCHMODE_ORDERED);
+define('DB_GETMODE_ASSOC',   DB_FETCHMODE_ASSOC);
+
+/**
+ * these are constants for the tableInfo-function
+ * they are bitwised or'ed. so if there are more constants to be defined
+ * in the future, adjust DB_TABLEINFO_FULL accordingly
+ */
+
+define('DB_TABLEINFO_ORDER', 1);
+define('DB_TABLEINFO_ORDERTABLE', 2);
+define('DB_TABLEINFO_FULL', 3);
+}
+
+/**
+ * The main "DB" class is simply a container class with some static
+ * methods for creating DB objects as well as some utility functions
+ * common to all parts of DB.
+ *
+ */
+
+class DB
+{
+	/**
+	 * Create a new DB object for the specified database type
+	 *
+	 * @param $type string database type, for example "mysql"
+	 *
+	 * @return object a newly created DB object, or a DB error code on
+	 * error
+	 */
+
+	function factory($type)
+	{
+		include_once(ADODB_DIR."/drivers/adodb-$type.inc.php");
+		$obj = NewADOConnection($type);
+		if (!is_object($obj)) $obj = new PEAR_Error('Unknown Database Driver: '.$dsninfo['phptype'],-1);
+		return $obj;
+	}
+
+	/**
+	 * Create a new DB object and connect to the specified database
+	 *
+	 * @param $dsn mixed "data source name", see the DB::parseDSN
+	 * method for a description of the dsn format.  Can also be
+	 * specified as an array of the format returned by DB::parseDSN.
+	 *
+	 * @param $options mixed if boolean (or scalar), tells whether
+	 * this connection should be persistent (for backends that support
+	 * this).  This parameter can also be an array of options, see
+	 * DB_common::setOption for more information on connection
+	 * options.
+	 *
+	 * @return object a newly created DB connection object, or a DB
+	 * error object on error
+	 *
+	 * @see DB::parseDSN
+	 * @see DB::isError
+	 */
+	function connect($dsn, $options = false)
+	{
+		if (is_array($dsn)) {
+			$dsninfo = $dsn;
+		} else {
+			$dsninfo = DB::parseDSN($dsn);
+		}
+		switch ($dsninfo["phptype"]) {
+			case 'pgsql': 	$type = 'postgres7'; break;
+			case 'ifx':		$type = 'informix9'; break;
+			default: 		$type = $dsninfo["phptype"]; break;
+		}
+
+		if (is_array($options) && isset($options["debug"]) &&
+			$options["debug"] >= 2) {
+			// expose php errors with sufficient debug level
+			 @include_once("adodb-$type.inc.php");
+		} else {
+			 @include_once("adodb-$type.inc.php");
+		}
+
+		@$obj = NewADOConnection($type);
+		if (!is_object($obj)) {
+			$obj = new PEAR_Error('Unknown Database Driver: '.$dsninfo['phptype'],-1);
+			return $obj;
+		}
+		if (is_array($options)) {
+			foreach($options as $k => $v) {
+				switch(strtolower($k)) {
+				case 'persist':
+				case 'persistent': 	$persist = $v; break;
+				#ibase
+				case 'dialect': 	$obj->dialect = $v; break;
+				case 'charset':		$obj->charset = $v; break;
+				case 'buffers':		$obj->buffers = $v; break;
+				#ado
+				case 'charpage':	$obj->charPage = $v; break;
+				#mysql
+				case 'clientflags': $obj->clientFlags = $v; break;
+				}
+			}
+		} else {
+		   	$persist = false;
+		}
+
+		if (isset($dsninfo['socket'])) $dsninfo['hostspec'] .= ':'.$dsninfo['socket'];
+		else if (isset($dsninfo['port'])) $dsninfo['hostspec'] .= ':'.$dsninfo['port'];
+		
+		if($persist) $ok = $obj->PConnect($dsninfo['hostspec'], $dsninfo['username'],$dsninfo['password'],$dsninfo['database']);
+		else  $ok = $obj->Connect($dsninfo['hostspec'], $dsninfo['username'],$dsninfo['password'],$dsninfo['database']);
+		
+		if (!$ok) $obj = ADODB_PEAR_Error();
+		return $obj;
+	}
+
+	/**
+	 * Return the DB API version
+	 *
+	 * @return int the DB API version number
+	 */
+	function apiVersion()
+	{
+		return 2;
+	}
+
+	/**
+	 * Tell whether a result code from a DB method is an error
+	 *
+	 * @param $value int result code
+	 *
+	 * @return bool whether $value is an error
+	 */
+	function isError($value)
+	{
+		if (!is_object($value)) return false;
+		$class = strtolower(get_class($value));
+		return $class == 'pear_error' || is_subclass_of($value, 'pear_error') || 
+				$class == 'db_error' || is_subclass_of($value, 'db_error');
+	}
+
+
+	/**
+	 * Tell whether a result code from a DB method is a warning.
+	 * Warnings differ from errors in that they are generated by DB,
+	 * and are not fatal.
+	 *
+	 * @param $value mixed result value
+	 *
+	 * @return bool whether $value is a warning
+	 */
+	function isWarning($value)
+	{
+		return false;
+		/*
+		return is_object($value) &&
+			(get_class( $value ) == "db_warning" ||
+			 is_subclass_of($value, "db_warning"));*/
+	}
+
+	/**
+	 * Parse a data source name
+	 *
+	 * @param $dsn string Data Source Name to be parsed
+	 *
+	 * @return array an associative array with the following keys:
+	 *
+	 *  phptype: Database backend used in PHP (mysql, odbc etc.)
+	 *  dbsyntax: Database used with regards to SQL syntax etc.
+	 *  protocol: Communication protocol to use (tcp, unix etc.)
+	 *  hostspec: Host specification (hostname[:port])
+	 *  database: Database to use on the DBMS server
+	 *  username: User name for login
+	 *  password: Password for login
+	 *
+	 * The format of the supplied DSN is in its fullest form:
+	 *
+	 *  phptype(dbsyntax)://username:password@protocol+hostspec/database
+	 *
+	 * Most variations are allowed:
+	 *
+	 *  phptype://username:password@protocol+hostspec:110//usr/db_file.db
+	 *  phptype://username:password@hostspec/database_name
+	 *  phptype://username:password@hostspec
+	 *  phptype://username@hostspec
+	 *  phptype://hostspec/database
+	 *  phptype://hostspec
+	 *  phptype(dbsyntax)
+	 *  phptype
+	 *
+	 * @author Tomas V.V.Cox <cox@idecnet.com>
+	 */
+	function parseDSN($dsn)
+	{
+		if (is_array($dsn)) {
+			return $dsn;
+		}
+
+		$parsed = array(
+			'phptype'  => false,
+			'dbsyntax' => false,
+			'protocol' => false,
+			'hostspec' => false,
+			'database' => false,
+			'username' => false,
+			'password' => false
+		);
+
+		// Find phptype and dbsyntax
+		if (($pos = strpos($dsn, '://')) !== false) {
+			$str = substr($dsn, 0, $pos);
+			$dsn = substr($dsn, $pos + 3);
+		} else {
+			$str = $dsn;
+			$dsn = NULL;
+		}
+
+		// Get phptype and dbsyntax
+		// $str => phptype(dbsyntax)
+		if (preg_match('|^(.+?)\((.*?)\)$|', $str, $arr)) {
+			$parsed['phptype'] = $arr[1];
+			$parsed['dbsyntax'] = (empty($arr[2])) ? $arr[1] : $arr[2];
+		} else {
+			$parsed['phptype'] = $str;
+			$parsed['dbsyntax'] = $str;
+		}
+
+		if (empty($dsn)) {
+			return $parsed;
+		}
+
+		// Get (if found): username and password
+		// $dsn => username:password@protocol+hostspec/database
+		if (($at = strpos($dsn,'@')) !== false) {
+			$str = substr($dsn, 0, $at);
+			$dsn = substr($dsn, $at + 1);
+			if (($pos = strpos($str, ':')) !== false) {
+				$parsed['username'] = urldecode(substr($str, 0, $pos));
+				$parsed['password'] = urldecode(substr($str, $pos + 1));
+			} else {
+				$parsed['username'] = urldecode($str);
+			}
+		}
+
+		// Find protocol and hostspec
+		// $dsn => protocol+hostspec/database
+		if (($pos=strpos($dsn, '/')) !== false) {
+			$str = substr($dsn, 0, $pos);
+			$dsn = substr($dsn, $pos + 1);
+		} else {
+			$str = $dsn;
+			$dsn = NULL;
+		}
+
+		// Get protocol + hostspec
+		// $str => protocol+hostspec
+		if (($pos=strpos($str, '+')) !== false) {
+			$parsed['protocol'] = substr($str, 0, $pos);
+			$parsed['hostspec'] = urldecode(substr($str, $pos + 1));
+		} else {
+			$parsed['hostspec'] = urldecode($str);
+		}
+
+		// Get dabase if any
+		// $dsn => database
+		if (!empty($dsn)) {
+			$parsed['database'] = $dsn;
+		}
+
+		return $parsed;
+	}
+
+	/**
+	 * Load a PHP database extension if it is not loaded already.
+	 *
+	 * @access public
+	 *
+	 * @param $name the base name of the extension (without the .so or
+	 * .dll suffix)
+	 *
+	 * @return bool true if the extension was already or successfully
+	 * loaded, false if it could not be loaded
+	 */
+	function assertExtension($name)
+	{
+		if (!extension_loaded($name)) {
+			$dlext = (strncmp(PHP_OS,'WIN',3) === 0) ? '.dll' : '.so';
+			@dl($name . $dlext);
+		}
+		if (!extension_loaded($name)) {
+			return false;
+		}
+		return true;
+	}
+}
+
+?>

src/adodb512/adodb-php4.inc.php

@@ -0,0 +1,16 @@
+<?php
+
+/*
+  V5.11 5 May 2010   (c) 2000-2010 John Lim (jlim#natsoft.com). All rights reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence.
+  
+  Set tabs to 4.
+*/
+
+
+class ADODB_BASE_RS {
+}
+
+?>

src/adodb512/contrib/toxmlrpc.inc.php

@@ -0,0 +1,183 @@
+<?php
+    /**
+    * Helper functions to convert between ADODB recordset objects and XMLRPC values.
+    * Uses John Lim's AdoDB and Edd Dumbill's phpxmlrpc libs
+    * 
+    * @author Daniele Baroncelli
+    * @author Gaetano Giunta
+    * @copyright (c) 2003-2004 Giunta/Baroncelli. All rights reserved.
+    * 
+    * @todo some more error checking here and there
+    * @todo document the xmlrpc-struct used to encode recordset info
+    * @todo verify if using xmlrpc_encode($rs->GetArray()) would work with:
+    *       - ADODB_FETCH_BOTH
+    *       - null values
+    */
+
+    /**
+    * Include the main libraries
+    */    
+    require_once('xmlrpc.inc');
+    if (!defined('ADODB_DIR')) require_once('adodb.inc.php');
+            
+    /**
+    * Builds an xmlrpc struct value out of an AdoDB recordset
+    */
+    function rs2xmlrpcval(&$adodbrs) {
+
+        $header = rs2xmlrpcval_header($adodbrs);
+        $body = rs2xmlrpcval_body($adodbrs);
+
+        // put it all together and build final xmlrpc struct
+        $xmlrpcrs = new xmlrpcval ( array(
+                "header" => $header,
+                "body" => $body,
+                ), "struct");
+
+        return $xmlrpcrs;
+
+    }
+
+    /**
+    * Builds an xmlrpc struct value describing an AdoDB recordset
+    */
+    function rs2xmlrpcval_header($adodbrs)
+    {
+        $numfields = $adodbrs->FieldCount();
+        $numrecords = $adodbrs->RecordCount();
+
+        // build structure holding recordset information
+        $fieldstruct = array();
+        for ($i = 0; $i < $numfields; $i++) {
+            $fld = $adodbrs->FetchField($i);
+            $fieldarray = array();
+            if (isset($fld->name))
+                $fieldarray["name"] = new xmlrpcval ($fld->name);
+            if (isset($fld->type))
+                $fieldarray["type"] = new xmlrpcval ($fld->type);
+            if (isset($fld->max_length))
+                $fieldarray["max_length"] = new xmlrpcval ($fld->max_length, "int");
+            if (isset($fld->not_null))
+                $fieldarray["not_null"] = new xmlrpcval ($fld->not_null, "boolean");
+            if (isset($fld->has_default))
+                $fieldarray["has_default"] = new xmlrpcval ($fld->has_default, "boolean");
+            if (isset($fld->default_value))
+                $fieldarray["default_value"] = new xmlrpcval ($fld->default_value);
+            $fieldstruct[$i] = new xmlrpcval ($fieldarray, "struct");
+        }
+        $fieldcount = new xmlrpcval ($numfields, "int");
+        $recordcount = new xmlrpcval ($numrecords, "int");
+        $sql = new xmlrpcval ($adodbrs->sql);
+        $fieldinfo = new xmlrpcval ($fieldstruct, "array");
+
+        $header = new xmlrpcval ( array(
+                "fieldcount" => $fieldcount,
+                "recordcount" => $recordcount,
+                "sql" => $sql,
+                "fieldinfo" => $fieldinfo
+                ), "struct");
+
+        return $header;
+    }
+
+    /**
+    * Builds an xmlrpc struct value out of an AdoDB recordset
+    * (data values only, no data definition)
+    */
+    function rs2xmlrpcval_body($adodbrs)
+    {
+        $numfields = $adodbrs->FieldCount();
+
+        // build structure containing recordset data
+        $adodbrs->MoveFirst();
+        $rows = array();
+        while (!$adodbrs->EOF) {
+            $columns = array();
+            // This should work on all cases of fetch mode: assoc, num, both or default
+            if ($adodbrs->fetchMode == 'ADODB_FETCH_BOTH' || count($adodbrs->fields) == 2 * $adodbrs->FieldCount())
+                for ($i = 0; $i < $numfields; $i++)
+                    if ($adodbrs->fields[$i] === null)
+                        $columns[$i] = new xmlrpcval ('');
+                    else
+                        $columns[$i] = xmlrpc_encode ($adodbrs->fields[$i]);
+            else
+                foreach ($adodbrs->fields as $val)
+                    if ($val === null)
+                        $columns[] = new xmlrpcval ('');
+                    else
+                        $columns[] = xmlrpc_encode ($val);
+
+            $rows[] = new xmlrpcval ($columns, "array");
+
+            $adodbrs->MoveNext();
+        }
+        $body = new xmlrpcval ($rows, "array");
+
+        return $body;    
+    }
+    
+    /**
+    * Returns an xmlrpc struct value as string out of an AdoDB recordset
+    */    
+    function rs2xmlrpcstring (&$adodbrs) {
+        $xmlrpc = rs2xmlrpcval ($adodbrs);
+        if ($xmlrpc)
+          return $xmlrpc->serialize();
+        else
+          return null;
+    }
+
+    /**
+    * Given a well-formed xmlrpc struct object returns an AdoDB object
+    * 
+    * @todo add some error checking on the input value
+    */
+    function xmlrpcval2rs (&$xmlrpcval) {
+
+        $fields_array = array();
+        $data_array = array();
+ 
+        // rebuild column information  
+        $header = $xmlrpcval->structmem('header');
+        
+        $numfields = $header->structmem('fieldcount');
+        $numfields = $numfields->scalarval();
+        $numrecords = $header->structmem('recordcount');
+        $numrecords = $numrecords->scalarval();
+        $sqlstring = $header->structmem('sql');
+        $sqlstring = $sqlstring->scalarval();
+        
+        $fieldinfo = $header->structmem('fieldinfo');
+        for ($i = 0; $i < $numfields; $i++) {
+            $temp = $fieldinfo->arraymem($i);
+            $fld = new ADOFieldObject();
+            while (list($key,$value) = $temp->structeach()) {
+                if ($key == "name") $fld->name = $value->scalarval();
+                if ($key == "type") $fld->type = $value->scalarval();
+                if ($key == "max_length") $fld->max_length = $value->scalarval();
+                if ($key == "not_null") $fld->not_null = $value->scalarval();
+                if ($key == "has_default") $fld->has_default = $value->scalarval();
+                if ($key == "default_value") $fld->default_value = $value->scalarval();
+            } // while
+            $fields_array[] = $fld;
+        } // for
+
+        // fetch recordset information into php array
+        $body = $xmlrpcval->structmem('body');
+        for ($i = 0; $i < $numrecords; $i++) {
+            $data_array[$i]= array();
+            $xmlrpcrs_row = $body->arraymem($i);
+            for ($j = 0; $j < $numfields; $j++) {
+                $temp = $xmlrpcrs_row->arraymem($j);
+                $data_array[$i][$j] = $temp->scalarval();
+            } // for j
+        } // for i
+
+        // finally build in-memory recordset object and return it
+        $rs = new ADORecordSet_array();
+        $rs->InitArrayFields($data_array,$fields_array);
+        return $rs;
+
+    }
+
+?>

src/adodb512/datadict/datadict-access.inc.php

@@ -0,0 +1,96 @@
+<?php
+
+/**
+  V5.11 5 May 2010   (c) 2000-2010 John Lim (jlim#natsoft.com). All rights reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence.
+	
+  Set tabs to 4 for best viewing.
+ 
+*/
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+class ADODB2_access extends ADODB_DataDict {
+	
+	var $databaseType = 'access';
+	var $seqField = false;
+	
+ 	
+ 	function ActualType($meta)
+	{
+		switch($meta) {
+		case 'C': return 'TEXT';
+		case 'XL':
+		case 'X': return 'MEMO'; 
+		
+		case 'C2': return 'TEXT'; // up to 32K
+		case 'X2': return 'MEMO';
+		
+		case 'B': return 'BINARY';
+		
+		case 'TS':
+		case 'D': return 'DATETIME';
+		case 'T': return 'DATETIME';
+		
+		case 'L': return 'BYTE';
+		case 'I': return 'INTEGER';
+		case 'I1': return 'BYTE';
+		case 'I2': return 'SMALLINT';
+		case 'I4': return 'INTEGER';
+		case 'I8': return 'INTEGER';
+		
+		case 'F': return 'DOUBLE';
+		case 'N': return 'NUMERIC';
+		default:
+			return $meta;
+		}
+	}
+	
+	// return string must begin with space
+	function _CreateSuffix($fname, &$ftype, $fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned)
+	{
+		if ($fautoinc) {
+			$ftype = 'COUNTER';
+			return '';
+		}
+		if (substr($ftype,0,7) == 'DECIMAL') $ftype = 'DECIMAL';
+		$suffix = '';
+		if (strlen($fdefault)) {
+			//$suffix .= " DEFAULT $fdefault";
+			if ($this->debug) ADOConnection::outp("Warning: Access does not supported DEFAULT values (field $fname)");
+		}
+		if ($fnotnull) $suffix .= ' NOT NULL';
+		if ($fconstraint) $suffix .= ' '.$fconstraint;
+		return $suffix;
+	}
+	
+	function CreateDatabase($dbname,$options=false)
+	{
+		return array();
+	}
+	
+	
+	function SetSchema($schema)
+	{
+	}
+
+	function AlterColumnSQL($tabname, $flds)
+	{
+		if ($this->debug) ADOConnection::outp("AlterColumnSQL not supported");
+		return array();
+	}
+	
+	
+	function DropColumnSQL($tabname, $flds)
+	{
+		if ($this->debug) ADOConnection::outp("DropColumnSQL not supported");
+		return array();
+	}
+	
+}
+
+
+?>

src/adodb512/datadict/datadict-db2.inc.php

@@ -0,0 +1,144 @@
+<?php
+
+/**
+  V5.11 5 May 2010   (c) 2000-2010 John Lim (jlim#natsoft.com). All rights reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence.
+	
+  Set tabs to 4 for best viewing.
+ 
+*/
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+class ADODB2_db2 extends ADODB_DataDict {
+	
+	var $databaseType = 'db2';
+	var $seqField = false;
+	
+ 	function ActualType($meta)
+	{
+		switch($meta) {
+		case 'C': return 'VARCHAR';
+		case 'XL': return 'CLOB';
+		case 'X': return 'VARCHAR(3600)'; 
+
+		case 'C2': return 'VARCHAR'; // up to 32K
+		case 'X2': return 'VARCHAR(3600)'; // up to 32000, but default page size too small
+
+		case 'B': return 'BLOB';
+
+		case 'D': return 'DATE';
+		case 'TS':
+		case 'T': return 'TIMESTAMP';
+
+		case 'L': return 'SMALLINT';
+		case 'I': return 'INTEGER';
+		case 'I1': return 'SMALLINT';
+		case 'I2': return 'SMALLINT';
+		case 'I4': return 'INTEGER';
+		case 'I8': return 'BIGINT';
+
+		case 'F': return 'DOUBLE';
+		case 'N': return 'DECIMAL';
+		default:
+			return $meta;
+		}
+	}
+	
+	// return string must begin with space
+	function _CreateSuffix($fname,&$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned)
+	{	
+		$suffix = '';
+		if ($fautoinc) return ' GENERATED ALWAYS AS IDENTITY'; # as identity start with 
+		if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
+		if ($fnotnull) $suffix .= ' NOT NULL';
+		if ($fconstraint) $suffix .= ' '.$fconstraint;
+		return $suffix;
+	}
+
+	function AlterColumnSQL($tabname, $flds)
+	{
+		if ($this->debug) ADOConnection::outp("AlterColumnSQL not supported");
+		return array();
+	}
+	
+	
+	function DropColumnSQL($tabname, $flds)
+	{
+		if ($this->debug) ADOConnection::outp("DropColumnSQL not supported");
+		return array();
+	}
+	
+	
+	function ChangeTableSQL($tablename, $flds, $tableoptions = false)
+	{
+		
+		/**
+		  Allow basic table changes to DB2 databases
+		  DB2 will fatally reject changes to non character columns 
+
+		*/
+		
+		$validTypes = array("CHAR","VARC");
+		$invalidTypes = array("BIGI","BLOB","CLOB","DATE", "DECI","DOUB", "INTE", "REAL","SMAL", "TIME");
+		// check table exists
+		$cols = $this->MetaColumns($tablename);
+		if ( empty($cols)) { 
+			return $this->CreateTableSQL($tablename, $flds, $tableoptions);
+		}
+		
+		// already exists, alter table instead
+		list($lines,$pkey) = $this->_GenFields($flds);
+		$alter = 'ALTER TABLE ' . $this->TableName($tablename);
+		$sql = array();
+		
+		foreach ( $lines as $id => $v ) {
+			if ( isset($cols[$id]) && is_object($cols[$id]) ) {
+				/**
+				  If the first field of $v is the fieldname, and
+				  the second is the field type/size, we assume its an
+				  attempt to modify the column size, so check that it is allowed
+				  $v can have an indeterminate number of blanks between the
+				  fields, so account for that too
+				 */
+				$vargs = explode(' ' , $v);
+				// assume that $vargs[0] is the field name.
+				$i=0;
+				// Find the next non-blank value;
+				for ($i=1;$i<sizeof($vargs);$i++)
+					if ($vargs[$i] != '')
+						break;
+				
+				// if $vargs[$i] is one of the following, we are trying to change the
+				// size of the field, if not allowed, simply ignore the request.
+				if (in_array(substr($vargs[$i],0,4),$invalidTypes)) 
+					continue;
+				// insert the appropriate DB2 syntax
+				if (in_array(substr($vargs[$i],0,4),$validTypes)) {
+					array_splice($vargs,$i,0,array('SET','DATA','TYPE'));
+				}
+
+				// Now Look for the NOT NULL statement as this is not allowed in
+				// the ALTER table statement. If it is in there, remove it
+				if (in_array('NOT',$vargs) && in_array('NULL',$vargs)) {
+					for ($i=1;$i<sizeof($vargs);$i++)
+					if ($vargs[$i] == 'NOT')
+						break;
+					array_splice($vargs,$i,2,'');
+				}
+				$v = implode(' ',$vargs);	
+				$sql[] = $alter . $this->alterCol . ' ' . $v;
+			} else {
+				$sql[] = $alter . $this->addCol . ' ' . $v;
+			}
+		}
+		
+		return $sql;
+	}
+	
+}
+
+
+?>

src/adodb512/datadict/datadict-firebird.inc.php

@@ -0,0 +1,152 @@
+<?php
+
+/**
+  V5.11 5 May 2010   (c) 2000-2010 John Lim (jlim#natsoft.com). All rights reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence.
+	
+  Set tabs to 4 for best viewing.
+ 
+*/
+
+class ADODB2_firebird extends ADODB_DataDict {
+	
+	var $databaseType = 'firebird';
+	var $seqField = false;
+	var $seqPrefix = 'gen_';
+	var $blobSize = 40000;	
+ 	
+ 	function ActualType($meta)
+	{
+		switch($meta) {
+		case 'C': return 'VARCHAR';
+		case 'XL': return 'VARCHAR(32000)'; 
+		case 'X': return 'VARCHAR(4000)'; 
+		
+		case 'C2': return 'VARCHAR'; // up to 32K
+		case 'X2': return 'VARCHAR(4000)';
+		
+		case 'B': return 'BLOB';
+			
+		case 'D': return 'DATE';
+		case 'TS':
+		case 'T': return 'TIMESTAMP';
+		
+		case 'L': return 'SMALLINT';
+		case 'I': return 'INTEGER';
+		case 'I1': return 'SMALLINT';
+		case 'I2': return 'SMALLINT';
+		case 'I4': return 'INTEGER';
+		case 'I8': return 'INTEGER';
+		
+		case 'F': return 'DOUBLE PRECISION';
+		case 'N': return 'DECIMAL';
+		default:
+			return $meta;
+		}
+	}
+	
+	function NameQuote($name = NULL)
+	{
+		if (!is_string($name)) {
+			return FALSE;
+		}
+		
+		$name = trim($name);
+		
+		if ( !is_object($this->connection) ) {
+			return $name;
+		}
+		
+		$quote = $this->connection->nameQuote;
+		
+		// if name is of the form `name`, quote it
+		if ( preg_match('/^`(.+)`$/', $name, $matches) ) {
+			return $quote . $matches[1] . $quote;
+		}
+		
+		// if name contains special characters, quote it
+		if ( !preg_match('/^[' . $this->nameRegex . ']+$/', $name) ) {
+			return $quote . $name . $quote;
+		}
+		
+		return $quote . $name . $quote;
+	}
+
+	function CreateDatabase($dbname, $options=false)
+	{
+		$options = $this->_Options($options);
+		$sql = array();
+		
+		$sql[] = "DECLARE EXTERNAL FUNCTION LOWER CSTRING(80) RETURNS CSTRING(80) FREE_IT ENTRY_POINT 'IB_UDF_lower' MODULE_NAME 'ib_udf'";
+		
+		return $sql;
+	}
+	
+	function _DropAutoIncrement($t)
+	{
+		if (strpos($t,'.') !== false) {
+			$tarr = explode('.',$t);
+			return 'DROP GENERATOR '.$tarr[0].'."gen_'.$tarr[1].'"';
+		}
+		return 'DROP GENERATOR "GEN_'.$t;
+	}
+	
+
+	function _CreateSuffix($fname,&$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned)
+	{
+		$suffix = '';
+		
+		if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
+		if ($fnotnull) $suffix .= ' NOT NULL';
+		if ($fautoinc) $this->seqField = $fname;
+		if ($fconstraint) $suffix .= ' '.$fconstraint;
+		
+		return $suffix;
+	}
+	
+/*
+CREATE or replace TRIGGER jaddress_insert
+before insert on jaddress
+for each row
+begin
+IF ( NEW."seqField" IS NULL OR NEW."seqField" = 0 ) THEN
+  NEW."seqField" = GEN_ID("GEN_tabname", 1);
+end;
+*/
+	function _Triggers($tabname,$tableoptions)
+	{	
+		if (!$this->seqField) return array();
+		
+		$tab1 = preg_replace( '/"/', '', $tabname );
+		if ($this->schema) {
+			$t = strpos($tab1,'.');
+			if ($t !== false) $tab = substr($tab1,$t+1);
+			else $tab = $tab1;
+			$seqField = $this->seqField;
+			$seqname = $this->schema.'.'.$this->seqPrefix.$tab;
+			$trigname = $this->schema.'.trig_'.$this->seqPrefix.$tab;
+		} else {
+			$seqField = $this->seqField;
+			$seqname = $this->seqPrefix.$tab1;
+			$trigname = 'trig_'.$seqname;
+		}
+		if (isset($tableoptions['REPLACE']))
+		{ $sql[] = "DROP GENERATOR \"$seqname\"";
+		  $sql[] = "CREATE GENERATOR \"$seqname\"";
+		  $sql[] = "ALTER TRIGGER \"$trigname\" BEFORE INSERT OR UPDATE AS BEGIN IF ( NEW.$seqField IS NULL OR NEW.$seqField = 0 ) THEN NEW.$seqField = GEN_ID(\"$seqname\", 1); END";
+		}
+		else
+		{ $sql[] = "CREATE GENERATOR \"$seqname\"";
+		  $sql[] = "CREATE TRIGGER \"$trigname\" FOR $tabname BEFORE INSERT OR UPDATE AS BEGIN IF ( NEW.$seqField IS NULL OR NEW.$seqField = 0 ) THEN NEW.$seqField = GEN_ID(\"$seqname\", 1); END";
+		}
+		
+		$this->seqField = false;
+		return $sql;
+	}
+
+}
+
+
+?>

src/adodb512/datadict/datadict-generic.inc.php

@@ -0,0 +1,126 @@
+<?php
+
+/**
+  V5.11 5 May 2010   (c) 2000-2010 John Lim (jlim#natsoft.com). All rights reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence.
+	
+  Set tabs to 4 for best viewing.
+ 
+*/
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+class ADODB2_generic extends ADODB_DataDict {
+	
+	var $databaseType = 'generic';
+	var $seqField = false;
+	
+ 	
+ 	function ActualType($meta)
+	{
+		switch($meta) {
+		case 'C': return 'VARCHAR';
+		case 'XL':
+		case 'X': return 'VARCHAR(250)';
+		
+		case 'C2': return 'VARCHAR';
+		case 'X2': return 'VARCHAR(250)';
+		
+		case 'B': return 'VARCHAR';
+			
+		case 'D': return 'DATE';
+		case 'TS':
+		case 'T': return 'DATE';
+		
+		case 'L': return 'DECIMAL(1)';
+		case 'I': return 'DECIMAL(10)';
+		case 'I1': return 'DECIMAL(3)';
+		case 'I2': return 'DECIMAL(5)';
+		case 'I4': return 'DECIMAL(10)';
+		case 'I8': return 'DECIMAL(20)';
+		
+		case 'F': return 'DECIMAL(32,8)';
+		case 'N': return 'DECIMAL';
+		default:
+			return $meta;
+		}
+	}
+
+	function AlterColumnSQL($tabname, $flds)
+	{
+		if ($this->debug) ADOConnection::outp("AlterColumnSQL not supported");
+		return array();
+	}
+	
+	
+	function DropColumnSQL($tabname, $flds)
+	{
+		if ($this->debug) ADOConnection::outp("DropColumnSQL not supported");
+		return array();
+	}
+	
+}
+
+/*
+//db2
+ 	function ActualType($meta)
+	{
+		switch($meta) {
+		case 'C': return 'VARCHAR';
+		case 'X': return 'VARCHAR'; 
+		
+		case 'C2': return 'VARCHAR'; // up to 32K
+		case 'X2': return 'VARCHAR';
+		
+		case 'B': return 'BLOB';
+			
+		case 'D': return 'DATE';
+		case 'T': return 'TIMESTAMP';
+		
+		case 'L': return 'SMALLINT';
+		case 'I': return 'INTEGER';
+		case 'I1': return 'SMALLINT';
+		case 'I2': return 'SMALLINT';
+		case 'I4': return 'INTEGER';
+		case 'I8': return 'BIGINT';
+		
+		case 'F': return 'DOUBLE';
+		case 'N': return 'DECIMAL';
+		default:
+			return $meta;
+		}
+	}
+	
+// ifx
+function ActualType($meta)
+	{
+		switch($meta) {
+		case 'C': return 'VARCHAR';// 255
+		case 'X': return 'TEXT'; 
+		
+		case 'C2': return 'NVARCHAR';
+		case 'X2': return 'TEXT';
+		
+		case 'B': return 'BLOB';
+			
+		case 'D': return 'DATE';
+		case 'T': return 'DATETIME';
+		
+		case 'L': return 'SMALLINT';
+		case 'I': return 'INTEGER';
+		case 'I1': return 'SMALLINT';
+		case 'I2': return 'SMALLINT';
+		case 'I4': return 'INTEGER';
+		case 'I8': return 'DECIMAL(20)';
+		
+		case 'F': return 'FLOAT';
+		case 'N': return 'DECIMAL';
+		default:
+			return $meta;
+		}
+	}
+*/
+?>

src/adodb512/datadict/datadict-ibase.inc.php

@@ -0,0 +1,68 @@
+<?php
+
+/**
+  V5.11 5 May 2010   (c) 2000-2010 John Lim (jlim#natsoft.com). All rights reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence.
+	
+  Set tabs to 4 for best viewing.
+ 
+*/
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+class ADODB2_ibase extends ADODB_DataDict {
+	
+	var $databaseType = 'ibase';
+	var $seqField = false;
+	
+ 	
+ 	function ActualType($meta)
+	{
+		switch($meta) {
+		case 'C': return 'VARCHAR';
+		case 'XL':
+		case 'X': return 'VARCHAR(4000)'; 
+		
+		case 'C2': return 'VARCHAR'; // up to 32K
+		case 'X2': return 'VARCHAR(4000)';
+		
+		case 'B': return 'BLOB';
+			
+		case 'D': return 'DATE';
+		case 'TS':
+		case 'T': return 'TIMESTAMP';
+		
+		case 'L': return 'SMALLINT';
+		case 'I': return 'INTEGER';
+		case 'I1': return 'SMALLINT';
+		case 'I2': return 'SMALLINT';
+		case 'I4': return 'INTEGER';
+		case 'I8': return 'INTEGER';
+		
+		case 'F': return 'DOUBLE PRECISION';
+		case 'N': return 'DECIMAL';
+		default:
+			return $meta;
+		}
+	}
+
+	function AlterColumnSQL($tabname, $flds)
+	{
+		if ($this->debug) ADOConnection::outp("AlterColumnSQL not supported");
+		return array();
+	}
+	
+	
+	function DropColumnSQL($tabname, $flds)
+	{
+		if ($this->debug) ADOConnection::outp("DropColumnSQL not supported");
+		return array();
+	}
+	
+}
+
+
+?>

src/adodb512/datadict/datadict-informix.inc.php

@@ -0,0 +1,81 @@
+<?php
+
+/**
+  V5.11 5 May 2010   (c) 2000-2010 John Lim (jlim#natsoft.com). All rights reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence.
+	
+  Set tabs to 4 for best viewing.
+ 
+*/
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+class ADODB2_informix extends ADODB_DataDict {
+	
+	var $databaseType = 'informix';
+	var $seqField = false;
+	
+ 	
+	function ActualType($meta)
+	{
+		switch($meta) {
+		case 'C': return 'VARCHAR';// 255
+		case 'XL':
+		case 'X': return 'TEXT'; 
+		
+		case 'C2': return 'NVARCHAR';
+		case 'X2': return 'TEXT';
+		
+		case 'B': return 'BLOB';
+			
+		case 'D': return 'DATE';
+		case 'TS':
+		case 'T': return 'DATETIME YEAR TO SECOND';
+		
+		case 'L': return 'SMALLINT';
+		case 'I': return 'INTEGER';
+		case 'I1': return 'SMALLINT';
+		case 'I2': return 'SMALLINT';
+		case 'I4': return 'INTEGER';
+		case 'I8': return 'DECIMAL(20)';
+		
+		case 'F': return 'FLOAT';
+		case 'N': return 'DECIMAL';
+		default:
+			return $meta;
+		}
+	}
+
+	function AlterColumnSQL($tabname, $flds)
+	{
+		if ($this->debug) ADOConnection::outp("AlterColumnSQL not supported");
+		return array();
+	}
+	
+	
+	function DropColumnSQL($tabname, $flds)
+	{
+		if ($this->debug) ADOConnection::outp("DropColumnSQL not supported");
+		return array();
+	}
+	
+	// return string must begin with space
+	function _CreateSuffix($fname, &$ftype, $fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned)
+	{
+		if ($fautoinc) {
+			$ftype = 'SERIAL';
+			return '';
+		}
+		$suffix = '';
+		if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
+		if ($fnotnull) $suffix .= ' NOT NULL';
+		if ($fconstraint) $suffix .= ' '.$fconstraint;
+		return $suffix;
+	}
+	
+}
+
+?>

src/adodb512/datadict/datadict-mssql.inc.php

@@ -0,0 +1,284 @@
+<?php
+
+/**
+  V5.11 5 May 2010   (c) 2000-2010 John Lim (jlim#natsoft.com). All rights reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence.
+	
+  Set tabs to 4 for best viewing.
+ 
+*/
+
+/*
+In ADOdb, named quotes for MS SQL Server use ". From the MSSQL Docs:
+
+	Note Delimiters are for identifiers only. Delimiters cannot be used for keywords, 
+	whether or not they are marked as reserved in SQL Server.
+	
+	Quoted identifiers are delimited by double quotation marks ("):
+	SELECT * FROM "Blanks in Table Name"
+	
+	Bracketed identifiers are delimited by brackets ([ ]):
+	SELECT * FROM [Blanks In Table Name]
+	
+	Quoted identifiers are valid only when the QUOTED_IDENTIFIER option is set to ON. By default, 
+	the Microsoft OLE DB Provider for SQL Server and SQL Server ODBC driver set QUOTED_IDENTIFIER ON 
+	when they connect. 
+	
+	In Transact-SQL, the option can be set at various levels using SET QUOTED_IDENTIFIER, 
+	the quoted identifier option of sp_dboption, or the user options option of sp_configure.
+	
+	When SET ANSI_DEFAULTS is ON, SET QUOTED_IDENTIFIER is enabled.
+	
+	Syntax
+	
+		SET QUOTED_IDENTIFIER { ON | OFF }
+
+
+*/
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+class ADODB2_mssql extends ADODB_DataDict {
+	var $databaseType = 'mssql';
+	var $dropIndex = 'DROP INDEX %2$s.%1$s';
+	var $renameTable = "EXEC sp_rename '%s','%s'";
+	var $renameColumn = "EXEC sp_rename '%s.%s','%s'";
+
+	var $typeX = 'TEXT';  ## Alternatively, set it to VARCHAR(4000)
+	var $typeXL = 'TEXT';
+	
+	//var $alterCol = ' ALTER COLUMN ';
+	
+	function MetaType($t,$len=-1,$fieldobj=false)
+	{
+		if (is_object($t)) {
+			$fieldobj = $t;
+			$t = $fieldobj->type;
+			$len = $fieldobj->max_length;
+		}
+		
+		$len = -1; // mysql max_length is not accurate
+		switch (strtoupper($t)) {
+		case 'R':
+		case 'INT': 
+		case 'INTEGER': return  'I';
+		case 'BIT':
+		case 'TINYINT': return  'I1';
+		case 'SMALLINT': return 'I2';
+		case 'BIGINT':  return  'I8';
+		case 'SMALLDATETIME': return 'T';
+		case 'REAL':
+		case 'FLOAT': return 'F';
+		default: return parent::MetaType($t,$len,$fieldobj);
+		}
+	}
+	
+	function ActualType($meta)
+	{
+		switch(strtoupper($meta)) {
+
+		case 'C': return 'VARCHAR';
+		case 'XL': return (isset($this)) ? $this->typeXL : 'TEXT';
+		case 'X': return (isset($this)) ? $this->typeX : 'TEXT'; ## could be varchar(8000), but we want compat with oracle
+		case 'C2': return 'NVARCHAR';
+		case 'X2': return 'NTEXT';
+		
+		case 'B': return 'IMAGE';
+			
+		case 'D': return 'DATETIME';
+		
+		case 'TS':
+		case 'T': return 'DATETIME';
+		case 'L': return 'BIT';
+		
+		case 'R':		
+		case 'I': return 'INT'; 
+		case 'I1': return 'TINYINT';
+		case 'I2': return 'SMALLINT';
+		case 'I4': return 'INT';
+		case 'I8': return 'BIGINT';
+		
+		case 'F': return 'REAL';
+		case 'N': return 'NUMERIC';
+		default:
+			return $meta;
+		}
+	}
+	
+	
+	function AddColumnSQL($tabname, $flds)
+	{
+		$tabname = $this->TableName ($tabname);
+		$f = array();
+		list($lines,$pkey) = $this->_GenFields($flds);
+		$s = "ALTER TABLE $tabname $this->addCol";
+		foreach($lines as $v) {
+			$f[] = "\n $v";
+		}
+		$s .= implode(', ',$f);
+		$sql[] = $s;
+		return $sql;
+	}
+	
+	/*
+	function AlterColumnSQL($tabname, $flds)
+	{
+		$tabname = $this->TableName ($tabname);
+		$sql = array();
+		list($lines,$pkey) = $this->_GenFields($flds);
+		foreach($lines as $v) {
+			$sql[] = "ALTER TABLE $tabname $this->alterCol $v";
+		}
+
+		return $sql;
+	}
+	*/
+	
+	function DropColumnSQL($tabname, $flds)
+	{
+		$tabname = $this->TableName ($tabname);
+		if (!is_array($flds))
+			$flds = explode(',',$flds);
+		$f = array();
+		$s = 'ALTER TABLE ' . $tabname;
+		foreach($flds as $v) {
+			$f[] = "\n$this->dropCol ".$this->NameQuote($v);
+		}
+		$s .= implode(', ',$f);
+		$sql[] = $s;
+		return $sql;
+	}
+	
+	// return string must begin with space
+	function _CreateSuffix($fname,&$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned)
+	{	
+		$suffix = '';
+		if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
+		if ($fautoinc) $suffix .= ' IDENTITY(1,1)';
+		if ($fnotnull) $suffix .= ' NOT NULL';
+		else if ($suffix == '') $suffix .= ' NULL';
+		if ($fconstraint) $suffix .= ' '.$fconstraint;
+		return $suffix;
+	}
+	
+	/*
+CREATE TABLE 
+    [ database_name.[ owner ] . | owner. ] table_name 
+    ( { < column_definition > 
+        | column_name AS computed_column_expression 
+        | < table_constraint > ::= [ CONSTRAINT constraint_name ] }
+
+            | [ { PRIMARY KEY | UNIQUE } [ ,...n ] 
+    ) 
+
+[ ON { filegroup | DEFAULT } ] 
+[ TEXTIMAGE_ON { filegroup | DEFAULT } ] 
+
+< column_definition > ::= { column_name data_type } 
+    [ COLLATE < collation_name > ] 
+    [ [ DEFAULT constant_expression ] 
+        | [ IDENTITY [ ( seed , increment ) [ NOT FOR REPLICATION ] ] ]
+    ] 
+    [ ROWGUIDCOL] 
+    [ < column_constraint > ] [ ...n ] 
+
+< column_constraint > ::= [ CONSTRAINT constraint_name ] 
+    { [ NULL | NOT NULL ] 
+        | [ { PRIMARY KEY | UNIQUE } 
+            [ CLUSTERED | NONCLUSTERED ] 
+            [ WITH FILLFACTOR = fillfactor ] 
+            [ON {filegroup | DEFAULT} ] ] 
+        ] 
+        | [ [ FOREIGN KEY ] 
+            REFERENCES ref_table [ ( ref_column ) ] 
+            [ ON DELETE { CASCADE | NO ACTION } ] 
+            [ ON UPDATE { CASCADE | NO ACTION } ] 
+            [ NOT FOR REPLICATION ] 
+        ] 
+        | CHECK [ NOT FOR REPLICATION ] 
+        ( logical_expression ) 
+    } 
+
+< table_constraint > ::= [ CONSTRAINT constraint_name ] 
+    { [ { PRIMARY KEY | UNIQUE } 
+        [ CLUSTERED | NONCLUSTERED ] 
+        { ( column [ ASC | DESC ] [ ,...n ] ) } 
+        [ WITH FILLFACTOR = fillfactor ] 
+        [ ON { filegroup | DEFAULT } ] 
+    ] 
+    | FOREIGN KEY 
+        [ ( column [ ,...n ] ) ] 
+        REFERENCES ref_table [ ( ref_column [ ,...n ] ) ] 
+        [ ON DELETE { CASCADE | NO ACTION } ] 
+        [ ON UPDATE { CASCADE | NO ACTION } ] 
+        [ NOT FOR REPLICATION ] 
+    | CHECK [ NOT FOR REPLICATION ] 
+        ( search_conditions ) 
+    } 
+
+
+	*/
+	
+	/*
+	CREATE [ UNIQUE ] [ CLUSTERED | NONCLUSTERED ] INDEX index_name 
+    ON { table | view } ( column [ ASC | DESC ] [ ,...n ] ) 
+		[ WITH < index_option > [ ,...n] ] 
+		[ ON filegroup ]
+		< index_option > :: = 
+		    { PAD_INDEX | 
+		        FILLFACTOR = fillfactor | 
+		        IGNORE_DUP_KEY | 
+		        DROP_EXISTING | 
+		    STATISTICS_NORECOMPUTE | 
+		    SORT_IN_TEMPDB  
+		}
+*/
+	function _IndexSQL($idxname, $tabname, $flds, $idxoptions)
+	{
+		$sql = array();
+		
+		if ( isset($idxoptions['REPLACE']) || isset($idxoptions['DROP']) ) {
+			$sql[] = sprintf ($this->dropIndex, $idxname, $tabname);
+			if ( isset($idxoptions['DROP']) )
+				return $sql;
+		}
+		
+		if ( empty ($flds) ) {
+			return $sql;
+		}
+		
+		$unique = isset($idxoptions['UNIQUE']) ? ' UNIQUE' : '';
+		$clustered = isset($idxoptions['CLUSTERED']) ? ' CLUSTERED' : '';
+		
+		if ( is_array($flds) )
+			$flds = implode(', ',$flds);
+		$s = 'CREATE' . $unique . $clustered . ' INDEX ' . $idxname . ' ON ' . $tabname . ' (' . $flds . ')';
+		
+		if ( isset($idxoptions[$this->upperName]) )
+			$s .= $idxoptions[$this->upperName];
+		
+
+		$sql[] = $s;
+		
+		return $sql;
+	}
+	
+	
+	function _GetSize($ftype, $ty, $fsize, $fprec)
+	{
+		switch ($ftype) {
+		case 'INT':
+		case 'SMALLINT':
+		case 'TINYINT':
+		case 'BIGINT':
+			return $ftype;
+		}
+    	if ($ty == 'T') return $ftype;
+    	return parent::_GetSize($ftype, $ty, $fsize, $fprec);    
+
+	}
+}
+?>

src/adodb512/datadict/datadict-mssqlnative.inc.php

@@ -0,0 +1,282 @@
+<?php
+
+/**
+  V5.11 5 May 2010   (c) 2000-2010 John Lim (jlim#natsoft.com). All rights reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence.
+	
+  Set tabs to 4 for best viewing.
+ 
+*/
+
+/*
+In ADOdb, named quotes for MS SQL Server use ". From the MSSQL Docs:
+
+	Note Delimiters are for identifiers only. Delimiters cannot be used for keywords, 
+	whether or not they are marked as reserved in SQL Server.
+	
+	Quoted identifiers are delimited by double quotation marks ("):
+	SELECT * FROM "Blanks in Table Name"
+	
+	Bracketed identifiers are delimited by brackets ([ ]):
+	SELECT * FROM [Blanks In Table Name]
+	
+	Quoted identifiers are valid only when the QUOTED_IDENTIFIER option is set to ON. By default, 
+	the Microsoft OLE DB Provider for SQL Server and SQL Server ODBC driver set QUOTED_IDENTIFIER ON 
+	when they connect. 
+	
+	In Transact-SQL, the option can be set at various levels using SET QUOTED_IDENTIFIER, 
+	the quoted identifier option of sp_dboption, or the user options option of sp_configure.
+	
+	When SET ANSI_DEFAULTS is ON, SET QUOTED_IDENTIFIER is enabled.
+	
+	Syntax
+	
+		SET QUOTED_IDENTIFIER { ON | OFF }
+
+
+*/
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+class ADODB2_mssqlnative extends ADODB_DataDict {
+	var $databaseType = 'mssqlnative';
+	var $dropIndex = 'DROP INDEX %2$s.%1$s';
+	var $renameTable = "EXEC sp_rename '%s','%s'";
+	var $renameColumn = "EXEC sp_rename '%s.%s','%s'";
+
+	var $typeX = 'TEXT';  ## Alternatively, set it to VARCHAR(4000)
+	var $typeXL = 'TEXT';
+	
+	//var $alterCol = ' ALTER COLUMN ';
+	
+	function MetaType($t,$len=-1,$fieldobj=false)
+	{
+		if (is_object($t)) {
+			$fieldobj = $t;
+			$t = $fieldobj->type;
+			$len = $fieldobj->max_length;
+		}
+		
+		$len = -1; // mysql max_length is not accurate
+		switch (strtoupper($t)) {
+		case 'R':
+		case 'INT': 
+		case 'INTEGER': return  'I';
+		case 'BIT':
+		case 'TINYINT': return  'I1';
+		case 'SMALLINT': return 'I2';
+		case 'BIGINT':  return  'I8';
+		
+		case 'REAL':
+		case 'FLOAT': return 'F';
+		default: return parent::MetaType($t,$len,$fieldobj);
+		}
+	}
+	
+	function ActualType($meta)
+	{
+		switch(strtoupper($meta)) {
+
+		case 'C': return 'VARCHAR';
+		case 'XL': return (isset($this)) ? $this->typeXL : 'TEXT';
+		case 'X': return (isset($this)) ? $this->typeX : 'TEXT'; ## could be varchar(8000), but we want compat with oracle
+		case 'C2': return 'NVARCHAR';
+		case 'X2': return 'NTEXT';
+		
+		case 'B': return 'IMAGE';
+			
+		case 'D': return 'DATETIME';
+		case 'T': return 'DATETIME';
+		case 'L': return 'BIT';
+		
+		case 'R':		
+		case 'I': return 'INT'; 
+		case 'I1': return 'TINYINT';
+		case 'I2': return 'SMALLINT';
+		case 'I4': return 'INT';
+		case 'I8': return 'BIGINT';
+		
+		case 'F': return 'REAL';
+		case 'N': return 'NUMERIC';
+		default:
+			return $meta;
+		}
+	}
+	
+	
+	function AddColumnSQL($tabname, $flds)
+	{
+		$tabname = $this->TableName ($tabname);
+		$f = array();
+		list($lines,$pkey) = $this->_GenFields($flds);
+		$s = "ALTER TABLE $tabname $this->addCol";
+		foreach($lines as $v) {
+			$f[] = "\n $v";
+		}
+		$s .= implode(', ',$f);
+		$sql[] = $s;
+		return $sql;
+	}
+	
+	/*
+	function AlterColumnSQL($tabname, $flds)
+	{
+		$tabname = $this->TableName ($tabname);
+		$sql = array();
+		list($lines,$pkey) = $this->_GenFields($flds);
+		foreach($lines as $v) {
+			$sql[] = "ALTER TABLE $tabname $this->alterCol $v";
+		}
+
+		return $sql;
+	}
+	*/
+	
+	function DropColumnSQL($tabname, $flds)
+	{
+		$tabname = $this->TableName ($tabname);
+		if (!is_array($flds))
+			$flds = explode(',',$flds);
+		$f = array();
+		$s = 'ALTER TABLE ' . $tabname;
+		foreach($flds as $v) {
+			$f[] = "\n$this->dropCol ".$this->NameQuote($v);
+		}
+		$s .= implode(', ',$f);
+		$sql[] = $s;
+		return $sql;
+	}
+	
+	// return string must begin with space
+	function _CreateSuffix($fname,&$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned)
+	{	
+		$suffix = '';
+		if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
+		if ($fautoinc) $suffix .= ' IDENTITY(1,1)';
+		if ($fnotnull) $suffix .= ' NOT NULL';
+		else if ($suffix == '') $suffix .= ' NULL';
+		if ($fconstraint) $suffix .= ' '.$fconstraint;
+		return $suffix;
+	}
+	
+	/*
+CREATE TABLE 
+    [ database_name.[ owner ] . | owner. ] table_name 
+    ( { < column_definition > 
+        | column_name AS computed_column_expression 
+        | < table_constraint > ::= [ CONSTRAINT constraint_name ] }
+
+            | [ { PRIMARY KEY | UNIQUE } [ ,...n ] 
+    ) 
+
+[ ON { filegroup | DEFAULT } ] 
+[ TEXTIMAGE_ON { filegroup | DEFAULT } ] 
+
+< column_definition > ::= { column_name data_type } 
+    [ COLLATE < collation_name > ] 
+    [ [ DEFAULT constant_expression ] 
+        | [ IDENTITY [ ( seed , increment ) [ NOT FOR REPLICATION ] ] ]
+    ] 
+    [ ROWGUIDCOL] 
+    [ < column_constraint > ] [ ...n ] 
+
+< column_constraint > ::= [ CONSTRAINT constraint_name ] 
+    { [ NULL | NOT NULL ] 
+        | [ { PRIMARY KEY | UNIQUE } 
+            [ CLUSTERED | NONCLUSTERED ] 
+            [ WITH FILLFACTOR = fillfactor ] 
+            [ON {filegroup | DEFAULT} ] ] 
+        ] 
+        | [ [ FOREIGN KEY ] 
+            REFERENCES ref_table [ ( ref_column ) ] 
+            [ ON DELETE { CASCADE | NO ACTION } ] 
+            [ ON UPDATE { CASCADE | NO ACTION } ] 
+            [ NOT FOR REPLICATION ] 
+        ] 
+        | CHECK [ NOT FOR REPLICATION ] 
+        ( logical_expression ) 
+    } 
+
+< table_constraint > ::= [ CONSTRAINT constraint_name ] 
+    { [ { PRIMARY KEY | UNIQUE } 
+        [ CLUSTERED | NONCLUSTERED ] 
+        { ( column [ ASC | DESC ] [ ,...n ] ) } 
+        [ WITH FILLFACTOR = fillfactor ] 
+        [ ON { filegroup | DEFAULT } ] 
+    ] 
+    | FOREIGN KEY 
+        [ ( column [ ,...n ] ) ] 
+        REFERENCES ref_table [ ( ref_column [ ,...n ] ) ] 
+        [ ON DELETE { CASCADE | NO ACTION } ] 
+        [ ON UPDATE { CASCADE | NO ACTION } ] 
+        [ NOT FOR REPLICATION ] 
+    | CHECK [ NOT FOR REPLICATION ] 
+        ( search_conditions ) 
+    } 
+
+
+	*/
+	
+	/*
+	CREATE [ UNIQUE ] [ CLUSTERED | NONCLUSTERED ] INDEX index_name 
+    ON { table | view } ( column [ ASC | DESC ] [ ,...n ] ) 
+		[ WITH < index_option > [ ,...n] ] 
+		[ ON filegroup ]
+		< index_option > :: = 
+		    { PAD_INDEX | 
+		        FILLFACTOR = fillfactor | 
+		        IGNORE_DUP_KEY | 
+		        DROP_EXISTING | 
+		    STATISTICS_NORECOMPUTE | 
+		    SORT_IN_TEMPDB  
+		}
+*/
+	function _IndexSQL($idxname, $tabname, $flds, $idxoptions)
+	{
+		$sql = array();
+		
+		if ( isset($idxoptions['REPLACE']) || isset($idxoptions['DROP']) ) {
+			$sql[] = sprintf ($this->dropIndex, $idxname, $tabname);
+			if ( isset($idxoptions['DROP']) )
+				return $sql;
+		}
+		
+		if ( empty ($flds) ) {
+			return $sql;
+		}
+		
+		$unique = isset($idxoptions['UNIQUE']) ? ' UNIQUE' : '';
+		$clustered = isset($idxoptions['CLUSTERED']) ? ' CLUSTERED' : '';
+		
+		if ( is_array($flds) )
+			$flds = implode(', ',$flds);
+		$s = 'CREATE' . $unique . $clustered . ' INDEX ' . $idxname . ' ON ' . $tabname . ' (' . $flds . ')';
+		
+		if ( isset($idxoptions[$this->upperName]) )
+			$s .= $idxoptions[$this->upperName];
+		
+
+		$sql[] = $s;
+		
+		return $sql;
+	}
+	
+	
+	function _GetSize($ftype, $ty, $fsize, $fprec)
+	{
+		switch ($ftype) {
+		case 'INT':
+		case 'SMALLINT':
+		case 'TINYINT':
+		case 'BIGINT':
+			return $ftype;
+		}
+    	if ($ty == 'T') return $ftype;
+    	return parent::_GetSize($ftype, $ty, $fsize, $fprec);    
+
+	}
+}
+?>

src/adodb512/datadict/datadict-mysql.inc.php

@@ -0,0 +1,182 @@
+<?php
+
+/**
+  V5.11 5 May 2010   (c) 2000-2010 John Lim (jlim#natsoft.com). All rights reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence.
+	
+  Set tabs to 4 for best viewing.
+ 
+*/
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+class ADODB2_mysql extends ADODB_DataDict {
+	var $databaseType = 'mysql';
+	var $alterCol = ' MODIFY COLUMN';
+	var $alterTableAddIndex = true;
+	var $dropTable = 'DROP TABLE IF EXISTS %s'; // requires mysql 3.22 or later
+	
+	var $dropIndex = 'DROP INDEX %s ON %s';
+	var $renameColumn = 'ALTER TABLE %s CHANGE COLUMN %s %s %s';	// needs column-definition!
+	
+	function MetaType($t,$len=-1,$fieldobj=false)
+	{
+		if (is_object($t)) {
+			$fieldobj = $t;
+			$t = $fieldobj->type;
+			$len = $fieldobj->max_length;
+		}
+		$is_serial = is_object($fieldobj) && $fieldobj->primary_key && $fieldobj->auto_increment;
+		
+		$len = -1; // mysql max_length is not accurate
+		switch (strtoupper($t)) {
+		case 'STRING': 
+		case 'CHAR':
+		case 'VARCHAR': 
+		case 'TINYBLOB': 
+		case 'TINYTEXT': 
+		case 'ENUM': 
+		case 'SET':
+			if ($len <= $this->blobSize) return 'C';
+			
+		case 'TEXT':
+		case 'LONGTEXT': 
+		case 'MEDIUMTEXT':
+			return 'X';
+			
+		// php_mysql extension always returns 'blob' even if 'text'
+		// so we have to check whether binary...
+		case 'IMAGE':
+		case 'LONGBLOB': 
+		case 'BLOB':
+		case 'MEDIUMBLOB':
+			return !empty($fieldobj->binary) ? 'B' : 'X';
+			
+		case 'YEAR':
+		case 'DATE': return 'D';
+		
+		case 'TIME':
+		case 'DATETIME':
+		case 'TIMESTAMP': return 'T';
+		
+		case 'FLOAT':
+		case 'DOUBLE':
+			return 'F';
+			
+		case 'INT': 
+		case 'INTEGER': return $is_serial ? 'R' : 'I';
+		case 'TINYINT': return $is_serial ? 'R' : 'I1';
+		case 'SMALLINT': return $is_serial ? 'R' : 'I2';
+		case 'MEDIUMINT': return $is_serial ? 'R' : 'I4';
+		case 'BIGINT':  return $is_serial ? 'R' : 'I8';
+		default: return 'N';
+		}
+	}
+
+	function ActualType($meta)
+	{
+		switch(strtoupper($meta)) {
+		case 'C': return 'VARCHAR';
+		case 'XL':return 'LONGTEXT';
+		case 'X': return 'TEXT';
+		
+		case 'C2': return 'VARCHAR';
+		case 'X2': return 'LONGTEXT';
+		
+		case 'B': return 'LONGBLOB';
+			
+		case 'D': return 'DATE';
+		case 'TS':
+		case 'T': return 'DATETIME';
+		case 'L': return 'TINYINT';
+		
+		case 'R':
+		case 'I4':
+		case 'I': return 'INTEGER';
+		case 'I1': return 'TINYINT';
+		case 'I2': return 'SMALLINT';
+		case 'I8': return 'BIGINT';
+		
+		case 'F': return 'DOUBLE';
+		case 'N': return 'NUMERIC';
+		default:
+			return $meta;
+		}
+	}
+	
+	// return string must begin with space
+	function _CreateSuffix($fname,&$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned)
+	{	
+		$suffix = '';
+		if ($funsigned) $suffix .= ' UNSIGNED';
+		if ($fnotnull) $suffix .= ' NOT NULL';
+		if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
+		if ($fautoinc) $suffix .= ' AUTO_INCREMENT';
+		if ($fconstraint) $suffix .= ' '.$fconstraint;
+		return $suffix;
+	}
+	
+	/*
+	CREATE [TEMPORARY] TABLE [IF NOT EXISTS] tbl_name [(create_definition,...)]
+		[table_options] [select_statement]
+		create_definition:
+		col_name type [NOT NULL | NULL] [DEFAULT default_value] [AUTO_INCREMENT]
+		[PRIMARY KEY] [reference_definition]
+		or PRIMARY KEY (index_col_name,...)
+		or KEY [index_name] (index_col_name,...)
+		or INDEX [index_name] (index_col_name,...)
+		or UNIQUE [INDEX] [index_name] (index_col_name,...)
+		or FULLTEXT [INDEX] [index_name] (index_col_name,...)
+		or [CONSTRAINT symbol] FOREIGN KEY [index_name] (index_col_name,...)
+		[reference_definition]
+		or CHECK (expr)
+	*/
+	
+	/*
+	CREATE [UNIQUE|FULLTEXT] INDEX index_name
+		ON tbl_name (col_name[(length)],... )
+	*/
+	
+	function _IndexSQL($idxname, $tabname, $flds, $idxoptions)
+	{
+		$sql = array();
+		
+		if ( isset($idxoptions['REPLACE']) || isset($idxoptions['DROP']) ) {
+			if ($this->alterTableAddIndex) $sql[] = "ALTER TABLE $tabname DROP INDEX $idxname";
+			else $sql[] = sprintf($this->dropIndex, $idxname, $tabname);
+
+			if ( isset($idxoptions['DROP']) )
+				return $sql;
+		}
+		
+		if ( empty ($flds) ) {
+			return $sql;
+		}
+		
+		if (isset($idxoptions['FULLTEXT'])) {
+			$unique = ' FULLTEXT';
+		} elseif (isset($idxoptions['UNIQUE'])) {
+			$unique = ' UNIQUE';
+		} else {
+			$unique = '';
+		}
+		
+		if ( is_array($flds) ) $flds = implode(', ',$flds);
+		
+		if ($this->alterTableAddIndex) $s = "ALTER TABLE $tabname ADD $unique INDEX $idxname ";
+		else $s = 'CREATE' . $unique . ' INDEX ' . $idxname . ' ON ' . $tabname;
+		
+		$s .= ' (' . $flds . ')';
+		
+		if ( isset($idxoptions[$this->upperName]) )
+			$s .= $idxoptions[$this->upperName];
+		
+		$sql[] = $s;
+		
+		return $sql;
+	}
+}
+?>

src/adodb512/datadict/datadict-oci8.inc.php

@@ -0,0 +1,297 @@
+<?php
+
+/**
+  V5.11 5 May 2010   (c) 2000-2010 John Lim (jlim#natsoft.com). All rights reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence.
+	
+  Set tabs to 4 for best viewing.
+ 
+*/
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+class ADODB2_oci8 extends ADODB_DataDict {
+	
+	var $databaseType = 'oci8';
+	var $seqField = false;
+	var $seqPrefix = 'SEQ_';
+	var $dropTable = "DROP TABLE %s CASCADE CONSTRAINTS";
+	var $trigPrefix = 'TRIG_';
+	var $alterCol = ' MODIFY ';
+	var $typeX = 'VARCHAR(4000)';
+	var $typeXL = 'CLOB';
+	
+	function MetaType($t,$len=-1)
+	{
+		if (is_object($t)) {
+			$fieldobj = $t;
+			$t = $fieldobj->type;
+			$len = $fieldobj->max_length;
+		}
+		switch (strtoupper($t)) {
+	 	case 'VARCHAR':
+	 	case 'VARCHAR2':
+		case 'CHAR':
+		case 'VARBINARY':
+		case 'BINARY':
+			if (isset($this) && $len <= $this->blobSize) return 'C';
+			return 'X';
+		
+		case 'NCHAR':
+		case 'NVARCHAR2':
+		case 'NVARCHAR':
+			if (isset($this) && $len <= $this->blobSize) return 'C2';
+			return 'X2';
+			
+		case 'NCLOB':
+		case 'CLOB':
+			return 'XL';
+		
+		case 'LONG RAW':
+		case 'LONG VARBINARY':
+		case 'BLOB':
+			return 'B';
+		
+		case 'TIMESTAMP':
+			return 'TS';
+			
+		case 'DATE': 
+			return 'T';
+		
+		case 'INT': 
+		case 'SMALLINT':
+		case 'INTEGER': 
+			return 'I';
+			
+		default:
+			return 'N';
+		}
+	}
+	
+ 	function ActualType($meta)
+	{
+		switch($meta) {
+		case 'C': return 'VARCHAR';
+		case 'X': return $this->typeX;
+		case 'XL': return $this->typeXL;
+		
+		case 'C2': return 'NVARCHAR2';
+		case 'X2': return 'NVARCHAR2(4000)';
+		
+		case 'B': return 'BLOB';
+		
+		case 'TS':
+				return 'TIMESTAMP';
+				
+		case 'D': 
+		case 'T': return 'DATE';
+		case 'L': return 'NUMBER(1)';
+		case 'I1': return 'NUMBER(3)';
+		case 'I2': return 'NUMBER(5)';
+		case 'I':
+		case 'I4': return 'NUMBER(10)';
+		
+		case 'I8': return 'NUMBER(20)';
+		case 'F': return 'NUMBER';
+		case 'N': return 'NUMBER';
+		case 'R': return 'NUMBER(20)';
+		default:
+			return $meta;
+		}	
+	}
+	
+	function CreateDatabase($dbname, $options=false)
+	{
+		$options = $this->_Options($options);
+		$password = isset($options['PASSWORD']) ? $options['PASSWORD'] : 'tiger';
+		$tablespace = isset($options["TABLESPACE"]) ? " DEFAULT TABLESPACE ".$options["TABLESPACE"] : '';
+		$sql[] = "CREATE USER ".$dbname." IDENTIFIED BY ".$password.$tablespace;
+		$sql[] = "GRANT CREATE SESSION, CREATE TABLE,UNLIMITED TABLESPACE,CREATE SEQUENCE TO $dbname";
+		
+		return $sql;
+	}
+	
+	function AddColumnSQL($tabname, $flds)
+	{
+		$f = array();
+		list($lines,$pkey) = $this->_GenFields($flds);
+		$s = "ALTER TABLE $tabname ADD (";
+		foreach($lines as $v) {
+			$f[] = "\n $v";
+		}
+		
+		$s .= implode(', ',$f).')';
+		$sql[] = $s;
+		return $sql;
+	}
+	
+	function AlterColumnSQL($tabname, $flds)
+	{
+		$f = array();
+		list($lines,$pkey) = $this->_GenFields($flds);
+		$s = "ALTER TABLE $tabname MODIFY(";
+		foreach($lines as $v) {
+			$f[] = "\n $v";
+		}
+		$s .= implode(', ',$f).')';
+		$sql[] = $s;
+		return $sql;
+	}
+	
+	function DropColumnSQL($tabname, $flds)
+	{
+		if (!is_array($flds)) $flds = explode(',',$flds);
+		foreach ($flds as $k => $v) $flds[$k] = $this->NameQuote($v);
+		
+		$sql = array();
+		$s = "ALTER TABLE $tabname DROP(";
+		$s .= implode(', ',$flds).') CASCADE CONSTRAINTS';
+		$sql[] = $s;
+		return $sql;
+	}
+	
+	function _DropAutoIncrement($t)
+	{
+		if (strpos($t,'.') !== false) {
+			$tarr = explode('.',$t);
+			return "drop sequence ".$tarr[0].".seq_".$tarr[1];
+		}
+		return "drop sequence seq_".$t;
+	}
+	
+	// return string must begin with space
+	function _CreateSuffix($fname,&$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned)
+	{
+		$suffix = '';
+		
+		if ($fdefault == "''" && $fnotnull) {// this is null in oracle
+			$fnotnull = false;
+			if ($this->debug) ADOConnection::outp("NOT NULL and DEFAULT='' illegal in Oracle");
+		}
+		
+		if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
+		if ($fnotnull) $suffix .= ' NOT NULL';
+		
+		if ($fautoinc) $this->seqField = $fname;
+		if ($fconstraint) $suffix .= ' '.$fconstraint;
+		
+		return $suffix;
+	}
+	
+/*
+CREATE or replace TRIGGER jaddress_insert
+before insert on jaddress
+for each row
+begin
+select seqaddress.nextval into :new.A_ID from dual;
+end;
+*/
+	function _Triggers($tabname,$tableoptions)
+	{
+		if (!$this->seqField) return array();
+		
+		if ($this->schema) {
+			$t = strpos($tabname,'.');
+			if ($t !== false) $tab = substr($tabname,$t+1);
+			else $tab = $tabname;
+			$seqname = $this->schema.'.'.$this->seqPrefix.$tab;
+			$trigname = $this->schema.'.'.$this->trigPrefix.$this->seqPrefix.$tab;
+		} else {
+			$seqname = $this->seqPrefix.$tabname;
+			$trigname = $this->trigPrefix.$seqname;
+		}
+		
+		if (strlen($seqname) > 30) {
+			$seqname = $this->seqPrefix.uniqid('');
+		} // end if
+		if (strlen($trigname) > 30) {
+			$trigname = $this->trigPrefix.uniqid('');
+		} // end if
+
+		if (isset($tableoptions['REPLACE'])) $sql[] = "DROP SEQUENCE $seqname";
+		$seqCache = '';
+		if (isset($tableoptions['SEQUENCE_CACHE'])){$seqCache = $tableoptions['SEQUENCE_CACHE'];}
+		$seqIncr = '';
+		if (isset($tableoptions['SEQUENCE_INCREMENT'])){$seqIncr = ' INCREMENT BY '.$tableoptions['SEQUENCE_INCREMENT'];}
+		$seqStart = '';
+		if (isset($tableoptions['SEQUENCE_START'])){$seqIncr = ' START WITH '.$tableoptions['SEQUENCE_START'];}
+		$sql[] = "CREATE SEQUENCE $seqname $seqStart $seqIncr $seqCache";
+		$sql[] = "CREATE OR REPLACE TRIGGER $trigname BEFORE insert ON $tabname FOR EACH ROW WHEN (NEW.$this->seqField IS NULL OR NEW.$this->seqField = 0) BEGIN select $seqname.nextval into :new.$this->seqField from dual; END;";
+		
+		$this->seqField = false;
+		return $sql;
+	}
+	
+	/*
+	CREATE [TEMPORARY] TABLE [IF NOT EXISTS] tbl_name [(create_definition,...)]
+		[table_options] [select_statement]
+		create_definition:
+		col_name type [NOT NULL | NULL] [DEFAULT default_value] [AUTO_INCREMENT]
+		[PRIMARY KEY] [reference_definition]
+		or PRIMARY KEY (index_col_name,...)
+		or KEY [index_name] (index_col_name,...)
+		or INDEX [index_name] (index_col_name,...)
+		or UNIQUE [INDEX] [index_name] (index_col_name,...)
+		or FULLTEXT [INDEX] [index_name] (index_col_name,...)
+		or [CONSTRAINT symbol] FOREIGN KEY [index_name] (index_col_name,...)
+		[reference_definition]
+		or CHECK (expr)
+	*/
+	
+
+	
+	function _IndexSQL($idxname, $tabname, $flds,$idxoptions)
+	{
+		$sql = array();
+		
+		if ( isset($idxoptions['REPLACE']) || isset($idxoptions['DROP']) ) {
+			$sql[] = sprintf ($this->dropIndex, $idxname, $tabname);
+			if ( isset($idxoptions['DROP']) )
+				return $sql;
+		}
+		
+		if ( empty ($flds) ) {
+			return $sql;
+		}
+		
+		if (isset($idxoptions['BITMAP'])) {
+			$unique = ' BITMAP'; 
+		} elseif (isset($idxoptions['UNIQUE'])) {
+			$unique = ' UNIQUE';
+		} else {
+			$unique = '';
+		}
+		
+		if ( is_array($flds) )
+			$flds = implode(', ',$flds);
+		$s = 'CREATE' . $unique . ' INDEX ' . $idxname . ' ON ' . $tabname . ' (' . $flds . ')';
+		
+		if ( isset($idxoptions[$this->upperName]) )
+			$s .= $idxoptions[$this->upperName];
+		
+		if (isset($idxoptions['oci8']))
+			$s .= $idxoptions['oci8'];
+		
+
+		$sql[] = $s;
+		
+		return $sql;
+	}
+	
+	function GetCommentSQL($table,$col)
+	{
+		$table = $this->connection->qstr($table);
+		$col = $this->connection->qstr($col);	
+		return "select comments from USER_COL_COMMENTS where TABLE_NAME=$table and COLUMN_NAME=$col";
+	}
+	
+	function SetCommentSQL($table,$col,$cmt)
+	{
+		$cmt = $this->connection->qstr($cmt);
+		return  "COMMENT ON COLUMN $table.$col IS $cmt";
+	}
+}
+?>

src/adodb512/datadict/datadict-postgres.inc.php

@@ -0,0 +1,448 @@
+<?php
+
+/**
+  V5.11 5 May 2010   (c) 2000-2010 John Lim (jlim#natsoft.com). All rights reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence.
+	
+  Set tabs to 4 for best viewing.
+ 
+*/
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+class ADODB2_postgres extends ADODB_DataDict {
+	
+	var $databaseType = 'postgres';
+	var $seqField = false;
+	var $seqPrefix = 'SEQ_';
+	var $addCol = ' ADD COLUMN';
+	var $quote = '"';
+	var $renameTable = 'ALTER TABLE %s RENAME TO %s'; // at least since 7.1
+	var $dropTable = 'DROP TABLE %s CASCADE';
+	
+	function MetaType($t,$len=-1,$fieldobj=false)
+	{
+		if (is_object($t)) {
+			$fieldobj = $t;
+			$t = $fieldobj->type;
+			$len = $fieldobj->max_length;
+		}
+		$is_serial = is_object($fieldobj) && $fieldobj->primary_key && $fieldobj->unique && 
+			$fieldobj->has_default && substr($fieldobj->default_value,0,8) == 'nextval(';
+		
+		switch (strtoupper($t)) {
+			case 'INTERVAL':
+			case 'CHAR':
+			case 'CHARACTER':
+			case 'VARCHAR':
+			case 'NAME':
+	   		case 'BPCHAR':
+				if ($len <= $this->blobSize) return 'C';
+			
+			case 'TEXT':
+				return 'X';
+	
+			case 'IMAGE': // user defined type
+			case 'BLOB': // user defined type
+			case 'BIT':	// This is a bit string, not a single bit, so don't return 'L'
+			case 'VARBIT':
+			case 'BYTEA':
+				return 'B';
+			
+			case 'BOOL':
+			case 'BOOLEAN':
+				return 'L';
+			
+			case 'DATE':
+				return 'D';
+			
+			case 'TIME':
+			case 'DATETIME':
+			case 'TIMESTAMP':
+			case 'TIMESTAMPTZ':
+				return 'T';
+			
+			case 'INTEGER': return !$is_serial ? 'I' : 'R';
+			case 'SMALLINT': 
+			case 'INT2': return !$is_serial ? 'I2' : 'R';
+			case 'INT4': return !$is_serial ? 'I4' : 'R';
+			case 'BIGINT': 
+			case 'INT8': return !$is_serial ? 'I8' : 'R';
+				
+			case 'OID':
+			case 'SERIAL':
+				return 'R';
+			
+			case 'FLOAT4':
+			case 'FLOAT8':
+			case 'DOUBLE PRECISION':
+			case 'REAL':
+				return 'F';
+				
+			 default:
+			 	return 'N';
+		}
+	}
+ 	
+ 	function ActualType($meta)
+	{
+		switch($meta) {
+		case 'C': return 'VARCHAR';
+		case 'XL':
+		case 'X': return 'TEXT';
+		
+		case 'C2': return 'VARCHAR';
+		case 'X2': return 'TEXT';
+		
+		case 'B': return 'BYTEA';
+			
+		case 'D': return 'DATE';
+		case 'TS':
+		case 'T': return 'TIMESTAMP';
+		
+		case 'L': return 'BOOLEAN';
+		case 'I': return 'INTEGER';
+		case 'I1': return 'SMALLINT';
+		case 'I2': return 'INT2';
+		case 'I4': return 'INT4';
+		case 'I8': return 'INT8';
+		
+		case 'F': return 'FLOAT8';
+		case 'N': return 'NUMERIC';
+		default:
+			return $meta;
+		}
+	}
+	
+	/**
+	 * Adding a new Column 
+	 *
+	 * reimplementation of the default function as postgres does NOT allow to set the default in the same statement
+	 *
+	 * @param string $tabname table-name
+	 * @param string $flds column-names and types for the changed columns
+	 * @return array with SQL strings
+	 */
+	function AddColumnSQL($tabname, $flds)
+	{
+		$tabname = $this->TableName ($tabname);
+		$sql = array();
+		list($lines,$pkey) = $this->_GenFields($flds);
+		$alter = 'ALTER TABLE ' . $tabname . $this->addCol . ' ';
+		foreach($lines as $v) {
+			if (($not_null = preg_match('/NOT NULL/i',$v))) {
+				$v = preg_replace('/NOT NULL/i','',$v);
+			}
+			if (preg_match('/^([^ ]+) .*DEFAULT ([^ ]+)/',$v,$matches)) {
+				list(,$colname,$default) = $matches;
+				$sql[] = $alter . str_replace('DEFAULT '.$default,'',$v);
+				$sql[] = 'UPDATE '.$tabname.' SET '.$colname.'='.$default;
+				$sql[] = 'ALTER TABLE '.$tabname.' ALTER COLUMN '.$colname.' SET DEFAULT ' . $default;
+			} else {				
+				$sql[] = $alter . $v;
+			}
+			if ($not_null) {
+				list($colname) = explode(' ',$v);
+				$sql[] = 'ALTER TABLE '.$tabname.' ALTER COLUMN '.$colname.' SET NOT NULL';
+			}
+		}
+		return $sql;
+	}
+
+
+	function DropIndexSQL ($idxname, $tabname = NULL)
+	{
+	   return array(sprintf($this->dropIndex, $this->TableName($idxname), $this->TableName($tabname)));
+	}
+	
+	/**
+	 * Change the definition of one column
+	 *
+	 * Postgres can't do that on it's own, you need to supply the complete defintion of the new table,
+	 * to allow, recreating the table and copying the content over to the new table
+	 * @param string $tabname table-name
+	 * @param string $flds column-name and type for the changed column
+	 * @param string $tableflds complete defintion of the new table, eg. for postgres, default ''
+	 * @param array/ $tableoptions options for the new table see CreateTableSQL, default ''
+	 * @return array with SQL strings
+	 */
+	 /*
+	function AlterColumnSQL($tabname, $flds, $tableflds='',$tableoptions='')
+	{
+		if (!$tableflds) {
+			if ($this->debug) ADOConnection::outp("AlterColumnSQL needs a complete table-definiton for PostgreSQL");
+			return array();
+		}
+		return $this->_recreate_copy_table($tabname,False,$tableflds,$tableoptions);
+	}*/
+	
+	function AlterColumnSQL($tabname, $flds, $tableflds='',$tableoptions='')
+	{
+	   // Check if alter single column datatype available - works with 8.0+
+	   $has_alter_column = 8.0 <= (float) @$this->serverInfo['version'];
+	
+	   if ($has_alter_column) {
+	      $tabname = $this->TableName($tabname);
+	      $sql = array();
+	      list($lines,$pkey) = $this->_GenFields($flds);
+	      $alter = 'ALTER TABLE ' . $tabname . $this->alterCol . ' ';
+	      foreach($lines as $v) {
+	         if ($not_null = preg_match('/NOT NULL/i',$v)) {
+	            $v = preg_replace('/NOT NULL/i','',$v);
+	         }
+	         // this next block doesn't work - there is no way that I can see to 
+	         // explicitly ask a column to be null using $flds
+	         else if ($set_null = preg_match('/NULL/i',$v)) {
+	            // if they didn't specify not null, see if they explicitely asked for null
+	            $v = preg_replace('/\sNULL/i','',$v);
+	         }
+	         
+	         if (preg_match('/^([^ ]+) .*DEFAULT ([^ ]+)/',$v,$matches)) {
+	            list(,$colname,$default) = $matches;
+	            $v = preg_replace('/^' . preg_quote($colname) . '\s/', '', $v);
+	            $sql[] = $alter . $colname . ' TYPE ' . str_replace('DEFAULT '.$default,'',$v);
+	            $sql[] = 'ALTER TABLE '.$tabname.' ALTER COLUMN '.$colname.' SET DEFAULT ' . $default;
+	         } 
+	         else {
+	            // drop default?
+	            preg_match ('/^\s*(\S+)\s+(.*)$/',$v,$matches);
+	            list (,$colname,$rest) = $matches;
+	            $sql[] = $alter . $colname . ' TYPE ' . $rest;
+	         }
+	
+	         list($colname) = explode(' ',$v);
+	         if ($not_null) {
+	            // this does not error out if the column is already not null
+	            $sql[] = 'ALTER TABLE '.$tabname.' ALTER COLUMN '.$colname.' SET NOT NULL';
+	         }
+	         if ($set_null) {
+	            // this does not error out if the column is already null
+	            $sql[] = 'ALTER TABLE '.$tabname.' ALTER COLUMN '.$colname.' DROP NOT NULL';
+	         }
+	      }
+	      return $sql;
+	   }
+	
+	   // does not have alter column
+	   if (!$tableflds) {
+	      if ($this->debug) ADOConnection::outp("AlterColumnSQL needs a complete table-definiton for PostgreSQL");
+	      return array();
+	   }
+	   return $this->_recreate_copy_table($tabname,False,$tableflds,$tableoptions);
+	}
+	
+	/**
+	 * Drop one column
+	 *
+	 * Postgres < 7.3 can't do that on it's own, you need to supply the complete defintion of the new table,
+	 * to allow, recreating the table and copying the content over to the new table
+	 * @param string $tabname table-name
+	 * @param string $flds column-name and type for the changed column
+	 * @param string $tableflds complete defintion of the new table, eg. for postgres, default ''
+	 * @param array/ $tableoptions options for the new table see CreateTableSQL, default ''
+	 * @return array with SQL strings
+	 */
+	function DropColumnSQL($tabname, $flds, $tableflds='',$tableoptions='')
+	{
+		$has_drop_column = 7.3 <= (float) @$this->serverInfo['version'];
+		if (!$has_drop_column && !$tableflds) {
+			if ($this->debug) ADOConnection::outp("DropColumnSQL needs complete table-definiton for PostgreSQL < 7.3");
+		return array();
+	}
+		if ($has_drop_column) {
+			return ADODB_DataDict::DropColumnSQL($tabname, $flds);
+		}
+		return $this->_recreate_copy_table($tabname,$flds,$tableflds,$tableoptions);
+	}
+	
+	/**
+	 * Save the content into a temp. table, drop and recreate the original table and copy the content back in
+	 *
+	 * We also take care to set the values of the sequenz and recreate the indexes.
+	 * All this is done in a transaction, to not loose the content of the table, if something went wrong!
+	 * @internal
+	 * @param string $tabname table-name
+	 * @param string $dropflds column-names to drop
+	 * @param string $tableflds complete defintion of the new table, eg. for postgres
+	 * @param array/string $tableoptions options for the new table see CreateTableSQL, default ''
+	 * @return array with SQL strings
+	 */
+	function _recreate_copy_table($tabname,$dropflds,$tableflds,$tableoptions='')
+	{
+		if ($dropflds && !is_array($dropflds)) $dropflds = explode(',',$dropflds);
+		$copyflds = array();
+		foreach($this->MetaColumns($tabname) as $fld) {
+			if (!$dropflds || !in_array($fld->name,$dropflds)) {
+				// we need to explicit convert varchar to a number to be able to do an AlterColumn of a char column to a nummeric one
+				if (preg_match('/'.$fld->name.' (I|I2|I4|I8|N|F)/i',$tableflds,$matches) && 
+					in_array($fld->type,array('varchar','char','text','bytea'))) {
+					$copyflds[] = "to_number($fld->name,'S9999999999999D99')";
+				} else {
+					$copyflds[] = $fld->name;
+				}
+				// identify the sequence name and the fld its on
+				if ($fld->primary_key && $fld->has_default && 
+					preg_match("/nextval\('([^']+)'::text\)/",$fld->default_value,$matches)) {
+					$seq_name = $matches[1];
+					$seq_fld = $fld->name;
+				}
+			}
+		}
+		$copyflds = implode(', ',$copyflds);
+		
+		$tempname = $tabname.'_tmp';
+		$aSql[] = 'BEGIN';		// we use a transaction, to make sure not to loose the content of the table
+		$aSql[] = "SELECT * INTO TEMPORARY TABLE $tempname FROM $tabname";
+		$aSql = array_merge($aSql,$this->DropTableSQL($tabname));
+		$aSql = array_merge($aSql,$this->CreateTableSQL($tabname,$tableflds,$tableoptions));
+		$aSql[] = "INSERT INTO $tabname SELECT $copyflds FROM $tempname";
+		if ($seq_name && $seq_fld) {	// if we have a sequence we need to set it again
+			$seq_name = $tabname.'_'.$seq_fld.'_seq';	// has to be the name of the new implicit sequence
+			$aSql[] = "SELECT setval('$seq_name',MAX($seq_fld)) FROM $tabname";
+		}
+		$aSql[] = "DROP TABLE $tempname";
+		// recreate the indexes, if they not contain one of the droped columns
+		foreach($this->MetaIndexes($tabname) as $idx_name => $idx_data)
+		{
+			if (substr($idx_name,-5) != '_pkey' && (!$dropflds || !count(array_intersect($dropflds,$idx_data['columns'])))) {
+				$aSql = array_merge($aSql,$this->CreateIndexSQL($idx_name,$tabname,$idx_data['columns'],
+					$idx_data['unique'] ? array('UNIQUE') : False));
+			}
+		}
+		$aSql[] = 'COMMIT';
+		return $aSql;
+	}
+	
+	function DropTableSQL($tabname)
+	{
+		$sql = ADODB_DataDict::DropTableSQL($tabname);
+		
+		$drop_seq = $this->_DropAutoIncrement($tabname);
+		if ($drop_seq) $sql[] = $drop_seq;
+		
+		return $sql;
+	}
+
+	// return string must begin with space
+	function _CreateSuffix($fname, &$ftype, $fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned)
+	{
+		if ($fautoinc) {
+			$ftype = 'SERIAL';
+			return '';
+		}
+		$suffix = '';
+		if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
+		if ($fnotnull) $suffix .= ' NOT NULL';
+		if ($fconstraint) $suffix .= ' '.$fconstraint;
+		return $suffix;
+	}
+	
+	// search for a sequece for the given table (asumes the seqence-name contains the table-name!)
+	// if yes return sql to drop it
+	// this is still necessary if postgres < 7.3 or the SERIAL was created on an earlier version!!!
+	function _DropAutoIncrement($tabname)
+	{
+		$tabname = $this->connection->quote('%'.$tabname.'%');
+
+		$seq = $this->connection->GetOne("SELECT relname FROM pg_class WHERE NOT relname ~ 'pg_.*' AND relname LIKE $tabname AND relkind='S'");
+
+		// check if a tables depends on the sequenz and it therefor cant and dont need to be droped separatly
+		if (!$seq || $this->connection->GetOne("SELECT relname FROM pg_class JOIN pg_depend ON pg_class.relfilenode=pg_depend.objid WHERE relname='$seq' AND relkind='S' AND deptype='i'")) {
+			return False;
+		}
+		return "DROP SEQUENCE ".$seq;
+	}
+	
+	function RenameTableSQL($tabname,$newname)
+	{
+		if (!empty($this->schema)) {
+			$rename_from = $this->TableName($tabname);
+			$schema_save = $this->schema;
+			$this->schema = false;
+			$rename_to = $this->TableName($newname);
+			$this->schema = $schema_save;
+			return array (sprintf($this->renameTable, $rename_from, $rename_to));
+		}
+
+		return array (sprintf($this->renameTable, $this->TableName($tabname),$this->TableName($newname)));
+	}
+	
+	/*
+	CREATE [ [ LOCAL ] { TEMPORARY | TEMP } ] TABLE table_name (
+	{ column_name data_type [ DEFAULT default_expr ] [ column_constraint [, ... ] ]
+	| table_constraint } [, ... ]
+	)
+	[ INHERITS ( parent_table [, ... ] ) ]
+	[ WITH OIDS | WITHOUT OIDS ]
+	where column_constraint is:
+	[ CONSTRAINT constraint_name ]
+	{ NOT NULL | NULL | UNIQUE | PRIMARY KEY |
+	CHECK (expression) |
+	REFERENCES reftable [ ( refcolumn ) ] [ MATCH FULL | MATCH PARTIAL ]
+	[ ON DELETE action ] [ ON UPDATE action ] }
+	[ DEFERRABLE | NOT DEFERRABLE ] [ INITIALLY DEFERRED | INITIALLY IMMEDIATE ]
+	and table_constraint is:
+	[ CONSTRAINT constraint_name ]
+	{ UNIQUE ( column_name [, ... ] ) |
+	PRIMARY KEY ( column_name [, ... ] ) |
+	CHECK ( expression ) |
+	FOREIGN KEY ( column_name [, ... ] ) REFERENCES reftable [ ( refcolumn [, ... ] ) ]
+	[ MATCH FULL | MATCH PARTIAL ] [ ON DELETE action ] [ ON UPDATE action ] }
+	[ DEFERRABLE | NOT DEFERRABLE ] [ INITIALLY DEFERRED | INITIALLY IMMEDIATE ]
+	*/
+	
+	
+	/*
+	CREATE [ UNIQUE ] INDEX index_name ON table
+[ USING acc_method ] ( column [ ops_name ] [, ...] )
+[ WHERE predicate ]
+CREATE [ UNIQUE ] INDEX index_name ON table
+[ USING acc_method ] ( func_name( column [, ... ]) [ ops_name ] )
+[ WHERE predicate ]
+	*/
+	function _IndexSQL($idxname, $tabname, $flds, $idxoptions)
+	{
+		$sql = array();
+		
+		if ( isset($idxoptions['REPLACE']) || isset($idxoptions['DROP']) ) {
+			$sql[] = sprintf ($this->dropIndex, $idxname, $tabname);
+			if ( isset($idxoptions['DROP']) )
+				return $sql;
+		}
+		
+		if ( empty ($flds) ) {
+			return $sql;
+		}
+		
+		$unique = isset($idxoptions['UNIQUE']) ? ' UNIQUE' : '';
+		
+		$s = 'CREATE' . $unique . ' INDEX ' . $idxname . ' ON ' . $tabname . ' ';
+		
+		if (isset($idxoptions['HASH']))
+			$s .= 'USING HASH ';
+		
+		if ( isset($idxoptions[$this->upperName]) )
+			$s .= $idxoptions[$this->upperName];
+		
+		if ( is_array($flds) )
+			$flds = implode(', ',$flds);
+		$s .= '(' . $flds . ')';
+		$sql[] = $s;
+		
+		return $sql;
+	}
+	
+	function _GetSize($ftype, $ty, $fsize, $fprec)
+	{
+		if (strlen($fsize) && $ty != 'X' && $ty != 'B' && $ty  != 'I' && strpos($ftype,'(') === false) {
+			$ftype .= "(".$fsize;
+			if (strlen($fprec)) $ftype .= ",".$fprec;
+			$ftype .= ')';
+		}
+		return $ftype;
+	}
+}
+?>

src/adodb512/datadict/datadict-sapdb.inc.php

@@ -0,0 +1,122 @@
+<?php
+
+/**
+  V4.50 6 July 2004  (c) 2000-2010 John Lim (jlim#natsoft.com). All rights reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence.
+	
+  Set tabs to 4 for best viewing.
+  
+  Modified from datadict-generic.inc.php for sapdb by RalfBecker-AT-outdoor-training.de
+*/
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+class ADODB2_sapdb extends ADODB_DataDict {
+	
+	var $databaseType = 'sapdb';
+	var $seqField = false;	
+	var $renameColumn = 'RENAME COLUMN %s.%s TO %s';
+ 	
+ 	function ActualType($meta)
+	{
+		switch($meta) {
+		case 'C': return 'VARCHAR';
+		case 'XL':
+		case 'X': return 'LONG';
+		
+		case 'C2': return 'VARCHAR UNICODE';
+		case 'X2': return 'LONG UNICODE';
+		
+		case 'B': return 'LONG';
+			
+		case 'D': return 'DATE';
+		case 'TS':
+		case 'T': return 'TIMESTAMP';
+		
+		case 'L': return 'BOOLEAN';
+		case 'I': return 'INTEGER';
+		case 'I1': return 'FIXED(3)';
+		case 'I2': return 'SMALLINT';
+		case 'I4': return 'INTEGER';
+		case 'I8': return 'FIXED(20)';
+		
+		case 'F': return 'FLOAT(38)';
+		case 'N': return 'FIXED';
+		default:
+			return $meta;
+		}
+	}
+	
+	function MetaType($t,$len=-1,$fieldobj=false)
+	{
+		if (is_object($t)) {
+			$fieldobj = $t;
+			$t = $fieldobj->type;
+			$len = $fieldobj->max_length;
+		}
+		static $maxdb_type2adodb = array(
+			'VARCHAR'	=> 'C',
+			'CHARACTER'	=> 'C',
+			'LONG'		=> 'X',		// no way to differ between 'X' and 'B' :-(
+			'DATE'		=> 'D',
+			'TIMESTAMP'	=> 'T',
+			'BOOLEAN'	=> 'L',
+			'INTEGER'	=> 'I4',
+			'SMALLINT'	=> 'I2',
+			'FLOAT'		=> 'F',
+			'FIXED'		=> 'N',
+		);
+		$type = isset($maxdb_type2adodb[$t]) ? $maxdb_type2adodb[$t] : 'C';
+
+		// convert integer-types simulated with fixed back to integer
+		if ($t == 'FIXED' && !$fieldobj->scale && ($len == 20 || $len == 3)) {
+			$type = $len == 20 ? 'I8' : 'I1';
+		}
+		if ($fieldobj->auto_increment) $type = 'R';
+
+		return $type;
+	}
+	
+	// return string must begin with space
+	function _CreateSuffix($fname,&$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned)
+	{	
+		$suffix = '';
+		if ($funsigned) $suffix .= ' UNSIGNED';
+		if ($fnotnull) $suffix .= ' NOT NULL';
+		if ($fautoinc) $suffix .= ' DEFAULT SERIAL';
+		elseif (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
+		if ($fconstraint) $suffix .= ' '.$fconstraint;
+		return $suffix;
+	}
+
+	function AddColumnSQL($tabname, $flds)
+	{
+		$tabname = $this->TableName ($tabname);
+		$sql = array();
+		list($lines,$pkey) = $this->_GenFields($flds);
+		return array( 'ALTER TABLE ' . $tabname . ' ADD (' . implode(', ',$lines) . ')' );
+	}
+	
+	function AlterColumnSQL($tabname, $flds)
+	{
+		$tabname = $this->TableName ($tabname);
+		$sql = array();
+		list($lines,$pkey) = $this->_GenFields($flds);
+		return array( 'ALTER TABLE ' . $tabname . ' MODIFY (' . implode(', ',$lines) . ')' );
+	}
+
+	function DropColumnSQL($tabname, $flds)
+	{
+		$tabname = $this->TableName ($tabname);
+		if (!is_array($flds)) $flds = explode(',',$flds);
+		foreach($flds as $k => $v) {
+			$flds[$k] = $this->NameQuote($v);
+		}
+		return array( 'ALTER TABLE ' . $tabname . ' DROP (' . implode(', ',$flds) . ')' );
+	}	
+}
+
+?>

src/adodb512/datadict/datadict-sqlite.inc.php

@@ -0,0 +1,89 @@
+<?php
+
+/**
+  V5.11 5 May 2010   (c) 2000-2010 John Lim (jlim#natsoft.com). All rights reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence.
+	
+  Set tabs to 4 for best viewing.
+ 
+	SQLite datadict Andrei Besleaga
+ 
+*/
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+class ADODB2_sqlite extends ADODB_DataDict {
+	var $databaseType = 'sqlite';
+	var $seqField = false;
+	var $addCol=' ADD COLUMN';
+	var $dropTable = 'DROP TABLE IF EXISTS %s';
+	var $dropIndex = 'DROP INDEX IF EXISTS %s';
+	var $renameTable = 'ALTER TABLE %s RENAME TO %s';
+	
+	
+
+	function ActualType($meta)
+	{
+		switch(strtoupper($meta)) {
+		case 'C': return 'VARCHAR'; //  TEXT , TEXT affinity
+		case 'XL':return 'LONGTEXT'; //  TEXT , TEXT affinity
+		case 'X': return 'TEXT'; //  TEXT , TEXT affinity
+		
+		case 'C2': return 'VARCHAR'; //  TEXT , TEXT affinity
+		case 'X2': return 'LONGTEXT'; //  TEXT , TEXT affinity
+		
+		case 'B': return 'LONGBLOB'; //  TEXT , NONE affinity , BLOB
+			
+		case 'D': return 'DATE'; // NUMERIC , NUMERIC affinity
+		case 'T': return 'DATETIME'; // NUMERIC , NUMERIC affinity
+		case 'L': return 'TINYINT'; // NUMERIC , INTEGER affinity
+		
+		case 'R': 
+		case 'I4':
+		case 'I': return 'INTEGER'; // NUMERIC , INTEGER affinity
+		case 'I1': return 'TINYINT'; // NUMERIC , INTEGER affinity
+		case 'I2': return 'SMALLINT'; // NUMERIC , INTEGER affinity
+		case 'I8': return 'BIGINT'; // NUMERIC , INTEGER affinity
+		
+		case 'F': return 'DOUBLE'; // NUMERIC , REAL affinity
+		case 'N': return 'NUMERIC'; // NUMERIC , NUMERIC affinity
+		default:
+			return $meta;
+		}
+	}
+	
+	// return string must begin with space
+	function _CreateSuffix($fname,$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned)
+	{	
+		$suffix = '';
+		if ($funsigned) $suffix .= ' UNSIGNED';
+		if ($fnotnull) $suffix .= ' NOT NULL';
+		if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
+		if ($fautoinc) $suffix .= ' AUTOINCREMENT';
+		if ($fconstraint) $suffix .= ' '.$fconstraint;
+		return $suffix;
+	}
+	
+	function AlterColumnSQL($tabname, $flds)
+	{
+		if ($this->debug) ADOConnection::outp("AlterColumnSQL not supported natively by SQLite");
+		return array();
+	}
+	
+	function DropColumnSQL($tabname, $flds)
+	{
+		if ($this->debug) ADOConnection::outp("DropColumnSQL not supported natively by SQLite");
+		return array();
+	}
+	
+	function RenameColumnSQL($tabname,$oldcolumn,$newcolumn,$flds='')
+	{
+		if ($this->debug) ADOConnection::outp("RenameColumnSQL not supported natively by SQLite");
+		return array();	
+	}
+	
+}
+?>

src/adodb512/datadict/datadict-sybase.inc.php

@@ -0,0 +1,229 @@
+<?php
+
+/**
+  V5.11 5 May 2010   (c) 2000-2010 John Lim (jlim#natsoft.com). All rights reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence.
+	
+  Set tabs to 4 for best viewing.
+ 
+*/
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+class ADODB2_sybase extends ADODB_DataDict {
+	var $databaseType = 'sybase';
+	
+	var $dropIndex = 'DROP INDEX %2$s.%1$s';
+	
+	function MetaType($t,$len=-1,$fieldobj=false)
+	{
+		if (is_object($t)) {
+			$fieldobj = $t;
+			$t = $fieldobj->type;
+			$len = $fieldobj->max_length;
+		}
+		
+		$len = -1; // mysql max_length is not accurate
+		switch (strtoupper($t)) {
+
+		case 'INT': 
+		case 'INTEGER': return  'I';
+		case 'BIT':
+		case 'TINYINT': return  'I1';
+		case 'SMALLINT': return 'I2';
+		case 'BIGINT':  return  'I8';
+		
+		case 'REAL':
+		case 'FLOAT': return 'F';
+		default: return parent::MetaType($t,$len,$fieldobj);
+		}
+	}
+	
+	function ActualType($meta)
+	{
+		switch(strtoupper($meta)) {
+		case 'C': return 'VARCHAR';
+		case 'XL':
+		case 'X': return 'TEXT';
+		
+		case 'C2': return 'NVARCHAR';
+		case 'X2': return 'NTEXT';
+		
+		case 'B': return 'IMAGE';
+			
+		case 'D': return 'DATETIME';
+		case 'TS':
+		case 'T': return 'DATETIME';
+		case 'L': return 'BIT';
+		
+		case 'I': return 'INT'; 
+		case 'I1': return 'TINYINT';
+		case 'I2': return 'SMALLINT';
+		case 'I4': return 'INT';
+		case 'I8': return 'BIGINT';
+		
+		case 'F': return 'REAL';
+		case 'N': return 'NUMERIC';
+		default:
+			return $meta;
+		}
+	}
+	
+	
+	function AddColumnSQL($tabname, $flds)
+	{
+		$tabname = $this->TableName ($tabname);
+		$f = array();
+		list($lines,$pkey) = $this->_GenFields($flds);
+		$s = "ALTER TABLE $tabname $this->addCol";
+		foreach($lines as $v) {
+			$f[] = "\n $v";
+		}
+		$s .= implode(', ',$f);
+		$sql[] = $s;
+		return $sql;
+	}
+	
+	function AlterColumnSQL($tabname, $flds)
+	{
+		$tabname = $this->TableName ($tabname);
+		$sql = array();
+		list($lines,$pkey) = $this->_GenFields($flds);
+		foreach($lines as $v) {
+			$sql[] = "ALTER TABLE $tabname $this->alterCol $v";
+		}
+
+		return $sql;
+	}
+	
+	function DropColumnSQL($tabname, $flds)
+	{
+		$tabname = $this->TableName($tabname);
+		if (!is_array($flds)) $flds = explode(',',$flds);
+		$f = array();
+		$s = "ALTER TABLE $tabname";
+		foreach($flds as $v) {
+			$f[] = "\n$this->dropCol ".$this->NameQuote($v);
+		}
+		$s .= implode(', ',$f);
+		$sql[] = $s;
+		return $sql;
+	}
+	
+	// return string must begin with space
+	function _CreateSuffix($fname,&$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned)
+	{	
+		$suffix = '';
+		if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
+		if ($fautoinc) $suffix .= ' DEFAULT AUTOINCREMENT';
+		if ($fnotnull) $suffix .= ' NOT NULL';
+		else if ($suffix == '') $suffix .= ' NULL';
+		if ($fconstraint) $suffix .= ' '.$fconstraint;
+		return $suffix;
+	}
+	
+	/*
+CREATE TABLE 
+    [ database_name.[ owner ] . | owner. ] table_name 
+    ( { < column_definition > 
+        | column_name AS computed_column_expression 
+        | < table_constraint > ::= [ CONSTRAINT constraint_name ] }
+
+            | [ { PRIMARY KEY | UNIQUE } [ ,...n ] 
+    ) 
+
+[ ON { filegroup | DEFAULT } ] 
+[ TEXTIMAGE_ON { filegroup | DEFAULT } ] 
+
+< column_definition > ::= { column_name data_type } 
+    [ COLLATE < collation_name > ] 
+    [ [ DEFAULT constant_expression ] 
+        | [ IDENTITY [ ( seed , increment ) [ NOT FOR REPLICATION ] ] ]
+    ] 
+    [ ROWGUIDCOL] 
+    [ < column_constraint > ] [ ...n ] 
+
+< column_constraint > ::= [ CONSTRAINT constraint_name ] 
+    { [ NULL | NOT NULL ] 
+        | [ { PRIMARY KEY | UNIQUE } 
+            [ CLUSTERED | NONCLUSTERED ] 
+            [ WITH FILLFACTOR = fillfactor ] 
+            [ON {filegroup | DEFAULT} ] ] 
+        ] 
+        | [ [ FOREIGN KEY ] 
+            REFERENCES ref_table [ ( ref_column ) ] 
+            [ ON DELETE { CASCADE | NO ACTION } ] 
+            [ ON UPDATE { CASCADE | NO ACTION } ] 
+            [ NOT FOR REPLICATION ] 
+        ] 
+        | CHECK [ NOT FOR REPLICATION ] 
+        ( logical_expression ) 
+    } 
+
+< table_constraint > ::= [ CONSTRAINT constraint_name ] 
+    { [ { PRIMARY KEY | UNIQUE } 
+        [ CLUSTERED | NONCLUSTERED ] 
+        { ( column [ ASC | DESC ] [ ,...n ] ) } 
+        [ WITH FILLFACTOR = fillfactor ] 
+        [ ON { filegroup | DEFAULT } ] 
+    ] 
+    | FOREIGN KEY 
+        [ ( column [ ,...n ] ) ] 
+        REFERENCES ref_table [ ( ref_column [ ,...n ] ) ] 
+        [ ON DELETE { CASCADE | NO ACTION } ] 
+        [ ON UPDATE { CASCADE | NO ACTION } ] 
+        [ NOT FOR REPLICATION ] 
+    | CHECK [ NOT FOR REPLICATION ] 
+        ( search_conditions ) 
+    } 
+
+
+	*/
+	
+	/*
+	CREATE [ UNIQUE ] [ CLUSTERED | NONCLUSTERED ] INDEX index_name 
+    ON { table | view } ( column [ ASC | DESC ] [ ,...n ] ) 
+		[ WITH < index_option > [ ,...n] ] 
+		[ ON filegroup ]
+		< index_option > :: = 
+		    { PAD_INDEX | 
+		        FILLFACTOR = fillfactor | 
+		        IGNORE_DUP_KEY | 
+		        DROP_EXISTING | 
+		    STATISTICS_NORECOMPUTE | 
+		    SORT_IN_TEMPDB  
+		}
+*/
+	function _IndexSQL($idxname, $tabname, $flds, $idxoptions)
+	{
+		$sql = array();
+		
+		if ( isset($idxoptions['REPLACE']) || isset($idxoptions['DROP']) ) {
+			$sql[] = sprintf ($this->dropIndex, $idxname, $tabname);
+			if ( isset($idxoptions['DROP']) )
+				return $sql;
+		}
+		
+		if ( empty ($flds) ) {
+			return $sql;
+		}
+		
+		$unique = isset($idxoptions['UNIQUE']) ? ' UNIQUE' : '';
+		$clustered = isset($idxoptions['CLUSTERED']) ? ' CLUSTERED' : '';
+		
+		if ( is_array($flds) )
+			$flds = implode(', ',$flds);
+		$s = 'CREATE' . $unique . $clustered . ' INDEX ' . $idxname . ' ON ' . $tabname . ' (' . $flds . ')';
+		
+		if ( isset($idxoptions[$this->upperName]) )
+			$s .= $idxoptions[$this->upperName];
+
+		$sql[] = $s;
+		
+		return $sql;
+	}
+}
+?>