diff --git a/Mohem/src/app/hmg-common/services/translator/translator.service.ts b/Mohem/src/app/hmg-common/services/translator/translator.service.ts index fff6de9e..00870278 100644 --- a/Mohem/src/app/hmg-common/services/translator/translator.service.ts +++ b/Mohem/src/app/hmg-common/services/translator/translator.service.ts @@ -174,7 +174,7 @@ export class TranslatorService { } private setCurrentLanguageToDefault() { - TranslatorService.CURRENT_LANGUAGE = TranslatorService.AR; + TranslatorService.CURRENT_LANGUAGE = TranslatorService.EN; } public setCurrentLanguage(language: string) { TranslatorService.CURRENT_LANGUAGE = language; diff --git a/Mohem/src/app/hmg-common/ui/nav-buttons/nav-buttons.component.html b/Mohem/src/app/hmg-common/ui/nav-buttons/nav-buttons.component.html index 2b618a0e..bfedc08a 100644 --- a/Mohem/src/app/hmg-common/ui/nav-buttons/nav-buttons.component.html +++ b/Mohem/src/app/hmg-common/ui/nav-buttons/nav-buttons.component.html @@ -11,7 +11,7 @@ --> - + diff --git a/Mohem/src/app/vacation-rule/home/home.component.html b/Mohem/src/app/vacation-rule/home/home.component.html index 43d923e7..5935739e 100644 --- a/Mohem/src/app/vacation-rule/home/home.component.html +++ b/Mohem/src/app/vacation-rule/home/home.component.html @@ -1,82 +1,84 @@ - + + {{ 'general,vacation-rule' | translate}} + +
+ + + + + + {{'vacation-rule, rule-Info' | translate}} + + + + + + + + + -
- - - - - - {{'vacation-rule, rule-Info' | translate}} - - - - - - - - - - - + - - -
- - - - - - - - -
- - - - - - - - + + +
- + - - - - - - - - - + +
+ + + + + + + + + + + + + + + + + + + + + + + + -
-
+
+
-
-
+
+
- \ No newline at end of file + +
+ {{'vacation-rule, create-rule' | translate}} +
+
\ No newline at end of file diff --git a/Mohem/src/app/vacation-rule/home/home.component.scss b/Mohem/src/app/vacation-rule/home/home.component.scss index 1f0f2007..7f727a35 100644 --- a/Mohem/src/app/vacation-rule/home/home.component.scss +++ b/Mohem/src/app/vacation-rule/home/home.component.scss @@ -16,10 +16,6 @@ ion-col.colBold { box-shadow: none; } -ion-button { - background: transparent; -} - ion-card-header { display: block; overflow: hidden; @@ -36,10 +32,10 @@ ion-card-header { float: right; } -.button, -.button-md, -button-ios { - background: transparent; +.footer-button { + border-radius: 2px; + padding: 0 1.1em; + min-height: 45px; } ion-card-header { @@ -58,19 +54,6 @@ ion-card-header { padding-top: 12px; width: 100%; min-height: 45px; - // @media screen and (max-width: 565px) { - // width: 80%; - // } - // @media screen and (max-width: 450px) { - // width: 74%; - // } - - // @include ltr() { - // float: left; - // } - // @include rtl() { - // float: right; - // } line-height: 1.2; } .button, @@ -83,11 +66,5 @@ ion-card-header { min-width: auto; padding: 0px !important; margin: 0px 5px !important; - // @include ltr() { - // float: right; - // } - // @include rtl() { - // float: left; - // } } } diff --git a/Mohem/src/app/vacation-rule/home/home.component.ts b/Mohem/src/app/vacation-rule/home/home.component.ts index 06263bb4..5180fe2c 100644 --- a/Mohem/src/app/vacation-rule/home/home.component.ts +++ b/Mohem/src/app/vacation-rule/home/home.component.ts @@ -124,6 +124,10 @@ export class HomeComponent implements OnInit { console.log(this.GetVacationRulesList); } + Vaction_Type() { + + } + getVacationRules() { this.P_PAGE_NUM = 1; this.IsReachEnd = false; diff --git a/Mohem/src/assets/localization/i18n.json b/Mohem/src/assets/localization/i18n.json index 1b030c8e..93391298 100644 --- a/Mohem/src/assets/localization/i18n.json +++ b/Mohem/src/assets/localization/i18n.json @@ -114,6 +114,10 @@ "rule-status": { "en": "Status", "ar": "الحالة" + }, + "create-rule": { + "en": "Create Rule", + "ar": "إنشاء قاعدة" } }, "verificationcode": {