From 11ecc9a7f72dace29c0df55a19728929b21c2414 Mon Sep 17 00:00:00 2001 From: nitin raj Date: Wed, 22 Jun 2022 12:03:19 +0530 Subject: [PATCH 01/10] dialogue box and code changes --- .../dialog-box/dialog-box.component.html | 32 +++++++++++++++---- .../roles-and-activities.component.html | 2 +- 2 files changed, 27 insertions(+), 7 deletions(-) diff --git a/project/ws/app/src/lib/routes/profile-v3/components/dialog-box/dialog-box.component.html b/project/ws/app/src/lib/routes/profile-v3/components/dialog-box/dialog-box.component.html index 052c6365f..1c5ae7d42 100644 --- a/project/ws/app/src/lib/routes/profile-v3/components/dialog-box/dialog-box.component.html +++ b/project/ws/app/src/lib/routes/profile-v3/components/dialog-box/dialog-box.component.html @@ -33,9 +33,21 @@

3.   Streamlining the recruitment process

Example:

-

•   Ensures inclusion and accuracy of facts in vigilance proposals.

-

•   Coordinates and manages relationships with various stakeholders

-

•   Manages grievance redressal mechanisms

+ + + +

1.   Competency Label: Noting and Drafting

+

Competency Type: Functional

+

Description: Drafts and analyses a note, in order, in order to move a proposal for

+

decision making on the availability of evidence and existing rules and precedents.

+

2.   Competency Label: Communication Skills

+

Competency Type: Behavioural

+

Description: Articulates information to others in a language that is clear, concise, and easy to understand. It also includes the ability to listen and understand the unspoken feelings and concerns of others.

+

3.   Competency Label: Regulatory and Legal Advisory

+

Competency Type: Domain

+

Description: Provides advice to business and management stakeholders on regulatory + compliance and legal matters related to support business decision making

@@ -54,9 +66,17 @@

3.   Streamlining the recruitment process

Example:

-

•   Ensures inclusion and accuracy of facts in vigilance proposals.

-

•   Coordinates and manages relationships with various stakeholders

-

•   Manages grievance redressal mechanisms

+

1.   Competency Label: Noting and Drafting

+

Competency Type: Functional

+

Description: Drafts and analyses a note, in order, in order to move a proposal for

+

decision making on the availability of evidence and existing rules and precedents.

+

2.   Competency Label: Communication Skills

+

Competency Type: Behavioural

+

Description: Articulates information to others in a language that is clear, concise, and easy to understand. It also includes the ability to listen and understand the unspoken feelings and concerns of others.

+

3.   Competency Label: Regulatory and Legal Advisory

+

Competency Type: Domain

+

Description: Provides advice to business and management stakeholders on regulatory + compliance and legal matters related to support business decision making

