CelHRTeam/EchoTex_Payroll
12
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Compare commits

base: CelHRTeam:ab1e4bb0e55dca54732918ab79b2dce8758157cb
Branches Tags
CelHRTeam:devqc
CelHRTeam:dev_mashfiq
CelHRTeam:dev_chapal
CelHRTeam:main
..
compare: CelHRTeam:133ec0b76c778a08fadb796982fa0ae664b74b0e
Branches Tags
CelHRTeam:dev_mashfiq
CelHRTeam:devqc
CelHRTeam:dev_chapal
CelHRTeam:main

No commits in common. "ab1e4bb0e55dca54732918ab79b2dce8758157cb" and "133ec0b76c778a08fadb796982fa0ae664b74b0e" have entirely different histories.
ab1e4bb0e5 ... 133ec0b76c

12 changed files with 81 additions and 261 deletions
Show Stats Expand all files Collapse all files

3
HRM.BO/Bonus/ProdBonusAttn.cs
View File

@ -283,13 +283,12 @@ namespace HRM.BO
List<ProdBonusAttn> Get(int setupID, int ScheduleID);
List<ProdBonusAttn> Get(int setupID, DateTime dateTime);
List<ProdBonusAttn> GetBySetupLineDate(int setupID, int lineID, DateTime dateTime);
List<ProdBonusAttn> GetBySetupID(int iD);
List<ProdBonusAttn> GetBySetupIDs(string iDs);
List<ProdBonusAttn> GetByLineID(int lineID);
List<ProdBonusAttn> GetbySetupAndLineID(int setupID, int lineID);
DateTime? GetMaxDate(int setupID, int lineID, DateTime date);
}
#endregion

17
HRM.DA/DA/Bonus/ProdBonusAttnDA.cs
View File

@ -90,24 +90,7 @@ namespace HRM.DA
return tc.ExecuteReader(sql);
//return tc.ExecuteReader("SELECT * FROM ProdBonusAttn WHERE ProdBonusSetupID=%n AND CAST(InTime AS date)=%d", setupID, dateTime);
}
internal static IDataReader GetBySetupLineDate(TransactionContext tc, int setupID, int lineID, DateTime dateTime)
{
string sql = SQLParser.MakeSQL("SELECT PBA.*, E.EMPLOYEENO FROM ProdBonusAttn PBA Left Join EMPLOYEE E on E.EMPLOYEEID = PBA.EmployeeID WHERE PBA.ProdBonusSetupID=%n AND PBA.ProdBonusLineID=%n AND year(PBA.InTime)= %n AND month(PBA.InTime)= %n AND day(PBA.InTime)= %n ORDER BY TRY_CAST(E.EMPLOYEENO AS INT) ASC",
setupID, lineID, dateTime.Year, dateTime.Month,dateTime.Day);
return tc.ExecuteReader(sql);
}
internal static DateTime? GetMaxDate(TransactionContext tc, int setupID, int lineID, DateTime date)
{
DateTime? value = null;
object obj = tc.ExecuteScalar("SELECT max(intime) FROM ProdBonusAttn WHERE ProdBonusSetupID=%n AND ProdBonusLineID = %n AND OutTime < %d", setupID, lineID, date);
if (obj is not DBNull)
{
value = Convert.ToDateTime(obj);
}
return value;
}
#endregion
#region Delete function

51
HRM.DA/Service/Bonus/ProdBonusAttnService.cs
View File

