Inactive campaign related files

G Manojkumar
Showing 4 changed files with 285 additions and 127 deletions
application/resources/views/layout/module/hr/companymaster.blade.php
application/resources/views/layout/module/hr/loadcompanymaster.blade.php
application/resources/views/layout/module/hr/mainreport.blade.php
application/resources/views/layout/module/hr/masters.blade.php
--- a/application/resources/views/layout/module/hr/companymaster.blade.php
View file @83620b7
+++ b/application/resources/views/layout/module/hr/companymaster.blade.php
View file @83620b7
 <?php
 $client=Input::get("client");
+$status=Input::get("status");
+$campaignstartdate=Input::get("campaignstartdate");
+$campaignenddate=Input::get("campaignenddate");
 $monthworkdays=base64_encode(Input::get("monthworkdays"));
 $agencyfeesvalue=base64_encode(Input::get("agencyfeesvalue"));
 $agencyfeefunction=base64_encode(Input::get("agencyfeefunction"));
@@ -73,9 +77,15 @@ $mvalue.="developerparam~$developerparam|";
 $mvalue.="trackerfields~$trackerfields|";
-if($wakka->getCount("hrms_masters","mkey='$client' and mtype='company'")==0)$companyarr=$wakka->Query("insert into hrms_masters set mvalue='',mkey='$client',mtype='company';");
+//if($wakka->getCount("hrms_masters","mkey='$client' and mtype='company'")==0)$companyarr=$wakka->Query("insert into hrms_masters set mvalue='',mkey='$client',mtype='company';");
+//if($wakka->getCount("hrms_masters","mkey='$client' and mtype='company'")==0)$companyarr=$wakka->Query("insert into hrms_masters set mvalue='',mkey='$client',mtype='company', status='$status';");
+if($wakka->getCount("hrms_masters","mkey='$client' and mtype='company'")==0)$companyarr=$wakka->Query("insert into hrms_masters set mvalue='',mkey='$client',mtype='company', status='$status' ,campaignstartdate='$campaignstartdate', campaignenddate='$campaignenddate';");
+//$companyarr=$wakka->Query("update hrms_masters set mvalue='$mvalue' where mkey='$client' and mtype='company';");
+//$companyarr=$wakka->Query("update hrms_masters set mvalue='$mvalue', status='$status' where mkey='$client' and mtype='company';");
-$companyarr=$wakka->Query("update hrms_masters set mvalue='$mvalue' where mkey='$client' and mtype='company';");
+$companyarr=$wakka->Query("update hrms_masters set mvalue='$mvalue', status='$status', campaignstartdate='$campaignstartdate', campaignenddate='$campaignenddate' where mkey='$client' and mtype='company';");
 //if(!Auth::user()->moduleACL("Admin",true,true,true))$wakka->createMailQueue("system",$wakka->getEmailIdsFromList('HRManagerUsers'),Config::get("app.name").": Client Master Changed","[".$wakka->GetUserName()."] Has changed Clients [$client] Master Data");
 echo "<div class='message success close'><h2>Success!</h2><p>Data Saved</p></div>";
--- a/application/resources/views/layout/module/hr/loadcompanymaster.blade.php
View file @83620b7
+++ b/application/resources/views/layout/module/hr/loadcompanymaster.blade.php
View file @83620b7
@@ -4,10 +4,13 @@ if(Input::has('addcompany'))
 	$company=trim(Input::get("addcompany"));
 	if($company!="")
 	{
-		$companyarr=$wakka->LoadSingle("select * from hrms_masters where mtype='company' and mkey='$company'");
+		//$companyarr=$wakka->LoadSingle("select * from hrms_masters where mtype='company' and mkey='$company'");
+		$companyarr=$wakka->LoadSingle("select * from hrms_masters where mtype='company' and mkey='$company' and status='active'");
 		if(!$companyarr)
 		{
-			$wakka->Query("insert into hrms_masters set mvalue='',mkey='$company',mtype='company';");
+			//$wakka->Query("insert into hrms_masters set mvalue='',mkey='$company',mtype='company';");
+			//$wakka->Query("insert into hrms_masters set mvalue='',mkey='$company',mtype='company',status='active';");
+			$wakka->Query("insert into hrms_masters set mvalue='',mkey='$company',mtype='company',status='active', campaignstartdate='$campaignstartdate', campaignenddate='$campaignenddate';");
 		}
 	}
