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

Release 5.0.2 #3232

Merged
merged 2 commits into from
Nov 9, 2022
Merged

Release 5.0.2 #3232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fdaee47
Issues fix: ED-396, ED-405, ED-406, ED-407
Nov 8, 2022
10545b8
Merge pull request #339 from shikshalokam/5.0.2_QA
kiranharidas187 Nov 8, 2022
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
1 change: 1 addition & 0 deletions src/app/manage-learn/project/create-project/create-project.page.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,7 @@ export class CreateProjectPage implements OnInit {
cssClass: 'central-alert',
header: text[translateText.header],
message: text[translateText.message],
backdropDismiss:false,
buttons: [
{
text: text[translateText.yes],
Expand Down
6 changes: 2 additions & 4 deletions src/app/manage-learn/shared/components/filter-modal/filter-modal.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ export class FilterModalComponent implements OnInit {
}

ngOnInit() {
this.dataList = [];
this.search('');
}

Expand All @@ -49,15 +50,13 @@ export class FilterModalComponent implements OnInit {
if (searchText == null || searchText == undefined) {
searchText = '';
}
this.dataList = [];
this.searchText = searchText;

this.type == 'entity' ? this.serachEntity(searchText) : this.searchProgramByEntity(searchText);
}
async searchProgramByEntity(searchText: any) {
this.loader.startLoader();
let payload = await this.utils.getProfileData();

const config = {
url:
urlConstants.API_URLS.GET_PROGRAM_BY_ENTITY +
Expand All @@ -68,7 +67,7 @@ export class FilterModalComponent implements OnInit {
this.unnatiSrvc.post(config).subscribe(
(data) => {
this.loader.stopLoader();
this.dataList = data.result.data;
this.dataList = this.dataList.concat(data.result.data);
},
(error) => {
this.loader.stopLoader();
Expand All @@ -80,7 +79,6 @@ export class FilterModalComponent implements OnInit {
}
getEntityTypes() {
this.utils.getMandatoryEntitiesList().then((data) => {
console.log(data, 'data 109');
this.entityTypes = data;
});
}
Expand Down
2 changes: 1 addition & 1 deletion src/assets/i18n/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1360,7 +1360,7 @@
"FRMELEMNTS_LBL_MOBILE_NUMBER_PLACEHOLDER": "Mobile number for State or Org",
"FRMELEMNTS_LBL_EMAIL_ID_PLACEHOLDER": "Email address of State or Org",
"FRMELEMNTS_MSG_CONSENT_DECLARATION_INFO": "You can edit details from your Profile page",
"FRMELEMENTS_BTN_APPLY_FILTER":"Apply Filter",
"FRMELEMENTS_BTN_APPLY_FILTER":"Apply filter",
"FRMELEMNTS_LBL_START_IMP_POPUP_MSG1":"You must click on the Start improvement button to access and edit the project details.",
"FRMELEMNTS_LBL_START_IMP_POPUP_MSG2":"Click on the Start improvement to get complete access to the content",
"FRMELEMNTS_LBL_TO_SUBMIT_PROJECT":"To finish submission, click on Submit button below",
Expand Down