@ -159,32 +159,6 @@ namespace HRM.DA
return ProdBonusAttns;
}
public List<ProdBonusAttn> GetBySetupLineDate(int setupID, int lineID, DateTime dateTime)
{
List<ProdBonusAttn> ProdBonusAttns = new List<ProdBonusAttn>();
TransactionContext tc = null;
try
{
tc = TransactionContext.Begin();
DataReader dr = new DataReader(ProdBonusAttnDA.GetBySetupLineDate(tc, setupID, lineID, dateTime));
ProdBonusAttns = this.CreateObjects<ProdBonusAttn>(dr);
dr.Close();
tc.End();
}
catch (Exception e)
{
#region Handle Exception
if (tc != null)
tc.HandleError();
ExceptionLog.Write(e);
throw new ServiceException(e.Message, e);
#endregion
}
return ProdBonusAttns;
}
public List<ProdBonusAttn> GetBySetupID(int setupID)
{
@ -321,31 +295,6 @@ namespace HRM.DA
return ProdBonusAttns;
}
public DateTime? GetMaxDate(int setupID, int lineID, DateTime date)
{
TransactionContext tc = null;
try
{
DateTime? dateValue = null;
tc = TransactionContext.Begin();
dateValue = ProdBonusAttnDA.GetMaxDate(tc, setupID, lineID, date);
tc.End();
return dateValue;
}
catch (Exception e)
{
#region Handle Exception
if (tc != null)
tc.HandleError();
ExceptionLog.Write(e);
throw new ServiceException(e.Message, e);
#endregion
}
}
public int Save(ProdBonusAttn oProdBonusAttn)
{
TransactionContext tc = null;

4
HRM.Report/Class/rptDigitalServiceBook.cs
View File

@ -40,8 +40,8 @@ namespace HRM.Report
oDR["PARMANENTADDRESS"] = oDRow["PARMANENTADDRESS"];
oDR["PRESENTADDRESS"] = oDRow["PRESENTADDRESS"];
oDR["BIRTHDATE"] = Convert.ToDateTime(oDRow["BIRTHDATE"]).ToString("dd/MM/yyyy");
//if (oDRow["PHOTO"] is not DBNull)
// oDR["PHOTO"] = Convert.ToBase64String((byte[])oDRow["PHOTO"]);
if (oDRow["PHOTO"] is not DBNull)
oDR["PHOTO"] = Convert.ToBase64String((byte[])oDRow["PHOTO"]);
oDR["NIDNO"] = oDRow["NIDNO"];
oDR["HEIGHT"] = oDRow["HEIGHT"];
oDR["BLOODGROUP"] = GlobalExtensions.BloodGroupToFriendlyName((EnumBloodGroup)Enum.Parse(typeof(EnumBloodGroup),

2
HRM.Report/HRM.Report.csproj
View File

@ -42,7 +42,6 @@
<None Remove="Attendence\RDLC\rptMonthlyKPI.rdlc" />
<None Remove="RDLC\ActiveEmployeeDetail.rdlc" />
<None Remove="RDLC\Advice.rdlc" />
<None Remove="RDLC\AllDigitalServiceBook.rdlc" />
<None Remove="RDLC\AllEmpTaxInfo.rdlc" />
<None Remove="RDLC\AllMedicalClaim.rdlc" />
<None Remove="RDLC\ApointmentLetterForStuff.rdlc" />
@ -311,7 +310,6 @@
<EmbeddedResource Include="Attendence\RDLC\MultipleJobCardSub.rdlc" />
<EmbeddedResource Include="Attendence\RDLC\rptMonthlyKPI.rdlc" />
<EmbeddedResource Include="RDLC\ActiveEmployeeDetail.rdlc" />
<EmbeddedResource Include="RDLC\AllDigitalServiceBook.rdlc" />
<EmbeddedResource Include="RDLC\AllEmpTaxInfo.rdlc" />
<EmbeddedResource Include="RDLC\AllMedicalClaim.rdlc" />
<EmbeddedResource Include="RDLC\ApointmentLetterForStuff.rdlc" />

3
HRM.UI/ClientApp/src/app/_services/payroll/bonus.service.ts
View File

@ -124,9 +124,6 @@ export class BonusService {
getProdBonusAttnEmployeeList(item: any) {
return this.apiService.httpPost<Employee[]>('/Bonus/getProdBonusAttnEmployeeList', item);
}
getProdBonusAttnEmployeeListSwingAndPrinting(item: any) {
return this.apiService.httpPost<Employee[]>('/Bonus/getProdBonusAttnEmployeeListSwingAndPrinting', item);
}
saveAllProdBonusAttn(item: any) {
return this.apiService.httpPost<any[]>('/Bonus/saveAllProdBonusAttn', item);
}

6
HRM.UI/ClientApp/src/app/core-hr/employee-profile/general/general.component.html
View File

@ -247,12 +247,10 @@
</div>
<div class="p-col-12 p-md-12 p-lg-8">
<input [(ngModel)]="hrEmployee.nationalID" formControlName="nationalId"
id="txtNationalId" pInputText style="width:84%" type="text">
<!-- [readonly]="!active" -->
id="txtNationalId" pInputText style="width:84%" type="text" [readonly]="!active">
<button class="k-button k-primary" kendoButton icon="k-i-attachment-45 k-i-clip-45"
style="width: 15.5%; vertical-align: bottom; padding: 16px;"
style="width: 15.5%; vertical-align: bottom; padding: 16px;" [disabled]="!active"
(click)="popUpAttachment('NID')"></button>
<!-- [disabled]="!active" -->
</div>
<div class="p-col-12 p-md-12 p-lg-4">
<label for="txtPassportNo">Passport No</label>

3
HRM.UI/ClientApp/src/app/payroll-ot/production-bonus-attendance/production-bonus-attendance.component.html
View File

@ -84,7 +84,7 @@
</div>
<div class="p-col-12" align="right">
<button icon="refresh" kendoButton [primary]="true" style="width: fit-content" (click)="onClickLoad()"
<button icon="refresh" kendoButton [primary]="true" style="width: fit-content" (click)="onClickRefresh()"
[disabled]="selectedProdBSdata===undefined||selectedLine===undefined||selectedDate===undefined">Load</button>
</div>
<div class="p-col-12">
@ -94,7 +94,6 @@
Remove All
</button>
<kendo-grid-spacer></kendo-grid-spacer>
<label>Attendance Count: {{employeeList.length}} </label>
<!--<button kendoGridExcelCommand type="button" icon="file-excel">Export to
Excel</button>class="customButton"-->
</ng-template>

31
HRM.UI/ClientApp/src/app/payroll-ot/production-bonus-attendance/production-bonus-attendance.component.ts
View File

@ -187,7 +187,7 @@ export class ProductionBonusAttendanceComponent implements OnInit {
)
}
onClickLoad() {
onClickRefresh() {
// debugger;
const fromDate = new Date(this.productionBonusSetup.fromDate.setHours(0, 0, 0, 0));
const toDate = new Date(this.productionBonusSetup.toDate.setHours(0, 0, 0, 0));
@ -195,7 +195,6 @@ export class ProductionBonusAttendanceComponent implements OnInit {
if (selectedDate >= fromDate && selectedDate <= toDate) {
var dataForAttn = {
setupId: this.productionBonusSetup.id,
lineId: this.selectedLine.id,
date: this.selectedDate
}
// console.log(dataForAttn);
@ -226,6 +225,7 @@ export class ProductionBonusAttendanceComponent implements OnInit {
debugger
this.employeeList = resp;
this.employeeList.forEach(x => this.AddEmployeeGridData(x.id, false));
// console.log('employee List', this.employeeList);
},
(err) => {
this.notificationService.showError(err.error);
@ -246,31 +246,6 @@ export class ProductionBonusAttendanceComponent implements OnInit {
// }
// }
}
//New For Swing And Printig
if (this.prodBonusAttn.length <= 0 && (this.productionBonusSetup.productionBonusType == EnumProductionBonusType.Sewing ||
this.productionBonusSetup.productionBonusType == EnumProductionBonusType.Printing)) {
let data = {
prodLine: this.selectedLine,
date: this.selectedDate
}
this.loadingPanelService.ShowLoadingPanel = true;
this.bonusService.getProdBonusAttnEmployeeListSwingAndPrinting(data).subscribe(
(resp) => {
debugger
this.employeeList = resp;
this.employeeList.forEach(x => this.AddEmployeeGridData(x.id, false));
},
(err) => {
this.notificationService.showError(err.error);
this.loadingPanelService.ShowLoadingPanel = false;
},
() => {
this.loadingPanelService.ShowLoadingPanel = false;
}
);
}
if (this.prodBonusAttn.length > 0) {
debugger;
for (let i = 0; i < this.prodBonusAttn.length; i++) {
@ -285,7 +260,7 @@ export class ProductionBonusAttendanceComponent implements OnInit {
);
}
else {
this.notificationService.showWarning('Date did not match with Work Schedule','Schedule not matched!');
this.notificationService.showWarning('Date did not match with Work Schedule! Schedule not match');
}
}
onClickAdd() {

2
HRM.UI/ClientApp/src/app/payroll-ot/production-bonus-setup/production-bonus-setup.component.html
View File

@ -141,7 +141,7 @@
<label>Line Name</label>
</div>
<div class="p-col-12 p-lg-5" *ngIf="isNewLine">
<app-dynamic-picker [dynamicPickerView]="_departmentPicker" (onSelectCompleted)="createWorkSchedule($event)"></app-dynamic-picker>
<app-dynamic-picker [dynamicPickerView]="_departmentPicker"></app-dynamic-picker>
</div>
<div class="p-col-12 p-lg-5" *ngIf="!isNewLine">
<input [(ngModel)]="selectedRow.lineName" [readonly]="!isNewLine" type="text"

61
HRM.UI/ClientApp/src/app/payroll-ot/production-bonus-setup/production-bonus-setup.component.ts
View File

@ -461,12 +461,11 @@ export class ProductionBonusSetupComponent implements OnInit {
() => {
//newlineItem.amount
this.prodBonusLine.prodBonusSupervisors.push(newlineSupervisor);
//Commented For Test
// this.prodBonusLine.prodBonusParameters.push(newlineParameter);
this.prodBonusLine.prodBonusParameters.push(newlineParameter);
this.prodBonusLine.scheduledHour = this.scheduledHours;
this.prodBonusLine.lineName = this.department.name;
// console.log(this.prodBonusLine);
this.clearProdbonusLine();
// this.notificationService.showSuccess('Supervisor added to the line');
}
@ -484,19 +483,17 @@ export class ProductionBonusSetupComponent implements OnInit {
// this.prodBonusLine.prodBonusWorkSchedules.push(newLayoutWork);
// currentDate.setDate(currentDate.getDate() + 1);
// }
// //Commented For Test
// for (let i = 0; currentDate <= this.productionBonusSetup.toDate; i++) {
// let newLayoutWork: ProdBonusWorkSchedule = {
// prodBonusSetupID: 0,
// prodBonusLineID: 0,
// id: 0,
// startDateTime: new Date(currentDate.setHours(0, 0, 0, 0)),
// endDateTime: new Date(currentDate.setHours(23, 59, 59, 999))
// };
// this.prodBonusLine.prodBonusWorkSchedules.push(newLayoutWork);
// currentDate.setDate(currentDate.getDate() + 1);
// }
for (let i = 0; currentDate <= this.productionBonusSetup.toDate; i++) {
let newLayoutWork: ProdBonusWorkSchedule = {
prodBonusSetupID: 0,
prodBonusLineID: 0,
id: 0,
startDateTime: new Date(currentDate.setHours(0, 0, 0, 0)),
endDateTime: new Date(currentDate.setHours(23, 59, 59, 999))
};
this.prodBonusLine.prodBonusWorkSchedules.push(newLayoutWork);
currentDate.setDate(currentDate.getDate() + 1);
}
}
else {
debugger;
@ -528,7 +525,7 @@ export class ProductionBonusSetupComponent implements OnInit {
onClickOk() {
debugger;
if (this.isNewLine) {
if (this._departmentPicker.selectedID == undefined) {
if(this._departmentPicker.selectedID == undefined){
this.notificationService.showWarning('Please Select a Line'); return;
}
this.prodBonusLine.lineName = this._departmentPicker.selectedObjects[0]['name'];
@ -609,38 +606,10 @@ export class ProductionBonusSetupComponent implements OnInit {
this.editDetails = false;
this.prodBSdata = undefined;
}
onScheduledHoursChange(value: number) {
onScheduledHoursChange(value: number){
debugger;
this.prodBonusLine.scheduledHour = value;
this.scheduledHours;
this.productionBonusSetup.productionBonusLines
}
createWorkSchedule(data: any) {
debugger;
var newlineParameter: ProdBonusParameter = new ProdBonusParameter();
if (this.isNewLine){
newlineParameter.itemID = this._departmentPicker.selectedID;
newlineParameter.itemType = 0;
newlineParameter.prodBonusSetupID = this.productionBonusSetup.id;
this.prodBonusLine.prodBonusParameters.push(newlineParameter);
const currentDate = new Date(this.productionBonusSetup.fromDate);
const maxDate = new Date(this.productionBonusSetup.toDate);
maxDate.setDate(this.productionBonusSetup.toDate.getDate() + 1);
for (let i = 0; currentDate <= maxDate; i++) {
let newLayoutWork: ProdBonusWorkSchedule = {
prodBonusSetupID: 0,
prodBonusLineID: 0,
id: 0,
startDateTime: new Date(currentDate.setHours(0, 0, 0, 0)),
endDateTime: new Date(currentDate.setHours(23, 59, 59, 999))
};
this.prodBonusLine.prodBonusWorkSchedules.push(newLayoutWork);
currentDate.setDate(currentDate.getDate() + 1);
}
}
}
}

49
HRM.UI/Controllers/Payroll/BonusController.cs
View File

@ -569,7 +569,6 @@ namespace HRM.UI.Controllers.Payroll
{
var item = Newtonsoft.Json.JsonConvert.DeserializeObject(Convert.ToString(processItems));
int setupID = (int)item["setupId"].ToObject<int>();
int lineID = (int)item["lineId"].ToObject<int>();
DateTime date = (DateTime)item["date"].ToObject<DateTime>();
CurrentUser currentUser = CurrentUser.GetCurrentUser(HttpContext.User);
@ -577,7 +576,7 @@ namespace HRM.UI.Controllers.Payroll
List<ProdBonusAttn> AttnItems = new List<ProdBonusAttn>();
try
{
AttnItems = _prodBonusAttnService.GetBySetupLineDate(setupID, lineID, date);
AttnItems = _prodBonusAttnService.Get(setupID, date);
}
catch (Exception e)
@ -657,52 +656,6 @@ namespace HRM.UI.Controllers.Payroll
return Ok(_oFinalEmployees);
}
[HttpPost]
[Route("getProdBonusAttnEmployeeListSwingAndPrinting")]
public ActionResult getProdBonusAttnEmployeeListSwingAndPrinting(dynamic pItem)
{
var item = Newtonsoft.Json.JsonConvert.DeserializeObject(Convert.ToString(pItem));
DateTime date = (DateTime)item["date"].ToObject<DateTime>();
ProdBonusLine _oProdBonusLine = (ProdBonusLine)item["prodLine"].ToObject<ProdBonusLine>();
CurrentUser currentUser = CurrentUser.GetCurrentUser(HttpContext.User);
List<Employee> _oEmployees = new EmployeeService().Get(EnumEmployeeStatus.Live, (int)currentUser.PayrollTypeID);
List<Employee> _oFinalEmployees = new List<Employee>();
List<ProdBonusParameter> _oProdBonusParameters = new List<ProdBonusParameter>();
List<ProdBonusSupervisor> _oProdBonusSupervisors = new List<ProdBonusSupervisor>();
List<DailyAttnProcess> _oDailyAttnProsess = new List<DailyAttnProcess>();
List<ProdBonusAttn> _oProdBonusAttns = null;
try
{
DateTime? maxDate = _prodBonusAttnService.GetMaxDate(_oProdBonusLine.ProdBonusSetupID, _oProdBonusLine.ID, date);
if(maxDate != null)
_oProdBonusAttns = _prodBonusAttnService.GetBySetupLineDate(_oProdBonusLine.ProdBonusSetupID, _oProdBonusLine.ID, (DateTime)maxDate);
List<ProdBonusParameter> desigparam = _oProdBonusParameters.Where(o => o.ItemType == EnumBonusItemType.Designation).ToList();
if(_oProdBonusAttns != null && _oProdBonusAttns.Count > 0)
{
foreach (var pda in _oProdBonusAttns)
{
Employee emp = _oEmployees.Find(o => o.ID == pda.EmployeeID);
if (emp != null) _oFinalEmployees.Add(emp);
}
}
string emIds = _oFinalEmployees.Aggregate(new StringBuilder(), (sb, x) => sb.Append(x.ID + ","), sb => sb.ToString().Trim(','));
if (emIds != "")
{
_oDailyAttnProsess = new DailyAttnProcessService().Get(emIds, date.Date, date.Date.AddHours(23.9));
}
}
catch (Exception e)
{
return StatusCode(StatusCodes.Status500InternalServerError, e.Message);
}
return Ok(_oFinalEmployees);
}
[HttpGet("getByLineID/{lineID}")]
public ActionResult getByLineID(int lineID)
{