diff --git a/project/ws/app/src/lib/routes/profile-v3/routes/roles-and-activities/roles-and-activities.component.html b/project/ws/app/src/lib/routes/profile-v3/routes/roles-and-activities/roles-and-activities.component.html index 37e565c50..d3fc2e470 100644 --- a/project/ws/app/src/lib/routes/profile-v3/routes/roles-and-activities/roles-and-activities.component.html +++ b/project/ws/app/src/lib/routes/profile-v3/routes/roles-and-activities/roles-and-activities.component.html @@ -47,7 +47,7 @@ info_outlined What is an activity? From 2591caeaaf10a5db725703423fdc535ab708d0b8 Mon Sep 17 00:00:00 2001 From: NandiniAV Date: Fri, 24 Jun 2022 18:10:49 +0530 Subject: [PATCH 02/10] Updated activation link condition in events hub --- .../right-menu-card.component.ts | 6 +++++- .../events/routes/events/events.component.ts | 20 +++++++++++++------ 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/project/ws/app/src/lib/routes/events/components/right-menu-card/right-menu-card.component.ts b/project/ws/app/src/lib/routes/events/components/right-menu-card/right-menu-card.component.ts index 3e36f42b9..07971f362 100644 --- a/project/ws/app/src/lib/routes/events/components/right-menu-card/right-menu-card.component.ts +++ b/project/ws/app/src/lib/routes/events/components/right-menu-card/right-menu-card.component.ts @@ -92,7 +92,11 @@ export class RightMenuCardComponent implements OnInit, OnDestroy { const currentTime = new Date().getHours() * 60 + new Date().getMinutes() const minustime = starttime - currentTime - if (eventData.startDate === todaysdate && minustime < 16 && (selectedStartDate > today || selectedEndDate < today)) { + // tslint:disable-next-line:max-line-length + if (eventData.startDate === todaysdate && (minustime > 0 && minustime < 16) && (selectedStartDate > today || selectedEndDate < today)) { + return true + } + if (eventData.startDate === todaysdate && (today >= selectedStartDate && today <= selectedEndDate)) { return true } return false diff --git a/project/ws/app/src/lib/routes/events/routes/events/events.component.ts b/project/ws/app/src/lib/routes/events/routes/events/events.component.ts index 6de13ad2e..3405c1c34 100644 --- a/project/ws/app/src/lib/routes/events/routes/events/events.component.ts +++ b/project/ws/app/src/lib/routes/events/routes/events/events.component.ts @@ -123,7 +123,8 @@ export class EventsComponent implements OnInit { this.allEvents['featuredEvents'] = [] Object.keys(data).forEach((index: any) => { const obj = data[index] - const expiryDateFormat = this.customDateFormat(obj.startDate, obj.startTime) + const expiryStartTimeFormat = this.customDateFormat(obj.startDate, obj.startTime) + const expiryEndTimeFormat = this.customDateFormat(obj.startDate, obj.endTime) const floor = Math.floor const hours = floor(obj.duration / 60) const minutes = obj.duration % 60 @@ -159,7 +160,7 @@ export class EventsComponent implements OnInit { pastevent: false, } this.allEvents['all'].push(eventDataObj) - const isToday = this.compareDate(expiryDateFormat, obj.startDate) + const isToday = this.compareDate(expiryStartTimeFormat, obj.startDate, expiryEndTimeFormat) if (isToday) { this.allEvents['todayEvents'].push(eventDataObj) } @@ -169,10 +170,10 @@ export class EventsComponent implements OnInit { const now = new Date() const today = moment(now).format('YYYY-MM-DD HH:mm') - if (expiryDateFormat < today) { + if (expiryStartTimeFormat < today) { eventDataObj.pastevent = true } - // const isPast = this.compareDate(expiryDateFormat); + // const isPast = this.compareDate(expiryStartTimeFormat); // (!isPast) ? this.allEvents['all'].push(eventDataObj) : this.allEvents['todayEvents'].push(eventDataObj) }) this.filter('all') @@ -226,7 +227,7 @@ export class EventsComponent implements OnInit { } } - compareDate(selectedDate: any, startDate: any) { + compareDate(startime: any, startDate: any, endtime: any) { const now = new Date() const today = moment(now).format('YYYY-MM-DD HH:mm') @@ -236,7 +237,14 @@ export class EventsComponent implements OnInit { // tslint:disable-next-line:prefer-template const month = ('0' + (now.getMonth() + 1)).slice(-2) const todaysdate = `${year}-${month}-${day}` - return (startDate === todaysdate && selectedDate > today) ? true : false + // return (startDate === todaysdate && (startime >= today || endtime <= today)) ? true : false + if (startDate === todaysdate && startime > today) { + return true + } + if (startDate === todaysdate && (today >= startime && today <= endtime)) { + return true + } + return false } allEventDateFormat(datetime: any) { From 88567243d9239d77e6e553c57f3d13549ffaafb6 Mon Sep 17 00:00:00 2001 From: NandiniAV Date: Thu, 30 Jun 2022 16:35:56 +0530 Subject: [PATCH 03/10] Added contact us page --- src/app/app-routing.module.ts | 8 ++-- src/app/app.module.ts | 2 + .../app-footer/app-footer.component.html | 1 + .../public-contacthome.component.html | 19 ++++++++++ .../public-contacthome.component.scss | 37 +++++++++++++++++++ .../public-contacthome.component.ts | 21 +++++++++++ 6 files changed, 83 insertions(+), 5 deletions(-) create mode 100644 src/app/routes/public/public-contacthome/public-contacthome.component.html create mode 100644 src/app/routes/public/public-contacthome/public-contacthome.component.scss create mode 100644 src/app/routes/public/public-contacthome/public-contacthome.component.ts diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index d22d399bd..f737ecbe6 100755 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -22,6 +22,7 @@ import { AppTocResolverService } from '@ws/app/src/lib/routes/app-toc/resolvers/ import { PublicLogoutComponent } from './routes/public/public-logout/public-logout.component' import { PublicSignupComponent } from './routes/public/public-signup/public-signup.component' import { PublicHomeComponent } from './routes/public/public-home/public-home.component' +import { PublicContacthomeComponent } from './routes/public/public-contacthome/public-contacthome.component' // 💥💥💥💥💥💥💥💥💥💥💥💥💥💥💥💥💥💥💥💥💥💥💥💥💥💥💥💥💥💥💥💥💥💥💥💥💥💥💥 // Please declare routes in alphabetical order @@ -685,16 +686,13 @@ const routes: Routes = [ }, { path: 'public/contact', - component: PublicContactComponent, + component: PublicContacthomeComponent, data: { pageType: 'feature', - pageKey: 'public-faq', + pageKey: 'public-contact', module: 'support', pageId: 'public/contact', }, - resolve: { - pageData: PageResolve, - }, }, { path: 'public/faq', diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 9eb3767fc..0787bc3e2 100755 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -71,6 +71,7 @@ import { PublicLogoutModule } from './routes/public/public-logout/public-logout. import { PublicSignupModule } from './routes/public/public-signup/public-signup.module' import { PublicHomeComponent } from './routes/public/public-home/public-home.component' import { PublicHomeService } from './services/public-home.service' +import { PublicContacthomeComponent } from './routes/public/public-contacthome/public-contacthome.component' // import { ServiceWorkerModule } from '@angular/service-worker' // import { environment } from '../environments/environment' @@ -109,6 +110,7 @@ const getBaseHref = (platformLocation: PlatformLocation): string => { LoginRootDirective, NoConnectionComponent, PublicHomeComponent, + PublicContacthomeComponent, ], imports: [ FormsModule, diff --git a/src/app/component/app-footer/app-footer.component.html b/src/app/component/app-footer/app-footer.component.html index 784ca1e2c..4ca2d942e 100755 --- a/src/app/component/app-footer/app-footer.component.html +++ b/src/app/component/app-footer/app-footer.component.html @@ -34,6 +34,7 @@

Support

 Frequently asked questions + Contact Us diff --git a/src/app/routes/public/public-contacthome/public-contacthome.component.html b/src/app/routes/public/public-contacthome/public-contacthome.component.html new file mode 100644 index 000000000..4fcada522 --- /dev/null +++ b/src/app/routes/public/public-contacthome/public-contacthome.component.html @@ -0,0 +1,19 @@ +
+ + +
+
+
+
+ +

Contact Us

+ +
We would love to hear from you!
+

Send us a mail to mission.karmayogi@gov.in. Our representatives will reach out to you at the earliest.

+

You may contact us on 1800 111 555 or visit our service desk for more details.

+

To know more click here.

+ +
+
+
+ \ No newline at end of file diff --git a/src/app/routes/public/public-contacthome/public-contacthome.component.scss b/src/app/routes/public/public-contacthome/public-contacthome.component.scss new file mode 100644 index 000000000..a13da256a --- /dev/null +++ b/src/app/routes/public/public-contacthome/public-contacthome.component.scss @@ -0,0 +1,37 @@ +@import "ws-vars"; +@import "ws-common"; + +.container-balanced { + max-width: 1202px; + margin-left: auto !important; + margin-right: auto !important; +} +.faq_main_box{ + padding: 45px 8px 0 8px; + + @include breakpoint-xs { + padding: 45px 0; + } +} +h2.main_title_text { + font-weight: 600!important; +} +.full_width_box { + width: 100%; +} +.flex-4 { + flex: 4; +} + +.custom { + @include breakpoint-xs { + flex-direction: column; + } + + @include breakpoint-s { + flex-direction: column; + } +} +.flex-3 { + flex: 3; +} diff --git a/src/app/routes/public/public-contacthome/public-contacthome.component.ts b/src/app/routes/public/public-contacthome/public-contacthome.component.ts new file mode 100644 index 000000000..1f2b392e3 --- /dev/null +++ b/src/app/routes/public/public-contacthome/public-contacthome.component.ts @@ -0,0 +1,21 @@ +import { Component, OnInit } from '@angular/core' +import { ConfigurationsService, NsPage } from '@sunbird-cb/utils' + +@Component({ + selector: 'ws-public-contacthome', + templateUrl: './public-contacthome.component.html', + styleUrls: ['./public-contacthome.component.scss'], +}) +export class PublicContacthomeComponent implements OnInit { + contactUsMail = '' + pageNavbar: Partial = this.configSvc.pageNavBar + + constructor(private configSvc: ConfigurationsService) {} + + ngOnInit() { + if (this.configSvc.instanceConfig) { + this.contactUsMail = this.configSvc.instanceConfig.mailIds.contactUs + } + } + +} From 0ebec85afce3ed8d29d49c74a2be56e80f4d50e6 Mon Sep 17 00:00:00 2001 From: NandiniAV Date: Thu, 30 Jun 2022 16:39:29 +0530 Subject: [PATCH 04/10] updated contact us page --- .../public-contacthome/public-contacthome.component.html | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/app/routes/public/public-contacthome/public-contacthome.component.html b/src/app/routes/public/public-contacthome/public-contacthome.component.html index 4fcada522..afb41e398 100644 --- a/src/app/routes/public/public-contacthome/public-contacthome.component.html +++ b/src/app/routes/public/public-contacthome/public-contacthome.component.html @@ -7,8 +7,7 @@

Contact Us

- -
We would love to hear from you!
+

Send us a mail to mission.karmayogi@gov.in. Our representatives will reach out to you at the earliest.

You may contact us on 1800 111 555 or visit our service desk for more details.

To know more click here.

From 027311e1077a7d1ee1ad8d1953b31f9816ab1f41 Mon Sep 17 00:00:00 2001 From: nitin raj Date: Thu, 30 Jun 2022 17:54:46 +0530 Subject: [PATCH 05/10] footer changes --- src/app/component/root/root.component.ts | 5 ++++- .../public-home/public-home.component.scss | 17 ++++++++++++++--- .../public-signup/public-signup.component.scss | 5 +++-- .../public-signup/public-signup.component.ts | 4 ++-- 4 files changed, 23 insertions(+), 8 deletions(-) diff --git a/src/app/component/root/root.component.ts b/src/app/component/root/root.component.ts index f0653ba5c..91add6825 100755 --- a/src/app/component/root/root.component.ts +++ b/src/app/component/root/root.component.ts @@ -208,7 +208,10 @@ export class RootComponent implements OnInit, AfterViewInit { this.showFooter = false this.showNavbar = false this.isNavBarRequired = false - } else { + } else if (this.currentUrl.startsWith('/public/home')) { + this.showNavbar = true + } + else { this.showFooter = true this.showNavbar = true this.isNavBarRequired = true diff --git a/src/app/routes/public/public-home/public-home.component.scss b/src/app/routes/public/public-home/public-home.component.scss index 17e924f1c..07e33c64b 100644 --- a/src/app/routes/public/public-home/public-home.component.scss +++ b/src/app/routes/public/public-home/public-home.component.scss @@ -43,9 +43,9 @@ padding: 0; margin: 0; } - a { - color: #A221D8; - } + // a { + // color: #A221D8; + // } a:hover { text-decoration: none; @@ -575,3 +575,14 @@ // width: 90%; // } // } + + + ::ng-deep .app-footer { + display: none!important; + visibility: hidden!important; + } + + ::ng-deep .top_footer_box { + display: none!important; + visibility: hidden!important; + } diff --git a/src/app/routes/public/public-signup/public-signup.component.scss b/src/app/routes/public/public-signup/public-signup.component.scss index f9c7a1033..6a28e404c 100644 --- a/src/app/routes/public/public-signup/public-signup.component.scss +++ b/src/app/routes/public/public-signup/public-signup.component.scss @@ -392,9 +392,9 @@ } } - .mat-form-field-wrapper{ + // .mat-form-field-wrapper{ - } + // } .combined-field { @@ -781,3 +781,4 @@ body.recaptcha { visibility: visible !important; } } + diff --git a/src/app/routes/public/public-signup/public-signup.component.ts b/src/app/routes/public/public-signup/public-signup.component.ts index ebc5f271d..6df767868 100644 --- a/src/app/routes/public/public-signup/public-signup.component.ts +++ b/src/app/routes/public/public-signup/public-signup.component.ts @@ -51,7 +51,7 @@ export function forbiddenNamesValidatorPosition(optionsArray: any): ValidatorFn export class PublicSignupComponent implements OnInit, OnDestroy { registrationForm!: FormGroup namePatern = `^[a-zA-Z\\s\\']{1,32}$` - // emailWhitelistPattern = `^[a-zA-Z0-9._-]{3,}\\b(@gov|@nic)\\b\.\\b(in)\\b$` + emailWhitelistPattern = `^[a-zA-Z0-9._-]{3,}\\b@\\b[a-zA-Z0-9]*|\\b(.gov|.nic)\b\\.\\b(in)\\b$` departments!: any masterDepartments!: Observable | undefined masterDepartmentsOriginal!: [] @@ -79,7 +79,7 @@ export class PublicSignupComponent implements OnInit, OnDestroy { firstname: new FormControl('', [Validators.required, Validators.pattern(this.namePatern)]), lastname: new FormControl('', [Validators.required, Validators.pattern(this.namePatern)]), position: new FormControl('', [Validators.required, forbiddenNamesValidatorPosition(this.masterPositions)]), - email: new FormControl('', [Validators.required, Validators.email]), + email: new FormControl('', [Validators.required, Validators.pattern(this.emailWhitelistPattern)]), department: new FormControl('', [Validators.required, forbiddenNamesValidator(this.masterDepartments)]), confirmBox: new FormControl(false, [Validators.required]), // recaptchaReactive: new FormControl(null, [Validators.required]), From 9d73e77f405c8bbb6dd7e75153cba13f32c71d95 Mon Sep 17 00:00:00 2001 From: nitin raj Date: Thu, 30 Jun 2022 18:14:38 +0530 Subject: [PATCH 06/10] public home page img name changed --- src/app/routes/public/public-home/public-home.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/routes/public/public-home/public-home.component.html b/src/app/routes/public/public-home/public-home.component.html index 85c4709a3..63c440a2e 100644 --- a/src/app/routes/public/public-home/public-home.component.html +++ b/src/app/routes/public/public-home/public-home.component.html @@ -89,7 +89,7 @@

How does the platform enable you
-