@@ -45,8 +48,18 @@ foreach($workflowarr as $wfline)
 if($client!="")
 {
 	$mastersdata=$wakka->getCompanyMaster($client);
+	$mastersdata["status"] = ucfirst($mastersdata["status"]);
 	echo "<br>";
+	echo "<p><label class='label-small_new' style='width:15%'>Status:</label><select class='form_hrm_select' name=status id=status>
+	<option value='".($mastersdata["status"])."'>".($mastersdata["status"])."</option>
+  <option value=active>Active</option>
+  <option value=inactive>Inactive</option>
+  </select></p>";
+	echo "<p><label class='label-small_new' style='width:15%'>Campaign Start Date :</label><input type=text class='form_new form_new_amend datetimepicker' name=campaignstartdate id=campaignstartdate value='".($mastersdata["campaignstartdate"])."'></p>";
+	echo "<p><label class='label-small_new' style='width:15%'>Campaign End Date :</label><input type=text class='form_new form_new_amend datetimepicker' name=campaignenddate id=campaignenddate value='".($mastersdata["campaignenddate"])."'></p>";
 	echo "<p><label class='label-small_new' style='width:15%'>Contract Start Date :</label><input type=text class='form_new form_new_amend' name=contractstartdate id=contractstartdate value='".($mastersdata["contractstartdate"])."'></p>";
 	echo "<p><label class='label-small_new' style='width:15%'>Contract End Date :</label><input type=text class='form_new form_new_amend' name=contractenddate id=contractenddate value='".($mastersdata["contractenddate"])."'></p>";
@@ -120,7 +133,9 @@ foreach($trackerfieldsarr as $key)$optionsstr.="<option value='$key' selected>$t
 foreach($toarr as $key=>$opts)$optionsstr.="<option value='$key'>$opts</option>";
 ?>
 <script>
+$('body').on('focus',".datetimepicker", function(){
+    $(this).datetimepicker({format: 'HH:mm'});                
+});
 $(document).ready(function(){
 });
--- a/application/resources/views/layout/module/hr/mainreport.blade.php
View file @83620b7
+++ b/application/resources/views/layout/module/hr/mainreport.blade.php
View file @83620b7
 <?php
-// phpinfo();
 $kformlib=new \App\Jobs\KFormLib($wakka->HRCoreVars["HRFiledsStr"]);
 //error_reporting(E_ALL); 
 ini_set("memory_limit", -1);
 include_once(app_path().'/lib/phpexcel/PHPExcel.php');
-include_once(app_path().'/lib/PHP_XLSXWriter-master/xlsxwriter.class.php');
 $wakka->setUserTimezone();
 $themehome=$wakka->GetThemePath('/');
-$sindex[0]='salbasic';
+	  $sindex[0]='salbasic';
-$sindex[1]='salhouserent';
+	  $sindex[1]='salhouserent';
-$sindex[2]='saltransport';
+	  $sindex[2]='saltransport';
-$sindex[3]='salfood';
+	  $sindex[3]='salfood';
-$sindex[4]='saltelephone';
+	  $sindex[4]='saltelephone';
-$sindex[5]='salmedical';
+	  $sindex[5]='salmedical';
-$sindex[6]='salelectricity';
+	  $sindex[6]='salelectricity';
-$sindex[7]='salother';
+	  $sindex[7]='salother';
-$sindex[8]='saltotal';
+	  $sindex[8]='saltotal';
-$sindex[9]='nettotal';$kformlib->HRFieldNames['nettotal']="Net Salary";
+	  $sindex[9]='nettotal';$kformlib->HRFieldNames['nettotal']="Net Salary";
 if(Input::has("reportsubmit"))
 {
@@ -68,44 +63,38 @@ if(Input::has("reportsubmit"))
  if(!empty($datesdiffstr))
  {
    $ddprts=explode(",",$datesdiffstr);//datesdiffstr=servicestoppeddate,joiningdate,LT,180 ==> if(servicestopdate-joiningdate < 180) then ok,else not ok
-}
+  }
-// $finputarr=Input::get("fieldsarr");
-$finputarr=$_POST["fieldsarr"];
-array_unshift($finputarr,'id');
-$selectedfields=$_POST["selectedfields"];
-array_unshift($selectedfields,'EmpID');
-if(is_array($finputarr))foreach($finputarr as $eachfield)$fieldsarr[]=$eachfield;
+	//$finputarr=Input::get("fieldsarr");
-else {echo "Please Select List of fields In report.";return;}
+	$finputarr=$_REQUEST['fieldsarr'];
+  if(is_array($finputarr))foreach($finputarr as $eachfield)$fieldsarr[]=$eachfield;
+  else {echo "Please Select List of fields In report.";return;}
-$reporttype=Input::get("reporttype");
+  $reporttype=Input::get("reporttype");
-$outputtype=Input::get("outputtype","XLS");
+  $outputtype=Input::get("outputtype","XLS");
-if(sizeof($fieldsarr)==0){echo "Please Select List of fields In report.";return;}
+  if(sizeof($fieldsarr)==0){echo "Please Select List of fields In report.";return;}
-if($client==""&&$currentstatus==""&&$visacompany==''&&$modfrom[0]==''&&$crefrom[0]==''&&$empid==''&&$fieldbyrange==''){echo $client."Please Select atleast one of Client or Status or ModifyFrom or CreatedFrom.";return;}
+  if($reporttype==""){echo "Please Select a Report Type.";return;}
+  if($client==""&&$currentstatus==""&&$visacompany==''&&$modfrom[0]==''&&$crefrom[0]==''&&$empid==''&&$fieldbyrange==''){echo $client."Please Select atleast one of Client or Status or ModifyFrom or CreatedFrom.";return;}
-if($reporttype=='Binary')$reporttype='|b';
+  if($reporttype=='Binary')$reporttype='|b';
-if($reporttype=='History')$reporttype='|h';
+  if($reporttype=='History')$reporttype='|h';
-if($reporttype=='Values')$reporttype='';
+  if($reporttype=='Values')$reporttype='';
-$filterstr=array();
+  $filterstr=array();
-if($empid!="")
+  if($empid!="")
-{
+  {
    $idarr=explode(',',$empid);
    foreach($idarr as $tid)if(trim($tid)!='')$tarr[]="'$tid'";
    $empid=implode(",",$tarr);
    $filterstr[]=" id in ($empid) ";
-}
+  }
-else
+  else
-{
+  {
    if($client!=""){$filterstr[]=getQueryFromList('client',$client);}
    if($currentstatus!=""){$filterstr[]=getQueryFromList('currentstatus',$currentstatus);}
 //     if($visacompany!=""){$filterstr[]=getQueryFromList('visacompany',$visacompany);}
@@ -119,80 +108,161 @@ else
    {
         $filterstr[]=" modified>='".date('Y-m-d 00:00:00',$frcrefrom)."' ";
    }
-}
+  }
-$type = PHPExcel_Cell_DataType::TYPE_STRING;
+  $type = PHPExcel_Cell_DataType::TYPE_STRING;
-if(!empty($filterstr))$filterstr=implode(" and ",$filterstr);else $filterstr="";
-if($filterstr=="")$filterstr="1";
+  if(!empty($filterstr))$filterstr=implode(" and ",$filterstr);else $filterstr="";
-$savereportname=Input::get("savereportname");
+  if($filterstr=="")$filterstr="1";
-if($savereportname!="")
+  $savereportname=Input::get("savereportname");
-{
+  if($savereportname!="")
+  {
    $userreports=$wakka->GetBBBUserData("UserSavedReports");
    $userreports[$savereportname]=base64_encode(json_encode(Input::all()));
    $wakka->SetBBBUserData("UserSavedReports",$userreports);
-}
+  }
-$usersarr=$wakka->getPersonsdownloadreport($filterstr);
-foreach($usersarr as $r => $userdata)
-{
-	$ppldata[]=unserialize($userdata['peopledata']);
-}
-// dd($ppldata);
+	$usersarr=$wakka->getPersons($filterstr);
-for ($i=0; $i <count($ppldata) ; $i++) { 
-	for ($j=0; $j <count($finputarr) ; $j++) { 
+  $inputFileType = "Excel5";
-if ($ppldata[$i] != false){
+  $objReader = PHPExcel_IOFactory::createReader($inputFileType);
+  $objPHPExcel = $objReader->load("$themehome/uploads/sreports/blank.xls");
+  $baseRow = 3;
+  $highestColumn = sizeof($fieldsarr);
-		if (array_key_exists ($finputarr[$j], $ppldata[$i])) {
+  $baserowArr=$fieldsarr;
+  $objPHPExcel->getActiveSheet()->setCellValue("A1", "id");
+  for ($head = 0; $head < $highestColumn; $head++){
+    $colstr=PHPExcel_Cell::stringFromColumnIndex($head+1);
+    $objPHPExcel->getActiveSheet()->setCellValue($colstr."1", $baserowArr[$head]);
+  }
-            $usersdata[$i][$finputarr[$j]]=$ppldata[$i][$finputarr[$j]];
+  $objPHPExcel->getActiveSheet()->setCellValue("A2", "EMPID");
+  for ($head = 0; $head < $highestColumn; $head++){
+    $colstr=PHPExcel_Cell::stringFromColumnIndex($head+1);
+    $objPHPExcel->getActiveSheet()->setCellValue($colstr."2", $kformlib->HRFieldNames[$baserowArr[$head]]);
+  }
-        }else if (! array_key_exists ($finputarr[$j], $ppldata[$i]))
+  $skippedrows=0;
+  foreach($usersarr as $r => $userdata)
  {
-		   	$usersdata[$i][$finputarr[$j]] = "";
+    $ppldata=unserialize($userdata['peopledata']);
+    $logarr=unserialize($userdata['modifylog']);
+    $hrexclusiveflag=0;if(empty($ppldata['client']))$ppldata['client']='__';
+    if(strstr($wakka->HRCoreVars['HRExclusiveClients'],$ppldata['client']))
+    {
+			if(!$wakka->IsAdmin())
+			{
+				if(!strstr($wakka->getManagerUsers($wakka->getUserListforClient($ppldata['client'])),$wakka->GetUserName()))
+				{
+					if(!strstr($wakka->GetBBBUserData("clientsownerlist"),$ppldata['client']))$hrexclusiveflag=1;
 				}
 			}
    }
-} 
+    if(($wakka->GetBBBUserData("readotherdata")=="No"&&!$wakka->recordReadAccess($ppldata))||$hrexclusiveflag==1)$pass=0;
+    else
+    {
-	$headerexcel = [];
+    if($filterbyfielddates==1)
-    foreach($finputarr as $cachekey)
+    {
+      if(!isset($ppldata[$fieldbyrange])||trim($ppldata[$fieldbyrange])==""){$skippedrows++;continue;}
+      else
      {
-		if($cachekey!='')
+	//$fieldbyrange $frcrefrom $frcreto
+	$tdt=explode(".",$ppldata[$fieldbyrange]);
+	if(sizeof($tdt)==3)
+	{
+	$tdt=mktime(0, 0, 0, intval($tdt[1]), intval($tdt[0]), intval($tdt[2]));
+	if(!($tdt>=$frcrefrom&&$tdt<=$frcreto)){$skippedrows++;continue;}
+	}
+	else {$skippedrows++;continue;}
+      }
+    }
+    if(sizeof($ddprts)>3)
+    {
+      $dddt1=explode(".",$ppldata[$ddprts[0]]);
+      $dddt2=explode(".",$ppldata[$ddprts[1]]);
+      $dddt1=mktime(0, 0, 0, intval($dddt1[1]), intval($dddt1[0]), intval($dddt1[2]));
+      $dddt2=mktime(0, 0, 0, intval($dddt2[1]), intval($dddt2[0]), intval($dddt2[2]));
+      if($ddprts[2]=="LT")
+      {
+	if($dddt1-$dddt2 < $ddprts[3]);else {$skippedrows++;continue;}
+      }
+      if($ddprts[2]=="GT")
      {
-			$headerexcel['id'] = 'string';
+	if($dddt1-$dddt2 > $ddprts[3]);else {$skippedrows++;continue;}
-			$headerexcel[$cachekey] = 'string'; //$headerexcel2[] = $cachekey => 'string';
      }
    }
-// dd($headerexcel2);
-    $filename = "MainReport.xlsx";
-    header('Content-disposition: attachment; filename="'.XLSXWriter::sanitize_filename($filename).'"');
-    header("Content-Type: application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
-    header('Content-Transfer-Encoding: binary');
-    header('Cache-Control: must-revalidate');
-    header('Pragma: public');   
-    $writer = new XLSXWriter();
-    $styles1 = array( 'font'=>'Arial','font-size'=>10,'font-style'=>'bold', 'fill'=>'#eee', 'halign'=>'center', 'border'=>'left,right,top,bottom');
-    $writer->writeSheetHeader('Sheet1', $headerexcel,$styles1,['freeze_rows'=>1, 'freeze_columns'=>1]);
-     $writer->writeSheetRow('Sheet1', $selectedfields,$styles1 );
-	foreach($usersdata as $row)
+    $row = $baseRow + $r - $skippedrows;$rkey=0;
+    $objPHPExcel->getActiveSheet()->getCellByColumnAndRow(0,$row)->setValueExplicit($userdata['id'], $type);
+    foreach($baserowArr as $key => $val)
    {
-	    $writer->writeSheetRow('Sheet1', $row, $row_options = ['height'=>15]);
+      $cellval=$wakka->getXlsVal($baserowArr[$key].$reporttype,$ppldata,$logarr);
+      $objPHPExcel->getActiveSheet()->getCellByColumnAndRow($key+1,$row)->setValueExplicit($cellval, $type);
+      $rkey=$key+1;
    }
-    $writer->writeToStdOut();
+    //month data in report
+    if($asalyear>2000&&$asalmonth>0)
+    {
+	$saldata=$ppldata["salaryentries"][$asalyear][$asalmonth];
+	$leavedata=$ppldata["leavesentries"][$asalyear][1][$asalmonth];
-    return;
+	$objPHPExcel->getActiveSheet()->getCellByColumnAndRow(++$rkey,$row)->setValueExplicit($leavedata[0][2], $type);
+	$objPHPExcel->getActiveSheet()->getCellByColumnAndRow($rkey,1)->setValueExplicit("Annual Leaves", $type);
+	$objPHPExcel->getActiveSheet()->getCellByColumnAndRow(++$rkey,$row)->setValueExplicit($leavedata[1][2], $type);
+	$objPHPExcel->getActiveSheet()->getCellByColumnAndRow($rkey,1)->setValueExplicit("Sick Leaves", $type);
+	$objPHPExcel->getActiveSheet()->getCellByColumnAndRow(++$rkey,$row)->setValueExplicit($leavedata[2][2], $type);
+	$objPHPExcel->getActiveSheet()->getCellByColumnAndRow($rkey,1)->setValueExplicit("Meternity Leaves", $type);
+	for($i=0;$i<=9;$i++)
+	{
+	  $objPHPExcel->getActiveSheet()->getCellByColumnAndRow($rkey+1,"1")->setValueExplicit($kformlib->HRFieldNames[$sindex[$i]], $type);
+	  $objPHPExcel->getActiveSheet()->getCellByColumnAndRow($rkey+1,$row)->setValueExplicit($saldata[1][$i][1], $type);
+	  $rkey=$rkey+1;
+	}
+	$objPHPExcel->getActiveSheet()->getCellByColumnAndRow(++$rkey,$row)->setValueExplicit($wakka->getLOPAmt($ppldata,$asalyear,$asalmonth), $type);
+	$objPHPExcel->getActiveSheet()->getCellByColumnAndRow($rkey,1)->setValueExplicit("LOP Amount", $type);
+	$objPHPExcel->getActiveSheet()->getCellByColumnAndRow(++$rkey,$row)->setValueExplicit($wakka->getNWDAmt($ppldata,$asalyear,$asalmonth), $type);
+	$objPHPExcel->getActiveSheet()->getCellByColumnAndRow($rkey,1)->setValueExplicit("NWD Amount", $type);
+	foreach($saldata[0] as $tadded)
+	{
+	  $objPHPExcel->getActiveSheet()->getCellByColumnAndRow($rkey+1,1)->setValueExplicit("Add/Ded Type", $type);
+	  $objPHPExcel->getActiveSheet()->getCellByColumnAndRow($rkey+2,1)->setValueExplicit("Value", $type);
+	  $objPHPExcel->getActiveSheet()->getCellByColumnAndRow($rkey+3,1)->setValueExplicit("Remarks", $type);
+	  $objPHPExcel->getActiveSheet()->getCellByColumnAndRow($rkey+1,$row)->setValueExplicit($tadded[0], $type);
+	  $objPHPExcel->getActiveSheet()->getCellByColumnAndRow($rkey+2,$row)->setValueExplicit($tadded[1], $type);
+	  $objPHPExcel->getActiveSheet()->getCellByColumnAndRow($rkey+3,$row)->setValueExplicit($tadded[2], $type);
+	  $rkey+=3;
+	}
+    }
+    }
+  }
+  header('Content-Type: application/vnd.ms-excel');
+  header('Content-Disposition: attachment;filename="MainReport.xls"');
+  header('Cache-Control: max-age=0');
+  $objWriter = PHPExcel_IOFactory::createWriter($objPHPExcel, $inputFileType);
+  $objWriter->save('php://output');
+  return;
 }
 function getQueryFromList($key,$list)
 {
@@ -299,17 +369,27 @@ function getQueryFromList($key,$list)
 <div class="layout-app"><!-- row-app -->
    <div class="row row-app">
    <div class="col-md-12">
        <div class="col-separator col-separator-first col-unscrollable box" style='overflow:hidden'>
            <div class=innerAll>
-					<div class="relativeWrap" >
+<div class="relativeWrap" >
 	<div class="tab_generic">
+		<!-- Tabs Heading -->
 		<div class="tab_bar_purple tabsbar-2">
 			<ul class="row row-merge">
                            <li class=active><a href="#tabs-1" data-toggle="tab">Select Filters and Report format</a></li>
 			</ul>
 		</div>
+		<!-- // Tabs Heading END -->
 		<div class="tab-content">
  <div id=tabs-1 class="tab-pane active">
    <fieldset>
 		<legend class='task_legend'>Select Filters</legend>
@@ -319,12 +399,16 @@ function getQueryFromList($key,$list)
 	<input type=hidden name=visacompany id=visacompany value=''>
 	<input type=hidden name=currentstatus id=currentstatus value=''>
 	<div id=reportformarrs></div>
 	<p>
 		<label class='label-small_new' style='width:15%'>Record Ids:</label>
 		<input class='form_new form_new_amend' id='empid' name='empid' type='text' value='' style='width:25%' />
 		<span class=field_desc id='fd'></span><span class=validate_success></span><span class=validate_error></span>
 	</p>
-											<p><label class='label-small_new' style='width:15%'></label><b>-- OR --</b></p>
+	<p>
+		<label class='label-small_new' style='width:15%'></label>
+		<b>-- OR --</b>
+	</p>
 	<p>
 		<label class='label-small_new' style='width:15%'>Company: </label>
 		<select name=client2 id=client2 multiple='' data-rel=chosen class=select2multi style='width:40%'>
@@ -336,7 +420,7 @@ function getQueryFromList($key,$list)
 		</select>
 		</p>
 		<div class='clear:both'></div>
-											<!--<p>
+<!--	<p>
 		<label class='label-small_new' style='width:15%'>Visa Company: </label>
 		<select name=visacompany2 id=visacompany2 multiple='' data-rel=chosen class=select2multi style='width:40%'>
 		<?php 
@@ -345,34 +429,81 @@ function getQueryFromList($key,$list)
 		?>
 		</select>
 	</p>-->
+	<p>
+		<label class='label-small_new' style='width:15%'>Record Status: </label>
+		<select name=currentstatus2 id=currentstatus2 multiple='' data-rel=chosen class=select2multi style='width:40%'>
 		<?php 
-											$toarr=array();
+		$clients=explode("~",$kformlib->FormSelectVals['currentstatus']);
-											$optionsstr="";
+		foreach($clients as $clientval){echo "<option value='$clientval'>$clientval</option>";}
-											$fileids=explode(",",$kformlib->HRFiledsStr);
+		?>
-											foreach($fileids as $fileid)
+		<?php if($wakka->IsAdmin()){ ?><option value='<?php echo $wakka->HRCoreVars["systemExitStatus"]; ?>'><?php echo $wakka->HRCoreVars["systemExitStatus"]; ?></option><?php } ?>
-											{
+		</select>
+	</p>
+	<p>
+		<label class='label-small_new' style='width:15%'>Record Modified From: </label>
+		<input size=7 id='modfrom' name='modfrom' type='text' value='' /> To: <input size=7 id='modto' name='modto' type='text' value='' />
+	</p>
+	<p>
+		<label class='label-small_new' style='width:15%'>Record Created From: </label>
+		<input size=7 id='crefrom' name='crefrom' type='text' value='' /> To: <input size=7 id='creto' name='creto' type='text' value='' />
+	</p>
+	<p>
+		<label class='label-small_new' style='width:15%'>For:</label><select class='form_hrm_select' id=fieldbyrange name=fieldbyrange><option></option>
+		<?php 
+		$dtfields=explode(",",$kformlib->HRDateFilds);
+		foreach($dtfields as $tdtf)if(trim($tdtf)!="")echo "<option value='$tdtf'>".$kformlib->HRFieldNames[$tdtf]."</option>";
+		?>
+		</select>
+		</p>
+		<p>
+		<label class='label-small_new' style='width:15%'>Between:</label> 
+		<input size=7 id='frcrefrom' name='frcrefrom' type='text' value='' /> To: <input size=7 id='frcreto' name='frcreto' type='text' value='' />
+	</p>
+<?php
+$toarr=array();
+$optionsstr="";
+$fileids=explode(",",$kformlib->HRFiledsStr);
+foreach($fileids as $fileid)
+{
  if(trim($fileid)!='')
  {
  if(strstr($kformlib->HRFileFieldsStr,$fileid))$ftype='File';
  else if(strstr($kformlib->HRDateFilds,$fileid))$ftype='Date';
  else if(strstr($kformlib->HRDropFilds,$fileid))$ftype='Dropdown';
  else $ftype='Text';
-													$toarr[$fileid]=$kformlib->HRFieldNames[$fileid];
+  $toarr[$fileid]=$kformlib->HRFieldNames[$fileid]." ($ftype)";
-												}
  }
+}
 //asort($toarr);
-											foreach($toarr as $key=>$opts)$optionsstr.="<option value='$key'>$opts</option>";
+foreach($toarr as $key=>$opts)$optionsstr.="<option value='$key'>$opts</option>";
-											?>
+?>
 		<p><label  class='label-small_new' style='width:15%;'>Fields: </label>
-												<select size=9 id=fieldsarr2 multiple='multiple' style='width:40%' class=select2multi>
+			<select size=9 id=fieldsarr2 multiple='multiple' style='width:40%' class=select2multi><?php echo $optionsstr; ?></select><span style='margin-left: 20px;line-height: 30px;'>(Hold ctrl to select multiple)</span></p>
-													<?php echo $optionsstr; ?>
+		<p><label  class='label-small_new' style='width:15%'>Report Type</label><select class='form_hrm_select' id=reporttype name=reporttype><option value='Values'>Values</option><option value='Binary'>Binary</option><option value='History'>History</option></select>
+			<select class='form_hrm_select' id=outputtype name=outputtype><option value='XLS'>XLS</option><option value='CSV'>CSV</option></select>
+			<select class='form_hrm_select' id='asalmonth' name='asalmonth'>
+	<option value=''></option>
+	<option value=1>Jan</option>
+	<option value=2>Feb</option>
+	<option value=3>Mar</option>
+	<option value=4>Apr</option>
+	<option value=5>May</option>
+	<option value=6>Jun</option>
+	<option value=7>Jul</option>
+	<option value=8>Aug</option>
+	<option value=9>Sep</option>
+	<option value=10>Oct</option>
+	<option value=11>Nov</option>
+	<option value=12>Dec</option>
      </select>
-												<span style='margin-left: 20px;line-height: 30px;'>(Hold ctrl to select multiple)</span>
+			<select class='form_hrm_select' id='asalyear' name='asalyear'>
-											</p>
+	<option value=''></option>
-											<p><label  class='label-small_new' style='width:15%'>Report Type</label>
+	<?php for($i=date('Y')+1;$i>=1990;$i--)echo "<option value=$i>$i</option>"; ?>
-												<select class='form_hrm_select' id=outputtype name=outputtype><option value='XLSX'>XLSX</option><!-- <option value='CSV'>CSV</option></select> -->
+      </select>
      </p>
 	<p>
@@ -397,12 +528,12 @@ function getQueryFromList($key,$list)
    </fieldset>
  </div>
-							</div>
+</div>
 		</div>
 	</div>
-				</div>
+</div>
-				<!-- // Tabs END -->
+<!-- // Tabs END -->
@@ -410,31 +541,28 @@ function getQueryFromList($key,$list)
        </div>
    </div>
-</div>
+    </div>
 </div><!-- // END row-app -->
 <script>
-	$('#modfrom').datepicker({dateFormat: 'dd.mm.yy',inline: true,changeYear: true,selectOtherMonths: true,yearRange: '<?php echo (date('Y')-70).":".(date('Y')+5); ?>'});
+$('#modfrom').datepicker({dateFormat: 'dd.mm.yy',inline: true,changeYear: true,selectOtherMonths: true,yearRange: '<?php echo (date('Y')-70).":".(date('Y')+5); ?>'});
-	$('#modto').datepicker({dateFormat: 'dd.mm.yy',inline: true,changeYear: true,selectOtherMonths: true,yearRange: '<?php echo (date('Y')-70).":".(date('Y')+5); ?>'});
+$('#modto').datepicker({dateFormat: 'dd.mm.yy',inline: true,changeYear: true,selectOtherMonths: true,yearRange: '<?php echo (date('Y')-70).":".(date('Y')+5); ?>'});
-	$('#crefrom').datepicker({dateFormat: 'dd.mm.yy',inline: true,changeYear: true,selectOtherMonths: true,yearRange: '<?php echo (date('Y')-70).":".(date('Y')+5); ?>'});
+$('#crefrom').datepicker({dateFormat: 'dd.mm.yy',inline: true,changeYear: true,selectOtherMonths: true,yearRange: '<?php echo (date('Y')-70).":".(date('Y')+5); ?>'});
-	$('#creto').datepicker({dateFormat: 'dd.mm.yy',inline: true,changeYear: true,selectOtherMonths: true,yearRange: '<?php echo (date('Y')-70).":".(date('Y')+5); ?>'});
+$('#creto').datepicker({dateFormat: 'dd.mm.yy',inline: true,changeYear: true,selectOtherMonths: true,yearRange: '<?php echo (date('Y')-70).":".(date('Y')+5); ?>'});
-	$('#frcrefrom').datepicker({dateFormat: 'dd.mm.yy',inline: true,changeYear: true,selectOtherMonths: true,yearRange: '<?php echo (date('Y')-70).":".(date('Y')+5); ?>'});
+$('#frcrefrom').datepicker({dateFormat: 'dd.mm.yy',inline: true,changeYear: true,selectOtherMonths: true,yearRange: '<?php echo (date('Y')-70).":".(date('Y')+5); ?>'});
-	$('#frcreto').datepicker({dateFormat: 'dd.mm.yy',inline: true,changeYear: true,selectOtherMonths: true,yearRange: '<?php echo (date('Y')-70).":".(date('Y')+5); ?>'});
+$('#frcreto').datepicker({dateFormat: 'dd.mm.yy',inline: true,changeYear: true,selectOtherMonths: true,yearRange: '<?php echo (date('Y')-70).":".(date('Y')+5); ?>'});
-	function setRptSelection()
+function setRptSelection()
-	{
+{
 $("#client").val($("#client2").val());
 //  $("#visacompany").val($("#visacompany2").val());
-$("#currentstatus").val($("#currentstatus2").val());
+ $("#currentstatus").val($("#currentstatus2").val());
-$("#reportformarrs").html("");
-$("#fieldsarr2").select2("data").forEach(function(elem){$("#reportformarrs").append("<input type=hidden name=fieldsarr[] value='"+elem.id+"'>");});
-$("#fieldsarr2").select2("data").forEach(function(elem){$("#reportformarrs").append("<input type=hidden name=selectedfields[] value='"+elem.text+"'>");});
+ $("#reportformarrs").html("");
+ $("#fieldsarr2").select2("data").forEach(function(elem){$("#reportformarrs").append("<input type=hidden name=fieldsarr[] value='"+elem.id+"'>");});
-document.reportform.submit();
+ document.reportform.submit();
 }
 // $("#client2").dropdownchecklist({icon:{}, width:300, maxDropHeight:300, emptyText:"Select.." });
 // $("#visacompany2").dropdownchecklist({icon:{}, width:300, maxDropHeight:300, emptyText:"Select.." });
--- a/application/resources/views/layout/module/hr/masters.blade.php
View file @83620b7
+++ b/application/resources/views/layout/module/hr/masters.blade.php
View file @83620b7
@@ -198,12 +198,14 @@ $reportarr=$wakka->LoadAll("select * from hrms_masters where mtype='reports' ord
 	    if($user["role"]=="Manager"||$wakka->IsAdmin())
 	    {
 				$companyarr=$wakka->LoadAll("select * from hrms_masters where mtype='company'");
+		//		print_r($companyarr);
 				foreach($companyarr as $tcompany)echo "<option value='$tcompany[mkey]'>$tcompany[mkey]</option>";
 	    }
 	    else 
 	    {
 	      echo "<option value=''></option>";
 	      $clients=explode(",",trim($wakka->GetBBBUserData("clientsownerlist")));
+	//	print_r($clients);
 	      foreach($clients as $tclient)if(trim($tclient)!="")echo "<option value='$tclient'>$tclient</option>";
 	    }
 	  ?>
@@ -426,6 +428,9 @@ function saveCompanies()
 {
  var vardata="client="+$("#companyselect").val();
+  vardata+="&status="+encodeURIComponent($("#status").val());
+  vardata+="&campaignstartdate="+encodeURIComponent($("#campaignstartdate").val());
+  vardata+="&campaignenddate="+encodeURIComponent($("#campaignenddate").val());
  vardata+="&agencyfeesvalue="+encodeURIComponent($("#agencyfeesvalue").val());
  vardata+="&agencyfeefunction="+encodeURIComponent($("#agencyfeefunction").val());
  vardata+="&contractstartdate="+encodeURIComponent($("#contractstartdate").val());