diff --git a/src/app/attendance/attendance.component.html b/src/app/attendance/attendance.component.html index 586bfab4..f27dc2ac 100644 --- a/src/app/attendance/attendance.component.html +++ b/src/app/attendance/attendance.component.html @@ -1,8 +1,8 @@ -
+
-

April

+

{{languageConstants.april}}

2021

-

Attendance

+

"{{languageConstants.attendance}}

diff --git a/src/app/attendance/attendance.component.scss b/src/app/attendance/attendance.component.scss index 9ec71422..4654026c 100644 --- a/src/app/attendance/attendance.component.scss +++ b/src/app/attendance/attendance.component.scss @@ -1,5 +1,5 @@ @import '../../styles.scss'; -#flexi-leave{ +#attendance{ .align-middle{ @include flex-box(column, top); text-align: center; diff --git a/src/app/attendance/attendance.component.ts b/src/app/attendance/attendance.component.ts index 765acd6d..b0bc1f98 100644 --- a/src/app/attendance/attendance.component.ts +++ b/src/app/attendance/attendance.component.ts @@ -9,9 +9,14 @@ import { TranslationContentService } from 'src/constants/language/TranslationCon export class AttendanceComponent implements OnInit { public showAttendanceStatus:string = 'showAttendanceStatus'; public active:string = 'active'; + public languageConstants: any; + constructor(private translationContentService:TranslationContentService) { } ngOnInit(): void { + this.translationContentService.getContent().subscribe((content: any) => { + this.languageConstants = Object.assign({}, content); + }); } } diff --git a/src/app/current-screen/current-screen.component.html b/src/app/current-screen/current-screen.component.html index 2b30fff9..0501cf14 100644 --- a/src/app/current-screen/current-screen.component.html +++ b/src/app/current-screen/current-screen.component.html @@ -37,16 +37,16 @@
-
+
-
+
-
+
-
+
diff --git a/src/app/current-screen/current-screen.component.scss b/src/app/current-screen/current-screen.component.scss index 2a378020..51f05df5 100644 --- a/src/app/current-screen/current-screen.component.scss +++ b/src/app/current-screen/current-screen.component.scss @@ -5,7 +5,7 @@ margin-bottom: 20%; height: 100%; .content { - background: $clr-grey; + background: $clr-mania; width: 100%; @include flex-box(column, center, center); .clear-content{ @@ -115,6 +115,7 @@ background-color: $clr-mania; .width-90{ width: 90%; + min-width: 90%; margin: 5% auto; } } diff --git a/src/app/flexi-leave/flexi-leave.component.html b/src/app/flexi-leave/flexi-leave.component.html index 0cff7519..39e9da2c 100644 --- a/src/app/flexi-leave/flexi-leave.component.html +++ b/src/app/flexi-leave/flexi-leave.component.html @@ -1,8 +1,8 @@
-

April

+

{{languageConstants.april}}

2021

-

Flexi

+

{{languageConstants.flexi}}

diff --git a/src/app/flexi-leave/flexi-leave.component.scss b/src/app/flexi-leave/flexi-leave.component.scss index 9ec71422..a6b2ac3e 100644 --- a/src/app/flexi-leave/flexi-leave.component.scss +++ b/src/app/flexi-leave/flexi-leave.component.scss @@ -6,6 +6,7 @@ padding-bottom: 5px; width: 90%; margin: 0% auto; + padding: 5%; } .leave-status{ background-color: $clr-mania; diff --git a/src/app/home/home.component.ts b/src/app/home/home.component.ts index 230c3128..9126169f 100644 --- a/src/app/home/home.component.ts +++ b/src/app/home/home.component.ts @@ -24,7 +24,8 @@ export class HomeComponent implements OnInit { let page = item.split('_thumb.png')[0]; if(page === 'leave'){ - page = 'applyLeave' + //page = 'applyLeave' + page = 'screen'; } this.router.navigate([page]); diff --git a/src/app/leave-status/leave-status.component.html b/src/app/leave-status/leave-status.component.html index aed4f43f..a78942ce 100644 --- a/src/app/leave-status/leave-status.component.html +++ b/src/app/leave-status/leave-status.component.html @@ -6,8 +6,8 @@
26/2/2021 - 28/2/2021
-
Approved & Completed
-
Earned Leave
+
{{languageConstants.approved}} & {{languageConstants.completed}}
+
{{languageConstants.earnedLeave}}
{{'mukund' | uppercase}}
@@ -60,8 +60,8 @@
26/2/2021 - 28/2/2021
-
Approved
-
Outdoor Duty
+
{{languageConstants.approved}}
+
{{languageConstants.outdoorDuty}}
{{'mukund' | uppercase}}
diff --git a/src/app/leave-status/leave-status.component.scss b/src/app/leave-status/leave-status.component.scss index 33ba08ca..62050c51 100644 --- a/src/app/leave-status/leave-status.component.scss +++ b/src/app/leave-status/leave-status.component.scss @@ -1,7 +1,9 @@ @import '../../styles.scss'; #leaveStatusPage{ background-color: #ffffff; - border-radius: 0% 2%; + border-radius: 0% 2%; + border-top-right-radius: 20px; + border-bottom-right-radius: 20px; .status-clr{ background-color: #354814A6; } diff --git a/src/app/odpnr/odpnr.component.html b/src/app/odpnr/odpnr.component.html index 8196cfed..376c5f3a 100644 --- a/src/app/odpnr/odpnr.component.html +++ b/src/app/odpnr/odpnr.component.html @@ -6,7 +6,7 @@

{{languageConstants.month}}

2021

-

OD/FPNR

+

{{languageConstants.odpnr}}

diff --git a/src/app/odpnr/odpnr.component.scss b/src/app/odpnr/odpnr.component.scss index 507e1b2b..cd907968 100644 --- a/src/app/odpnr/odpnr.component.scss +++ b/src/app/odpnr/odpnr.component.scss @@ -5,7 +5,7 @@ margin-bottom: 20%; height: 100%; .content { - background: $clr-grey; + background: $clr-mania; width: 100%; @include flex-box(column, center, center); .clear-content{ diff --git a/src/constants/language/englishLanguageConstants.ts b/src/constants/language/englishLanguageConstants.ts index 1cda7d1e..2cf3e3af 100644 --- a/src/constants/language/englishLanguageConstants.ts +++ b/src/constants/language/englishLanguageConstants.ts @@ -105,5 +105,10 @@ export const englishLanguageConstants = { daysPaid: 'DAYS PAID', tue: 'TUE', week: 'WEEK', - min: 'MIN' + min: 'MIN', + attendance: 'Attendance', + odpnr: 'OD/FPNR', + approved: 'Approved', + outdoorDuty:'Outdoor Duty', + completed: 'Completed' }; \ No newline at end of file diff --git a/src/constants/language/hindiLanguageConstants.ts b/src/constants/language/hindiLanguageConstants.ts index 07d3c72d..61c2869e 100644 --- a/src/constants/language/hindiLanguageConstants.ts +++ b/src/constants/language/hindiLanguageConstants.ts @@ -3,7 +3,7 @@ export const hindiLanguageConstants = { month:'अप्रैल', leave: 'लीव', applyLeave: 'छुट्टी आवेदन', - exigencyLeave: 'Exigency Leave', + exigencyLeave: 'अत्यावश्यक अवकाश', attendance: 'उपस्थिति रिपोर्ट', employeeLetters: 'कर्मचारी पत्र', odfpnr: 'ओडी / ऍफ़ पि एन आर', @@ -236,6 +236,10 @@ export const hindiLanguageConstants = { daysPaid: 'भुगतान किए गए दिन', tue: 'मंगल', week: 'सप्ताह', - min: 'मिनट' + min: 'मिनट', + odpnr:'ओडी/एफपीएनआर', + approved: 'मंजूर', + outdoorDuty:'आउटडोर ड्यूटी', + completed: 'पूरा हुआ' }; diff --git a/src/constants/language/marathiLanguageConstants.ts b/src/constants/language/marathiLanguageConstants.ts index 768a3bb8..dbcf2fe5 100644 --- a/src/constants/language/marathiLanguageConstants.ts +++ b/src/constants/language/marathiLanguageConstants.ts @@ -5,9 +5,9 @@ export const marathiLanguageConstants = { casualLeave: 'शेवटची वेळ', month:'एप्रिल', leave: 'लीव', - applyLeave: 'Apply Leave', - exigencyLeave: 'Exigency Leave', - policyPath: 'policiesMarathi', + applyLeave: 'रजा लागू करा', + exigencyLeave: 'अत्यावश्यक रजा', + policyPath: 'धोरणे', coronaVirus: 'कोरोना व्हायरस किंवा COVID-19 म्हणजे काय?', precautionDropDown: 'काय करावे', annualHealthCheck: 'वार्षिक आरोग्य तपासणी', @@ -90,5 +90,14 @@ export const marathiLanguageConstants = { daysPaid: 'दिवस भरले', tue: 'मंगळ', week: 'आठवडा', - min: 'मि' + min: 'मि', + submit: 'प्रस्तुत करणे', + cancel: 'रद्द करा', + checkDetails:'सबमिट करण्यापूर्वी तपशील तपासा', + casualSickLeave: 'लागू: कॅज्युअल कम आजारी रजा', + attendance: 'उपस्थिती', + odpnr:'ओडी/एफपीएनआर', + approved: 'स्वीकृत', + outdoorDuty:'आउटडोअर ड्युटी', + completed: 'पूर्ण झाले' }; \ No newline at end of file