-
Action By
+
{{ts.trPK('userProfile','actionBy')}}{{action.actionBy}}
-
descriptions
-
May 16,2021
+
{{action.comments}}
+
{{(action.actionDate)?.substring(0,10)}}
diff --git a/Mohem/src/app/mowadhafi/request-details/request-details.component.scss b/Mohem/src/app/mowadhafi/request-details/request-details.component.scss
index 06ad71a7..7ecde242 100644
--- a/Mohem/src/app/mowadhafi/request-details/request-details.component.scss
+++ b/Mohem/src/app/mowadhafi/request-details/request-details.component.scss
@@ -70,7 +70,8 @@
font-size: 13px;
margin-bottom: 0px;
margin-top: -10px;
- color: gray;
+ color: #a9a5a5;
+ font-family: 'WorkSans-bold';
}
.request-list-container {
@@ -78,7 +79,6 @@
padding-left: 37px;
clear: both;
min-height: 200px;
- margin-bottom: 80px;
padding-top: 15px;
}
.request-list-container:before{
@@ -162,7 +162,7 @@
margin-bottom: 0px;
margin-top: -10px;
color: gray;
- margin-left: 178px;
+ margin-left: 172px;
}
.date-span-ar{
diff --git a/Mohem/src/app/mowadhafi/request-details/request-details.component.ts b/Mohem/src/app/mowadhafi/request-details/request-details.component.ts
index ca0a2600..c122da44 100644
--- a/Mohem/src/app/mowadhafi/request-details/request-details.component.ts
+++ b/Mohem/src/app/mowadhafi/request-details/request-details.component.ts
@@ -15,6 +15,16 @@ import { Location } from '@angular/common';
})
export class RequestDetailsComponent implements OnInit {
public direction : String;
+ public actionInfo:any = [];
+ public teckitInfo:any;
+ public description:any;
+ public section:any;
+ public topic:any;
+ public ticketRefre:any;
+ public date:any;
+ public status:any;
+ public teckitDetial:any;
+
constructor(
public ts: TranslatorService,
@@ -31,8 +41,9 @@ export class RequestDetailsComponent implements OnInit {
}
ngOnInit() {
+ this.teckitDetial = this.cs.sharedService.getSharedData('ticket-info', true)
+ this.getTicketDetails();
this.getTicketTransaction();
- this.getTicketDetails()
}
goback() {
@@ -44,8 +55,8 @@ export class RequestDetailsComponent implements OnInit {
getTicketTransaction(){
const request = {
- EmployeeNumber:"121816",
- ItgTicketId:"5a10de61-c4db-4c77-e464-08d8a1beaaac",
+ EmployeeNumber:'',
+ ItgTicketId:this.teckitDetial.ticketId,
};
this.MowadhafiService.getTicketTransaction(request, ()=> {} , this.ts.trPK('general', 'retry')).subscribe((result)=>
@@ -54,14 +65,23 @@ export class RequestDetailsComponent implements OnInit {
}) }
handlegetTicketTransactionResult(result){
+ let x;
+ if(this.cs.validResponse(result)){
+ x = JSON.parse(result.Mohemm_ITG_ResponseItem);
+ console.log(x);
+ this.actionInfo=x.result.data;
+ for (let i = 0; i < this.actionInfo.length; i++) {
+ console.log(i + ' : ' + this.actionInfo[i].ticketTypeName)
+
+ }
+ }
}
getTicketDetails(){
const request = {
- EmployeeNumber:"121816",
- TokenID:"@dm!n",
- ItgTicketId:"5a10de61-c4db-4c77-e464-08d8a1beaaac",
+ EmployeeNumber:'',
+ ItgTicketId:this.teckitDetial.ticketId,
};
this.MowadhafiService.getTicketDetails(request, ()=> {} , this.ts.trPK('general', 'retry')).subscribe((result)=>
@@ -70,6 +90,19 @@ export class RequestDetailsComponent implements OnInit {
}) }
handlegetTicketDetailsResult(result){
+
+ let res;
+ if(this.cs.validResponse(result)){
+ res = JSON.parse(result.Mohemm_ITG_ResponseItem);
+ console.log(res);
+ this.teckitInfo = res.result.data;
+ this.status =this.teckitInfo.ticketStatusName;
+ this.date =this.teckitInfo.created.substring(0, 10);
+ this.ticketRefre =this.teckitInfo.ticketReferenceNo;
+ this.section = this.teckitInfo.sectionName;
+ this.topic =this.teckitInfo.topicName;
+ this.description =this.teckitInfo.description;
+ }
}
diff --git a/Mohem/src/app/my-team/details/details.component.html b/Mohem/src/app/my-team/details/details.component.html
index a22f7da9..e8bc1fd3 100644
--- a/Mohem/src/app/my-team/details/details.component.html
+++ b/Mohem/src/app/my-team/details/details.component.html
@@ -400,7 +400,7 @@
{{ts.trPK('myTeam','my-team-members')}}
-
+
diff --git a/Mohem/src/app/my-team/details/details.component.ts b/Mohem/src/app/my-team/details/details.component.ts
index 83674888..63cb72ed 100644
--- a/Mohem/src/app/my-team/details/details.component.ts
+++ b/Mohem/src/app/my-team/details/details.component.ts
@@ -92,7 +92,10 @@ export class DetailsComponent implements OnInit {
public selectedFilter = '';
public itemType = '';
public monthNo: any;
- isFavorite: boolean = false;
+ isFavorite = false;
+ public EmpNumer:any;
+ public isFavor:any;
+ public EmployeeTotal:any;
@@ -231,7 +234,9 @@ export class DetailsComponent implements OnInit {
this.showAttendanceTracking();
// tslint:disable-next-line: max-line-length
this.currentMonthName = this.direction === 'en' ? this.common.getMonthName(this.monthIndex) : this.common.getMonthNameAr(this.monthIndex);
- this.getSuborinatesAttStatus();
+ // this.getSuborinatesAttStatus();
+ // this.getFavorit();
+
}
@@ -300,7 +305,6 @@ export class DetailsComponent implements OnInit {
this.timeCardService.getDayHoursTypeDetails(dayAndHoursReqObj, '', '', this.isPostNoLoad).subscribe((result) => {
if (this.common.validResponse(result)) {
- console.log(result.GetDayHoursTypeDetailsList);
this.common.sharedService.setSharedData(result.GetDayHoursTypeDetailsList, 'RTP_IDs');
this.countAllAttendDays(result.GetDayHoursTypeDetailsList);
}
@@ -308,7 +312,7 @@ export class DetailsComponent implements OnInit {
}
monthCardSliders(monthNo) {
- console.log(monthNo + "__________________")
+
/* change
*/
@@ -321,8 +325,7 @@ export class DetailsComponent implements OnInit {
//end
this.calendarConfig(this.getMonthName(monthNo), this.currentYear);
- console.log("next month =" + this.nextMonth);
- console.log(" Month Name =" + this.currentMonthName);
+
}
@@ -350,7 +353,7 @@ export class DetailsComponent implements OnInit {
this.preMonth = 12;
}
this.currentDate = new Date(this.currentYear, (this.preMonth - 1), 1);
- console.log(this.currentDate);
+
this.calendarConfig(this.getMonthName(this.preMonth), this.currentYear);
this.preMonth = this.preMonth - 1;
this.nextMonth = this.preMonth + 2;
@@ -525,6 +528,8 @@ export class DetailsComponent implements OnInit {
this.isSpecialist = this.common.sharedService.getSharedData('isSpecialist', false) ? true : false;
if (this.employee) {
this.getEmpSubordinate(userID);
+ this.isFavorite = false;
+ this.getFavorit();
}
}
@@ -587,7 +592,7 @@ export class DetailsComponent implements OnInit {
};
this.getEmployeeSubordinatesRequestObject = body;
this.myTeamService.getEmployeeSubordinates(body).subscribe((result: any) => {
- console.log('one');
+
if (this.common.validResponse(result)) {
this.handleEmpResult(result.GetEmployeeSubordinatesList);
}
@@ -595,6 +600,7 @@ export class DetailsComponent implements OnInit {
}
handleEmpResult(result) {
+ this.EmployeeTotal = result.length;
const lastItemIndex = result.length - 1;
const lastItem = result[lastItemIndex];
if (lastItem) {
@@ -625,7 +631,7 @@ export class DetailsComponent implements OnInit {
doInfinite(infiniteScroll) {
if (!this.isReachEnd) {
this.myTeamService.getEmployeeSubordinates(this.getEmployeeSubordinatesRequestObject).subscribe((result: any) => {
- console.log('two');
+
if (this.common.validResponse(result)) {
this.handleEmpResult(result.GetEmployeeSubordinatesList);
}
@@ -715,37 +721,29 @@ export class DetailsComponent implements OnInit {
}
}
- getSuborinatesAttStatus() {
- const request = {
- // VersionID:2.8,
- // Channel:37,
- // LanguageID:2,
- // MobileType:"android",
- // P_SESSION_ID:1142449920,
- // MobileNumber:"0508079569",
- // TokenID:"VHR_Token",
- // P_USER_NAME:"111209",
- // UserName:"111209",
- // P_EMAIL_ADDRESS:"Faisal.AlQurashi@cloudsolutions.com.sa",
- SearchMonth: "January",
- SearchYear: 2021
+ // getSuborinatesAttStatus() {
+ // const request = {
+ // // SearchMonth: "January",
+ // // SearchYear: 2021
+ // SearchMonth: "",
+ // SearchYear: Number
- };
- // this.myTeamService.getSuborinatesAttStatus().subscribe((result: any) =>
- this.myTeamService.getSuborinatesAttStatus(request, () => { }, this.ts.trPK('general', 'retry')).subscribe((result) => {
- this.handleRespondSuborinatesAttStatusResult(result);
+ // };
+ // // this.myTeamService.getSuborinatesAttStatus().subscribe((result: any) =>
+ // this.myTeamService.getSuborinatesAttStatus(request, () => { }, this.ts.trPK('general', 'retry')).subscribe((result) => {
+ // this.handleRespondSuborinatesAttStatusResult(result);
- })
- }
+ // })
+ // }
- handleRespondSuborinatesAttStatusResult(result) {
- // this.EmpTotal = result.GetSubordinatesAttdStatusList.length;
- this.EmpTotal = result.GetSubordinatesAttdStatusList[0].NUMBER_OF_EMPLOYEES;
- console.log("total no " + this.EmpTotal)
- }
+ // handleRespondSuborinatesAttStatusResult(result) {
+ // // this.EmpTotal = result.GetSubordinatesAttdStatusList.length;
+ // this.EmpTotal = result.GetSubordinatesAttdStatusList[0].NUMBER_OF_EMPLOYEES;
+
+ // }
activeFilter(index: number) {
- console.log(this.filters);
+
if (this.currentActiveIndex !== index) {
this.previousActiveIndex = this.currentActiveIndex;
this.currentActiveIndex = index;
@@ -804,8 +802,9 @@ export class DetailsComponent implements OnInit {
this.common.presentConfirmDialog(
confirmBoxhtml
, () => {
+
var request =
- { "USER_NAME": selEmp['USER_NAME'], "EMPLOYEE_DISPLAY_NAME": selEmp['EMPLOYEE_DISPLAY_NAME'], "EMAIL_ADDRESS": selEmp.EMAIL_ADDRESS, "EMPLOYEE_IMAGE": selEmp.EMPLOYEE_IMAGE, "IsFavorite": true };
+ [ { "USER_NAME": this.employee.EMPLOYEE_NUMBER, "EMPLOYEE_DISPLAY_NAME": this.employee.EMPLOYEE_DISPLAY_NAME, "EMAIL_ADDRESS": this.employee.EMAIL_ADDRESS, "EMPLOYEE_IMAGE": this.employee.EMPLOYEE_IMAGE, "IsFavorite": !this.isFavorite}];
this.saveUserFavruiteList(request);
// this.isFavorite = false;
@@ -813,7 +812,7 @@ export class DetailsComponent implements OnInit {
}, () => {
})
- this.isFavorite = false;
+
// if (selectValue == "1" || selectValue == "2" || selectValue == "3") {
// this.isSelect = true;
// }
@@ -832,6 +831,7 @@ export class DetailsComponent implements OnInit {
if (this.common.validResponse(result)) {
this.common.stopLoading();
this.favoriteUserList = result['Mohemm_GetFavoriteReplacementsList'];
+
}
@@ -842,10 +842,27 @@ export class DetailsComponent implements OnInit {
}).subscribe((result) => {
if (this.common.validResponse(result)) {
this.common.toastPK("replacementRoll", "favorite-saved");
- this.isFavorite = true;
+ this.isFavorite = !this.isFavorite;
}
})
}
+ getFavorit(){
+ this.worklistService.getFavoriteMyTeam({}, () => {
+ }).subscribe((result) => {
+ this.EmpNumer = result.Mohemm_GetFavoriteReplacementsList;
+
+ this.EmpNumer.forEach(element => {
+ if(element.USER_NAME === this.employee.EMPLOYEE_NUMBER){
+
+ this.isFavorite = true;
+
+ }
+ });
+
+ });
+ }
+
+
}
diff --git a/Mohem/src/app/my-team/home/home.component.html b/Mohem/src/app/my-team/home/home.component.html
index 356357b3..e97bf341 100644
--- a/Mohem/src/app/my-team/home/home.component.html
+++ b/Mohem/src/app/my-team/home/home.component.html
@@ -47,7 +47,7 @@
{{ts.trPK('myTeam','my-team-members')}}
-
+
diff --git a/Mohem/src/app/my-team/home/home.component.ts b/Mohem/src/app/my-team/home/home.component.ts
index 295da569..46296c21 100644
--- a/Mohem/src/app/my-team/home/home.component.ts
+++ b/Mohem/src/app/my-team/home/home.component.ts
@@ -31,6 +31,7 @@ export class HomeComponent implements OnInit {
public pageFirstVisit = false;
myColor: string = 'secondary';
public EmpTotal = [];
+ public EmployeeTotal: any;
public options = {
cutoutPercentage: 80,
@@ -99,7 +100,7 @@ export class HomeComponent implements OnInit {
this.common.sharedService.setSharedData( [], DetailsComponent.opendEmployeesARR);
this.setIntitial();
- this.getSuborinatesAttStatus();
+ // this.getSuborinatesAttStatus();
}
toggleColor() {
this.myColor = 'secondary';
@@ -166,6 +167,7 @@ export class HomeComponent implements OnInit {
}
handleEmpResult(result) {
+ this.EmployeeTotal = result.length;
const lastItemIndex = result.length - 1;
const lastItem = result[lastItemIndex];
if (lastItem) {
@@ -240,33 +242,23 @@ export class HomeComponent implements OnInit {
- getSuborinatesAttStatus(){
- const request = {
- // VersionID:2.8,
- // Channel:37,
- // LanguageID:2,
- // MobileType:"android",
- // P_SESSION_ID:1142449920,
- // MobileNumber:"0508079569",
- // TokenID:"VHR_Token",
- // P_USER_NAME:"111209",
- // UserName:"111209",
- // P_EMAIL_ADDRESS:"Faisal.AlQurashi@cloudsolutions.com.sa",
- SearchMonth:"January",
- SearchYear:2021
+ // getSuborinatesAttStatus(){
+ // const request = {
+ // // SearchMonth:"January",
+ // SearchYear:Number,
- };
- // this.myTeamService.getSuborinatesAttStatus().subscribe((result: any) =>
- this.myTeamService.getSuborinatesAttStatus(request, ()=> {} , this.ts.trPK('general', 'retry')).subscribe((result)=>
- {
- this.handleRespondSuborinatesAttStatusResult(result);
+ // };
+ // // this.myTeamService.getSuborinatesAttStatus().subscribe((result: any) =>
+ // this.myTeamService.getSuborinatesAttStatus(request, ()=> {} , this.ts.trPK('general', 'retry')).subscribe((result)=>
+ // {
+ // this.handleRespondSuborinatesAttStatusResult(result);
- })
- }
+ // })
+ // }
- handleRespondSuborinatesAttStatusResult(result){
- // this.EmpTotal = result.GetSubordinatesAttdStatusList.length;
- this.EmpTotal = result.GetSubordinatesAttdStatusList[0].NUMBER_OF_EMPLOYEES;
- console.log("total no "+this.EmpTotal)
- }
+ // handleRespondSuborinatesAttStatusResult(result){
+ // // this.EmpTotal = result.GetSubordinatesAttdStatusList.length;
+ // this.EmpTotal = result.GetSubordinatesAttdStatusList[0].NUMBER_OF_EMPLOYEES;
+ // console.log("total no "+this.EmpTotal)
+ // }
}
diff --git a/Mohem/src/app/my-team/service/my-team.service.ts b/Mohem/src/app/my-team/service/my-team.service.ts
index 31354d76..87507d70 100644
--- a/Mohem/src/app/my-team/service/my-team.service.ts
+++ b/Mohem/src/app/my-team/service/my-team.service.ts
@@ -7,7 +7,7 @@ import { AuthenticationService } from "src/app/hmg-common/services/authenticatio
export class MyTeamService {
public static EMPLOYEE_SHARED_DATA = 'employee';
public static getMyTeam = 'Services/ERP.svc/REST/GET_EMPLOYEE_SUBORDINATES';
- public static getSuborinateStatus = 'Services/ERP.svc/REST/GET_SUBORDINATES_ATTD_STATUS';
+ // public static getSuborinateStatus = 'Services/ERP.svc/REST/GET_SUBORDINATES_ATTD_STATUS';
constructor(
@@ -20,11 +20,13 @@ export class MyTeamService {
return this.con.post(MyTeamService.getMyTeam, request, onError, errorLabel);
}
- public getSuborinatesAttStatus(absence: any, onError?: any, errorLabel?: string){
- const request = absence;
- this.authService.authenticateRequest(request);
- return this.con.post(MyTeamService.getSuborinateStatus, request, onError, errorLabel);
- }
+ // public getSuborinatesAttStatus(absence: any, onError?: any, errorLabel?: string){
+ // const request = absence;
+ // this.authService.authenticateRequest(request);
+ // console.log("________________________________");
+ // console.log(request);
+ // return this.con.post(MyTeamService.getSuborinateStatus, request, onError, errorLabel);
+ // }
diff --git a/Mohem/src/app/notification/service/worklist.service.ts b/Mohem/src/app/notification/service/worklist.service.ts
index c53b6f8a..1673443f 100644
--- a/Mohem/src/app/notification/service/worklist.service.ts
+++ b/Mohem/src/app/notification/service/worklist.service.ts
@@ -59,7 +59,13 @@ export class WorklistService {
var req: any = {};
req['Mohemm_ChangeReplacementsInputList'] = request;
this.authService.authenticateRequest(req);
-
+ console.log(req);
return this.api.post(WorklistService.saveFavorite, req, onError, errorLabel);
}
-}
\ No newline at end of file
+
+ public getFavoriteMyTeam(req: any, onError?: any, errorLabel?: string): Observable
{
+ this.authService.authenticateRequest(req);
+ return this.api.post(WorklistService.getFavorite, req, onError, errorLabel);
+ }
+}
+
diff --git a/Mohem/src/assets/localization/i18n.json b/Mohem/src/assets/localization/i18n.json
index 15e83c59..639eaad5 100644
--- a/Mohem/src/assets/localization/i18n.json
+++ b/Mohem/src/assets/localization/i18n.json
@@ -1175,6 +1175,10 @@
"en": "Topic",
"ar": "العنوان"
},
+ "actionBy": {
+ "en": "Action By :",
+ "ar": " : بواسطة"
+ },
"postedDate": {
"en": "Posted on",
"ar": "نشر في"
@@ -1205,7 +1209,7 @@
},
"HR-Request": {
"en": "HR Request",
- "ar": "HR طلبات ال "
+ "ar": "HR طلبات"
},
"performance-evaluation": {
"en": "Performance Evaluation",
@@ -1635,6 +1639,14 @@
"en": "Absence list",
"ar": "قائمة الإجازات"
},
+ "AccrualUsed": {
+ "en": "Accrual Used",
+ "ar": "الأستحقاق المستخدم"
+ },
+ "PreviousYears": {
+ "en": "Previous Years",
+ "ar": "السنوات السابقه"
+ },
"accrualBalances": {
"en": "Accrual Balances",
"ar": "رصيد حساب المستحقات"