+
@@ -77,5 +127,9 @@
+
+
+
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/Mohem/src/app/my-team/home/home.component.scss b/Mohem/src/app/my-team/home/home.component.scss
index ded6a0aa..13788acf 100644
--- a/Mohem/src/app/my-team/home/home.component.scss
+++ b/Mohem/src/app/my-team/home/home.component.scss
@@ -30,20 +30,37 @@ ion-content {
}
.request-heading {
span {
- text-align: center;
+ // text-align: center;
+ // display: block;
+ // padding-top: 8px;
+ // font-family: workSans-Regular;
display: block;
padding-top: 8px;
- font-family: workSans-Regular;
+ padding-left: 15px;
+ font-weight: bold;
+ font-size: 12px;
+ margin-top: 9px;
}
}
+.search-label{
+ border: 1px solid #ccc;
+ margin-left: 15px;
+ margin-right: 15px;
+ border-radius: 22px;
+ margin-top: 24px;
+ font-size: 11px;
+ color: rgb(143, 141, 141);
+}
+
.result-graph {
position: relative;
background: white;
margin-top: 20px;
- padding-bottom: 20px;
+ padding-bottom: 35px;
border-radius: 20px;
z-index: 1;
+ border: 1px solid #ccc;
}
.result-text-container {
padding: 0;
@@ -139,7 +156,7 @@ ion-content {
width: 100%;
height: 100%;
border-radius: 80px;
- border: 1px solid #ccc;
+ border: 1px solid rgb(170, 169, 169);
margin: 0px auto 6px;
}
@@ -162,3 +179,64 @@ ion-content {
}
}
}
+
+// .myClass .toggle-icon {
+// background-color: purple; // this changes the background, ie the grey stripe.
+// .toggle-inner {
+// background-color: yellow; // this changes the backgroundcolor of the toggle dot.
+// }
+// }
+
+.text-label{
+ --color: black !important;
+ font-size: 13px;
+ margin-left: 15px;
+ margin-right: 18px;
+}
+
+.radio-list{
+ background: white;
+ margin-left: 18px;
+ /* margin-right: 10px; */
+ margin-top: 12px;
+}
+
+// .selected .radio-icon {
+// border-color: #0064D9;
+// color: red;
+// }
+
+ .radio-icon{
+
+.custom-radio .radio-icon {
+ margin: 0px;
+ border-radius: 50%;
+ border-width: var(--border-width);
+ border-style: var(--border-style);
+ border-color: #dcdcdc;
+ margin-top: 6px !important;
+ border-color: #d8d4d4 !important;}
+}
+.text{
+ font-size: 16px;
+ font-weight: bolder;
+ font-family: 'WorkSans-Bold';
+ margin-top: 27px;
+}
+
+.number{
+ width: 20px;
+ height: 20px;
+ padding-right: -10px;
+ border-radius: 100%;
+ background-color: #269DB8;
+ z-index: 9;
+ margin-top: 26px;
+}
+
+.numberEmp{
+ color: white;
+ font-size: 13px;
+ font-weight: bolder;
+ margin-left: 6px;
+}
\ No newline at end of file
diff --git a/Mohem/src/app/my-team/home/home.component.ts b/Mohem/src/app/my-team/home/home.component.ts
index edc30021..295da569 100644
--- a/Mohem/src/app/my-team/home/home.component.ts
+++ b/Mohem/src/app/my-team/home/home.component.ts
@@ -7,6 +7,7 @@ import { MenuResponse } from 'src/app/hmg-common/services/menu/models/menu-respo
import { MyTeamService } from '../service/my-team.service';
import { ModalController, IonInfiniteScroll } from '@ionic/angular';
import { DetailsComponent } from '../details/details.component';
+import { Body } from '@angular/http/src/body';
@Component({
selector: 'app-home',
templateUrl: './home.component.html',
@@ -28,6 +29,8 @@ export class HomeComponent implements OnInit {
public selEmpNo: any;
public totalEmployees = 0;
public pageFirstVisit = false;
+ myColor: string = 'secondary';
+ public EmpTotal = [];
public options = {
cutoutPercentage: 80,
@@ -95,7 +98,13 @@ export class HomeComponent implements OnInit {
ngOnInit() {
this.common.sharedService.setSharedData( [], DetailsComponent.opendEmployeesARR);
this.setIntitial();
+
+ this.getSuborinatesAttStatus();
}
+ toggleColor() {
+ this.myColor = 'secondary';
+ // this.myColor = '#269DB8'
+}
// activeFilter(index: number) {
// this.previousActiveIndex = this.currentActiveIndex;
@@ -228,4 +237,36 @@ export class HomeComponent implements OnInit {
this.showEmailInput = true;
}
}
+
+
+
+ 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
+
+ };
+ // 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)
+ }
}
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 ebda3f1d..a15eb1c4 100644
--- a/Mohem/src/app/my-team/service/my-team.service.ts
+++ b/Mohem/src/app/my-team/service/my-team.service.ts
@@ -7,6 +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';
constructor(
public con: ConnectorService,
private authService: AuthenticationService
@@ -16,4 +17,11 @@ export class MyTeamService {
this.authService.authenticateRequest(request);
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);
+ }
+
}
diff --git a/Mohem/src/app/vacation-rule/vacation-type/vacation-type.component.html b/Mohem/src/app/vacation-rule/vacation-type/vacation-type.component.html
index f4fa3715..15900c2a 100644
--- a/Mohem/src/app/vacation-rule/vacation-type/vacation-type.component.html
+++ b/Mohem/src/app/vacation-rule/vacation-type/vacation-type.component.html
@@ -30,16 +30,15 @@
-
-
- {{'vacation-rule, itemType' | translate}}
-
-
- {{x.ITEM_TYPE_DISPLAY_NAME}}
-
-
+
+
+
+
+
diff --git a/Mohem/src/app/vacation-rule/vacation-type/vacation-type.component.scss b/Mohem/src/app/vacation-rule/vacation-type/vacation-type.component.scss
index 7edf7d17..c4fc2246 100644
--- a/Mohem/src/app/vacation-rule/vacation-type/vacation-type.component.scss
+++ b/Mohem/src/app/vacation-rule/vacation-type/vacation-type.component.scss
@@ -162,3 +162,72 @@ color: black !important;
// .cusprogressbar li.active:before {
// background-color: #209a83;
// }
+
+
+.label-Select{
+ color: var(--dark);
+ font-size: 15px;
+ border: none;
+ font-weight: 400;
+ -webkit-transform: translate3d(0, 0, 0);
+ transform: translate3d(0, 0, 0);
+ width: 80%;
+ // padding: 1px 0px;
+ background-color: var(--light);
+ border-bottom: var(--cusgray) solid 1px;
+ border-radius: 0px;
+ // margin-left: 20px;
+ margin-left: 34px;
+ margin-top: -10px;
+ // -webkit-appearance: none;
+ // -moz-appearance: none;
+ text-indent: 1px;
+ // text-overflow: '';
+ box-shadow: none;
+ -webkit-box-shadow:none;
+ -moz-box-shadow: none;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ overflow: hidden;
+
+ :root[dir="ltr"]{
+ background-image: linear-gradient(45deg, transparent 50%, #999 50%), linear-gradient(135deg, #999 50%, transparent 50%), linear-gradient(to right, #ffffff, #ffffff);
+ background-position: calc(100% - 14px) calc(1em + 2px), calc(100% - 8px) calc(1em + 2px), 100% 0;
+ background-size: 6px 6px, 6px 6px, 2.9em 2.9em;
+ background-repeat: no-repeat;
+ padding-right: 20px;
+ }
+ :root[dir="rtl"]{
+ background-image: linear-gradient(-135deg, #999 50%, transparent 50%),linear-gradient(-45deg, transparent 50%, #999 50%), linear-gradient(to right, #ffffff, #ffffff);
+ background-position: calc(1em - 10px) calc(100% - 8px), calc(1em - 4px) calc(100% - 8px), 0 100%;
+ background-size: 6px 6px, 6px 6px, 2.9em 2.9em;
+ background-repeat: no-repeat;
+ padding-left: 20px;
+ }
+}
+
+.label{
+ font-size: 16px;
+ // margin-left: 15px;
+ color: #a2a5a6 !important;
+ display: block;
+ overflow: hidden;
+ -webkit-box-flex: 1;
+ -webkit-flex: 1;
+ -ms-flex: 1;
+ flex: 1;
+ white-space: normal;
+ // padding-top: 10px;
+ // padding: 5px 0px;
+ padding-left: 10px !important;
+ margin: 10px auto;
+ :root[dir="ltr"]{
+ font-family: var(--fontFamilySemiBoldEN) !important;
+ }
+ :root[dir="rtl"]{
+ font-family: var(--fontFamilyIOSAR) !important;
+ font-weight: bold;
+ }
+
+
+}
\ No newline at end of file
diff --git a/Mohem/src/assets/imgs/call-o.svg b/Mohem/src/assets/imgs/call-o.svg
new file mode 100644
index 00000000..b5a9434a
--- /dev/null
+++ b/Mohem/src/assets/imgs/call-o.svg
@@ -0,0 +1,6 @@
+
diff --git a/Mohem/src/assets/imgs/call.svg b/Mohem/src/assets/imgs/call.svg
new file mode 100644
index 00000000..e7b1638d
--- /dev/null
+++ b/Mohem/src/assets/imgs/call.svg
@@ -0,0 +1,5 @@
+
diff --git a/Mohem/src/assets/imgs/create req.svg b/Mohem/src/assets/imgs/create req.svg
new file mode 100644
index 00000000..8cbae617
--- /dev/null
+++ b/Mohem/src/assets/imgs/create req.svg
@@ -0,0 +1,6 @@
+
diff --git a/Mohem/src/assets/imgs/create-req.svg b/Mohem/src/assets/imgs/create-req.svg
new file mode 100644
index 00000000..8cbae617
--- /dev/null
+++ b/Mohem/src/assets/imgs/create-req.svg
@@ -0,0 +1,6 @@
+
diff --git a/Mohem/src/assets/imgs/fav filled.svg b/Mohem/src/assets/imgs/fav filled.svg
new file mode 100644
index 00000000..7987c91b
--- /dev/null
+++ b/Mohem/src/assets/imgs/fav filled.svg
@@ -0,0 +1,3 @@
+
diff --git a/Mohem/src/assets/imgs/fav.svg b/Mohem/src/assets/imgs/fav.svg
new file mode 100644
index 00000000..cbad1863
--- /dev/null
+++ b/Mohem/src/assets/imgs/fav.svg
@@ -0,0 +1,3 @@
+
diff --git a/Mohem/src/assets/imgs/profile.svg b/Mohem/src/assets/imgs/profile.svg
new file mode 100644
index 00000000..735b72f7
--- /dev/null
+++ b/Mohem/src/assets/imgs/profile.svg
@@ -0,0 +1,14 @@
+
diff --git a/Mohem/src/assets/imgs/team-members.svg b/Mohem/src/assets/imgs/team-members.svg
new file mode 100644
index 00000000..fbfbaa33
--- /dev/null
+++ b/Mohem/src/assets/imgs/team-members.svg
@@ -0,0 +1,34 @@
+
diff --git a/Mohem/src/assets/imgs/view days.svg b/Mohem/src/assets/imgs/view days.svg
new file mode 100644
index 00000000..cdeb2c3f
--- /dev/null
+++ b/Mohem/src/assets/imgs/view days.svg
@@ -0,0 +1,8 @@
+
diff --git a/Mohem/src/assets/imgs/view stats.svg b/Mohem/src/assets/imgs/view stats.svg
new file mode 100644
index 00000000..ab5ab989
--- /dev/null
+++ b/Mohem/src/assets/imgs/view stats.svg
@@ -0,0 +1,6 @@
+
diff --git a/Mohem/src/assets/imgs/view-attendance.svg b/Mohem/src/assets/imgs/view-attendance.svg
new file mode 100644
index 00000000..f0d0087f
--- /dev/null
+++ b/Mohem/src/assets/imgs/view-attendance.svg
@@ -0,0 +1,8 @@
+
diff --git a/Mohem/src/assets/imgs/view-days.svg b/Mohem/src/assets/imgs/view-days.svg
new file mode 100644
index 00000000..cdeb2c3f
--- /dev/null
+++ b/Mohem/src/assets/imgs/view-days.svg
@@ -0,0 +1,8 @@
+
diff --git a/Mohem/src/assets/imgs/view-stats.svg b/Mohem/src/assets/imgs/view-stats.svg
new file mode 100644
index 00000000..ab5ab989
--- /dev/null
+++ b/Mohem/src/assets/imgs/view-stats.svg
@@ -0,0 +1,6 @@
+
diff --git a/Mohem/src/assets/localization/i18n.json b/Mohem/src/assets/localization/i18n.json
index 4ec28a25..7252d7a0 100644
--- a/Mohem/src/assets/localization/i18n.json
+++ b/Mohem/src/assets/localization/i18n.json
@@ -1077,6 +1077,10 @@
"en": "My Profile",
"ar": "معلوماتي"
},
+ "profile-details": {
+ "en": "Profile Details",
+ "ar": "تفاصيل الملف الشخصي"
+ },
"edit-profile": {
"en": "Edit Profile",
"ar": "تعديل المعلومات"
@@ -1125,6 +1129,10 @@
"en": "Employee Detail",
"ar": "بيانات الموظف"
},
+ "role": {
+ "en": "Role",
+ "ar": "Role"
+ },
"address": {
"en": "Address",
"ar": "العنوان"
@@ -1227,7 +1235,7 @@
},
"monthly-attendance-calendar": {
"ar": "سجل الحضور الشهري",
- "en": "Monthly Attendance Calendar"
+ "en": "Monthly Attendance"
},
"completed": {
"ar": "منجز",
@@ -1577,6 +1585,10 @@
"en": "Late",
"ar": "التأخير"
},
+ "search-by": {
+ "en": "Search By",
+ "ar": "البحث بواسطة"
+ },
"attendance-statistics": {
"en": "Attendance Statistics",
"ar": "احصائيات الحضور"
@@ -1590,7 +1602,19 @@
"ar": "عدد"
},
"team-members": {
- "en": "TEAM MEMBERS",
+ "en": "Team Members",
+ "ar": " اعضاء الفريق"
+ },
+ "view-attendence": {
+ "en": "View Attendance",
+ "ar": " عرض الحضور"
+ },
+ "profile-details": {
+ "en": "Profile Detailes",
+ "ar": " الملف الشخصي"
+ },
+ "my-team-members": {
+ "en": "My Team Members",
"ar": " اعضاء الفريق"
},
"team-stats": {
@@ -2660,7 +2684,7 @@
"ar": "ساعات التقصير"
},
"schedule": {
- "en": "Schedule",
+ "en": "Scheduled Days",
"ar": "ايام العمل"
},
"off-days": {
@@ -2671,6 +2695,14 @@
"en": "Non Analyzed",
"ar": "لايوجد تحليل"
},
+ "view-days": {
+ "en": "View Days",
+ "ar": "عرض الأيام"
+ },
+ "view-stats": {
+ "en": "View Stats",
+ "ar": "عرض الأحصائيات"
+ },
"attendance-statistics": {
"en": "Attendance Statistics",
"ar": "احصائيات الحضور"