diff --git a/Mohem/src/app/hmg-common/ui/circle-calendar/circle-calendar.component.scss b/Mohem/src/app/hmg-common/ui/circle-calendar/circle-calendar.component.scss
index 1094d585..26f5f287 100644
--- a/Mohem/src/app/hmg-common/ui/circle-calendar/circle-calendar.component.scss
+++ b/Mohem/src/app/hmg-common/ui/circle-calendar/circle-calendar.component.scss
@@ -129,8 +129,8 @@
bottom: 0;
}
.label-text{
- font-size: 12px;
- padding: 5px;
- position: relative;
- bottom: 3px;
+ font-size: 10px;
+ padding: 5px;
+ position: relative;
+ bottom: 5px;
}
\ No newline at end of file
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 8ebffd54..19cc2e60 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
@@ -62,10 +62,10 @@
{{'vacation-rule, all-label' | translate}}
-
+
@@ -137,10 +137,10 @@
{{assignMode.RADIO_BUTTON_LABEL}}
-
+
{{'vacation-rule, close' | translate}}
diff --git a/Mohem/src/app/vacation-rule/vacation-type/vacation-type.component.ts b/Mohem/src/app/vacation-rule/vacation-type/vacation-type.component.ts
index d6adb920..8d6dca41 100644
--- a/Mohem/src/app/vacation-rule/vacation-type/vacation-type.component.ts
+++ b/Mohem/src/app/vacation-rule/vacation-type/vacation-type.component.ts
@@ -62,7 +62,8 @@ export class VacationTypeComponent implements OnInit {
selectInput: any;
textInput: TextInput;
hideForwordEmployee: any;
- notifTypeSelP2: string;
+ // notifTypeSelP2: string;
+ notifTypeSelP2 = "*";
P_RESPOND_ATTRIBUTES_TBL: any=[];
vacationRuleRequest: createVacationRequest;
confirmMsg: string;
@@ -309,6 +310,7 @@ export class VacationTypeComponent implements OnInit {
this.notification_list = result.GetItemTypeNotificationsList;
//rest radio button of notifTypeSel (All , select)
this.notificationTypeShow=true;
+ this.NextPage();
} else {
this.cs.presentAlert(result.ErrorEndUserMessage);
diff --git a/Mohem/src/assets/localization/i18n.json b/Mohem/src/assets/localization/i18n.json
index 94ff7088..85f869db 100644
--- a/Mohem/src/assets/localization/i18n.json
+++ b/Mohem/src/assets/localization/i18n.json
@@ -443,7 +443,7 @@
},
"select": {
"en": "Please select",
- "ar": "إختر لو سمحت"
+ "ar": "الرجاء الاختيار"
},
"need": {
"en": "You need",
@@ -1437,7 +1437,7 @@
},
"busG": {
"en": "Business Group",
- "ar": "الإدارة"
+ "ar": "مجموعة العمل"
},
"phone-no": {
"en": "Phone Number",
@@ -1465,7 +1465,7 @@
},
"payrol": {
"en": "Payroll",
- "ar": "سجل الرواتب"
+ "ar": "كشف الرواتب"
},
"orgEmail": {
"en": "Organization Email Address",