diff --git a/application/views/includes/header.php b/application/views/includes/header.php
index 221a7332..2c5e4ccf 100755
--- a/application/views/includes/header.php
+++ b/application/views/includes/header.php
@@ -456,14 +456,20 @@ $(function() {
assets/tabletoexport/jquery.tableexport.v2.js">
+
+
+
+'Company');
+ $historytableflag = 0;
+ if(!empty($childdata) )
+ {
+ if(count($childdata) > 0 ){
+ $historytableflag = 1; }
+ //echo "child";
+ }
+ if(!empty($loanrecords))
+ {
+
+ foreach($loanrecords as $r)
+ {
+
+ if(!empty($r->Loan_Issued_Date))
+ {
+ $dateflag=1;
+ $statusflag=1;
+ }
+
+
+
+ }
+ }
+ if(!empty($loanemployees))
+ {
+ foreach($loanemployees as $l)
+ {
+ $source[$l->EmpID] = $l->EmpID.'-'.$l->FName.'-'.$l->Lname;
+ }
+
+ }
+ $monthsoptions = array("01" => "Jan", "02" => "Feb","03" => "Mar","04" => "Apr","05" => "May","06" => "June","07"=> "July","08"=> "Aug","09" => "Sep","10"=> "Oct","11" => "Nov","12"=>"Dec");
+
+ ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ S.No
+ Employee Name
+ Loan Given
+
+ Loan Issue Date
+
+ Loan Recovered
+
+ Loan Status
+
+ Loan Balance
+
+
+
+
+
+
+ EmpID.'/'.$fyear.'">'.$rec->EmpID.'-'.$rec->FName.'-'.$rec->Lname.'';?>
+
+ Loan_ID.'">'.$rec->EmpID.'-'.$rec->FName.'-'.$rec->Lname.'';?>
+
+ Loan_Amount)){$totalloangiven+=$rec->Loan_Amount; echo $rec->Loan_Amount;}else{echo "0.00";}?>
+
+ Loan_Issued_Date)){echo $rec->Loan_Issued_Date;}else{echo "-";}?>
+
+ Paid_Amount)){$totalrecovered+=$rec->Paid_Amount ;echo $rec->Paid_Amount;}else{echo "0.00";} ?>
+
+ is_Active == 1){$final = "Pending "; }else{$final = "Completed ";} if($rec->Remaining_Due < 0 and $rec->is_Active == 1){$final.=",Over Due ";} echo $final;?>
+
+ Loan_Amount) and ($rec->Paid_Amount))){ $totalbalance+= ($rec->Loan_Amount - $rec->Paid_Amount);echo number_format(($rec->Loan_Amount - $rec->Paid_Amount),2,'.','');}else {echo "0.00";}?>
+
+
+
+
+
+
+
+ Total
+
+
+
+
+
+
+
+ Loan_ID;
+ $Name = $c->EmpID.'-'.$c->FirstName.'-'.$c->LastName;
+ $Loan = $c->Loan_Amount;
+ $Issue_date = $c->Loan_Issued_Date;
+ $dis = 'Loan ID:-'.$Loan_ID.'-Name:-'.$Name.'- Amount:-'. $Loan;
+ break;
+ }
+ }
+
+
+ ?>
+
+
+
+
+
+ Date Due_Month Due Amount Balance Amount
+
+ Due_Date,0,2);
+ $yr = substr($child->Due_Date,3,4);
+ $final = $monthsoptions[$monthno].'-'.$yr;
+
+ ?>
+ Entry_Date),'Y-m-d');?> Due_Amount ;?> Balance_Amount;?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/application/views/monthlypayinputs.php b/application/views/monthlypayinputs.php
index c80ac1c8..28635c4c 100755
--- a/application/views/monthlypayinputs.php
+++ b/application/views/monthlypayinputs.php
@@ -1,5 +1,7 @@
@@ -71,7 +73,7 @@ $('html').bind('keypress', function(e)
$aftersix = array();
for ($i = 0; $i <3;$i++){
- $month++;;
+ $month++;
if($month > 12)
{
$month = 1;
@@ -134,6 +136,7 @@ $('html').bind('keypress', function(e)
S.No
Employee Id
Employee Name
+
Days Worked
LOP Days
Paid Leave
OT Hours Worked in Hrs
@@ -178,15 +181,16 @@ $('html').bind('keypress', function(e)
?>
- EmpID ?>
FirstName ." ". $record->LastName ?>
- LOP_Days)){echo $record->LOP_Days;}else{echo "0.00";}?>
- Paid_leave)){echo $record->Paid_leave;}else { echo number_format(0.00,2,'.','');} ?>
- OT_Hrs_Worked)){echo $record->OT_Hrs_Worked;}else { echo number_format(0.00,2,'.','');} ?>
- Loan_Recovered)){if(is_numeric($record->Loan_Recovered)){echo number_format($record->Loan_Recovered,2,'.','');}else {echo $record->Loan_Recovered;}}else{echo number_format(0.00,2,'.','');} ?>
- Incentives)){echo $record->Incentives;}else{ echo number_format(0.00,2,'.','');;} ?>
- Other_Deductions)){echo $record->Other_Deductions; }else{ echo number_format(0.00,2,'.','');;} ?>
+ Key)){echo "contenteditable='true';"; } ?> Key)){?> title="Payslip Calculated" style="text-align:right;color:blue;"style="text-align:right;" >Days_worked)){echo $record->Days_worked;}else{echo "0.00";}?>
+ Key)){echo "contenteditable='true';"; } ?> Key)){?> title="Payslip Calculated" style="text-align:right;color:blue;"style="text-align:right;" >LOP_Days)){echo $record->LOP_Days;}else{echo "0.00";}?>
+ Key)){echo "contenteditable='true';"; } ?> Key)){?> title="Payslip Calculated" style="text-align:right;color:blue;"style="text-align:right;" >Paid_leave)){echo number_format($record->Paid_leave,2,'.','');}else { echo number_format(0.00,2,'.','');} ?>
+ Key)){echo "contenteditable='true';"; } ?> Key)){?> title="Payslip Calculated" style="text-align:right;color:blue;"style="text-align:right;" >OT_Hrs_Worked)){echo $record->OT_Hrs_Worked;}else { echo number_format(0.00,2,'.','');} ?>
+ Key)){echo "contenteditable='true';"; } ?> Key)){?> title="Payslip Calculated" style="text-align:right;color:blue;"style="text-align:right;" >Loan_Recovered)){if(is_numeric($record->Loan_Recovered)){echo number_format($record->Loan_Recovered,2,'.','');}else {echo $record->Loan_Recovered;}}else{echo number_format(0.00,2,'.','');} ?>
+ Key)){echo "contenteditable='true';"; } ?> Key)){?> title="Payslip Calculated" style="text-align:right;color:blue;"style="text-align:right;" >Incentives)){echo $record->Incentives;}else{ echo number_format(0.00,2,'.','');;} ?>
+ Key)){echo "contenteditable='true';"; } ?> Key)){?> title="Payslip Calculated" style="text-align:right;color:blue;"style="text-align:right;" >Other_Deductions)){echo $record->Other_Deductions; }else{ echo number_format(0.00,2,'.','');;} ?>
@@ -241,7 +245,7 @@ $('html').bind('keypress', function(e)
{
var alldata = $("#monthlylistings").tableToJSON();
- // alert(JSON.stringify(alldata));
+ //alert(JSON.stringify(alldata));
alldata=JSON.stringify(alldata)
var month = $('#monthyear').val();
$('#content').loader('hide');
@@ -325,7 +329,7 @@ $('html').bind('keypress', function(e)
if(data)
{
$('#content').loader('hide');
- //alert(data);
+ alert(data);
var trHTML="";
var obj =JSON.parse(data);
var temparray = [];
@@ -347,6 +351,8 @@ $('html').bind('keypress', function(e)
++i
i=i-j;
+ var Days_Worked = val.Days_worked;
+ if(Days_Worked == null){ Days_Worked="0.00";}
var LOP_Days = val.LOP_Days;
if(LOP_Days == null){ LOP_Days="0.00";}
var Paid_leave = val.Paid_leave;
@@ -365,6 +371,7 @@ $('html').bind('keypress', function(e)
'
' + (i) + ' ' +
'
' + val.EmpID + ' ' +
'
' + val.FirstName+" "+ val.LastName + ' ' +
+ '
' + Days_Worked + ' ' +
'
' + LOP_Days + ' ' +
'
' + Paid_leave + ' ' +
'
' + OT_Hrs_Worked + ' ' +
diff --git a/application/views/publicholidays.php b/application/views/publicholidays.php
new file mode 100644
index 00000000..270810d1
--- /dev/null
+++ b/application/views/publicholidays.php
@@ -0,0 +1,242 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Holiday_Name
+ Date
+ Action
+
+
+
+
+
+
+
+
+
+
+ H_Name)){echo $day->H_Name;}else{echo "NO DATA";}?>
+ H_Date)){echo $day->H_Date;}else{echo "NO DATA";}?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/assets/js/jquery.CongelarFilaColumna.js b/assets/js/jquery.CongelarFilaColumna.js
new file mode 100644
index 00000000..6c92e60e
--- /dev/null
+++ b/assets/js/jquery.CongelarFilaColumna.js
@@ -0,0 +1,633 @@
+/*
+* CongelarFilaColumna is a jQuery plugin that allows freezing of rows and columns.
+* Scrolling can be enabled. Both rows and columns can be frozen. Rows to be frozen
+* should be placed in 'thead' (whole frozen header). You can freeze rows and columns combined with colspan or rowspan.
+*
+*
+* Copyright (c) 2017
+* Author: Agustin Rios Reyes.
+* Email: nitsugario@gmail.com
+* Github: https://github.com/nitsugario/jQuery-Freeze-Table-Column-and-Rows
+* Versión: 2.2
+*
+* Licensed under MIT
+* http://www.opensource.org/licenses/mit-license.php
+*
+*/
+
+(function($)
+{
+ $.fn.CongelarFilaColumna = function (method)
+ {
+
+ var defaults =
+ {
+ width: '100%',
+ height: '100%',
+ Columnas: 3, //Number of columns fixed
+ soloThead : false, //only the fixed header
+ coloreacelda: false,
+ colorcelda: '#F4FA58',
+ lboHoverTr: false,
+ tfoot: false
+ };
+ var settings = {};
+ var methods =
+ {
+ init: function (options)
+ {
+ settings = $.extend({}, defaults, options);
+
+ return this.each(function ()
+ {
+ var $tabla = $(this);
+
+ if (helpers._EsUnaTabla($tabla))
+ {
+ methods.setup.apply(this, Array.prototype.slice.call(arguments, 1));
+ }
+ else
+ {
+ $.error('La Tabla No es válida. :( ');
+ };
+ });
+ },
+ setup: function ()
+ {
+ if ( settings.soloThead )
+ {
+ var $wrapper,
+ $lobTable = $(this),
+ lobTable = this,
+ lstClassTable = $lobTable.attr("class");
+
+ helpers._ObtenerAsignarAnchoAltoThead( $lobTable );
+
+ var lobThead = $lobTable.find("thead").clone(),
+ lnuWidthTable = $lobTable.width(),
+ lobTableThead = $("
").attr("class",lstClassTable).append(lobThead);
+
+
+ settings.scrollbarOffset = helpers._OptenerWidthBarraScroll();
+ $lobTable.css({'width':lnuWidthTable});
+
+ if (!$lobTable.closest('.fht-table-wrapper').length)
+ {
+ $lobTable.addClass('fht-table');
+ $lobTable.wrap('
');
+ }
+
+ $wrapper = $lobTable.closest('.fht-table-wrapper');
+
+ if ( $wrapper.find('.fht-fixed-body').length == 0)
+ $lobTable.wrap('
');
+
+ $fixedBody = $wrapper.find('.fht-fixed-body');
+
+ $wrapper.css({
+ width: settings.width,
+ height: settings.height
+ });
+
+ /*Agregamos la tabla completa a fht-tbody-conten*/
+ $lobTable.wrap('');
+ $lobTable.closest('.fht-tbody-conten').css({'width':lnuWidthTable});
+ $lobDivBody = $wrapper.find('div.fht-tbody');
+
+ /*Agregamos el encabesado clonado al div fht-thead*/
+ $lobDivTHead = $('
').prependTo($fixedBody).css({'width':lnuWidthTable});
+ lobTableThead.css({'width':lnuWidthTable});
+ $lobDivTHead.append(lobTableThead).css({'width':lnuWidthTable});
+
+ $lobTable.css({
+ 'margin-top': -$lobDivTHead.outerHeight(true)
+ });
+
+ var lnuTbodyHeight = $wrapper.height() - $lobDivTHead.outerHeight(true);
+
+ $lobDivBody.css({
+ 'height': lnuTbodyHeight,
+ 'width':lnuWidthTable+settings.scrollbarOffset+2
+ });
+
+ helpers._OnScroll( $lobDivBody );
+
+ return lobTable;
+ }
+ else
+ {
+ var $wrapper,
+ $tabla = $(this),
+ tabla = this,
+ contenedor = $(this).parent(),
+ classT = $tabla.attr("class");
+
+ helpers._ObtenerAsignarAnchoAlto($tabla);
+
+ var thead = $tabla.find("thead").clone(),
+ anchotabla = $tabla.width(),
+ tablaTH = $("").attr("class",classT).append(thead),
+ $tablaTHCol = $("").attr("class",classT).append($("")),
+ $tablaTBCol = $("").attr("class",classT).append($(""));
+
+ settings.scrollbarOffset = helpers._OptenerWidthBarraScroll();
+ $tabla.css({'width':anchotabla});
+
+ tablaTH.addClass('fht-table');
+ $tablaTHCol.addClass('fht-table');
+ $tablaTBCol.addClass('fht-table');
+
+ helpers._ClonarHeaderColumnasACongelar($tabla,$tablaTHCol,'thead',settings.Columnas);
+ helpers._ClonarHeaderColumnasACongelar($tabla,$tablaTBCol,'tbody',settings.Columnas);
+
+ if( settings.tfoot)
+ {
+ $tablaTBCol.append($(" "));
+ helpers._ClonarHeaderColumnasACongelar($tabla,$tablaTBCol,'tfoot',settings.Columnas);
+ }
+
+ if (!$tabla.closest('.fht-table-wrapper').length)
+ {
+ $tabla.addClass('fht-table');
+ $tabla.wrap('
');
+ }
+
+ $wrapper = $tabla.closest('.fht-table-wrapper');
+
+ if ( $wrapper.find('.fht-fixed-column').length == 0)
+ {
+ $tabla.wrap('
');
+ $('
').prependTo($wrapper);
+ $fixedBody = $wrapper.find('.fht-fixed-body');
+ }
+
+ $wrapper.css({
+ width: settings.width,
+ height: settings.height
+ });
+
+ if (!$tabla.hasClass('fht-table-init'))
+ {
+ $tabla.wrap('');
+ }
+
+ $tabla.closest('.fht-tbody-conten').css({'width':anchotabla});
+ $divBody = $wrapper.find('div.fht-tbody');
+
+ if (!$tabla.hasClass('fht-table-init'))
+ {
+
+ $divHead = $('
').prependTo($fixedBody).css({'width':anchotabla});
+
+ tablaTH.css({'width':anchotabla});
+
+ $divHead.append(tablaTH).css({'width':anchotabla});
+ }
+ else
+ {
+ $divHead = $wrapper.find('div.fht-thead');
+ }
+
+ $tabla.css({
+ 'margin-top': -$tabla.find('thead').outerHeight(true)
+ });
+
+ var tbodyHeight = $wrapper.height() - $divHead.outerHeight(true);
+
+ $divBody.css({
+ 'height': tbodyHeight
+ });
+
+ $tabla.addClass('fht-table-init');
+
+ var $fixedColumn = $wrapper.find('.fht-fixed-column');
+
+ var $thead = $('
').append($tablaTHCol),
+ $tbody = $('
').append($tablaTBCol),
+ $fixedBody = $wrapper.find('.fht-fixed-body'),
+ fixedBodyWidth = $wrapper.width(),
+ fixedBodyHeight = $fixedBody.find('.fht-tbody').outerHeight() - settings.scrollbarOffset;
+
+ $thead.appendTo($fixedColumn);
+
+ var AnchoCol = $thead.find('table').width()+1;
+
+ $thead.find('table').css({'width': AnchoCol,'height':$divHead.outerHeight(true)});
+ $tbody.find('table').css({'width': AnchoCol});
+
+ $tbody.appendTo($fixedColumn).css({
+ 'height': fixedBodyHeight+2,
+ 'background-color': '#ffffff'
+ });
+
+ $fixedColumn.css({
+ 'width': AnchoCol
+ });
+
+ $fixedBody.css({
+ 'width': fixedBodyWidth
+ });
+
+ helpers._OnScroll($divBody);
+
+ return tabla;
+ };
+ }
+ };
+ var helpers =
+ {
+ /*
+ * return boolean
+ * valida si el elemento tien un thead y un tbody.
+ */
+ _EsUnaTabla: function($obj)
+ {
+ var $tabla = $obj,
+ TieneTable = $tabla.is('table'),
+ TieneThead = $tabla.find('thead').length > 0,
+ TieneTbody = $tabla.find('tbody').length > 0;
+
+ if (TieneTable && TieneThead && TieneTbody)
+ {
+ return true;
+ }
+
+ return false;
+ },
+ _ObtenerAsignarAnchoAltoThead: function($obj)
+ {
+ var $lobTable = $obj;
+
+ $lobTable.find("thead tr").each(function()
+ {
+ $(this).find("th").each(function()
+ {
+ if( settings.coloreacelda )
+ $(this).css({'background-color': settings.colorcelda});
+
+ $(this).css({'width':$(this).width(),'height':$(this).height(),'overflow': 'hidden'});
+ });
+ });
+ },
+ _ObtenerAsignarAnchoAlto: function($obj)
+ {
+ var $tabla = $obj,
+ lstTipoThTd = "",
+ lnuCuentaColumnasFila = 1,
+ lnuColumnasFijas = settings.Columnas,
+ lboRowspan = false,
+ lboColspan = false,
+ lboMasColumnas = true,
+ lboFaltaColumnaFila = false,
+ lnuCuantosColspan = 0,
+ lnuCuentaColspan = 0,
+ lnuCuantosRowspan = 0,
+ lnuCuentaRowspan = 0,
+ lnuCuentaRowspanFaltan = 0;
+
+ $tabla.find("tr").each(function(lnuFila)
+ {
+ lstTipoThTd = ( $(this).parent().is('thead') ) ? 'th' : ( $(this).parent().is('tbody') ) ? 'td' : ( $(this).parent().is('tfoot') ) ? 'td' : 'undefined';
+
+ //-- Asignar un identificador a las filas, si no lo tienen.
+ if( $(this).parent().is('tbody') || $(this).parent().is('tfoot') )
+ {
+ lstSigla = ( $(this).parent().is('thead') ) ? 'th' : ( $(this).parent().is('tbody') ) ? 'tb' : ( $(this).parent().is('tfoot') ) ? 'tf' : 'undefined';
+ lstIdTr = lstSigla+lnuFila;
+
+ if( settings.lboHoverTr )
+ if( !$(this).attr("id") )
+ $(this).attr("id",lstIdTr);
+ }
+
+ if ( !lboRowspan )
+ {
+ $(this).find( lstTipoThTd ).each(function(lnuCell)
+ {
+ if ( lnuCuentaColumnasFila <= lnuColumnasFijas )
+ {
+ if ( $(this).attr("rowspan") )
+ {
+ if ( $(this).attr( "colspan" ) )
+ lnuCuentaRowspan = lnuCuentaRowspan-parseInt($(this).attr( "colspan" ))-1;
+ else
+ lnuCuentaRowspan++;
+
+ if( lnuCuantosRowspan < $(this).attr("rowspan") )
+ {
+ lnuCuantosRowspan = $(this).attr("rowspan")-1;
+ lboFaltaColumnaFila = true;
+ }
+ else
+ lboFaltaColumnaFila = true;
+
+ lnuCuentaRowspanFaltan = $(this).attr("rowspan")-1;
+ lboRowspan = true;
+ }
+
+ if ( $(this).attr( "colspan" ) )
+ lnuCuentaColumnasFila += parseInt($(this).attr( "colspan" ));
+ else
+ lnuCuentaColumnasFila++;
+
+ if( settings.coloreacelda )
+ $(this).css({'background-color': settings.colorcelda});
+
+ $(this).css({'width':$(this).width(),'height':$(this).height(),'overflow': 'hidden'});
+ }
+ });
+
+ lnuCuentaColumnasFila = 1;
+
+ if( lboRowspan )
+ lnuCuantosRowspan--;
+ }
+ else
+ {
+ var lnuFaltan = lnuColumnasFijas - lnuCuentaRowspan;
+ lnuCuentaRowspanFaltan--;
+
+ if ( lnuCuantosRowspan-- <= 0 )
+ {
+ lboRowspan = false;
+ lnuCuentaRowspan = 0;
+
+ if( lnuFaltan > 0 )
+ {
+ lnuCuentaColumnasFila3 = 1;
+ lnuColumnasFijas3 = lnuFaltan;
+
+ $(this).find( lstTipoThTd ).each(function(lnuCell)
+ {
+ if ( lnuCuentaColumnasFila3 <= lnuColumnasFijas3 )
+ {
+ if ( $(this).attr( "colspan" ) )
+ lnuCuentaColumnasFila3 += parseInt($(this).attr( "colspan" ));
+ else
+ lnuCuentaColumnasFila3++;
+
+ if( settings.coloreacelda )
+ $(this).css({'background-color': settings.colorcelda});
+
+ $(this).css({'width':$(this).width(),'height':$(this).height(),'overflow': 'hidden'});
+ }
+ });
+
+ lnuCuentaColumnasFila3 = 1;
+ }
+ }
+ else
+ {
+ lnuCuentaColumnasFila2 = 1;
+ lnuColumnasFijas2 = lnuFaltan;
+
+ $(this).find( lstTipoThTd ).each(function(lnuCell)
+ {
+ if ( lnuCuentaColumnasFila2 <= lnuColumnasFijas2 )
+ {
+ if ( $(this).attr( "colspan" ) )
+ lnuCuentaColumnasFila2 += parseInt($(this).attr( "colspan" ));
+ else
+ lnuCuentaColumnasFila2++;
+
+ if( settings.coloreacelda )
+ $(this).css({'background-color': settings.colorcelda});
+
+ $(this).css({'width':$(this).width(),'height':$(this).height(),'overflow': 'hidden'});
+ }
+ });
+
+ lnuCuentaColumnasFila2 = 1;
+ }
+
+ };
+ });
+ },
+ _ClonarHeaderColumnasACongelar: function($pobTabla,$ponDonde,pstTipoThTbTf,pnuCuantasCols)
+ {
+ var lnuCuentaColumnasFila = 1,
+ lnuColumnasFijas = pnuCuantasCols,
+ lboRowspan = false,
+ lboColspan = false,
+ lboMasColumnas = true,
+ lboFaltaColumnaFila = false,
+ lnuCuantosColspan = 0,
+ lnuCuentaColspan = 0,
+ lnuCuantosRowspan = 0,
+ lnuCuentaRowspan = 0,
+ lnuCuentaRowspanFaltan = 0,
+ $lobTrThTd = $pobTabla.find(pstTipoThTbTf),
+ lstTipoThTd = (pstTipoThTbTf == "thead") ? "th" : (pstTipoThTbTf == "tbody" || pstTipoThTbTf =='tfoot') ? "td" : "td",
+ $lobClonarTrThTd;
+
+ $lobTrThTd.find("tr").each(function(lnuFila)
+ {
+ if( settings.lboHoverTr )// Asignar el evento hover a las filas para marcarlas.
+ if( pstTipoThTbTf =='tbody' || pstTipoThTbTf =='tfoot' )
+ {
+ $(this).hover(
+ function()
+ {
+ lstIdTr = "#"+$(this).attr("id");
+ $(this).css( "background", "rgba(182,227,250,0.6)" );
+ $(lstIdTr).css( "background", "rgba(182,227,250,0.6)" );
+ },
+ function() {
+ lstIdTr = "#"+$(this).attr("id");
+ $(this).css( "background", "" );
+ $(lstIdTr).css( "background", "" );
+ }
+ );
+ }
+
+ if ( !lboRowspan )
+ {
+ var tr = $(this).clone(true).html("");
+
+ $(this).find( lstTipoThTd ).each(function(lnuCell)
+ {
+ if ( lnuCuentaColumnasFila <= lnuColumnasFijas )
+ {
+ if ( $(this).attr("rowspan") )
+ {
+ if ( $(this).attr( "colspan" ) )
+ lnuCuentaRowspan = lnuCuentaRowspan-parseInt($(this).attr( "colspan" ))-1;
+ else
+ lnuCuentaRowspan++;
+
+ if( lnuCuantosRowspan < $(this).attr("rowspan") )
+ {
+ lnuCuantosRowspan = $(this).attr("rowspan")-1;
+ lboFaltaColumnaFila = true;
+ }
+ else
+ lboFaltaColumnaFila = true;
+
+ lnuCuentaRowspanFaltan = $(this).attr("rowspan")-1;
+ lboRowspan = true;
+ }
+
+ if ( $(this).attr( "colspan" ) )
+ lnuCuentaColumnasFila += parseInt($(this).attr( "colspan" ));
+ else
+ lnuCuentaColumnasFila++;
+
+ if (lnuCell == 0)
+ {
+ $lobClonarTrThTd = tr.appendTo($ponDonde.find(pstTipoThTbTf));
+ $lobClonarTrThTd.append($(this).clone());
+ }
+ else
+ $lobClonarTrThTd.append($(this).clone());
+ }
+ });
+
+ lnuCuentaColumnasFila = 1;
+
+ if( lboRowspan )
+ lnuCuantosRowspan--;
+ }
+ else
+ {
+ var lnuFaltan = lnuColumnasFijas - lnuCuentaRowspan;
+ lnuCuentaRowspanFaltan--;
+
+ if ( lnuCuantosRowspan-- <= 0 )
+ {
+ lboRowspan = false;
+ lnuCuentaRowspan = 0;
+
+ if( lnuFaltan > 0 )
+ {
+ lnuCuentaColumnasFila3 = 1;
+ lnuColumnasFijas3 = lnuFaltan;
+ var tr = $(this).clone(true).html("");
+
+ $(this).find( lstTipoThTd ).each(function(lnuCell)
+ {
+ if ( lnuCuentaColumnasFila3 <= lnuColumnasFijas3 )
+ {
+ if ( $(this).attr( "colspan" ) )
+ lnuCuentaColumnasFila3 += parseInt($(this).attr( "colspan" ));
+ else
+ lnuCuentaColumnasFila3++;
+
+ if (lnuCell == 0)
+ {
+ $lobClonarTrThTd = tr.appendTo($ponDonde.find(pstTipoThTbTf));
+ $lobClonarTrThTd.append($(this).clone());
+ }
+ else
+ $lobClonarTrThTd.append($(this).clone());
+ }
+ });
+
+ lnuCuentaColumnasFila3 = 1;
+ }
+ else
+ {
+ var tr = $(this).clone(true).html("");
+ tr.appendTo($ponDonde.find(pstTipoThTbTf));
+ }
+ }
+ else
+ {
+ if( lnuFaltan > 0 )
+ {
+ lnuCuentaColumnasFila2 = 1;
+ lnuColumnasFijas2 = lnuFaltan;
+ var tr = $(this).clone(true).html("");
+
+ $(this).find( lstTipoThTd ).each(function(lnuCell)
+ {
+ if ( lnuCuentaColumnasFila2 <= lnuColumnasFijas2 )
+ {
+ if ( $(this).attr( "colspan" ) )
+ lnuCuentaColumnasFila2 += parseInt($(this).attr( "colspan" ));
+ else
+ lnuCuentaColumnasFila2++;
+
+ if (lnuCell == 0)
+ {
+ $lobClonarTrThTd = tr.appendTo($ponDonde.find(pstTipoThTbTf));
+ $lobClonarTrThTd.append($(this).clone());
+ }
+ else
+ $lobClonarTrThTd.append($(this).clone());
+ }
+ });
+
+ lnuCuentaColumnasFila2 = 1;
+ }
+ else
+ {
+ var tr = $(this).clone(true).html("");
+ tr.appendTo($ponDonde.find(pstTipoThTbTf));
+ }
+ }
+ };
+ });
+ },
+ _OnScroll: function($obj)
+ {
+ var $tabla = $obj,
+ $wrapper = $tabla.closest('.fht-table-wrapper'),
+ $thead = $tabla.siblings('.fht-thead');
+
+ $tabla.on('scroll', function()
+ {
+ if( !settings.soloThead )
+ {
+ var $fixedColumns = $wrapper.find('.fht-fixed-column');
+
+ $fixedColumns.find('.fht-tbody table').css({
+ 'margin-top': -$tabla.scrollTop()
+ });
+ }
+
+ $thead.find('table').css({
+ 'margin-left': -this.scrollLeft
+ });
+
+ });
+ },
+ _OptenerWidthBarraScroll: function()
+ {
+ var scrollbarWidth = 0;
+
+ if (!scrollbarWidth)
+ {
+ if (/msie/.test(navigator.userAgent.toLowerCase()))
+ {
+ var $textarea1 = $('').css({ position: 'absolute', top: -1000, left: -1000 }).appendTo('body'),
+ $textarea2 = $('').css({ position: 'absolute', top: -1000, left: -1000 }).appendTo('body');
+
+ scrollbarWidth = $textarea1.width() - $textarea2.width() + 2;
+ $textarea1.add($textarea2).remove();
+
+ }
+ else
+ {
+ var $div = $('
').css({ width: 100, height: 100, overflow: 'auto', position: 'absolute', top: -1000, left: -1000 })
+ .prependTo('body').append('
').find('div')
+ .css({ width: '100%', height: 200 });
+
+ scrollbarWidth = 100 - $div.width();
+ $div.parent().remove();
+
+ }
+ }
+
+ return scrollbarWidth;
+ }
+ };
+
+ if (methods[method])
+ return methods[method].apply(this, Array.prototype.slice.call(arguments, 1));
+ else if (typeof method === 'object' || !method)
+ return methods.init.apply(this, arguments);
+ else
+ $.error('El Método "' + method + '" No existe en el plugin CongelarFilaColumna! :( ');
+
+ }
+})(jQuery);
\ No newline at end of file
diff --git a/assets/tabletoexport/jquery.tableexport.v2.js b/assets/tabletoexport/jquery.tableexport.v2.js
new file mode 100644
index 00000000..743ec873
--- /dev/null
+++ b/assets/tabletoexport/jquery.tableexport.v2.js
@@ -0,0 +1,85 @@
+(function ($) {
+
+ $.fn.tableExport = function (options) {
+
+ var settings = $.extend({}, $.fn.tableExport.defaults, options),
+ rowD = $.fn.tableExport.rowDel, bootstrapClass, bootstrapTheme, bootstrapSpacing;
+
+ if (settings.bootstrap) {
+ bootstrapClass = $.fn.tableExport.bootstrap[0] + " ";
+ bootstrapTheme = $.fn.tableExport.bootstrap[1] + " ";
+
+ } else {
+ bootstrapClass = bootstrapTheme = bootstrapSpacing = "";
+ }
+
+
+ return this.each(function () {
+ var $el = $(this),
+ $rows = settings.headings ? $el.find('tr') : $el.find('tr:has(td)'),
+ fileName = settings.fileName === "id" ? $el.attr('id') : settings.fileName,
+ exporters = {
+ csv: function (rdel, name) {
+ rdel = '"' + rdel + '"';
+ var colD = '"' + $.fn.tableExport.csv.separator + '"',
+ dataURL = 'data:text/csv;charset=utf-8,' +
+ encodeURIComponent('"' + $rows.map(function (i, val) {
+ var $cols = $(val).find('th, td');
+ return $cols.map(function (i, val) {
+ return $(val).text().replace(/"/g, '""')
+ }).get().join(colD);
+ }).get().join(rdel) + '"'),
+ myFile = name + ".csv",
+ myContent = $.fn.tableExport.csv.buttonContent,
+ myClass = $.fn.tableExport.csv.defaultClass;
+ createButton(dataURL, myFile, myContent, myClass);
+ }
+ };
+
+ settings.formats.forEach(
+ function (key) {
+ exporters[key](rowD, fileName);
+ }
+ );
+
+ function checkCaption(exportButton) {
+ var $caption = $el.find('caption:not(.head)');
+ $caption.length ? $caption.append(exportButton) : $el.prepend('' + exportButton + ' ');
+ }
+
+ function createButton(dataURL, myFile, myContent, myClass) {
+ var exportButton = "" + myContent + " ";
+ checkCaption(exportButton);
+ }
+ });
+ };
+
+ // Define the plugin default properties.
+ $.fn.tableExport.defaults = {
+ headings: true, // [Boolean], display table headings (th elements) in the first row, [default: true]
+ formats: ["csv"],
+ fileName: "id", // [id, name, String], filename for the downloaded file, [default: "export"]
+ bootstrap: true, // [String], additional button classes to add, [default: ""]
+ position: "bottom" // [top, bottom], position of the caption element relative to table, [default: "bottom"]
+ };
+
+
+
+ $.fn.tableExport.csv = {
+ defaultClass: "csv",
+ buttonContent: "Excel",
+ separator: ","
+ };
+
+
+
+ $.fn.tableExport.bootstrap = ["btn", "btn-default", "btn-toolbar"];
+
+ $.fn.tableExport.rowDel = "\r\n";
+
+
+}(jQuery));
+
+
+
+