Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

issue #fix 1127,1111 #331

Merged
merged 5 commits into from
Dec 26, 2023
Merged

issue #fix 1127,1111 #331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9ba68c9
issue #fix 1127,1111
GSuma21 Dec 12, 2023
0292ff3
issue #fix
GSuma21 Dec 12, 2023
c8b2b71
Merge remote-tracking branch 'upstream/release-2.5.0' into release-2.5.0
GSuma21 Dec 21, 2023
7e69729
issue #fix 1143
GSuma21 Dec 26, 2023
86d3dc1
issue #fix ng class
GSuma21 Dec 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/app/pages/feedback/feedback.page.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
</div>

</ion-content>
<ion-footer class="ion-no-border">
<ion-footer class="ion-no-border" *ngIf="form1">
<section [ngClass]="{'btn-disabled': !form1.myForm.valid , 'btn-valid':form1.myForm.valid}">
<ion-button expand="full" (click)="submit()">{{'SUBMIT_FEEDBACK' | translate}}</ion-button>
</section>
</ion-footer>
6 changes: 3 additions & 3 deletions src/app/pages/home-search/home-search.page.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<app-page-header [config]="headerConfig"></app-page-header>
<ion-content class="ion-padding">
<ion-toolbar>
<ion-searchbar class="top-padding" [(ngModel)]="searchText" placeholder="" (keypress)="checkInput($event)" debounce="100"></ion-searchbar>
<ion-searchbar (ionClear)="cancelSearch($event)" class="top-padding" [(ngModel)]="searchText" placeholder="" (keypress)="checkInput($event)" debounce="100"></ion-searchbar>
</ion-toolbar>
<ion-segment (ionChange)="segmentChanged($event)" [value]="type">
<ion-segment-button value="all-sessions">
<ion-label class="segment-label">{{ "ALL_SESSIONS" | translate }}</ion-label>
<ion-label class="segment-label">{{ "SESSIONS" | translate }}</ion-label>
</ion-segment-button>
<ion-segment-button value="mentor-profile">
<ion-label class="segment-label">{{ "MENTOR_PROFILE" | translate }}</ion-label>
<ion-label class="segment-label">{{ "MENTORS" | translate }}</ion-label>
</ion-segment-button>
</ion-segment>
<div *ngIf="results">
Expand Down
4 changes: 4 additions & 0 deletions src/app/pages/home-search/home-search.page.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,10 @@ export class HomeSearchPage implements OnInit {
this.search();
}
}
cancelSearch(event: any){
this.searching = true
this.results = []
}
trimLeft(inputString: string): string {
return this.searchText = inputString.replace(/^\s+/, '');
}
Expand Down
5 changes: 2 additions & 3 deletions src/app/pages/tabs/mentor-directory/mentor-directory.page.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@
[(ngModel)]="searchText" (ionChange)="onSearch()"></ion-searchbar>
</div>
</ion-toolbar>
<ion-content *ngIf="isLoaded">

<ion-content >
<div *ngFor="let mentor of mentors">
<div class="index-label">
{{mentor.key}}
Expand All @@ -21,7 +20,7 @@
</ion-row>
</ion-grid>
</div>
<div *ngIf="!mentors?.length">
<div *ngIf="!mentors?.length && isLoaded">
<app-no-data-found [messageHeader]="'NO_MENTORS_AVAILABLE'"> </app-no-data-found>
</div>
<ion-infinite-scroll #infinitescroll [disabled]="mentors.length==0" (ionInfinite)="loadMore($event)">
Expand Down
3 changes: 2 additions & 1 deletion src/assets/i18n/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,5 +226,6 @@
"USER_CANT_ACCESS_THIS_SESSION":"You can’t access this session.",
"USER_CANT_ACCESS_SESSION_GO_TO_HOME_PAGE":"This is a private mentoring session. You shall not be able to access it. Go to the ‘All session’ tab to enroll for mentoring sessions that are available to you.",
"USER_CANT_ACCESS_THIS_PROFILE":"You can’t access this mentor’s profile.",
"USER_CANT_ACCESS_PROFILE_GO_TO_HOME_PAGE":"This mentor's profile is private. Go to the ‘All session’ tab to enroll for mentoring sessions that are available to you."
"USER_CANT_ACCESS_PROFILE_GO_TO_HOME_PAGE":"This mentor's profile is private. Go to the ‘All session’ tab to enroll for mentoring sessions that are available to you.",
"SESSIONS":"Sessions"
}
3 changes: 2 additions & 1 deletion src/assets/i18n/hi.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,5 +230,6 @@
"USER_CANT_ACCESS_THIS_SESSION":"आप इस सेशन को एक्सेस नहीं कर सकते",
"USER_CANT_ACCESS_SESSION_GO_TO_HOME_PAGE":"यह एक निजी मेंटरिंग सेशन है। आप इसको एक्सेस नहीं कर पाएंगे। 'ऑल सेशन' टैब पर जाएं और उन मेंटरिंग सेशन के लिए रजिस्टर करें जो आपके लिए उपलब्ध हैं।",
"USER_CANT_ACCESS_THIS_PROFILE":"आप इस मेंटर के प्रोफ़ाइल नहीं देख सकते।",
"USER_CANT_ACCESS_PROFILE_GO_TO_HOME_PAGE":"इस मेंटर का प्रोफ़ाइल निजी है। उन सेशन के लिए रजिस्टर करें जो आपके लिए उपलब्ध हैं, 'ऑल सेशन' टैब पर जाएं।"
"USER_CANT_ACCESS_PROFILE_GO_TO_HOME_PAGE":"इस मेंटर का प्रोफ़ाइल निजी है। उन सेशन के लिए रजिस्टर करें जो आपके लिए उपलब्ध हैं, 'ऑल सेशन' टैब पर जाएं।",
"SESSIONS":"सत्र"
}